renamed title/subtitle -> nav_title/nav_subtitle

12 files changed, 18 insertions, 18 deletions

diff --git a/debug_toolbar/panels/__init__.py b/debug_toolbar/panels/__init__.py
index 459e550..879755a 100644
--- a/debug_toolbar/panels/__init__.py
+++ b/debug_toolbar/panels/__init__.py
@@ -14,11 +14,11 @@ class DebugPanel(object):
     def dom_id(self):
         return 'djDebug%sPanel' % (self.name.replace(' ', ''))
 
-    def title(self):
+    def nav_title(self):
         """Title showing in toolbar"""
         raise NotImplementedError
 
-    def subtitle(self):
+    def nav_subtitle(self):
         """Subtitle showing until title in toolbar"""
         return ''
 
diff --git a/debug_toolbar/panels/cache.py b/debug_toolbar/panels/cache.py
index 613d4d9..f1a921b 100644
--- a/debug_toolbar/panels/cache.py
+++ b/debug_toolbar/panels/cache.py
@@ -87,7 +87,7 @@ 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 url(self):
diff --git a/debug_toolbar/panels/headers.py b/debug_toolbar/panels/headers.py
index 213198a..5462dec 100644
--- a/debug_toolbar/panels/headers.py
+++ b/debug_toolbar/panels/headers.py
@@ -31,7 +31,7 @@ class HeaderDebugPanel(DebugPanel):
         'SERVER_SOFTWARE',
     )
 
-    def title(self):
+    def nav_title(self):
         return 'HTTP Headers'
 
     def url(self):
diff --git a/debug_toolbar/panels/logger.py b/debug_toolbar/panels/logger.py
index 91688a8..6e46d9d 100644
--- a/debug_toolbar/panels/logger.py
+++ b/debug_toolbar/panels/logger.py
@@ -51,10 +51,10 @@ class LoggingPanel(DebugPanel):
         handler.clear_records()
         return records
 
-    def title(self):
+    def nav_title(self):
         return "Logging"
 
-    def subtitle(self):
+    def nav_subtitle(self):
         return "%s message%s" % (len(handler.get_records()), (len(handler.get_records()) == 1) and '' or 's')
 
     def url(self):
diff --git a/debug_toolbar/panels/request_vars.py b/debug_toolbar/panels/request_vars.py
index 88a7204..023f690 100644
--- a/debug_toolbar/panels/request_vars.py
+++ b/debug_toolbar/panels/request_vars.py
@@ -8,7 +8,7 @@ class RequestVarsDebugPanel(DebugPanel):
     name = 'RequestVars'
     has_content = True
 
-    def title(self):
+    def nav_title(self):
         return 'Request Vars'
 
     def url(self):
diff --git a/debug_toolbar/panels/settings_vars.py b/debug_toolbar/panels/settings_vars.py
index e090718..93cae32 100644
--- a/debug_toolbar/panels/settings_vars.py
+++ b/debug_toolbar/panels/settings_vars.py
@@ -10,7 +10,7 @@ class SettingsVarsDebugPanel(DebugPanel):
     name = 'SettingsVars'
     has_content = True
 
-    def title(self):
+    def nav_title(self):
         return 'Settings'
 
     def url(self):
diff --git a/debug_toolbar/panels/signals.py b/debug_toolbar/panels/signals.py
index 7fe382e..1aca1da 100644
--- a/debug_toolbar/panels/signals.py
+++ b/debug_toolbar/panels/signals.py
@@ -34,7 +34,7 @@ class SignalDebugPanel(DebugPanel):
         'post_syncdb': post_syncdb,
     }
 
-    def title(self):
+    def nav_title(self):
         return "Signals"
 
     def url(self):
diff --git a/debug_toolbar/panels/sql.py b/debug_toolbar/panels/sql.py
index d1d1ead..2e70c77 100644
--- a/debug_toolbar/panels/sql.py
+++ b/debug_toolbar/panels/sql.py
@@ -73,10 +73,10 @@ class SQLDebugPanel(DebugPanel):
         self._offset = len(connection.queries)
         self._sql_time = 0
 
-    def title(self):
+    def nav_title(self):
         return 'SQL'
 
-    def subtitle(self):
+    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 %s in %.2fms" % (
diff --git a/debug_toolbar/panels/template.py b/debug_toolbar/panels/template.py
index b548287..98b0769 100644
--- a/debug_toolbar/panels/template.py
+++ b/debug_toolbar/panels/template.py
@@ -41,7 +41,7 @@ class TemplateDebugPanel(DebugPanel):
     def _storeTemplateInfo(self, sender, **kwargs):
         self.templates.append(kwargs)
 
-    def title(self):
+    def nav_title(self):
         return 'Templates'
 
     def url(self):
diff --git a/debug_toolbar/panels/timer.py b/debug_toolbar/panels/timer.py
index 1491272..554d696 100644
--- a/debug_toolbar/panels/timer.py
+++ b/debug_toolbar/panels/timer.py
@@ -31,10 +31,10 @@ 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 subtitle(self):
+    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
diff --git a/debug_toolbar/panels/version.py b/debug_toolbar/panels/version.py
index da05bf1..083b9cf 100644
--- a/debug_toolbar/panels/version.py
+++ b/debug_toolbar/panels/version.py
@@ -7,10 +7,10 @@ class VersionDebugPanel(DebugPanel):
     """
     name = 'Version'
 
-    def title(self):
+    def nav_title(self):
         return 'Django Version'
 
-    def subtitle(self):
+    def nav_subtitle(self):
         return django.get_version()
 
     def url(self):
diff --git a/debug_toolbar/templates/debug_toolbar/base.html b/debug_toolbar/templates/debug_toolbar/base.html
index f6a508d..a45e9b6 100644
--- a/debug_toolbar/templates/debug_toolbar/base.html
+++ b/debug_toolbar/templates/debug_toolbar/base.html
@@ -31,8 +31,8 @@
 					{% else %}
 					    <div class="contentless">
 					{% endif %}
-					{{ panel.title }}
-					{% with panel.subtitle as subtitle %}
+					{{ panel.nav_title }}
+					{% with panel.nav_subtitle as subtitle %}
 						{% if subtitle %}<br><small>{{ subtitle }}</small>{% endif %}
 					{% endwith %}
 					{% if panel.has_content %}