6 files changed, 8 insertions, 8 deletions
diff --git a/templates/web/base/admin/bodies.html b/templates/web/base/admin/bodies.html
index eab0f4c49..9f4b81340 100644
--- a/templates/web/base/admin/bodies.html
+++ b/templates/web/base/admin/bodies.html
@@ -16,7 +16,7 @@
 
   [% IF c.config.STAGING_SITE and !c.config.STAGING_FLAGS.send_reports %]
   <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>STAGING_FLAGS send_reports</code></a>") %]
+    [% 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='https://fixmystreet.org/customising/config/#send_reports_on_staging'><code>STAGING_FLAGS send_reports</code></a>") %]
   </p>
   [% END %]
 
diff --git a/templates/web/base/admin/body-form.html b/templates/web/base/admin/body-form.html
index 54445a282..958ea5d78 100644
--- a/templates/web/base/admin/body-form.html
+++ b/templates/web/base/admin/body-form.html
@@ -70,7 +70,7 @@
             your config file is not pointing to a live MapIt service.") %]
         [% END %]
         <br>
-        [% loc("For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>.")%]
+        [% loc("For more information, see <a href='https://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>.")%]
       </p>
     </div>
     <p>
diff --git a/templates/web/base/admin/body.html b/templates/web/base/admin/body.html
index 7fa446f44..92d20f665 100644
--- a/templates/web/base/admin/body.html
+++ b/templates/web/base/admin/body.html
@@ -61,7 +61,7 @@
   </p>
 [% ELSIF c.config.STAGING_SITE and !c.config.STAGING_FLAGS.send_reports %]
   <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>STAGING_FLAGS send_reports</code></a>") %]
+    [% 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='https://fixmystreet.org/customising/config/#send_reports_on_staging'><code>STAGING_FLAGS send_reports</code></a>") %]
   </p>
 [% END %]
 
diff --git a/templates/web/base/admin/config_page.html b/templates/web/base/admin/config_page.html
index d448d2a63..8e8d562ff 100644
--- a/templates/web/base/admin/config_page.html
+++ b/templates/web/base/admin/config_page.html
@@ -139,7 +139,7 @@ running version <strong>[% git_version || 'unknown' %]</strong>.
 
 Other things can be changed on a cobrand basis by using functions in an
 (optional) Cobrand .pm module, as explained in the
-<a href="http://fixmystreet.org/customising/" class="admin-offsite-link">customising section of our
+<a href="https://fixmystreet.org/customising/" class="admin-offsite-link">customising section of our
 documentation</a>. If you wish to add new functionality just for your cobrand
 that can't be done simply by changes to your cobrand's templates, you might
 need to add a new Cobrand function.
@@ -147,7 +147,7 @@ need to add a new Cobrand function.
 <p>Examples of cobrand functions are below; this is not exhaustive.
 Many were added for one specific cobrand, so didn't need a general
 configuration option. Please feel free to discuss on <a
-href="http://fixmystreet.org/community/" class="admin-offsite-link">our mailing list</a> if you think
+href="https://fixmystreet.org/community/" class="admin-offsite-link">our mailing list</a> if you think
 something should be moved to the general.yml file, done differently,
 or have any questions.</p>
 
diff --git a/templates/web/base/admin/index.html b/templates/web/base/admin/index.html
index 8498055b1..8691dbcf8 100644
--- a/templates/web/base/admin/index.html
+++ b/templates/web/base/admin/index.html
@@ -3,11 +3,11 @@
 
 <div class="fms-admin-info fms-admin-floated">
 This is the administration interface for [% site_name %]. If you
-need any help or guidance, there is <a href="http://fixmystreet.org/">plenty of
+need any help or guidance, there is <a href="https://fixmystreet.org/">plenty of
 online documentation</a>. The FixMyStreet Platform is
 <a href="https://github.com/mysociety/fixmystreet">actively supported</a> by
 its developers, and has a community of people using or working on the code.
-Please <a href="http://fixmystreet.org/community/">sign up to the mailing list
+Please <a href="https://fixmystreet.org/community/">sign up to the mailing list
 or get in touch</a> to let us know about your use of the FixMyStreet Platform,
 and to receive notices of updates.
 </div>
diff --git a/templates/web/base/admin/report_edit.html b/templates/web/base/admin/report_edit.html
index 00e686566..138ba8c05 100644
--- a/templates/web/base/admin/report_edit.html
+++ b/templates/web/base/admin/report_edit.html
@@ -92,7 +92,6 @@ class="admin-offsite-link">[% problem.latitude %], [% problem.longitude %]</a>
 <li>[% loc('Cobrand:') %] [% problem.cobrand %]
 <br><small>[% loc('Cobrand data:') %] [% cobrand_data OR '<em>' _ loc('None') _ '</em>' %]</small>
 </li>
-<li>[% loc('Extra data:') %] [% problem.extra ? 'Yes' : 'No' %]</li>
 <li>[% loc('Going to send questionnaire?') %] [% IF problem.send_questionnaire %][% loc('Yes') %][% ELSE %][% loc('No') %][% END %]</li>
 
 <li><label for="external_id">[% loc('External ID') %]:</label>
@@ -126,6 +125,7 @@ class="admin-offsite-link">[% problem.latitude %], [% problem.longitude %]</a>
 <li><label class="inline-text" for="category">[% loc('Category:') %]</label>
     [% INCLUDE 'admin/report-category.html' %]
 </li>
+<li>[% loc('Extra data:') %] [% IF extra_fields.size %]<ul>[% FOREACH field IN extra_fields %]<li><strong>[% field.name %]</strong>: [% field.val %]</li>[% END %]</ul>[% ELSE %]No[% END %]</li>
 <li><label class="inline-text" for="anonymous">[% loc('Anonymous:') %]</label>
 <select class="form-control" name="anonymous"  id="anonymous">
 <option [% 'selected ' IF problem.anonymous %]value="1">[% loc('Yes') %]</option>