[Fusionforge-commits] FusionForge branch master updated. v6.0.5-1680-gaa5b085

Marc-Etienne VARGENAU vargenau at libremir.placard.fr.eu.org
Fri Apr 21 15:47:36 CEST 2017


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, master has been updated
       via  aa5b08589365f9d8d1bc0cd5f66ecfaa3292e859 (commit)
      from  ab429ce0504a523fa8b63c65ea3ef4243066b8a1 (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 -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=aa5b08589365f9d8d1bc0cd5f66ecfaa3292e859

commit aa5b08589365f9d8d1bc0cd5f66ecfaa3292e859
Author: Marc-Etienne Vargenau <marc-etienne.vargenau at nokia.com>
Date:   Fri Apr 21 15:47:32 2017 +0200

    Move headerJS up, like in Layout class

diff --git a/src/www/themes/funky/Theme.class.php b/src/www/themes/funky/Theme.class.php
index 59a6253..e2e69f3 100644
--- a/src/www/themes/funky/Theme.class.php
+++ b/src/www/themes/funky/Theme.class.php
@@ -39,6 +39,65 @@ class Theme_Funky extends Layout {
 		$this->addStylesheet('/scripts/jquery-ui/css/overcast/jquery-ui.theme-1.12.1.css');
 	}
 
+	/**
+	 * headerJS() - creates the JS headers and calls the plugin javascript hook
+	 * @todo generalize this
+	 */
+	function headerJS() {
+		global $use_tooltips;
+
+		echo html_e('script', array('type' => 'text/javascript', 'src' => util_make_uri('/js/common.js')), '', false);
+		plugin_hook("javascript_file");
+
+		// invoke the 'javascript' hook for custom javascript addition
+		$params = array('return' => false);
+		plugin_hook("javascript", $params);
+		$javascript = $params['return'];
+		if($javascript) {
+			echo html_ao('script', array('type' => 'text/javascript')).'//<![CDATA['."\n";
+			echo $javascript;
+			echo "\n".'//]]'."\n";
+			echo html_ac(html_ap() -1);
+		}
+		html_use_storage();
+		html_use_coolfieldset();
+		html_use_jqueryui();
+		echo $this->getJavascripts();
+		echo html_ao('script', array('type' => 'text/javascript'));
+		echo '	//<![CDATA[
+			jQuery(window).load(function(){
+				setTimeout("jQuery(\'.feedback\').hide(\'slow\')", 5000);
+				setInterval(function() {
+						setTimeout("jQuery(\'.feedback\').hide(\'slow\')", 5000);
+					}, 5000);
+				jQuery("button").button();
+				jQuery(":submit").button();
+				jQuery(":reset").button();
+				jQuery(":button").button();
+				jQuery("#tabber").tabs();
+			});
+			//]]>'."\n";
+		if ($use_tooltips) {
+			echo '	jQuery(document).ready(
+					function() {
+						jQuery(document).tooltip({
+								show: {
+									effect: \'slideDown\'
+									},
+								track: true,
+								open: function (event, ui) {
+									setTimeout(function () {
+										jQuery(ui.tooltip).hide(\'slideUp\');
+										}, 5000);
+									}
+								});
+					}
+				);'."\n";
+		}
+		echo html_ac(html_ap() -1);
+	}
+}
+
 	function bodyHeader($params) {
 		if (!isset($params['h1']) && isset($params['title'])) {
 			$params['h1'] = $params['title'];
@@ -59,7 +118,7 @@ class Theme_Funky extends Layout {
 		}
 		$params['links'] = &$links;
 		plugin_hook('headermenu', $params);
-		$template = isset($params['template']) ?  $params['template'] : ' | ';
+		$template = isset($params['template']) ? $params['template'] : ' | ';
 		$cells[] = array(implode($template, $links), 'id' => 'header-col2');
 		echo $this->multiTableRow(array(), $cells);
 		$cells = array();
@@ -185,7 +244,7 @@ class Theme_Funky extends Layout {
 		return html_ac(html_ap() -1).'<!-- class="box-surround" -->'."\n";
 	}
 
-	function tabGenerator($tabs_dirs, $tabs_titles, $tabs_tooltips, $nested=false,  $selected=false, $sel_tab_bgcolor='white',  $total_width='100%') {
+	function tabGenerator($tabs_dirs, $tabs_titles, $tabs_tooltips, $nested=false, $selected=false, $sel_tab_bgcolor='white', $total_width='100%') {
 		$count = count($tabs_dirs);
 
 		if ($count < 1) {
@@ -213,7 +272,7 @@ class Theme_Funky extends Layout {
 			$attrs['style'] = 'width:'.$tabwidth.'%';
 			$return .= html_ao('td', $attrs);
 			$attrs = array();
-			$attrs['id'] =  md5($tabs_dirs[$i]);
+			$attrs['id'] = md5($tabs_dirs[$i]);
 			$attrs['href'] = $tabs_dirs[$i];
 			if (preg_match('/^https?:\/\//', $tabs_dirs[$i])) {
 				$attrs['target'] = '_blank';
@@ -263,7 +322,7 @@ class Theme_Funky extends Layout {
 	 * @return	string	Html to build a submenu.
 	 */
 	function printSubMenu($title_arr, $links_arr, $attr_arr) {
-		$count  = count($title_arr) - 1;
+		$count = count($title_arr) - 1;
 		$return = '';
 
 		if (!count($attr_arr)) {
@@ -292,71 +351,12 @@ class Theme_Funky extends Layout {
 	 * @return	string	Html to build a submenu.
 	 */
 	function subMenu($title_arr, $links_arr, $attr_arr = array()) {
-		$return  = $this->beginSubMenu();
+		$return = $this->beginSubMenu();
 		$return .= $this->printSubMenu($title_arr, $links_arr, $attr_arr);
 		$return .= $this->endSubMenu();
 		return $return;
 	}
 
-	/**
-	 * headerJS() - creates the JS headers and calls the plugin javascript hook
-	 * @todo generalize this
-	 */
-	function headerJS() {
-		global $use_tooltips;
-
-		echo html_e('script', array('type' => 'text/javascript', 'src' => util_make_uri('/js/common.js')), '', false);
-		plugin_hook("javascript_file");
-
-		// invoke the 'javascript' hook for custom javascript addition
-		$params = array('return' => false);
-		plugin_hook("javascript", $params);
-		$javascript = $params['return'];
-		if($javascript) {
-			echo html_ao('script', array('type' => 'text/javascript')).'//<![CDATA['."\n";
-			echo $javascript;
-			echo "\n".'//]]'."\n";
-			echo html_ac(html_ap() -1);
-		}
-		html_use_storage();
-		html_use_coolfieldset();
-		html_use_jqueryui();
-		echo $this->getJavascripts();
-		echo html_ao('script', array('type' => 'text/javascript'));
-		echo '	//<![CDATA[
-			jQuery(window).load(function(){
-				setTimeout("jQuery(\'.feedback\').hide(\'slow\')", 5000);
-				setInterval(function() {
-						setTimeout("jQuery(\'.feedback\').hide(\'slow\')", 5000);
-					}, 5000);
-				jQuery("button").button();
-				jQuery(":submit").button();
-				jQuery(":reset").button();
-				jQuery(":button").button();
-				jQuery("#tabber").tabs();
-			});
-			//]]>'."\n";
-		if ($use_tooltips) {
-			echo '	jQuery(document).ready(
-					function() {
-						jQuery(document).tooltip({
-								show: {
-									effect: \'slideDown\'
-									},
-								track: true,
-								open: function (event, ui) {
-									setTimeout(function () {
-										jQuery(ui.tooltip).hide(\'slideUp\');
-										}, 5000);
-									}
-								});
-					}
-				);'."\n";
-		}
-		echo html_ac(html_ap() -1);
-	}
-}
-
 // Local Variables:
 // mode: php
 // c-file-style: "bsd"

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

Summary of changes:
 src/www/themes/funky/Theme.class.php | 128 +++++++++++++++++------------------
 1 file changed, 64 insertions(+), 64 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list