17 files changed, 61 insertions, 36 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
diff --git a/templates/web/base/around/display_location.html b/templates/web/base/around/display_location.html
index dbe7d9ffd..804be9603 100755
--- a/templates/web/base/around/display_location.html
+++ b/templates/web/base/around/display_location.html
@@ -27,7 +27,7 @@
         }
     );
 
-    PROCESS "maps/${map.type}.html";
+    PROCESS "maps/${map.type}.html" around_page = 1;
 
     SET bodyclass = 'mappage';
     SET rss = [ loc('Recent local problems, FixMyStreet'), rss_url ] IF c.cobrand.moniker != 'emptyhomes';
@@ -53,9 +53,7 @@
 
       [% IF c.cobrand.moniker != 'emptyhomes' %]
         <p id='sub_map_links'>
-            [% IF c.cobrand.moniker == 'zurich' %]
-                <a class="hidden-nojs" id="map_layer_toggle" href="">Stadtplan</a>
-            [% END %]
+            [% map_sub_links %]
             [% IF c.req.params.no_pins %]
                 <a id='hide_pins_link' rel='nofollow' href='[% c.uri_with( { no_pins => 0 } ) %]'>[% loc('Show pins') %]</a>
             [% ELSE %]
diff --git a/templates/web/base/auth/change_password.html b/templates/web/base/auth/change_password.html
index 5f2861aa3..b4170c23e 100644
--- a/templates/web/base/auth/change_password.html
+++ b/templates/web/base/auth/change_password.html
@@ -1,4 +1,4 @@
-[% INCLUDE 'header.html', title = loc('Change password') %]
+[% INCLUDE 'header.html', title = loc('Change password'), bodyclass = 'authpage' %]
 
 <h1>[% loc('Change password') %]</h1>
 
diff --git a/templates/web/base/common_header_tags.html b/templates/web/base/common_header_tags.html
index 49b649eca..16098b7f5 100644
--- a/templates/web/base/common_header_tags.html
+++ b/templates/web/base/common_header_tags.html
@@ -42,5 +42,5 @@
 
 <title>
     [% "$title :: " | html IF title %]
-    [% site_title || 'FixMyStreet' %]
+    [% PROCESS 'site-name.html' -%]
 </title>
diff --git a/templates/web/base/faq/faq-en-gb.html b/templates/web/base/faq/faq-en-gb.html
index 55046ce4a..e1e07a8d7 100755
--- a/templates/web/base/faq/faq-en-gb.html
+++ b/templates/web/base/faq/faq-en-gb.html
@@ -5,7 +5,7 @@
         <ul class="plain-list">
             <li><strong>Frequently Asked Questions</strong></li>
             <li><a href="/privacy">Privacy and cookies</a></li>
-            <li><a href="/contact">Contact [% c.cobrand.site_title %]</a></li>
+            <li><a href="/contact">Contact [% PROCESS 'site-name.html' -%]</a></li>
         </ul>
     </aside>
 </div>
@@ -15,15 +15,15 @@
 <dl>
 
     <dt>What is this site?</dt>
-    <dd>[% c.cobrand.site_title %] is a site to help people report to their
+    <dd>[% PROCESS 'site-name.html' -%] is a site to help people report to their
     local authority, view, or discuss local issues they&rsquo;ve found, by
     simply locating them on a map.</dd>
 
-    <dt>How do I get in touch with [% c.cobrand.site_title %]?</dt>
+    <dt>How do I get in touch with [% PROCESS 'site-name.html' -%]?</dt>
     <dd>Here&rsquo;s our <a href="/contact">contact page</a>.</dd>
 
-    <dt>What sort of problems should I report with [% c.cobrand.site_title %]?</dt>
-    <dd>This depends upon the precise purpose of [% c.cobrand.site_title %];
+    <dt>What sort of problems should I report with [% PROCESS 'site-name.html' -%]?</dt>
+    <dd>This depends upon the precise purpose of [% PROCESS 'site-name.html' -%];
     in the UK, FixMyStreet is primarily for reporting things which are
     <strong>broken or dirty or damaged or dumped, and need fixing, cleaning
     or clearing</strong>, such as:
@@ -38,8 +38,8 @@
     </ul>
     </dd>
 
-    <dt>What isn&rsquo;t [% c.cobrand.site_title %] for?</dt>
-    <dd>[% c.cobrand.site_title %] is not a way of getting in touch with your
+    <dt>What isn&rsquo;t [% PROCESS 'site-name.html' -%] for?</dt>
+    <dd>[% PROCESS 'site-name.html' -%] is not a way of getting in touch with your
     authority for all issues &ndash; please use this site only for problems
     such as the above. We often route problem reports via cleansing services or
     highways and so using this site for other matters may result in a delay in
@@ -75,9 +75,9 @@
     a registered charity, so if you want to make a contribution,
         <a href="https://www.mysociety.org/donate/">please do</a>.</dd>
 
-    <dt>Can I use [% c.cobrand.site_title %] on my mobile?</dt>
+    <dt>Can I use [% PROCESS 'site-name.html' -%] on my mobile?</dt>
     <dd>
-    <p>The [% c.cobrand.site_title %] website will already work on your mobile
+    <p>The [% PROCESS 'site-name.html' -%] website will already work on your mobile
     phone, adapting to the size of your screen automatically.</p>
     </dd>
 </dl>
@@ -90,18 +90,18 @@
 to find out where reports go at the moment. Also <a href="/contact">contact us</a>
 to update the address or addresses we use.</dd>
 
-    <dt>I&rsquo;m from an authority, can we have [% c.cobrand.site_title %]
+    <dt>I&rsquo;m from an authority, can we have [% PROCESS 'site-name.html' -%]
     on our website?</dt>
     <dd>Quite possibly &ndash; contact the people who run this site.</dd>
 
     <dt>Do you remove silly or illegal content?</dt>
-    <dd>[% c.cobrand.site_title %] is not responsible for the content and
+    <dd>[% PROCESS 'site-name.html' -%] is not responsible for the content and
     accuracy of material submitted by its users. We reserve the right to
     edit or remove any problems or updates which we consider to be
     inappropriate upon being informed by a user of the site.</dd>
 
     <dt>Why can&rsquo;t I zoom out more on the reporting map?</dt>
-    <dd>We want to keep [% c.cobrand.site_title %] locally focused, so restrict
+    <dd>We want to keep [% PROCESS 'site-name.html' -%] locally focused, so restrict
     the ability to move radically between areas. The map on Your Reports will
     let you see all the reports you&rsquo;ve made, wherever they are. If
     you&rsquo;re from the authority then the emailed version of the problem
@@ -111,7 +111,7 @@ to update the address or addresses we use.</dd>
 <h2><a name="organisation"></a>Organisation Questions</h2>
 
 <dl>
-    <dt>Who built [% c.cobrand.site_title %]?</dt>
+    <dt>Who built [% PROCESS 'site-name.html' -%]?</dt>
     <dd>This will depend upon the installation of the FixMyStreet Platform,
     who should create their own <code>faq/</code> template in their cobrand
     directory to replace this default one. The FixMyStreet Platform was
diff --git a/templates/web/base/js/translation_strings.html b/templates/web/base/js/translation_strings.html
index a14443b71..669055a1b 100644
--- a/templates/web/base/js/translation_strings.html
+++ b/templates/web/base/js/translation_strings.html
@@ -42,6 +42,9 @@
         ok: '[% loc('OK') | replace("'", "\\'") %]',
         map: '[% loc('MAP') | replace("'", "\\'") %]',
 
+        map_map: '[% loc('Map') | replace("'", "\\'") %]',
+        map_satellite: '[% loc('Satellite') | replace("'", "\\'") %]',
+
         permalink: '[% loc('Permalink') | replace("'", "\\'") %]',
 
         report_problem_heading: '[% loc('Click map to report a problem') | replace("'", "\\'") %]'
diff --git a/templates/web/base/maps/google-ol.html b/templates/web/base/maps/google-ol.html
index 35c046b55..919ae073f 100644
--- a/templates/web/base/maps/google-ol.html
+++ b/templates/web/base/maps/google-ol.html
@@ -9,7 +9,15 @@
 <![endif]-->
 [% END %]
 
+[% map_sub_links = BLOCK %]
+<a class="hidden-nojs" id="map_layer_toggle" href="">[% loc('Satellite') %]</a>
+[% END %]
+
 [% map_html = BLOCK %]
 [% INCLUDE maps/openlayers.html %]
+[% UNLESS around_page %]
+<p id="sub_map_links">
+     [% map_sub_links %]
+</p>
+[% END %]
 [% END %]
-
diff --git a/templates/web/base/report/new/category_extras.html b/templates/web/base/report/new/category_extras.html
index 928b61041..6b15cbef9 100644
--- a/templates/web/base/report/new/category_extras.html
+++ b/templates/web/base/report/new/category_extras.html
@@ -11,14 +11,16 @@
 
     <div class="form-field">
         <label for="form_[% meta_name %]">[% meta.description _ ':' %]</label>
-        [% IF meta.exists('values') %]
-        <select name="[% meta_name %]" id="form_[% meta_name %]"[% meta.required == 'true' ? ' required' : '' %]>
-            [% FOR option IN meta.values.value.value %]
-                <option value="[% option.key.0 %]"[% IF option.key.0 == report_meta.$meta_name.value %] selected[% END %]>[% option.name.0 %]</option>
+        [% IF meta.variable != 'false' %]
+            [% IF meta.exists('values') 
+            <select name="[% meta_name %]" id="form_[% meta_name %]"[% meta.required == 'true' ? ' required' : '' %]>
+                [% FOR option IN meta.values.value.value %]
+                    <option value="[% option.key.0 %]"[% IF option.key.0 == report_meta.$meta_name.value %] selected[% END %]>[% option.name.0 %]</option>
+                [% END %]
+            </select>
+            [% ELSE %]
+            <input type="text" value="[% report_meta.$meta_name | html %]" name="[% meta_name %]" id="form_[% meta_name %]"[% meta.required == 'true' ? ' required' : '' %]>
             [% END %]
-        </select>
-        [% ELSE %]
-        <input type="text" value="[% report_meta.$meta_name | html %]" name="[% meta_name %]" id="form_[% meta_name %]"[% meta.required == 'true' ? ' required' : '' %]>
         [% END %]
     </div>
         [%- END %]
diff --git a/templates/web/base/report/new/councils_extra_text.html b/templates/web/base/report/new/councils_extra_text.html
index 1088b9f8b..b77758b01 100644
--- a/templates/web/base/report/new/councils_extra_text.html
+++ b/templates/web/base/report/new/councils_extra_text.html
@@ -1 +1 @@
-[% loc('The subject and details of the problem will be public, plus your name if you give us permission.') %]
+[% loc('The summary and description will also be made public (see our <a href="/privacy">privacy policy</a>).') %]
diff --git a/templates/web/base/report/new/councils_text_some.html b/templates/web/base/report/new/councils_text_some.html
index 8d4768612..70cb97617 100644
--- a/templates/web/base/report/new/councils_text_some.html
+++ b/templates/web/base/report/new/councils_text_some.html
@@ -7,9 +7,8 @@
     [%- '.' IF loop.last %]    
 [% END %]
 
-[%
-    loc('The subject and details of the problem will be public, plus your name if you give us permission.');
-%]
+[% loc('The summary and description will also be made public (see our <a href="/privacy">privacy policy</a>).') %]
+
 [%
     nget(
         "We do <strong>not</strong> yet have details for the other council that covers this location.",
diff --git a/templates/web/base/report/new/fill_in_details_form.html b/templates/web/base/report/new/fill_in_details_form.html
index ec05e127e..cee0244c7 100644
--- a/templates/web/base/report/new/fill_in_details_form.html
+++ b/templates/web/base/report/new/fill_in_details_form.html
@@ -15,7 +15,7 @@
             loc('the local council')
         );
     %]
-    [% loc('The subject and details of the problem will be public, plus your name if you give us permission.') %]
+    [% loc('The summary and description will also be made public (see our <a href="/privacy">privacy policy</a>).') %]
     </p>
 [% ELSE %]
     [% PROCESS 'report/new/councils_text.html' %]
diff --git a/templates/web/base/site-name.html b/templates/web/base/site-name.html
new file mode 100644
index 000000000..4e9a24bb9
--- /dev/null
+++ b/templates/web/base/site-name.html
@@ -0,0 +1 @@
+FixMyStreet
diff --git a/templates/web/base/static/privacy.html b/templates/web/base/static/privacy.html
index 55d8531f4..36720207b 100755
--- a/templates/web/base/static/privacy.html
+++ b/templates/web/base/static/privacy.html
@@ -7,7 +7,7 @@
         <ul class="plain-list">
             <li><a href="/faq">Frequently Asked Questions</a></li>
             <li><strong>Privacy and cookies</strong></li>
-            <li><a href="/contact">Contact [% c.cobrand.site_title %]</a></li>
+            <li><a href="/contact">Contact [% PROCESS 'site-name.html' -%]</a></li>
         </ul>
     </aside>
 </div>