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 8580bff1b8b315b73274ef89ceb6c713ab6fce5c (commit)
from bc83350d2adc1b14eff19c99731220d61d13ce1f (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=8580bff1b8b315b73274ef89ceb6c713ab6fce5c
commit 8580bff1b8b315b73274ef89ceb6c713ab6fce5c
Author: Marc-Etienne Vargenau <[email protected]>
Date: Fri Jun 24 16:23:55 2016 +0200
New function: html_use_tablesorter()
diff --git a/src/common/tracker/actions/ind.php
b/src/common/tracker/actions/ind.php
index 65fda81..6383082 100644
--- a/src/common/tracker/actions/ind.php
+++ b/src/common/tracker/actions/ind.php
@@ -36,7 +36,7 @@ if ($at_arr === false) {
exit_permission_denied('tracker');
}
-use_javascript('/js/sortable.js');
+html_use_tablesorter();
$atf->header();
diff --git a/src/common/tracker/actions/tracker.php
b/src/common/tracker/actions/tracker.php
index 6e9a4a8..a4f494f 100644
--- a/src/common/tracker/actions/tracker.php
+++ b/src/common/tracker/actions/tracker.php
@@ -545,7 +545,7 @@ switch (getStringFromRequest('func')) {
} elseif ($ah->isError()) {
exit_error($ah->getErrorMessage(),'tracker');
} else {
- use_javascript('/js/sortable.js');
+ html_use_tablesorter();
if (forge_check_perm ('tracker', $ath->getID(),
'manager')) {
include $gfcommon.'tracker/actions/mod.php';
} elseif (forge_check_perm ('tracker', $ath->getID(),
'tech')) {
diff --git a/src/common/widget/Widget_ProjectLatestDocuments.class.php
b/src/common/widget/Widget_ProjectLatestDocuments.class.php
index 305955f..23c58c2 100644
--- a/src/common/widget/Widget_ProjectLatestDocuments.class.php
+++ b/src/common/widget/Widget_ProjectLatestDocuments.class.php
@@ -74,7 +74,7 @@ class Widget_ProjectLatestDocuments extends Widget {
if (!count($keys)) {
$result .= $HTML->information(_('This project has not
published any documents.'));
} else {
- use_javascript('/js/sortable.js');
+ html_use_tablesorter();
$result .= $HTML->getJavascripts();
$tabletop = array(_('Date'), _('File Name'),
_('Title'), _('Author'), _('Path'));
$classth = array('', '', '', '', '');
diff --git a/src/common/widget/Widget_ProjectLatestFileReleases.class.php
b/src/common/widget/Widget_ProjectLatestFileReleases.class.php
index 7232078..ac2bf03 100644
--- a/src/common/widget/Widget_ProjectLatestFileReleases.class.php
+++ b/src/common/widget/Widget_ProjectLatestFileReleases.class.php
@@ -72,7 +72,7 @@ class Widget_ProjectLatestFileReleases extends Widget {
$titleArr[] = _('Monitor');
}
$titleArr[] = _('Download');
- use_javascript('/js/sortable.js');
+ html_use_tablesorter();
$result .= $HTML->getJavascripts();
$result .= $HTML->listTableTop($titleArr, false,
'sortable_widget_frs_listpackage full', 'sortable');
foreach ($frsrnrs as $key => $frsrnr) {
diff --git a/src/plugins/headermenu/common/headermenuPlugin.class.php
b/src/plugins/headermenu/common/headermenuPlugin.class.php
index 7c65a0d..5ad7583 100644
--- a/src/plugins/headermenu/common/headermenuPlugin.class.php
+++ b/src/plugins/headermenu/common/headermenuPlugin.class.php
@@ -406,7 +406,7 @@ 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');
- use_javascript('/js/sortable.js');
+ html_use_tablesorter();
site_admin_header(array('title'=>_('Site Global
Menu Admin'), 'toptab' => ''));
$returned = true;
break;
@@ -430,7 +430,7 @@ 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');
- use_javascript('/js/sortable.js');
+ html_use_tablesorter();
$group_id = getIntFromRequest('group_id');
$params['toptab'] = 'admin';
$params['group'] = $group_id;
diff --git
a/src/plugins/mantisbt/common/mantisbt_Widget_ProjectLastIssues.class.php
b/src/plugins/mantisbt/common/mantisbt_Widget_ProjectLastIssues.class.php
index fbaba85..39d387a 100644
--- a/src/plugins/mantisbt/common/mantisbt_Widget_ProjectLastIssues.class.php
+++ b/src/plugins/mantisbt/common/mantisbt_Widget_ProjectLastIssues.class.php
@@ -65,7 +65,7 @@ class mantisBT_Widget_ProjectLastIssues extends Widget {
$arrayBugs = array_slice($arrayBugs, 0, 5);
$content = '';
if (count($arrayBugs)) {
- use_javascript('/js/sortable.js');
+ html_use_tablesorter()
echo $HTML->getJavascripts();
$arrTitle = array(_('ID'), _('Title'), _('Status'),
_('Category'));
$content .= $HTML->listTableTop($arrTitle, false,
'sortable_widget_mantisbt_listissues full', 'sortable');
diff --git a/src/plugins/mantisbt/view/viewIssues.php
b/src/plugins/mantisbt/view/viewIssues.php
index 102fc98..7d872c7 100644
--- a/src/plugins/mantisbt/view/viewIssues.php
+++ b/src/plugins/mantisbt/view/viewIssues.php
@@ -127,7 +127,7 @@ if (!isset($clientSOAP) && !isset($errorPage)) {
if (!count($listBug)) {
echo $HTML->warning_msg(_('No tickets to display.'));
} else {
- use_javascript('/js/sortable.js');
+ html_use_tablesorter()
echo $HTML->getJavascripts();
include ($gfplugins.$mantisbt->name.'/view/jumpToIssue.php');
diff --git a/src/plugins/scmhook/common/scmhookPlugin.class.php
b/src/plugins/scmhook/common/scmhookPlugin.class.php
index 7aff29e..dbf02b2 100644
--- a/src/plugins/scmhook/common/scmhookPlugin.class.php
+++ b/src/plugins/scmhook/common/scmhookPlugin.class.php
@@ -192,7 +192,7 @@ project independently.");
function displayScmHook($group_id, $scm) {
global $HTML;
- use_javascript('/js/sortable.js');
+ html_use_tablesorter();
echo $HTML->getJavascripts();
$hooksAvailable = $this->getAvailableHooks($group_id);
$hooksEnabled = $this->getEnabledHooks($group_id);
diff --git a/src/plugins/taskboard/common/include/TaskBoardHtml.class.php
b/src/plugins/taskboard/common/include/TaskBoardHtml.class.php
index df73b29..889ba82 100644
--- a/src/plugins/taskboard/common/include/TaskBoardHtml.class.php
+++ b/src/plugins/taskboard/common/include/TaskBoardHtml.class.php
@@ -28,7 +28,7 @@ class TaskBoardHtml extends TaskBoard {
function header($params) {
global $HTML, $group_id;
- use_javascript('/js/sortable.js');
+ html_use_tablesorter();
use_stylesheet('/plugins/taskboard/css/agile-board.css');
use_javascript('/plugins/taskboard/js/agile-board.js');
html_use_jqueryui();
diff --git a/src/plugins/webanalytics/common/webanalyticsPlugin.class.php
b/src/plugins/webanalytics/common/webanalyticsPlugin.class.php
index a4c2681..6e659e3 100644
--- a/src/plugins/webanalytics/common/webanalyticsPlugin.class.php
+++ b/src/plugins/webanalytics/common/webanalyticsPlugin.class.php
@@ -161,7 +161,7 @@ such as Piwik or Google Analytics.");
session_require_global_perm('forge_admin');
global $gfwww;
require_once($gfwww.'admin/admin_utils.php');
- use_javascript('/js/sortable.js');
+ html_use_tablesorter();
site_admin_header(array('title'=>_('Site Global
Webanalytics Admin'), 'toptab' => ''));
$returned = true;
break;
diff --git a/src/www/account/editsshkeys.php b/src/www/account/editsshkeys.php
index cb454b9..4263b8b 100644
--- a/src/www/account/editsshkeys.php
+++ b/src/www/account/editsshkeys.php
@@ -41,7 +41,7 @@ if (!$u || !is_object($u)) {
exit_error($u->getErrorMessage(),'my');
}
-use_javascript('/js/sortable.js');
+html_use_tablesorter();
// not valid registration, or first time to page
site_user_header(array('title' => _('Manage Authorized Keys')));
$sshKeysArray = $u->getAuthorizedKeys();
diff --git a/src/www/account/index.php b/src/www/account/index.php
index 9a623df..f8f7a8f 100644
--- a/src/www/account/index.php
+++ b/src/www/account/index.php
@@ -106,7 +106,7 @@ if (getStringFromRequest('submit')) {//if this is set, then
the user has issued
plugin_hook("userisactivecheckboxpost", $hookParams);
}
-use_javascript('/js/sortable.js');
+html_use_tablesorter();
$title = _('My Account');
site_user_header(array('title'=>$title));
diff --git a/src/www/docman/index.php b/src/www/docman/index.php
index 0fcefcd..725ce68 100644
--- a/src/www/docman/index.php
+++ b/src/www/docman/index.php
@@ -84,7 +84,7 @@ html_use_simplemenu();
html_use_jqueryui();
html_use_jquerysplitter();
use_javascript('/docman/scripts/DocManController.js');
-use_javascript('/js/sortable.js');
+html_use_tablesorter();
site_project_header(array('title'=> _('Documents for ').$g->getPublicName(),
'group'=>$group_id, 'toptab'=>'docman'));
diff --git a/src/www/include/html.php b/src/www/include/html.php
index 1881a0c..b37037d 100644
--- a/src/www/include/html.php
+++ b/src/www/include/html.php
@@ -439,6 +439,13 @@ function html_use_jquery() {
use_javascript('/scripts/jquery/jquery-1.10.2.js');
}
+function html_use_tablesorter() {
+ // html_use_jquery();
+ // use_javascript('/scripts/jquery-tablesorter/jquery.tablesorter.js');
+ use_javascript('/js/sortable.js');
+}
+
+
function html_use_storage() {
html_use_jquery();
use_javascript('/scripts/jquery-storage/jquery.Storage.js');
-----------------------------------------------------------------------
Summary of changes:
src/common/tracker/actions/ind.php | 2 +-
src/common/tracker/actions/tracker.php | 2 +-
src/common/widget/Widget_ProjectLatestDocuments.class.php | 2 +-
src/common/widget/Widget_ProjectLatestFileReleases.class.php | 2 +-
src/plugins/headermenu/common/headermenuPlugin.class.php | 4 ++--
.../mantisbt/common/mantisbt_Widget_ProjectLastIssues.class.php | 2 +-
src/plugins/mantisbt/view/viewIssues.php | 2 +-
src/plugins/scmhook/common/scmhookPlugin.class.php | 2 +-
src/plugins/taskboard/common/include/TaskBoardHtml.class.php | 2 +-
src/plugins/webanalytics/common/webanalyticsPlugin.class.php | 2 +-
src/www/account/editsshkeys.php | 2 +-
src/www/account/index.php | 2 +-
src/www/docman/index.php | 2 +-
src/www/include/html.php | 7 +++++++
14 files changed, 21 insertions(+), 14 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
