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 ad99944de9a61a286c308daa5eefee528872c591 (commit)
from 5a683ddeb92c42a458c6d50cb48a0fdf948c57fe (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 ad99944de9a61a286c308daa5eefee528872c591
Author: Franck Villaume <[email protected]>
Date: Sun May 25 13:10:37 2014 +0200
themes: put JS at the right place. Avoid multiple tooltip call
diff --git a/src/www/themes/funky-wOw/Theme.class.php
b/src/www/themes/funky-wOw/Theme.class.php
index acd0337..73d7f75 100644
--- a/src/www/themes/funky-wOw/Theme.class.php
+++ b/src/www/themes/funky-wOw/Theme.class.php
@@ -211,20 +211,6 @@ class Theme extends Layout {
return '';
}
- global $use_tooltips;
-
- if ($use_tooltips) {
- echo html_ao('script', array('type' =>
'text/javascript'));
- echo ' //<![CDATA[
- jQuery(document).ready(
- function() {
- jQuery(document).tooltip();
- }
- );
- //]]>'."\n";
- echo html_ac(html_ap() -1);
- }
-
$return = '<!-- start tabs -->'."\n";
$attrs = array('class' => 'tabGenerator fullwidth');
@@ -371,8 +357,9 @@ class Theme extends Layout {
* @todo generalize this
*/
function headerJS() {
- echo html_e('script', array('type' => 'text/javascript', 'src'
=> util_make_uri('/js/common.js')), '', false);
+ 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
@@ -399,6 +386,17 @@ class Theme extends Layout {
});
//]]>'."\n";
echo html_ac(html_ap() -1);
+ if ($use_tooltips) {
+ echo html_ao('script', array('type' =>
'text/javascript'));
+ echo ' //<![CDATA[
+ jQuery(document).ready(
+ function() {
+ jQuery(document).tooltip();
+ }
+ );
+ //]]>'."\n";
+ echo html_ac(html_ap() -1);
+ }
}
}
diff --git a/src/www/themes/funky/Theme.class.php
b/src/www/themes/funky/Theme.class.php
index b669b09..c32eb8c 100644
--- a/src/www/themes/funky/Theme.class.php
+++ b/src/www/themes/funky/Theme.class.php
@@ -210,20 +210,6 @@ class Theme extends Layout {
return '';
}
- global $use_tooltips;
-
- if ($use_tooltips) {
- echo html_ao('script', array('type' =>
'text/javascript'));
- echo ' //<![CDATA[
- jQuery(document).ready(
- function() {
- jQuery(document).tooltip();
- }
- );
- //]]>'."\n";
- echo html_ac(html_ap() -1);
- }
-
$return = '<!-- start tabs -->'."\n";
$attrs = array('class' => 'tabGenerator fullwidth');
@@ -370,8 +356,9 @@ class Theme extends Layout {
* @todo generalize this
*/
function headerJS() {
- echo html_e('script', array('type' => 'text/javascript', 'src'
=> util_make_uri('/js/common.js')), '', false);
+ 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
@@ -398,6 +385,17 @@ class Theme extends Layout {
});
//]]>'."\n";
echo html_ac(html_ap() -1);
+ if ($use_tooltips) {
+ echo html_ao('script', array('type' =>
'text/javascript'));
+ echo ' //<![CDATA[
+ jQuery(document).ready(
+ function() {
+ jQuery(document).tooltip();
+ }
+ );
+ //]]>'."\n";
+ echo html_ac(html_ap() -1);
+ }
}
}
-----------------------------------------------------------------------
Summary of changes:
src/www/themes/funky-wOw/Theme.class.php | 28 +++++++++++++---------------
src/www/themes/funky/Theme.class.php | 28 +++++++++++++---------------
2 files changed, 26 insertions(+), 30 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
