merging in changes from rob/iu-rf and fixing conflicts

11 files changed, 68 insertions, 13 deletions

diff --git a/debug_toolbar/panels/__init__.py b/debug_toolbar/panels/__init__.py
index 54b3318..cf65aa8 100644
--- a/debug_toolbar/panels/__init__.py
+++ b/debug_toolbar/panels/__init__.py
@@ -14,7 +14,16 @@ class DebugPanel(object):
     def dom_id(self):
         return 'djDebug%sPanel' % (self.name.replace(' ', ''))
 
+    def nav_title(self):
+        """Title showing in toolbar"""
+        raise NotImplementedError
+
+    def nav_subtitle(self):
+        """Subtitle showing until title in toolbar"""
+        return ''
+
     def title(self):
+        """Title showing in panel"""
         raise NotImplementedError
 
     def url(self):
diff --git a/debug_toolbar/panels/cache.py b/debug_toolbar/panels/cache.py
index 613d4d9..a05d3cc 100644
--- a/debug_toolbar/panels/cache.py
+++ b/debug_toolbar/panels/cache.py
@@ -87,9 +87,12 @@ class CacheDebugPanel(DebugPanel):
             self.cache = CacheStatTracker(cache.cache)
             cache.cache = self.cache
 
-    def title(self):
+    def nav_title(self):
         return 'Cache: %.2fms' % self.cache.total_time
 
+    def title(self):
+        return 'Cache Usage'
+
     def url(self):
         return ''
 
diff --git a/debug_toolbar/panels/headers.py b/debug_toolbar/panels/headers.py
index 213198a..06858ef 100644
--- a/debug_toolbar/panels/headers.py
+++ b/debug_toolbar/panels/headers.py
@@ -31,6 +31,9 @@ class HeaderDebugPanel(DebugPanel):
         'SERVER_SOFTWARE',
     )
 
+    def nav_title(self):
+        return 'HTTP Headers'
+
     def title(self):
         return 'HTTP Headers'
 
diff --git a/debug_toolbar/panels/logger.py b/debug_toolbar/panels/logger.py
index cb88148..7ba1686 100644
--- a/debug_toolbar/panels/logger.py
+++ b/debug_toolbar/panels/logger.py
@@ -51,8 +51,14 @@ class LoggingPanel(DebugPanel):
         handler.clear_records()
         return records
 
+    def nav_title(self):
+        return "Logging"
+
+    def nav_subtitle(self):
+        return "%s message%s" % (len(handler.get_records()), (len(handler.get_records()) == 1) and '' or 's')
+
     def title(self):
-        return "Logging (%s message%s)" % (len(handler.get_records()), (len(handler.get_records()) == 1) and '' or 's')
+        return 'Log Messages'
 
     def url(self):
         return ''
diff --git a/debug_toolbar/panels/request_vars.py b/debug_toolbar/panels/request_vars.py
index 88a7204..d0a8c19 100644
--- a/debug_toolbar/panels/request_vars.py
+++ b/debug_toolbar/panels/request_vars.py
@@ -8,9 +8,12 @@ class RequestVarsDebugPanel(DebugPanel):
     name = 'RequestVars'
     has_content = True
 
+    def nav_title(self):
+        return 'Request Vars'
+    
     def title(self):
         return 'Request Vars'
-
+    
     def url(self):
         return ''
 
diff --git a/debug_toolbar/panels/settings_vars.py b/debug_toolbar/panels/settings_vars.py
index e090718..0b7c315 100644
--- a/debug_toolbar/panels/settings_vars.py
+++ b/debug_toolbar/panels/settings_vars.py
@@ -10,9 +10,12 @@ class SettingsVarsDebugPanel(DebugPanel):
     name = 'SettingsVars'
     has_content = True
 
-    def title(self):
+    def nav_title(self):
         return 'Settings'
 
+    def title(self):
+        return 'Settings from <code>%s</code>' % settings.SETTINGS_MODULE
+
     def url(self):
         return ''
 
diff --git a/debug_toolbar/panels/signals.py b/debug_toolbar/panels/signals.py
index 7fe382e..a922694 100644
--- a/debug_toolbar/panels/signals.py
+++ b/debug_toolbar/panels/signals.py
@@ -34,6 +34,9 @@ class SignalDebugPanel(DebugPanel):
         'post_syncdb': post_syncdb,
     }
 
+    def nav_title(self):
+        return "Signals"
+
     def title(self):
         return "Signals"
 
diff --git a/debug_toolbar/panels/sql.py b/debug_toolbar/panels/sql.py
index d3ac7f3..f12939e 100644
--- a/debug_toolbar/panels/sql.py
+++ b/debug_toolbar/panels/sql.py
@@ -73,14 +73,20 @@ class SQLDebugPanel(DebugPanel):
         self._offset = len(connection.queries)
         self._sql_time = 0
 
-    def title(self):
+    def nav_title(self):
+        return 'SQL'
+
+    def nav_subtitle(self):
         self._sql_time = sum(map(lambda q: float(q['time']), connection.queries))
         num_queries = len(connection.queries) - self._offset
-        return '%d SQL %s (%.2fms)' % (
+        return "%d %s in %.2fms" % (
             num_queries,
             (num_queries == 1) and 'query' or 'queries',
             self._sql_time
         )
+    
+    def title(self):
+        return 'SQL Queries'
 
     def url(self):
         return ''
diff --git a/debug_toolbar/panels/template.py b/debug_toolbar/panels/template.py
index 7dc7b06..8c6a972 100644
--- a/debug_toolbar/panels/template.py
+++ b/debug_toolbar/panels/template.py
@@ -41,6 +41,9 @@ class TemplateDebugPanel(DebugPanel):
     def _storeTemplateInfo(self, sender, **kwargs):
         self.templates.append(kwargs)
 
+    def nav_title(self):
+        return 'Templates'
+
     def title(self):
         return 'Templates'
 
@@ -72,7 +75,14 @@ class TemplateDebugPanel(DebugPanel):
             info['template'] = t
             # Clean up context for better readability
             c = d.get('context', None)
-            info['context'] = '\n'.join([pformat(_d) for _d in c.dicts])
+            
+            d_list = []
+            for _d in c.dicts:
+                try:
+                    d_list.append(pformat(d))
+                except UnicodeEncodeError:
+                    pass
+            info['context'] = '\n'.join(d_list)
             template_context.append(info)
         context = {
             'templates': template_context,
diff --git a/debug_toolbar/panels/timer.py b/debug_toolbar/panels/timer.py
index 352bf55..4ff68db 100644
--- a/debug_toolbar/panels/timer.py
+++ b/debug_toolbar/panels/timer.py
@@ -31,13 +31,19 @@ class TimerDebugPanel(DebugPanel):
         if self.has_resource:
             self._end_rusage = resource.getrusage(resource.RUSAGE_SELF)
 
-    def title(self):
+    def nav_title(self):
+        return 'Time'
+
+    def nav_subtitle(self):
         if self.has_resource:
             utime = self._end_rusage.ru_utime - self._start_rusage.ru_utime
             stime = self._end_rusage.ru_stime - self._start_rusage.ru_stime
-            return 'Time: %0.2fms, %0.2fms CPU' % (self.total_time, (utime + stime) * 1000.0)
+            return 'CPU: %0.2fms (%0.2fms)' % ((utime + stime) * 1000.0, self.total_time)
         else:
-            return 'Time: %0.2fms' % (self.total_time)
+            return 'TOTAL: %0.2fms' % (self.total_time)
+
+    def title(self):
+        return 'Resource Usage'
 
     def url(self):
         return ''
diff --git a/debug_toolbar/panels/version.py b/debug_toolbar/panels/version.py
index 7ea6543..083b9cf 100644
--- a/debug_toolbar/panels/version.py
+++ b/debug_toolbar/panels/version.py
@@ -6,9 +6,12 @@ class VersionDebugPanel(DebugPanel):
     Panel that displays the Django version.
     """
     name = 'Version'
-    
-    def title(self):
-        return 'Version: %s' % (django.get_version())
+
+    def nav_title(self):
+        return 'Django Version'
+
+    def nav_subtitle(self):
+        return django.get_version()
 
     def url(self):
         return ''