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

1 files changed, 8 insertions, 2 deletions

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 ''