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 c6fcf30ae123552e153a7ccdba777895ffa48cb5 (commit)
from b35608668d221ddc8c12e1856fa08dcf009f3136 (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=c6fcf30ae123552e153a7ccdba777895ffa48cb5
commit c6fcf30ae123552e153a7ccdba777895ffa48cb5
Author: Franck Villaume <[email protected]>
Date: Thu Oct 6 14:21:34 2016 +0200
revert 2 previous fix. The solution is not working :-/
diff --git a/src/plugins/headermenu/common/headermenuPlugin.class.php
b/src/plugins/headermenu/common/headermenuPlugin.class.php
index 7ad5ae3..0b4c79e 100644
--- a/src/plugins/headermenu/common/headermenuPlugin.class.php
+++ b/src/plugins/headermenu/common/headermenuPlugin.class.php
@@ -430,12 +430,12 @@ in the main menu (outermenu) or in the project menu
(groupmenu).");
html_use_jquery();
html_use_jqueryui();
use_javascript('/plugins/'.$this->name.'/scripts/HeaderMenuController.js');
+ html_use_tablesorter();
$group_id = getIntFromRequest('group_id');
$params['toptab'] = 'admin';
$params['group'] = $group_id;
$params['title'] = _('Menu Tabs Manager Admin');
site_project_header($params);
- html_use_tablesorter();
$returned = true;
break;
}
diff --git a/src/www/include/html.php b/src/www/include/html.php
index bb79b0d..c7adbac 100644
--- a/src/www/include/html.php
+++ b/src/www/include/html.php
@@ -456,12 +456,6 @@ function html_use_jquery() {
function html_use_tablesorter() {
// html_use_jquery();
// use_javascript('/scripts/jquery-tablesorter/jquery.tablesorter.js');
- echo html_ao('script', array('type' => 'text/javascript'));
- ?>
- //<![CDATA[
- var image_path = "<? echo util_make_uri('/images'); ?>";
- //]]>
- <?php
use_javascript('/js/sortable.js');
}
-----------------------------------------------------------------------
Summary of changes:
src/plugins/headermenu/common/headermenuPlugin.class.php | 2 +-
src/www/include/html.php | 6 ------
2 files changed, 1 insertion(+), 7 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
