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 54ec5dda1442cd0ecde9fc91d8159fa389254612 (commit)
from 9f845e6d6f81bed345798bf40ed890957e297008 (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=54ec5dda1442cd0ecde9fc91d8159fa389254612
commit 54ec5dda1442cd0ecde9fc91d8159fa389254612
Author: Franck Villaume <[email protected]>
Date: Thu Oct 6 13:49:24 2016 +0200
support url_prefix in html_use_sortable
diff --git a/src/www/include/html.php b/src/www/include/html.php
index c7adbac..bb79b0d 100644
--- a/src/www/include/html.php
+++ b/src/www/include/html.php
@@ -456,6 +456,12 @@ 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');
}
diff --git a/src/www/js/sortable.js b/src/www/js/sortable.js
index a1d5434..29e00c2 100644
--- a/src/www/js/sortable.js
+++ b/src/www/js/sortable.js
@@ -25,7 +25,9 @@ Version 1.5.7 + FusionForge
*/
/* You can change these values */
-var image_path = "/images/";
+if (typeof(image_path) == 'undefined') {
+ var image_path = "/images/";
+}
var image_up = "sort_up.gif";
var image_down = "sort_down.gif";
var image_none = "sort_none.gif";
-----------------------------------------------------------------------
Summary of changes:
src/www/include/html.php | 6 ++++++
src/www/js/sortable.js | 4 +++-
2 files changed, 9 insertions(+), 1 deletion(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
