Merge pull request #181 from okfn/debug-header-info

Debug header info
ckan · Nov 22, 2012 · c81ee8f · c81ee8f
2 parents 79edb76 + 3bffcb8
commit c81ee8f
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/ckan/config/deployment.ini_tmpl b/ckan/config/deployment.ini_tmpl
@@ -235,6 +235,14 @@ ckan.feeds.author_link =
 #ofs.aws_access_key_id = ....
 #ofs.aws_secret_access_key = ....
 
+
+# DEBUGGING
+
+# ckan.debug_supress_header This option can be set to suppress the debug
+# information showing the controller and action recieving the request being
+# shown in the header.  Note: This info only shows if debug is set to true.
+ckan.debug_supress_header = false
+
 ## ===================================
 ## Extensions
 

diff --git a/ckan/lib/app_globals.py b/ckan/lib/app_globals.py
@@ -161,5 +161,7 @@ def _init(self):
         datasets_per_page = int(config.get('ckan.datasets_per_page', '20'))
         self.datasets_per_page = datasets_per_page
 
+        self.debug_supress_header = asbool(config.get('ckan.debug_supress_header', 'false'))
+
 app_globals = _Globals()
 del _Globals
diff --git a/ckan/public/base/less/masthead.less b/ckan/public/base/less/masthead.less
@@ -194,11 +194,9 @@ header.masthead {
 
 	.debug {
 		position: absolute;
-		bottom: 10px;
+		top: 10px;
 		left: 10px;
-		font-size: 11px;
 		color: rgba(255, 255, 255, 0.5);
-		line-height: 1.2;
 	}
 
 }
diff --git a/ckan/templates/header.html b/ckan/templates/header.html
@@ -1,5 +1,5 @@
 <header class="masthead">
-  {% if config.debug %}
+  {% if config.debug and not g.debug_supress_header %}
     <div class="debug">Controller : {{ c.controller }}<br/>Action : {{ c.action }}</div>
   {% endif %}
   <div class="container">