Refactored the UI to be a right hand side vertical toolbar. DebugPanel subclass grew a subtitle method to display informative text under the title.

5 files changed, 23 insertions, 6 deletions

diff --git a/debug_toolbar/panels/__init__.py b/debug_toolbar/panels/__init__.py
index 54b3318..459e550 100644
--- a/debug_toolbar/panels/__init__.py
+++ b/debug_toolbar/panels/__init__.py
@@ -15,8 +15,13 @@ class DebugPanel(object):
         return 'djDebug%sPanel' % (self.name.replace(' ', ''))
 
     def title(self):
+        """Title showing in toolbar"""
         raise NotImplementedError
 
+    def subtitle(self):
+        """Subtitle showing until title in toolbar"""
+        return ''
+
     def url(self):
         raise NotImplementedError
 
diff --git a/debug_toolbar/panels/logger.py b/debug_toolbar/panels/logger.py
index cb88148..91688a8 100644
--- a/debug_toolbar/panels/logger.py
+++ b/debug_toolbar/panels/logger.py
@@ -52,7 +52,10 @@ class LoggingPanel(DebugPanel):
         return records
 
     def title(self):
-        return "Logging (%s message%s)" % (len(handler.get_records()), (len(handler.get_records()) == 1) and '' or 's')
+        return "Logging"
+
+    def subtitle(self):
+        return "%s message%s" % (len(handler.get_records()), (len(handler.get_records()) == 1) and '' or 's')
 
     def url(self):
         return ''
diff --git a/debug_toolbar/panels/sql.py b/debug_toolbar/panels/sql.py
index d3ac7f3..d1d1ead 100644
--- a/debug_toolbar/panels/sql.py
+++ b/debug_toolbar/panels/sql.py
@@ -74,9 +74,12 @@ class SQLDebugPanel(DebugPanel):
         self._sql_time = 0
 
     def title(self):
+        return 'SQL'
+
+    def 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
diff --git a/debug_toolbar/panels/timer.py b/debug_toolbar/panels/timer.py
index 352bf55..1491272 100644
--- a/debug_toolbar/panels/timer.py
+++ b/debug_toolbar/panels/timer.py
@@ -32,12 +32,15 @@ class TimerDebugPanel(DebugPanel):
             self._end_rusage = resource.getrusage(resource.RUSAGE_SELF)
 
     def title(self):
+        return 'Time'
+
+    def 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 url(self):
         return ''
diff --git a/debug_toolbar/panels/version.py b/debug_toolbar/panels/version.py
index 7ea6543..da05bf1 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())
+        return 'Django Version'
+
+    def subtitle(self):
+        return django.get_version()
 
     def url(self):
         return ''