Permalink
Browse files

Merge pull request #322 from mattrobenolt/fix-static-urls

Fix static assets
  • Loading branch information...
2 parents ad15287 + 171406f commit aeb45f2fea083fb182f5fd33e7c4980780b1ea81 @jezdez jezdez committed Oct 5, 2012
Showing with 2 additions and 3 deletions.
  1. +1 −1 debug_toolbar/templates/debug_toolbar/base.html
  2. +1 −2 debug_toolbar/toolbar/loader.py
@@ -3,7 +3,7 @@
@media print { #djDebug {display:none;}}
</style>
<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>
+<script type="text/javascript" src="{{ STATIC_URL }}debug_toolbar/js/toolbar.min.js"></script>
<div id="djDebug" style="display:none;" dir="ltr">
<div style="display:none;" id="djDebugToolbar">
<ul id="djDebugPanelList">
@@ -26,6 +26,7 @@ def __init__(self, request):
self.template_context = {
'BASE_URL': base_url, # for backwards compatibility
'DEBUG_TOOLBAR_MEDIA_URL': self.config.get('MEDIA_URL'),
+ 'STATIC_URL': settings.STATIC_URL,
}
self.load_panels()
@@ -55,8 +56,6 @@ def render_toolbar(self):
"""
Renders the overall Toolbar with panels inside.
"""
- media_path = os.path.join(os.path.dirname(__file__), os.pardir, 'media', 'debug_toolbar')
-
context = self.template_context.copy()
context.update({
'panels': self.panels,

0 comments on commit aeb45f2

Please sign in to comment.