diff options
| -rw-r--r-- | debug_toolbar/media/toolbar.css | 2 | ||||
| -rw-r--r-- | debug_toolbar/media/toolbar.js | 19 | ||||
| -rw-r--r-- | debug_toolbar/middleware.py | 4 | ||||
| -rw-r--r-- | debug_toolbar/templates/debug_toolbar/base.html | 5 | ||||
| -rw-r--r-- | debug_toolbar/templates/debug_toolbar/panels/sql.html | 2 | ||||
| -rw-r--r-- | debug_toolbar/templates/debug_toolbar/panels/sql_explain.html | 1 |
6 files changed, 24 insertions, 9 deletions
diff --git a/debug_toolbar/media/toolbar.css b/debug_toolbar/media/toolbar.css index 11dd978..7d2ad82 100644 --- a/debug_toolbar/media/toolbar.css +++ b/debug_toolbar/media/toolbar.css @@ -12,3 +12,5 @@ #djDebug th, #djDebug td {padding: 5px;} #djDebug .row1 td {background:#fff;} #djDebug .row2 td {background:#ddd;} +#djDebugWindow {z-index:2000000;} +#djDebugWindow .back {float:right; font-weight:bold;} diff --git a/debug_toolbar/media/toolbar.js b/debug_toolbar/media/toolbar.js index 3da65d2..7d2f6b5 100644 --- a/debug_toolbar/media/toolbar.js +++ b/debug_toolbar/media/toolbar.js @@ -17,13 +17,22 @@ jQuery(function() { } return false; }); - jQuery('#djDebugTemplatePanel a.djTemplateShowContext').click(function() { - jQuery.djDebug.toggle_content(jQuery(this).parent().next()); - }); jQuery('#djDebug a.close').click(function() { jQuery(document).trigger('close.djDebug'); return false; }); + jQuery('#djDebugWindow a.back').click(function() { + console.dir(jQuery(this).parent()); + jQuery(this).parent().hide(); + return false; + }); + jQuery('#djDebug a.remoteCall').click(function() { + jQuery.djDebug.remote_call(this); + return false; + }); + jQuery('#djDebugTemplatePanel a.djTemplateShowContext').click(function() { + jQuery.djDebug.toggle_content(jQuery(this).parent().next()); + }); }, open: function() { jQuery(document).bind('keydown.djDebug', function(e) { @@ -39,6 +48,10 @@ jQuery(function() { elem.show(); } }, + remote_call: function(obj) { + jQuery('#djDebugWindow').load(obj.href).show(); + + }, close: function() { jQuery(document).trigger('close.djDebug'); return false; diff --git a/debug_toolbar/middleware.py b/debug_toolbar/middleware.py index a7e5655..eebd5a2 100644 --- a/debug_toolbar/middleware.py +++ b/debug_toolbar/middleware.py @@ -23,8 +23,8 @@ class DebugToolbarMiddleware(object): def show_toolbar(self, request): if not settings.DEBUG: return False - if request.is_ajax(): - return False + #if request.is_ajax(): + # return False if not request.META.get('REMOTE_ADDR') in settings.INTERNAL_IPS: return False return True diff --git a/debug_toolbar/templates/debug_toolbar/base.html b/debug_toolbar/templates/debug_toolbar/base.html index 4cc028c..e654219 100644 --- a/debug_toolbar/templates/debug_toolbar/base.html +++ b/debug_toolbar/templates/debug_toolbar/base.html @@ -21,11 +21,10 @@ {% for panel in panels %} {% if panel.has_content %} <div id="{{ panel.dom_id }}" class="panelContent"> - <div class="title"> - <a href="" class="close">Close</a> - </div> + <a href="" class="close">Close</a> {{ panel.content|safe }} </div> {% endif %} {% endfor %} + <div id="djDebugWindow" class="panelContent"></div> </div> diff --git a/debug_toolbar/templates/debug_toolbar/panels/sql.html b/debug_toolbar/templates/debug_toolbar/panels/sql.html index 246fa74..bd167bc 100644 --- a/debug_toolbar/templates/debug_toolbar/panels/sql.html +++ b/debug_toolbar/templates/debug_toolbar/panels/sql.html @@ -12,7 +12,7 @@ <tr class="{% cycle 'row1' 'row2' %}"> <td>{{ query.time|floatformat:"4" }}</td> <td><pre>{{ query.sql|wordwrap:80|escape }}</pre></td> - <td><a href="/__debug__/sql_explain/?sql={{ query.raw_sql|urlencode }}¶ms={{ query.params|urlencode }}&time={{ query.time|floatformat:"4"|urlencode }}">EXPLAIN</a></td> + <td><a class="remoteCall" href="/__debug__/sql_explain/?sql={{ query.raw_sql|urlencode }}¶ms={{ query.params|urlencode }}&time={{ query.time|floatformat:"4"|urlencode }}">EXPLAIN</a></td> </tr> {% endfor %} </tbody> diff --git a/debug_toolbar/templates/debug_toolbar/panels/sql_explain.html b/debug_toolbar/templates/debug_toolbar/panels/sql_explain.html index 757d43f..8219205 100644 --- a/debug_toolbar/templates/debug_toolbar/panels/sql_explain.html +++ b/debug_toolbar/templates/debug_toolbar/panels/sql_explain.html @@ -1,3 +1,4 @@ +<a class="back" href="">« Back</a> <h3>SQL Explained</h3> <dl> <dt>Executed SQL</dt> |