[Fusionforge-commits] FusionForge branch Branch_5_3 updated. b2829bb7bb379aa9ce87ea436a7c6d2ec590c52b

Julien HEYMAN jheyman at fusionforge.org
Thu Feb 27 18:54:32 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_3 has been updated
       via  b2829bb7bb379aa9ce87ea436a7c6d2ec590c52b (commit)
       via  298a6fbb15f1b91986450c731a215455d8b6d953 (commit)
      from  d30bf60dc906f620da690b21051fd325093cbf4e (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 b2829bb7bb379aa9ce87ea436a7c6d2ec590c52b
Author: Julien HEYMAN <julien.heyman at atos.net>
Date:   Thu Feb 27 18:52:53 2014 +0100

    Fix url_prefix on css and js

diff --git a/src/www/include/Layout.class.php b/src/www/include/Layout.class.php
index a0f84d1..acb87d3 100644
--- a/src/www/include/Layout.class.php
+++ b/src/www/include/Layout.class.php
@@ -182,6 +182,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;
 		}
 	}
@@ -201,6 +204,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);
 		}
 	}

commit 298a6fbb15f1b91986450c731a215455d8b6d953
Author: Julien HEYMAN <julien.heyman at atos.net>
Date:   Thu Feb 27 18:49:24 2014 +0100

    Revert "Merge branch 'Branch_5_2' into Branch_5_3"
    
    This reverts commit d30bf60dc906f620da690b21051fd325093cbf4e, reversing
    changes made to 247d404a78c4ce704cc543dbf181e352920c61e3.

diff --git a/src/www/include/Layout.class.php b/src/www/include/Layout.class.php
index 419561a..a0f84d1 100644
--- a/src/www/include/Layout.class.php
+++ b/src/www/include/Layout.class.php
@@ -182,9 +182,6 @@ 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;
 		}
 	}
@@ -204,9 +201,6 @@ 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);
 		}
 	}
@@ -353,17 +347,9 @@ 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 language="JavaScript" type="text/javascript">/* <![CDATA[ */';
+			<script type="text/javascript" src="'. util_make_uri('/js/common.js') .'"></script>
+			<script type="text/javascript">/* <![CDATA[ */';
 		plugin_hook ("javascript",false);
 		echo '
 			/* ]]> */</script>';
diff --git a/src/www/themes/funky/Theme.class.php b/src/www/themes/funky/Theme.class.php
index fa9fccd..31070fa 100644
--- a/src/www/themes/funky/Theme.class.php
+++ b/src/www/themes/funky/Theme.class.php
@@ -430,13 +430,7 @@ class Theme extends Layout {
 	 */
 	function headerJS()
 	{
-		$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');
-
+		echo '<script type="text/javascript" src="'. util_make_uri('/js/common.js') .'"></script>';
 
 		plugin_hook("javascript_file", false);
 

-----------------------------------------------------------------------

Summary of changes:
 src/www/include/Layout.class.php     |   24 ++++++++----------------
 src/www/themes/funky/Theme.class.php |    8 +-------
 2 files changed, 9 insertions(+), 23 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list