5 files changed, 17 insertions, 3 deletions
diff --git a/templates/web/base/admin/bodies.html b/templates/web/base/admin/bodies.html
index ad0594146..a039f8208 100644
--- a/templates/web/base/admin/bodies.html
+++ b/templates/web/base/admin/bodies.html
@@ -9,6 +9,13 @@
     contacts (such as an email address) to which reports are sent.') %]
   </p>
 [% ELSE %]
+
+  [% IF c.config.STAGING_SITE and !c.config.SEND_REPORTS_ON_STAGING %]
+  <p class="fms-admin-warning">
+    [% tprintf(loc("As this is a staging site and %s is false, reports made on this site will be sent to the problem reporter, not the contact given for the report’s category."), "<a class='admin-offsite-link' href='http://fixmystreet.org/customising/config/#send_reports_on_staging'><code>SEND_REPORTS_ON_STAGING</code></a>") %]
+  </p>
+  [% END %]
+
   <table cellspacing="0" cellpadding="2" border="1">
       <tr>
           <th>[% loc('Name') %]</th>
diff --git a/templates/web/base/admin/body.html b/templates/web/base/admin/body.html
index e67cb2b07..cd87a5af8 100644
--- a/templates/web/base/admin/body.html
+++ b/templates/web/base/admin/body.html
@@ -47,6 +47,10 @@
     <br>
     [% loc("Add a contact using the form below.") %]
   </p>
+[% ELSIF c.config.STAGING_SITE and !c.config.SEND_REPORTS_ON_STAGING %]
+  <p class="fms-admin-warning">
+    [% tprintf(loc("As this is a staging site and %s is false, reports made on this site will be sent to the problem reporter, not the contact given for the report’s category."), "<a class='admin-offsite-link' href='http://fixmystreet.org/customising/config/#send_reports_on_staging'><code>SEND_REPORTS_ON_STAGING</code></a>") %]
+  </p>
 [% END %]
 
 <form method="post" action="[% c.uri_for('body', body_id ) %]" enctype="application/x-www-form-urlencoded" accept-charset="utf-8">
@@ -61,7 +65,7 @@
     </tr>
     [% WHILE ( cat = contacts.next ) %]
       <tr [% IF cat.deleted %]class="is-deleted"[% END %]>
-        <td class="contact-category"><a href="[% c.uri_for( 'body_edit', body_id, cat.category ) %]">[% cat.category %]</a>
+        <td class="contact-category"><a href="[% c.uri_for( 'body', body_id, cat.category ) %]">[% cat.category %]</a>
             <br>[% cat.email | html %]</td>
         <td>
             [% loc('Confirmed') %]:&nbsp;
diff --git a/templates/web/base/admin/body_edit.html b/templates/web/base/admin/category_edit.html
index ef7a0a11c..ef7a0a11c 100644
--- a/templates/web/base/admin/body_edit.html
+++ b/templates/web/base/admin/category_edit.html
diff --git a/templates/web/base/admin/config_page.html b/templates/web/base/admin/config_page.html
index 0b29590e4..211d41f31 100644
--- a/templates/web/base/admin/config_page.html
+++ b/templates/web/base/admin/config_page.html
@@ -39,7 +39,10 @@ running version <strong>[% git_version || 'unknown' %]</strong>.
 [% INCLUDE with_cobrand value="ADMIN_BASE_URL" cob=c.cobrand.admin_base_url %]
 
 [% INCLUDE subsection heading="Display" %]
-[% INCLUDE just_value value="Site title" conf = c.cobrand.site_title %]
+<tr>
+    <td>Site title</td>
+    <td colspan=2>[% PROCESS 'site-name.html' -%]</td>
+</tr>
 [% allowed_conf = FOR k IN c.config.ALLOWED_COBRANDS %]
     [% IF k.keys %][% k.items.join(':') %][% ELSE %][% k %][% END %]
     [%- ',' IF NOT loop.last %]
diff --git a/templates/web/base/admin/index.html b/templates/web/base/admin/index.html
index 17f7bd22a..c9d2b8deb 100644
--- a/templates/web/base/admin/index.html
+++ b/templates/web/base/admin/index.html
@@ -1,7 +1,7 @@
 [% INCLUDE 'admin/header.html' title=loc('Summary') -%]
 
 <div class="fms-admin-info fms-admin-floated">
-This is the administration interface for [% c.cobrand.site_title %]. If you
+This is the administration interface for [% PROCESS 'site-name.html' -%]. If you
 need any help or guidance, there is <a href="http://fixmystreet.org/">plenty of
 online documentation</a>. The FixMyStreet Platform is
 <a href="https://github.com/mysociety/fixmystreet">actively supported</a> by