[Fusionforge-commits] FusionForge branch Branch_5_2 updated. 28c8c8c1edce93913a56bdaecafd51f08b9ab707
Julien HEYMAN
jheyman at fusionforge.org
Thu Feb 27 18:26:48 CET 2014
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".
The branch, Branch_5_2 has been updated
via 28c8c8c1edce93913a56bdaecafd51f08b9ab707 (commit)
via ba59a00e5c00ba3fd4bdd67bf48a7ea68958ab13 (commit)
from 6fef2b4662a6f0e913fca66db5eb6dae32bdb60a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 28c8c8c1edce93913a56bdaecafd51f08b9ab707
Merge: ba59a00 6fef2b4
Author: Julien HEYMAN <julien.heyman at atos.net>
Date: Thu Feb 27 18:26:33 2014 +0100
Merge branch 'Branch_5_2'
commit ba59a00e5c00ba3fd4bdd67bf48a7ea68958ab13
Author: Julien HEYMAN <julien.heyman at atos.net>
Date: Thu Feb 27 18:26:00 2014 +0100
Fix url_prefix on css and fs
diff --git a/src/www/include/Layout.class.php b/src/www/include/Layout.class.php
index b075a4a..079badb 100644
--- a/src/www/include/Layout.class.php
+++ b/src/www/include/Layout.class.php
@@ -181,6 +181,9 @@ class Layout extends Error {
$js .= '?'.date ("U", filemtime($filename));
}
}
+ if (forge_get_config('url_prefix')){
+ $js = forge_get_config('url_prefix').$js;
+ }
$this->javascripts[] = $js;
}
}
@@ -200,6 +203,9 @@ class Layout extends Error {
$css .= '?'.date ("U", filemtime($filename));
}
}
+ if (forge_get_config('url_prefix')){
+ $css = forge_get_config('url_prefix').$css;
+ }
$this->stylesheets[] = array('css' => $css, 'media' => $media);
}
}
@@ -333,15 +339,16 @@ class Layout extends Error {
* @todo generalize this
*/
function headerJS() {
+ $this->addJavascript('/scripts/prototype/prototype.js');
+ $this->addJavascript('/scripts/scriptaculous/scriptaculous.js');
+ $this->addJavascript('/scripts/codendi/Tooltip.js');
+ $this->addJavascript('/scripts/codendi/LayoutManager.js');
+ $this->addJavascript('/scripts/codendi/ReorderColumns.js');
+ $this->addJavascript('/scripts/codendi/codendi-1236793993.js');
+ $this->addJavascript('/scripts/codendi/validate.js');
+ $this->addJavascript('/js/common.js');
+
echo '
- <script type="text/javascript" src="/scripts/prototype/prototype.js"></script>
- <script type="text/javascript" src="/scripts/scriptaculous/scriptaculous.js"></script>
- <script type="text/javascript" src="/scripts/codendi/Tooltip.js"></script>
- <script type="text/javascript" src="/scripts/codendi/LayoutManager.js"></script>
- <script type="text/javascript" src="/scripts/codendi/ReorderColumns.js"></script>
- <script type="text/javascript" src="/scripts/codendi/codendi-1236793993.js"></script>
- <script type="text/javascript" src="/scripts/codendi/validate.js"></script>
- <script type="text/javascript" src="'. util_make_uri('/js/common.js') .'"></script>
<script language="JavaScript" type="text/javascript">/* <![CDATA[ */';
plugin_hook ("javascript",false);
echo '
diff --git a/src/www/themes/funky/Theme.class.php b/src/www/themes/funky/Theme.class.php
index d9e1ac1..c276869 100644
--- a/src/www/themes/funky/Theme.class.php
+++ b/src/www/themes/funky/Theme.class.php
@@ -417,12 +417,13 @@ class Theme extends Layout {
*/
function headerJS()
{
- echo '<script type="text/javascript" src="'. util_make_uri('/js/common.js') .'"></script>';
- echo '<script type="text/javascript" src="/scripts/codendi/LayoutManager.js"></script>';
- echo '<script type="text/javascript" src="/scripts/codendi/ReorderColumns.js"></script>';
- echo '<script type="text/javascript" src="/scripts/codendi/codendi-1236793993.js"></script>';
- echo '<script type="text/javascript" src="/scripts/codendi/validate.js"></script>';
- echo '<script type="text/javascript" src="/scripts/codendi/Tooltip.js"></script>';
+ $this->addjavascript('/js/common.js');
+ $this->addjavascript('/scripts/codendi/LayoutManager.js');
+ $this->addjavascript('/scripts/codendi/ReorderColumns.js');
+ $this->addjavascript('/scripts/codendi/codendi-1236793993.js');
+ $this->addjavascript('/scripts/codendi/validate.js');
+ $this->addjavascript('/scripts/codendi/Tooltip.js');
+
plugin_hook("javascript_file", false);
diff --git a/src/www/themes/gforge/css/theme.css b/src/www/themes/gforge/css/theme.css
index c0688e2..61349da 100644
--- a/src/www/themes/gforge/css/theme.css
+++ b/src/www/themes/gforge/css/theme.css
@@ -80,7 +80,7 @@ input[type="text"], input[type="password"], textarea {
.tabGenerator {font-weight:bold; margin:0; }
.tabGenerator td {padding:0; }
.tabGenerator .tg-left div div {
- background: 0 0 url(/themes/gforge/images/toptab-new/left.gif) no-repeat;
+ background: 0 0 url(../images/toptab-new/left.gif) no-repeat;
display: block;
width: 3px;
height: 30px;
@@ -89,13 +89,13 @@ input[type="text"], input[type="password"], textarea {
vertical-align: middle;
}
.tabGenerator .tg-middle div div {
- background: url(/themes/gforge/images/toptab-new/middle.gif);
+ background: url(../images/toptab-new/middle.gif);
text-align:center;
vertical-align: middle;
height: 30px;
}
.tabGenerator .tg-right div div {
- background: 0 0 url(/themes/gforge/images/toptab-new/right.gif) no-repeat;
+ background: 0 0 url(../images/toptab-new/right.gif) no-repeat;
display: block;
width: 9px;
height: 30px;
@@ -107,17 +107,17 @@ input[type="text"], input[type="password"], textarea {
.tabGenerator .tg-middle div div.nested,
.tabGenerator .tg-right div div.nested {height: 22px; padding-top:0.5em; }
-.tabGenerator .tg-left div.selected div {background-image:url(/themes/gforge/images/toptab-new/selected-left.gif); }
-.tabGenerator .tg-middle div.selected div {background-image: url(/themes/gforge/images/toptab-new/selected-middle.gif); }
-.tabGenerator .tg-right div.selected div {background-image: url(/themes/gforge/images/toptab-new/selected-right.gif)}
+.tabGenerator .tg-left div.selected div {background-image:url(../images/toptab-new/selected-left.gif); }
+.tabGenerator .tg-middle div.selected div {background-image: url(../images/toptab-new/selected-middle.gif); }
+.tabGenerator .tg-right div.selected div {background-image: url(../images/toptab-new/selected-right.gif)}
-.tabGenerator .tg-left div div.nested {background:0 0 url(/themes/gforge/images/bottomtab-new/middle.gif); }
-.tabGenerator .tg-middle div div.nested {background:url(/themes/gforge/images/bottomtab-new/middle.gif); }
-.tabGenerator .tg-right div div.nested {background: 0 0 url(/themes/gforge/images/bottomtab-new/separator.gif); }
+.tabGenerator .tg-left div div.nested {background:0 0 url(../images/bottomtab-new/middle.gif); }
+.tabGenerator .tg-middle div div.nested {background:url(../images/bottomtab-new/middle.gif); }
+.tabGenerator .tg-right div div.nested {background: 0 0 url(../images/bottomtab-new/separator.gif); }
-.tabGenerator .tg-left div.selected div.nested {background:0 0 url(/themes/gforge/images/bottomtab-new/selected-middle.gif); }
-.tabGenerator .tg-middle div.selected div.nested{background:url(/themes/gforge/images/bottomtab-new/selected-middle.gif); }
-.tabGenerator .tg-right div.selected div.nested {background: 0 0 url(/themes/gforge/images/bottomtab-new/selected-separator.gif); }
+.tabGenerator .tg-left div.selected div.nested {background:0 0 url(../images/bottomtab-new/selected-middle.gif); }
+.tabGenerator .tg-middle div.selected div.nested{background:url(../images/bottomtab-new/selected-middle.gif); }
+.tabGenerator .tg-right div.selected div.nested {background: 0 0 url(../images/bottomtab-new/selected-separator.gif); }
/* set padding only for non nested tabs */
.tabGenerator .tg-middle div div a {display:block; padding-top: 0.5em;}
-----------------------------------------------------------------------
Summary of changes:
src/www/include/Layout.class.php | 23 +++++++++++++++--------
src/www/themes/funky/Theme.class.php | 13 +++++++------
src/www/themes/gforge/css/theme.css | 24 ++++++++++++------------
3 files changed, 34 insertions(+), 26 deletions(-)
hooks/post-receive
--
FusionForge
More information about the Fusionforge-commits
mailing list