11 files changed, 4 insertions, 20 deletions
diff --git a/templates/web/default/admin/report_edit.html b/templates/web/default/admin/report_edit.html
index 79207192d..cbba1b3b0 100644
--- a/templates/web/default/admin/report_edit.html
+++ b/templates/web/default/admin/report_edit.html
@@ -14,10 +14,6 @@
 <li><label for='detail'>[% loc('Details:') %]</label><br><textarea name='detail' id='detail' cols=60 rows=10>[% problem.detail | html %]</textarea></li>
 <li>[% loc('Co-ordinates:') %] [% problem.latitude %], [% problem.longitude %] ( [% loc('originally entered') %] [% problem.postcode | html %] , [% IF problem.used_map %][% loc('used map') %][% ELSE %][% loc("didn't use map") %][% END %])</li>
 <li>[% loc('For council(s):') %] [% IF problem.council %][% problem.council %][% ELSE %]<em>[% loc('None' ) %]</em>[% END %] ([% loc('other areas:') %] [% problem.areas | remove('^,') | remove( ',$' ) %])</li>
-<li><label for="anonymous">[% loc('Anonymous:') %]</label> <select name="anonymous"  id="anonymous">
-<option [% 'selected ' IF problem.anonymous %]value="1">[% loc('Yes') %]</option>
-<option [% 'selected ' IF !problem.anonymous %]value="0">[% loc('No') %]</option>
-</select></li>
 <li><label for="state">[% loc('State:') %]</label> <select name="state"  id="state">
     [% FOREACH state IN [ ['confirmed', loc('Open')], ['investigating',
     loc('Investigating')], ['planned', loc('Planned')], ['in progress',
@@ -27,6 +23,10 @@
     [% END %]
 </select></li>
 <li>[% loc('Category:') %] [% problem.category | html %] </li>
+<li><label for="anonymous">[% loc('Anonymous:') %]</label> <select name="anonymous"  id="anonymous">
+<option [% 'selected ' IF problem.anonymous %]value="1">[% loc('Yes') %]</option>
+<option [% 'selected ' IF !problem.anonymous %]value="0">[% loc('No') %]</option>
+</select></li>
 <li>[% loc('Name:') %] <input type='text' name='name' id='name' value='[% problem.name | html %]'></li>
 <li>[% loc('Email:') %] <input type='text' id='email' name='email' value='[% problem.user.email | html %]'> [% PROCESS abuse_button %] [% PROCESS flag_button user=problem.user %]</li>
 <li>[% loc('Phone:') %] [% problem.user.phone | html %]</li>
diff --git a/templates/web/default/alert/index.html b/templates/web/default/alert/index.html
index f717ad58c..d8478cf98 100644
--- a/templates/web/default/alert/index.html
+++ b/templates/web/default/alert/index.html
@@ -22,7 +22,6 @@ within a certain distance of a particular location.') %]
 postcode or street name and area:' ) %]
   <input type="text" name="pc" value="[% pc | html %]">
   <input type="submit" value="[% loc('Go') %]">
-  [% cobrand_form_elements %]
   </p>
 </form>
 
diff --git a/templates/web/default/alert/list.html b/templates/web/default/alert/list.html
index 36bfaffd9..c763331cc 100644
--- a/templates/web/default/alert/list.html
+++ b/templates/web/default/alert/list.html
@@ -22,8 +22,6 @@
   <input type="hidden" name="type" value="local">
   <input type="hidden" name="pc" value="[% pc | html %]">
 
-  [% cobrand_form_elements %]
-
   [% IF photos.size %]
     <div id="alert_photos">
       <h2>[% loc('Photos of recent nearby reports') %]</h2>
diff --git a/templates/web/default/alert/updates.html b/templates/web/default/alert/updates.html
index 76b5ef23e..5efc41bac 100644
--- a/templates/web/default/alert/updates.html
+++ b/templates/web/default/alert/updates.html
@@ -15,7 +15,6 @@
 <input type="hidden" name="id" value="[% problem_id | html %]">
 <input type="hidden" name="type" value="updates">
 <input type="submit" value="[% loc('Subscribe') %]">
-[% cobrand_form_elements %]
 </form>
 
 
diff --git a/templates/web/default/around/around_index.html b/templates/web/default/around/around_index.html
index 3e6d96acd..c07eb2ca2 100644
--- a/templates/web/default/around/around_index.html
+++ b/templates/web/default/around/around_index.html
@@ -15,7 +15,6 @@
 
 <form action="[% c.uri_for('/around') %]" method="get" name="postcodeForm" id="postcodeForm">
     <label for="pc">[% question %]:</label>&nbsp;<input type="text" name="pc" value="[% pc | html %]" id="pc" size="10" maxlength="200">&nbsp;<input type="submit" value="[% loc('Go') %]" id="submit">
-[% c.cobrand.form_elements('postcodeForm') %]
 
 [% IF partial_token %]
     <input type="hidden" name="partial" value="[% partial_token.token %]">
diff --git a/templates/web/default/around/display_location.html b/templates/web/default/around/display_location.html
index bebc787e2..b5705a77b 100755
--- a/templates/web/default/around/display_location.html
+++ b/templates/web/default/around/display_location.html
@@ -40,7 +40,6 @@
 <input type="hidden" name="map_override" value="[% c.req.params.map_override | html %]">
 [% END %]
 <input type="hidden" name="pc" value="[% pc | html %]">
-[% c.cobrand.form_elements('mapForm') %]
 
 <input type="hidden" name="latitude" id="fixmystreet.latitude" value="[% short_latitude | html %]">
 <input type="hidden" name="longitude" id="fixmystreet.longitude" value="[% short_longitude | html %]">
diff --git a/templates/web/default/contact/index.html b/templates/web/default/contact/index.html
index 2c0c2ff02..50e8d3845 100644
--- a/templates/web/default/contact/index.html
+++ b/templates/web/default/contact/index.html
@@ -92,8 +92,6 @@
 <textarea class="required" name="message" id="form_message" rows="7" cols="50">[% message | html %]</textarea></div>
 <div class="checkbox"><input type="submit" value="[% loc('Post') %]"></div>
 
-[% c.cobrand.form_elements('contactForm') %]
-
 </form>
 
 [% INCLUDE 'contact/address.html' %]
diff --git a/templates/web/default/index.html b/templates/web/default/index.html
index eaf8804db..06f3ef771 100644
--- a/templates/web/default/index.html
+++ b/templates/web/default/index.html
@@ -32,7 +32,6 @@
     <span><input type="text" name="pc" value="" id="pc" size="10" maxlength="200">
     <input type="submit" value="[% loc('Go') %]" id="submit">
     </span>
-    [% c.cobrand.form_elements('postcodeForm') %]
 </form>
 
 <div id="front_intro">
diff --git a/templates/web/default/questionnaire/index.html b/templates/web/default/questionnaire/index.html
index a7e5ad60c..5b48f8915 100644
--- a/templates/web/default/questionnaire/index.html
+++ b/templates/web/default/questionnaire/index.html
@@ -21,8 +21,6 @@
 
 <input type="hidden" name="token" value="[% token | html %]">
 
-[% c.cobrand.form_elements('questionnaireForm') %]
-
 [% IF c.cobrand.moniker == 'emptyhomes' %]
 [% IF num_questionnaire == 1 %]
 [% loc('<p>Getting empty homes back into use can be difficult. You shouldn&rsquo;t expect
diff --git a/templates/web/default/report/display.html b/templates/web/default/report/display.html
index 1e320e1b4..999d332d2 100644
--- a/templates/web/default/report/display.html
+++ b/templates/web/default/report/display.html
@@ -41,7 +41,6 @@
         <input type="hidden" name="id" value="[% problem.id %]">
         <input type="hidden" name="type" value="updates">
         <input type="submit" value="[% loc('Subscribe') %]">
-        [% cobrand_alert_fields %]
     </form>
     &nbsp;
     <a href="[% c.uri_for( '/rss', problem.id ) %]">
@@ -192,8 +191,6 @@
 
 [% END %]
 
-        [% cobrand_update_fields %]
-
     </form>
 </div>
 
diff --git a/templates/web/default/report/new/fill_in_details.html b/templates/web/default/report/new/fill_in_details.html
index 701a9bafa..22d1ee739 100644
--- a/templates/web/default/report/new/fill_in_details.html
+++ b/templates/web/default/report/new/fill_in_details.html
@@ -9,12 +9,10 @@
 <input type="hidden" name="map_override" value="[% c.req.params.map_override | html %]">
 [% END %]
 <input type="hidden" name="pc" value="[% pc | html %]">
-[% c.cobrand.form_elements('mapForm') %]
 [% ELSE %]
 <form action="[% c.uri_for('/report/new') %]" method="post" name="mapSkippedForm"[% IF c.cobrand.allow_photo_upload %] enctype="multipart/form-data"[% END %] class="validate">
 <input type="hidden" name="pc" value="[% pc | html %]">
 <input type="hidden" name="skipped" value="1">
-[% c.cobrand.form_elements('mapSkippedForm') %]
 [% END %]
 
 <input type="hidden" name="latitude" id="fixmystreet.latitude" value="[% short_latitude | html %]">