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 dd2588f40bb48ce859cd9a465f7e5b2831cd88bd (commit)
from c6fcf30ae123552e153a7ccdba777895ffa48cb5 (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=dd2588f40bb48ce859cd9a465f7e5b2831cd88bd
commit dd2588f40bb48ce859cd9a465f7e5b2831cd88bd
Author: Franck Villaume <[email protected]>
Date: Thu Oct 6 14:55:13 2016 +0200
better url_prefix support with sortable.js
diff --git a/src/www/include/Layout.class.php b/src/www/include/Layout.class.php
index b7f59d7..99db4ae 100644
--- a/src/www/include/Layout.class.php
+++ b/src/www/include/Layout.class.php
@@ -289,6 +289,9 @@ class Layout extends FFError {
$this->headerFavIcon();
$this->headerRSS();
$this->headerSearch();
+ echo '<script type="text/javascript">//<![CDATA[' .
+ "\n\tvar sys_url_base = " . minijson_encode(util_make_url("/"),
false) . ";\n" .
+ "//]]></script>\n";
$this->headerJS();
$this->headerCSS();
$this->headerForgepluckerMeta();
diff --git a/src/www/js/sortable.js b/src/www/js/sortable.js
index 29e00c2..6253006 100644
--- a/src/www/js/sortable.js
+++ b/src/www/js/sortable.js
@@ -25,8 +25,9 @@ Version 1.5.7 + FusionForge
*/
/* You can change these values */
-if (typeof(image_path) == 'undefined') {
- var image_path = "/images/";
+var image_path = "/images/";
+if (typeof(sys_url_base) !== 'undefined') {
+ var image_path = sys_url_base+"/images/";
}
var image_up = "sort_up.gif";
var image_down = "sort_down.gif";
-----------------------------------------------------------------------
Summary of changes:
src/www/include/Layout.class.php | 3 +++
src/www/js/sortable.js | 5 +++--
2 files changed, 6 insertions(+), 2 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
