Merge pull request django-commons#313 from graingert/master

Use links to static JS and CSS, using {{ STATIC_URL }}

Author: jezdez

MANIFEST.in

@@ -1,5 +1,5 @@
 include AUTHORS
 include LICENSE
 include README.rst
-recursive-include debug_toolbar/media *
+recursive-include debug_toolbar/static *
 recursive-include debug_toolbar/templates *

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

@@ -1,9 +1,9 @@
 {% load i18n %}
 <style type="text/css">
 @media print { #djDebug {display:none;}}
-{{ css }}
 </style>
-<script type="text/javascript">{{ js }}</script>
+<link rel="stylesheet" href="{{ STATIC_URL }}debug_toolbar/css/toolbar.min.css" type="text/css">
+<script type="text/javascript" src="{{ STATIC_URL }}debug_toolbar/css/toolbar.min.js"></script>
 <div id="djDebug" style="display:none;" dir="ltr">
 	<div style="display:none;" id="djDebugToolbar">
 		<ul id="djDebugPanelList">

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

@@ -60,8 +60,6 @@ def render_toolbar(self):
         context = self.template_context.copy()
         context.update({
             'panels': self.panels,
-            'js': mark_safe(open(os.path.join(media_path, 'js', 'toolbar.min.js'), 'r').read()),
-            'css': mark_safe(open(os.path.join(media_path, 'css', 'toolbar.min.css'), 'r').read()),
         })
 
         return render_to_string('debug_toolbar/base.html', context)

debug_toolbar/media/debug_toolbar/img/back.png renamed to debug_toolbar/static/debug_toolbar/img/back.png

@@ -9,7 +9,6 @@
 _PREFIX = '__debug__'
 
 urlpatterns = patterns('',
-    url(r'^%s/m/(.*)$' % _PREFIX, 'debug_toolbar.views.debug_media'),
     url(r'^%s/sql_select/$' % _PREFIX, 'debug_toolbar.views.sql_select', name='sql_select'),
     url(r'^%s/sql_explain/$' % _PREFIX, 'debug_toolbar.views.sql_explain', name='sql_explain'),
     url(r'^%s/sql_profile/$' % _PREFIX, 'debug_toolbar.views.sql_profile', name='sql_profile'),

debug_toolbar/media/debug_toolbar/img/back_hover.png renamed to debug_toolbar/static/debug_toolbar/img/back_hover.png

@@ -23,14 +23,6 @@ def __str__(self):
         return repr(self.value)
 
 
-def debug_media(request, path):
-    root = getattr(settings, 'DEBUG_TOOLBAR_MEDIA_ROOT', None)
-    if root is None:
-        parent = os.path.abspath(os.path.dirname(__file__))
-        root = os.path.join(parent, 'media', 'debug_toolbar')
-    return django.views.static.serve(request, path, root)
-
-
 def sql_select(request):
     """
     Returns the output of the SQL SELECT statement.

debug_toolbar/media/debug_toolbar/img/close.png renamed to debug_toolbar/static/debug_toolbar/img/close.png

@@ -17,6 +17,8 @@
 INTERNAL_IPS = ('127.0.0.1',)
 MEDIA_ROOT = os.path.join(PROJECT_PATH, 'media')
 MEDIA_URL = '/media'
+STATIC_ROOT = os.path.join(HOME_ROOT, 'staticfiles')
+STATIC_URL = '/static/'
 MIDDLEWARE_CLASSES = (
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',

debug_toolbar/media/debug_toolbar/img/close_hover.png renamed to debug_toolbar/static/debug_toolbar/img/close_hover.png

@@ -6,7 +6,7 @@
 	.hide {display:none;}
 	#v {font-weight:bold;}
 	</style>
-	<script type="text/javascript" charset="utf-8" src="{{ MEDIA_URL }}/js/jquery.js"></script>
+	<script type="text/javascript" charset="utf-8" src="{{ STATIC_URL }}/js/jquery.js"></script>
 	<script type="text/javascript">
 		$(document).ready(function() {
 			$('p.hide').show();

debug_toolbar/media/debug_toolbar/img/djdt_vertical.png renamed to debug_toolbar/static/debug_toolbar/img/djdt_vertical.png

@@ -5,7 +5,7 @@
 	<style>
 	.hide {display:none;}
 	</style>
-	<script type="text/javascript" charset="utf-8" src="{{ MEDIA_URL }}/js/mootools.js"></script>
+	<script type="text/javascript" charset="utf-8" src="{{ STATIC_URL }}/js/mootools.js"></script>
 	<script type="text/javascript">
 		window.addEvent('domready', function() {
 			$$('p.hide').setStyle('display', 'block');

debug_toolbar/media/debug_toolbar/img/dot.gif renamed to debug_toolbar/static/debug_toolbar/img/dot.gif

@@ -5,7 +5,7 @@
 	<style>
 	.hide {display:none;}
 	</style>
-	<script type="text/javascript" charset="utf-8" src="{{ MEDIA_URL }}/js/prototype.js"></script>
+	<script type="text/javascript" charset="utf-8" src="{{ STATIC_URL }}/js/prototype.js"></script>
 	<script type="text/javascript">
 		document.observe('dom:loaded', function() {
 			$('showme').removeClassName('hide');

debug_toolbar/media/debug_toolbar/img/indicator.png renamed to debug_toolbar/static/debug_toolbar/img/indicator.png

@@ -103,8 +103,6 @@ def test_request_urlconf_string(self):
 
             self.assertFalse(isinstance(request.urlconf, basestring))
 
-            self.assertTrue(hasattr(request.urlconf.urlpatterns[0], '_callback_str'))
-            self.assertEquals(request.urlconf.urlpatterns[0]._callback_str, 'debug_toolbar.views.debug_media')
             self.assertTrue(hasattr(request.urlconf.urlpatterns[1], '_callback_str'))
             self.assertEquals(request.urlconf.urlpatterns[-1]._callback_str, 'tests.views.execute_sql')
 
@@ -120,8 +118,6 @@ def test_request_urlconf_string_per_request(self):
 
             self.assertFalse(isinstance(request.urlconf, basestring))
 
-            self.assertTrue(hasattr(request.urlconf.urlpatterns[0], '_callback_str'))
-            self.assertEquals(request.urlconf.urlpatterns[0]._callback_str, 'debug_toolbar.views.debug_media')
             self.assertTrue(hasattr(request.urlconf.urlpatterns[1], '_callback_str'))
             self.assertEquals(request.urlconf.urlpatterns[-1]._callback_str, 'tests.views.execute_sql')
 
@@ -135,8 +131,6 @@ def test_request_urlconf_module(self):
 
             self.assertFalse(isinstance(request.urlconf, basestring))
 
-            self.assertTrue(hasattr(request.urlconf.urlpatterns[0], '_callback_str'))
-            self.assertEquals(request.urlconf.urlpatterns[0]._callback_str, 'debug_toolbar.views.debug_media')
             self.assertTrue(hasattr(request.urlconf.urlpatterns[1], '_callback_str'))
             self.assertEquals(request.urlconf.urlpatterns[-1]._callback_str, 'tests.views.execute_sql')