Fixed django-commons#60 - Added MEDIA_URL config option to be able to override the URL to the static files (good with django-staticfiles). Also moved media files to subdirectories like other apps.

Signed-off-by: Rob Hudson <[email protected]>

Author: jezdez

debug_toolbar/media/debug_toolbar/Makefile

@@ -2,7 +2,7 @@
 all: compress_js compress_css
 
 compress_js:
-	java -jar ~/bin/yuicompressor.jar toolbar.js > toolbar.min.js
+	java -jar ~/bin/yuicompressor.jar js/toolbar.js > js/toolbar.min.js
 
 compress_css:
-	java -jar ~/bin/yuicompressor.jar --type css toolbar.css > toolbar.min.css
+	java -jar ~/bin/yuicompressor.jar --type css css/toolbar.css > css/toolbar.min.css

debug_toolbar/media/debug_toolbar/toolbar.css renamed to debug_toolbar/media/debug_toolbar/css/toolbar.css

@@ -72,7 +72,7 @@
 }
 
 #djDebug #djDebugToolbar li.active {
-	background-image:url(indicator.png);
+	background-image:url(http://github.com/%3Cspan%20class=%22x%20x-first%22%3E..%3C/span%3E%3Cspan%20class=%22pl-c1%20x%22%3E/%3C/span%3E%3Cspan%20class=%22x%20x-last%22%3Eimg/%3C/span%3Eindicator.png);
 	background-repeat:no-repeat;
 	background-position:left center;
 	background-color:#333;
@@ -116,7 +116,7 @@
 	text-decoration:none;
 	text-align:center;
 	text-indent:-999999px;
-	background:#000 url(djdt_vertical.png) no-repeat left center;
+	background:#000 url(http://github.com/%3Cspan%20class=%22x%20x-first%22%3E..%3C/span%3E%3Cspan%20class=%22pl-c1%20x%22%3E/%3C/span%3E%3Cspan%20class=%22x%20x-last%22%3Eimg/%3C/span%3Edjdt_vertical.png) no-repeat left center;
 	opacity:0.5;
 }
 
@@ -293,19 +293,19 @@
 	right:15px;
 	height:40px;
 	width:40px;
-	background:url(close.png) no-repeat center center;
+	background:url(http://github.com/%3Cspan%20class=%22x%20x-first%22%3E..%3C/span%3E%3Cspan%20class=%22pl-c1%20x%22%3E/%3C/span%3E%3Cspan%20class=%22x%20x-last%22%3Eimg/%3C/span%3Eclose.png) no-repeat center center;
 }
 
 #djDebug .panelContent .djDebugClose:hover {
-	background-image:url(close_hover.png);
+	background-image:url(http://github.com/%3Cspan%20class=%22x%20x-first%22%3E..%3C/span%3E%3Cspan%20class=%22pl-c1%20x%22%3E/%3C/span%3E%3Cspan%20class=%22x%20x-last%22%3Eimg/%3C/span%3Eclose_hover.png);
 }
 
 #djDebug .panelContent .djDebugClose.djDebugBack {
-	background-image:url(back.png);
+	background-image:url(http://github.com/%3Cspan%20class=%22x%20x-first%22%3E..%3C/span%3E%3Cspan%20class=%22pl-c1%20x%22%3E/%3C/span%3E%3Cspan%20class=%22x%20x-last%22%3Eimg/%3C/span%3Eback.png);
 }
 
 #djDebug .panelContent .djDebugClose.djDebugBack:hover  {
-	background-image:url(back_hover.png);
+	background-image:url(http://github.com/%3Cspan%20class=%22x%20x-first%22%3E..%3C/span%3E%3Cspan%20class=%22pl-c1%20x%22%3E/%3C/span%3E%3Cspan%20class=%22x%20x-last%22%3Eimg/%3C/span%3Eback_hover.png);
 }
 
 #djDebug .panelContent dt, #djDebug .panelContent dd {

debug_toolbar/media/debug_toolbar/css/toolbar.min.css

@@ -4,7 +4,7 @@
 	if (!(j = window.jQuery) || version > j.fn.jquery || callback(j)) {
 		var script = document.createElement("script");
 		script.type = "text/javascript";
-		script.src = BASEURL + "/__debug__/m/jquery.js";
+		script.src = DEBUG_TOOLBAR_MEDIA_URL + "js/jquery.js";
 		script.onload = script.onreadystatechange = function() {
 			if (!loaded && (!(d = this.readyState) || d == "loaded" || d == "complete")) {
 				callback((j = window.jQuery).noConflict(1), loaded = true);
@@ -16,7 +16,7 @@
 })(window, document, "1.3", function($, jquery_loaded) {
 
 	$.cookie = function(name, value, options) { if (typeof value != 'undefined') { options = options || {}; if (value === null) { value = ''; options.expires = -1; } var expires = ''; if (options.expires && (typeof options.expires == 'number' || options.expires.toUTCString)) { var date; if (typeof options.expires == 'number') { date = new Date(); date.setTime(date.getTime() + (options.expires * 24 * 60 * 60 * 1000)); } else { date = options.expires; } expires = '; expires=' + date.toUTCString(); } var path = options.path ? '; path=' + (options.path) : ''; var domain = options.domain ? '; domain=' + (options.domain) : ''; var secure = options.secure ? '; secure' : ''; document.cookie = [name, '=', encodeURIComponent(value), expires, path, domain, secure].join(''); } else { var cookieValue = null; if (document.cookie && document.cookie != '') { var cookies = document.cookie.split(';'); for (var i = 0; i < cookies.length; i++) { var cookie = $.trim(cookies[i]); if (cookie.substring(0, name.length + 1) == (name + '=')) { cookieValue = decodeURIComponent(cookie.substring(name.length + 1)); break; } } } return cookieValue; } };
-	$('head').append('<link rel="stylesheet" href="'+BASEURL+'/__debug__/m/toolbar.min.css" type="text/css" />');
+	$('head').append('<link rel="stylesheet" href="'+DEBUG_TOOLBAR_MEDIA_URL+'css/toolbar.min.css" type="text/css" />');
 	var COOKIE_NAME = 'djdt';
 	var djdt = {
 		init: function() {