diff options
| author | Jannis Leidel | 2012-10-05 02:46:18 -0700 |
|---|---|---|
| committer | Jannis Leidel | 2012-10-05 02:46:18 -0700 |
| commit | aeb45f2fea083fb182f5fd33e7c4980780b1ea81 (patch) | |
| tree | d27d4a7e6b0b0f3e5a1b6f7111848b419fc588e6 /debug_toolbar | |
| parent | ad152874296ec55e322696dcd6c539a33a423f51 (diff) | |
| parent | 171406fbb940895721a55a46de68551f00b9908c (diff) | |
| download | django-debug-toolbar-aeb45f2fea083fb182f5fd33e7c4980780b1ea81.tar.bz2 | |
Merge pull request #322 from mattrobenolt/fix-static-urls
Fix static assets
Diffstat (limited to 'debug_toolbar')
| -rw-r--r-- | debug_toolbar/templates/debug_toolbar/base.html | 2 | ||||
| -rw-r--r-- | debug_toolbar/toolbar/loader.py | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/debug_toolbar/templates/debug_toolbar/base.html b/debug_toolbar/templates/debug_toolbar/base.html index 8e91f60..a790bd1 100644 --- a/debug_toolbar/templates/debug_toolbar/base.html +++ b/debug_toolbar/templates/debug_toolbar/base.html @@ -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"> diff --git a/debug_toolbar/toolbar/loader.py b/debug_toolbar/toolbar/loader.py index ac42f3b..5701118 100644 --- a/debug_toolbar/toolbar/loader.py +++ b/debug_toolbar/toolbar/loader.py @@ -26,6 +26,7 @@ class DebugToolbar(object): 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 @@ class DebugToolbar(object): """ 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, |