Merge pull request django-cms#2270 from jonprindiville/jstree-rel-marker-gif

Fixes jsTree's relative URL construction for theme components

Author: Angelo Dini

cms/static/cms/js/plugins/cms.changelist.js

@@ -54,6 +54,22 @@ $(document).ready(function () {
 		return this.after(o).remove().end(); 
 	};
 
+	// For passing in to jsTree's settings.ui.theme_path in order to enable
+	// it to construct a proper relative URL for its assets. If theme_path
+	// remains false, jsTree will construct a path using the contents of the
+	// location bar. In the case that static files (including jsTree's
+	// javascript) are served from a location other than that of the HTML
+	// files, the URLs constructed will be incorrect.
+	function script_url_path() {
+		// Find the URL that loaded this script (not sure if we can
+		// programatically determine the name of the current script, so it is
+		// hardcoded here)
+		full_url = $('script[src*="/cms.changelist.js"]').attr('src');
+		// Return everything but the filename
+		return full_url.slice(0,full_url.lastIndexOf('/'));
+	}
+
+
 	var tree;
 	// global initTree function
 	initTree = function(){
@@ -77,7 +93,7 @@ $(document).ready(function () {
 				rtl: false,
 				animation: 0,
 				hover_mode: true,
-				theme_path: false,
+				theme_path: script_url_path() + "/../jstree/themes/",
 				theme_name: "default",
 				a_class: "title"
 			},
@@ -537,4 +553,4 @@ $(document).ready(function () {
 	}
 
 });
-})(CMS.$);
+})(CMS.$);