3 files changed, 5 insertions, 46 deletions
diff --git a/templates/web/base/debug_footer.html b/templates/web/base/debug_footer.html
deleted file mode 100644
index a1b7fc155..000000000
--- a/templates/web/base/debug_footer.html
+++ /dev/null
@@ -1,40 +0,0 @@
-[% IF c.config.STAGING_SITE and c.config.SHOW_DEBUG %]
-
-<hr style="clear: both;">
-
-<ul>
-    <li>cobrand.moniker:           [% c.cobrand.moniker %]</li>
-    <li>additional_template_paths: [% additional_template_paths.join(', ') || '--empty--' %]</li>
-    <li>lang_code:                 [% lang_code %]</li>
-    <li>user.id:                   [% c.user.id || '--not logged in--' %]</li>
-</ul>
-
-<style type="text/css">
-    #overrides_form {
-        font-size: 80%;
-    }
-    #overrides_form label {
-            float: left;
-            text-align: right;
-            padding-right: 0.5em;
-            width: 12em;
-    }
-
-</style>
-
-<!-- Use a post so that we don't clutter up the url -->
-<form action="" method="post" id="overrides_form" name="overrides_form">
-
-    <label for="_override_clear_all">Clear all overrides:</label>
-    <input type="checkbox" name="_override_clear_all" id="_override_clear_all" value="1"><br>
-
-    [% FOREACH k IN ['cobrand_moniker', 'lang'] %]
-        <label for="override_[% k %]">[% k %]:</label>
-        <input type="text" name="_override_[% k %]" id="override_[% k %]" value="[% c.get_override(k)%]"><br>
-    [% END %]
-
-    <label>&nbsp;</label><input type="submit" value="Change overrides">
-</form>
-
-[% END %]
-
diff --git a/templates/web/base/debug_header.html b/templates/web/base/debug_header.html
index 92ccbc357..5bbb65cfc 100644
--- a/templates/web/base/debug_header.html
+++ b/templates/web/base/debug_header.html
@@ -1,5 +1,5 @@
-[% IF c.config.STAGING_SITE and c.config.SHOW_DEBUG %]
-    <p class="dev-site-notice">
-        [% loc("This is a developer site; things might break at any time, and the database will be periodically deleted.") %]
-    </p>
+[% IF c.config.STAGING_SITE ~%]
+    <div class="dev-site-notice">
+        [% loc("Staging site") %]
+    </div>
 [% END %]
diff --git a/templates/web/base/header.html b/templates/web/base/header.html
index 7f423ff9e..1469ea233 100644
--- a/templates/web/base/header.html
+++ b/templates/web/base/header.html
@@ -26,6 +26,7 @@
     [% TRY %][% PROCESS 'set_body_class.html' %][% CATCH file %][% END %]
     <body class="[% bodyclass | html IF bodyclass %]">
 
+    [% INCLUDE 'debug_header.html' %]
     [% TRY %][% PROCESS 'before_wrapper.html' %][% CATCH file %][% END %]
 
     <div class="wrapper">
@@ -36,5 +37,3 @@
 
             <div class="container">
                 <div class="content[% " $mainclass" | html IF mainclass %]" role="main">
-
-        <!-- [% INCLUDE 'debug_header.html' %] -->