Rename 'default' web directory to 'base'.

This should reduce confusion with the Default cobrand and override order.

121 files changed, 6 insertions, 6 deletions

diff --git a/bin/gettext-extract b/bin/gettext-extract
index a38c17127..9d22529d4 100755
--- a/bin/gettext-extract
+++ b/bin/gettext-extract
@@ -15,7 +15,7 @@ rm -f $PO
 
 # we don't want to extract strings from all the cobrand templates so list
 # the ones we care about
-find templates/web/default templates/web/fixmystreet templates/web/zurich templates/web/fiksgatami templates/web/emptyhomes templates/web/fixmybarangay -name '*.html' > template_list
+find templates/web/base templates/web/fixmystreet templates/web/zurich templates/web/fiksgatami templates/web/emptyhomes templates/web/fixmybarangay -name '*.html' > template_list
 
 # Extract from Perl
 xgettext.pl --gnu-gettext --verbose --output $PO --plugin perl=* --plugin tt2 --directory perllib -f template_list --directory db --directory bin
diff --git a/perllib/FixMyStreet/App/View/Web.pm b/perllib/FixMyStreet/App/View/Web.pm
index e4aafe951..033ad583f 100644
--- a/perllib/FixMyStreet/App/View/Web.pm
+++ b/perllib/FixMyStreet/App/View/Web.pm
@@ -13,7 +13,7 @@ use Utils;
 __PACKAGE__->config(
     TEMPLATE_EXTENSION => '.html',
     INCLUDE_PATH       => [          #
-        FixMyStreet->path_to( 'templates', 'web', 'default' ),
+        FixMyStreet->path_to( 'templates', 'web', 'base' ),
     ],
     ENCODING       => 'utf8',
     render_die     => 1,
diff --git a/perllib/FixMyStreet/Cobrand/Default.pm b/perllib/FixMyStreet/Cobrand/Default.pm
index 34ad5790f..8eb637879 100644
--- a/perllib/FixMyStreet/Cobrand/Default.pm
+++ b/perllib/FixMyStreet/Cobrand/Default.pm
@@ -24,10 +24,10 @@ Returns the path to the templates for this cobrand - by default
 
 sub path_to_web_templates {
     my $self = shift;
-    my $paths = [];
-    push @$paths, FixMyStreet->path_to( 'templates/web', $self->moniker )->stringify
-        unless $self->is_default;
-    push @$paths, FixMyStreet->path_to( 'templates/web/fixmystreet' )->stringify;
+    my $paths = [
+        FixMyStreet->path_to( 'templates/web', $self->moniker )->stringify,
+        FixMyStreet->path_to( 'templates/web/fixmystreet' )->stringify,
+    ];
     return $paths;
 }
 
diff --git a/templates/web/default/admin/bodies.html b/templates/web/base/admin/bodies.html
index 8bf7954f3..8bf7954f3 100644
--- a/templates/web/default/admin/bodies.html
+++ b/templates/web/base/admin/bodies.html
diff --git a/templates/web/default/admin/body-form.html b/templates/web/base/admin/body-form.html
index 608a77dc2..608a77dc2 100644
--- a/templates/web/default/admin/body-form.html
+++ b/templates/web/base/admin/body-form.html
diff --git a/templates/web/default/admin/body.html b/templates/web/base/admin/body.html
index b207d18ca..b207d18ca 100644
--- a/templates/web/default/admin/body.html
+++ b/templates/web/base/admin/body.html
diff --git a/templates/web/default/admin/body_edit.html b/templates/web/base/admin/body_edit.html
index f2bae0c0b..f2bae0c0b 100644
--- a/templates/web/default/admin/body_edit.html
+++ b/templates/web/base/admin/body_edit.html
diff --git a/templates/web/default/admin/config_page.html b/templates/web/base/admin/config_page.html
index 83300e4db..83300e4db 100644
--- a/templates/web/default/admin/config_page.html
+++ b/templates/web/base/admin/config_page.html
diff --git a/templates/web/default/admin/council_contacts.txt b/templates/web/base/admin/council_contacts.txt
index 2d1e04bfa..2d1e04bfa 100644
--- a/templates/web/default/admin/council_contacts.txt
+++ b/templates/web/base/admin/council_contacts.txt
diff --git a/templates/web/default/admin/edit-league.html b/templates/web/base/admin/edit-league.html
index 4f31eeb2e..4f31eeb2e 100644
--- a/templates/web/default/admin/edit-league.html
+++ b/templates/web/base/admin/edit-league.html
diff --git a/templates/web/default/admin/flagged.html b/templates/web/base/admin/flagged.html
index 518d1b14e..518d1b14e 100644
--- a/templates/web/default/admin/flagged.html
+++ b/templates/web/base/admin/flagged.html
diff --git a/templates/web/default/admin/footer.html b/templates/web/base/admin/footer.html
index 4c891c4ff..4c891c4ff 100644
--- a/templates/web/default/admin/footer.html
+++ b/templates/web/base/admin/footer.html
diff --git a/templates/web/default/admin/header.html b/templates/web/base/admin/header.html
index 9f3503e20..9f3503e20 100644
--- a/templates/web/default/admin/header.html
+++ b/templates/web/base/admin/header.html
diff --git a/templates/web/default/admin/index.html b/templates/web/base/admin/index.html
index ad5932d97..ad5932d97 100644
--- a/templates/web/default/admin/index.html
+++ b/templates/web/base/admin/index.html
diff --git a/templates/web/default/admin/list_updates.html b/templates/web/base/admin/list_updates.html
index 02845b0ee..02845b0ee 100644
--- a/templates/web/default/admin/list_updates.html
+++ b/templates/web/base/admin/list_updates.html
diff --git a/templates/web/default/admin/problem_row.html b/templates/web/base/admin/problem_row.html
index 2413a6062..2413a6062 100644
--- a/templates/web/default/admin/problem_row.html
+++ b/templates/web/base/admin/problem_row.html
diff --git a/templates/web/default/admin/questionnaire.html b/templates/web/base/admin/questionnaire.html
index 680e0d214..680e0d214 100644
--- a/templates/web/default/admin/questionnaire.html
+++ b/templates/web/base/admin/questionnaire.html
diff --git a/templates/web/default/admin/report_blocks.html b/templates/web/base/admin/report_blocks.html
index c2cffc352..c2cffc352 100644
--- a/templates/web/default/admin/report_blocks.html
+++ b/templates/web/base/admin/report_blocks.html
diff --git a/templates/web/default/admin/report_edit.html b/templates/web/base/admin/report_edit.html
index 12560fdf3..12560fdf3 100644
--- a/templates/web/default/admin/report_edit.html
+++ b/templates/web/base/admin/report_edit.html
diff --git a/templates/web/default/admin/reports.html b/templates/web/base/admin/reports.html
index 7267dd11d..7267dd11d 100644
--- a/templates/web/default/admin/reports.html
+++ b/templates/web/base/admin/reports.html
diff --git a/templates/web/default/admin/stats.html b/templates/web/base/admin/stats.html
index d143d9f28..d143d9f28 100644
--- a/templates/web/default/admin/stats.html
+++ b/templates/web/base/admin/stats.html
diff --git a/templates/web/default/admin/timeline.html b/templates/web/base/admin/timeline.html
index 6bf350a58..6bf350a58 100644
--- a/templates/web/default/admin/timeline.html
+++ b/templates/web/base/admin/timeline.html
diff --git a/templates/web/default/admin/update_edit.html b/templates/web/base/admin/update_edit.html
index 5ffce8bc4..5ffce8bc4 100644
--- a/templates/web/default/admin/update_edit.html
+++ b/templates/web/base/admin/update_edit.html
diff --git a/templates/web/default/admin/user-form.html b/templates/web/base/admin/user-form.html
index 4a57b05a0..4a57b05a0 100644
--- a/templates/web/default/admin/user-form.html
+++ b/templates/web/base/admin/user-form.html
diff --git a/templates/web/default/admin/user_edit.html b/templates/web/base/admin/user_edit.html
index d69c873a3..d69c873a3 100644
--- a/templates/web/default/admin/user_edit.html
+++ b/templates/web/base/admin/user_edit.html
diff --git a/templates/web/default/admin/users.html b/templates/web/base/admin/users.html
index db97c7d59..db97c7d59 100644
--- a/templates/web/default/admin/users.html
+++ b/templates/web/base/admin/users.html
diff --git a/templates/web/default/alert/_list.html b/templates/web/base/alert/_list.html
index 2ffcfae39..2ffcfae39 100644
--- a/templates/web/default/alert/_list.html
+++ b/templates/web/base/alert/_list.html
diff --git a/templates/web/default/alert/choose.html b/templates/web/base/alert/choose.html
index 312b9f520..312b9f520 100644
--- a/templates/web/default/alert/choose.html
+++ b/templates/web/base/alert/choose.html
diff --git a/templates/web/default/alert/index.html b/templates/web/base/alert/index.html
index e3dead34a..e3dead34a 100644
--- a/templates/web/default/alert/index.html
+++ b/templates/web/base/alert/index.html
diff --git a/templates/web/default/alert/list.html b/templates/web/base/alert/list.html
index 447bfcd76..447bfcd76 100644
--- a/templates/web/default/alert/list.html
+++ b/templates/web/base/alert/list.html
diff --git a/templates/web/default/alert/updates.html b/templates/web/base/alert/updates.html
index 5efc41bac..5efc41bac 100644
--- a/templates/web/default/alert/updates.html
+++ b/templates/web/base/alert/updates.html
diff --git a/templates/web/default/around/_report_banner.html b/templates/web/base/around/_report_banner.html
index 024fe08d9..024fe08d9 100755
--- a/templates/web/default/around/_report_banner.html
+++ b/templates/web/base/around/_report_banner.html
diff --git a/templates/web/default/around/_updates.html b/templates/web/base/around/_updates.html
index 8110a6c7c..8110a6c7c 100755
--- a/templates/web/default/around/_updates.html
+++ b/templates/web/base/around/_updates.html
diff --git a/templates/web/default/around/around_index.html b/templates/web/base/around/around_index.html
index 087abf65f..087abf65f 100644
--- a/templates/web/default/around/around_index.html
+++ b/templates/web/base/around/around_index.html
diff --git a/templates/web/default/around/around_map_list_items.html b/templates/web/base/around/around_map_list_items.html
index da75561b5..da75561b5 100644
--- a/templates/web/default/around/around_map_list_items.html
+++ b/templates/web/base/around/around_map_list_items.html
diff --git a/templates/web/default/around/display_location.html b/templates/web/base/around/display_location.html
index c8c6935de..c8c6935de 100755
--- a/templates/web/default/around/display_location.html
+++ b/templates/web/base/around/display_location.html
diff --git a/templates/web/default/around/location_error.html b/templates/web/base/around/location_error.html
index 9b907b64b..9b907b64b 100644
--- a/templates/web/default/around/location_error.html
+++ b/templates/web/base/around/location_error.html
diff --git a/templates/web/default/around/on_map_list_items.html b/templates/web/base/around/on_map_list_items.html
index 70a071406..70a071406 100644
--- a/templates/web/default/around/on_map_list_items.html
+++ b/templates/web/base/around/on_map_list_items.html
diff --git a/templates/web/default/around/postcode_form.html b/templates/web/base/around/postcode_form.html
index f58d7285d..f58d7285d 100644
--- a/templates/web/default/around/postcode_form.html
+++ b/templates/web/base/around/postcode_form.html
diff --git a/templates/web/default/around/tabbed_lists.html b/templates/web/base/around/tabbed_lists.html
index 4ad7b35fc..4ad7b35fc 100755
--- a/templates/web/default/around/tabbed_lists.html
+++ b/templates/web/base/around/tabbed_lists.html
diff --git a/templates/web/default/auth/change_password.html b/templates/web/base/auth/change_password.html
index c10560c3e..c10560c3e 100644
--- a/templates/web/default/auth/change_password.html
+++ b/templates/web/base/auth/change_password.html
diff --git a/templates/web/default/auth/general.html b/templates/web/base/auth/general.html
index f5e2e423f..f5e2e423f 100644
--- a/templates/web/default/auth/general.html
+++ b/templates/web/base/auth/general.html
diff --git a/templates/web/default/auth/sign_out.html b/templates/web/base/auth/sign_out.html
index 571e13f9f..571e13f9f 100644
--- a/templates/web/default/auth/sign_out.html
+++ b/templates/web/base/auth/sign_out.html
diff --git a/templates/web/default/auth/token.html b/templates/web/base/auth/token.html
index 361d4fbd5..361d4fbd5 100644
--- a/templates/web/default/auth/token.html
+++ b/templates/web/base/auth/token.html
diff --git a/templates/web/default/common_header_tags.html b/templates/web/base/common_header_tags.html
index cd6b4ab3a..cd6b4ab3a 100644
--- a/templates/web/default/common_header_tags.html
+++ b/templates/web/base/common_header_tags.html
diff --git a/templates/web/default/contact/blurb.html b/templates/web/base/contact/blurb.html
index 22c9a3cef..22c9a3cef 100644
--- a/templates/web/default/contact/blurb.html
+++ b/templates/web/base/contact/blurb.html
diff --git a/templates/web/default/contact/index.html b/templates/web/base/contact/index.html
index 8789fd03e..8789fd03e 100644
--- a/templates/web/default/contact/index.html
+++ b/templates/web/base/contact/index.html
diff --git a/templates/web/default/contact/submit.html b/templates/web/base/contact/submit.html
index 3845e9210..3845e9210 100644
--- a/templates/web/default/contact/submit.html
+++ b/templates/web/base/contact/submit.html
diff --git a/templates/web/default/contact/who.html b/templates/web/base/contact/who.html
index e69de29bb..e69de29bb 100644
--- a/templates/web/default/contact/who.html
+++ b/templates/web/base/contact/who.html
diff --git a/templates/web/default/dashboard/index.html b/templates/web/base/dashboard/index.html
index b3e1e8426..b3e1e8426 100644
--- a/templates/web/default/dashboard/index.html
+++ b/templates/web/base/dashboard/index.html
diff --git a/templates/web/default/debug_footer.html b/templates/web/base/debug_footer.html
index a1b7fc155..a1b7fc155 100644
--- a/templates/web/default/debug_footer.html
+++ b/templates/web/base/debug_footer.html
diff --git a/templates/web/default/debug_header.html b/templates/web/base/debug_header.html
index 92ccbc357..92ccbc357 100644
--- a/templates/web/default/debug_header.html
+++ b/templates/web/base/debug_header.html
diff --git a/templates/web/default/email_sent.html b/templates/web/base/email_sent.html
index 9afddf2bd..9afddf2bd 100644
--- a/templates/web/default/email_sent.html
+++ b/templates/web/base/email_sent.html
diff --git a/templates/web/default/errors.html b/templates/web/base/errors.html
index e0f484ba5..e0f484ba5 100644
--- a/templates/web/default/errors.html
+++ b/templates/web/base/errors.html
diff --git a/templates/web/default/errors/generic.html b/templates/web/base/errors/generic.html
index 12aa8e170..12aa8e170 100755
--- a/templates/web/default/errors/generic.html
+++ b/templates/web/base/errors/generic.html
diff --git a/templates/web/default/errors/page_error_404_not_found.html b/templates/web/base/errors/page_error_404_not_found.html
index 77db18e89..77db18e89 100644
--- a/templates/web/default/errors/page_error_404_not_found.html
+++ b/templates/web/base/errors/page_error_404_not_found.html
diff --git a/templates/web/default/faq/faq-en-gb.html b/templates/web/base/faq/faq-en-gb.html
index 57f346d31..57f346d31 100755
--- a/templates/web/default/faq/faq-en-gb.html
+++ b/templates/web/base/faq/faq-en-gb.html
diff --git a/templates/web/default/footer.html b/templates/web/base/footer.html
index a58a3e696..a58a3e696 100644
--- a/templates/web/default/footer.html
+++ b/templates/web/base/footer.html
diff --git a/templates/web/default/front/international_banner.html b/templates/web/base/front/international_banner.html
index e69de29bb..e69de29bb 100644
--- a/templates/web/default/front/international_banner.html
+++ b/templates/web/base/front/international_banner.html
diff --git a/templates/web/default/front/stats.html b/templates/web/base/front/stats.html
index 5367f1118..5367f1118 100644
--- a/templates/web/default/front/stats.html
+++ b/templates/web/base/front/stats.html
diff --git a/templates/web/default/header.html b/templates/web/base/header.html
index e6362a449..e6362a449 100644
--- a/templates/web/default/header.html
+++ b/templates/web/base/header.html
diff --git a/templates/web/default/header_logo.html b/templates/web/base/header_logo.html
index e69de29bb..e69de29bb 100644
--- a/templates/web/default/header_logo.html
+++ b/templates/web/base/header_logo.html
diff --git a/templates/web/default/header_opengraph.html b/templates/web/base/header_opengraph.html
index e69de29bb..e69de29bb 100644
--- a/templates/web/default/header_opengraph.html
+++ b/templates/web/base/header_opengraph.html
diff --git a/templates/web/default/header_rss.html b/templates/web/base/header_rss.html
index b93a2e7fc..b93a2e7fc 100644
--- a/templates/web/default/header_rss.html
+++ b/templates/web/base/header_rss.html
diff --git a/templates/web/default/index-steps.html b/templates/web/base/index-steps.html
index 431791c20..431791c20 100644
--- a/templates/web/default/index-steps.html
+++ b/templates/web/base/index-steps.html
diff --git a/templates/web/default/index.html b/templates/web/base/index.html
index 37bdd8c1e..37bdd8c1e 100644
--- a/templates/web/default/index.html
+++ b/templates/web/base/index.html
diff --git a/templates/web/default/js/translation_strings.html b/templates/web/base/js/translation_strings.html
index a14443b71..a14443b71 100644
--- a/templates/web/default/js/translation_strings.html
+++ b/templates/web/base/js/translation_strings.html
diff --git a/templates/web/default/js/validation_rules.html b/templates/web/base/js/validation_rules.html
index 409d0971f..409d0971f 100644
--- a/templates/web/default/js/validation_rules.html
+++ b/templates/web/base/js/validation_rules.html
diff --git a/templates/web/default/maps/fms.html b/templates/web/base/maps/fms.html
index 1cdfc0b35..1cdfc0b35 100644
--- a/templates/web/default/maps/fms.html
+++ b/templates/web/base/maps/fms.html
diff --git a/templates/web/default/maps/google-ol.html b/templates/web/base/maps/google-ol.html
index 35c046b55..35c046b55 100644
--- a/templates/web/default/maps/google-ol.html
+++ b/templates/web/base/maps/google-ol.html
diff --git a/templates/web/default/maps/google.html b/templates/web/base/maps/google.html
index 741edec40..741edec40 100644
--- a/templates/web/default/maps/google.html
+++ b/templates/web/base/maps/google.html
diff --git a/templates/web/default/maps/mapquest-attribution.html b/templates/web/base/maps/mapquest-attribution.html
index 8ca4ea650..8ca4ea650 100644
--- a/templates/web/default/maps/mapquest-attribution.html
+++ b/templates/web/base/maps/mapquest-attribution.html
diff --git a/templates/web/default/maps/openlayers.html b/templates/web/base/maps/openlayers.html
index 7967d4480..7967d4480 100644
--- a/templates/web/default/maps/openlayers.html
+++ b/templates/web/base/maps/openlayers.html
diff --git a/templates/web/default/maps/osm-streetview.html b/templates/web/base/maps/osm-streetview.html
index dff6a0c0f..dff6a0c0f 100644
--- a/templates/web/default/maps/osm-streetview.html
+++ b/templates/web/base/maps/osm-streetview.html
diff --git a/templates/web/default/maps/osm.html b/templates/web/base/maps/osm.html
index ce08e179a..ce08e179a 100644
--- a/templates/web/default/maps/osm.html
+++ b/templates/web/base/maps/osm.html
diff --git a/templates/web/default/maps/pins_js.html b/templates/web/base/maps/pins_js.html
index d9c6b3531..d9c6b3531 100644
--- a/templates/web/default/maps/pins_js.html
+++ b/templates/web/base/maps/pins_js.html
diff --git a/templates/web/default/my/my.html b/templates/web/base/my/my.html
index 33b2cc6a4..33b2cc6a4 100644
--- a/templates/web/default/my/my.html
+++ b/templates/web/base/my/my.html
diff --git a/templates/web/default/open311/index.html b/templates/web/base/open311/index.html
index aa77a8381..aa77a8381 100644
--- a/templates/web/default/open311/index.html
+++ b/templates/web/base/open311/index.html
diff --git a/templates/web/default/pagination.html b/templates/web/base/pagination.html
index 63180b600..63180b600 100644
--- a/templates/web/default/pagination.html
+++ b/templates/web/base/pagination.html
diff --git a/templates/web/default/questionnaire/completed-open.html b/templates/web/base/questionnaire/completed-open.html
index c860b7341..c860b7341 100644
--- a/templates/web/default/questionnaire/completed-open.html
+++ b/templates/web/base/questionnaire/completed-open.html
diff --git a/templates/web/default/questionnaire/completed.html b/templates/web/base/questionnaire/completed.html
index 4d848a63c..4d848a63c 100644
--- a/templates/web/default/questionnaire/completed.html
+++ b/templates/web/base/questionnaire/completed.html
diff --git a/templates/web/default/questionnaire/creator_fixed.html b/templates/web/base/questionnaire/creator_fixed.html
index 5b6d1254a..5b6d1254a 100644
--- a/templates/web/default/questionnaire/creator_fixed.html
+++ b/templates/web/base/questionnaire/creator_fixed.html
diff --git a/templates/web/default/questionnaire/index.html b/templates/web/base/questionnaire/index.html
index 6783bca57..6783bca57 100644
--- a/templates/web/default/questionnaire/index.html
+++ b/templates/web/base/questionnaire/index.html
diff --git a/templates/web/default/report/_council_sent_info.html b/templates/web/base/report/_council_sent_info.html
index 958562dc2..958562dc2 100644
--- a/templates/web/default/report/_council_sent_info.html
+++ b/templates/web/base/report/_council_sent_info.html
diff --git a/templates/web/default/report/_main.html b/templates/web/base/report/_main.html
index 0124052c0..0124052c0 100644
--- a/templates/web/default/report/_main.html
+++ b/templates/web/base/report/_main.html
diff --git a/templates/web/default/report/_support.html b/templates/web/base/report/_support.html
index 3e372ba69..3e372ba69 100644
--- a/templates/web/default/report/_support.html
+++ b/templates/web/base/report/_support.html
diff --git a/templates/web/default/report/banner.html b/templates/web/base/report/banner.html
index bd7798d79..bd7798d79 100644
--- a/templates/web/default/report/banner.html
+++ b/templates/web/base/report/banner.html
diff --git a/templates/web/default/report/display.html b/templates/web/base/report/display.html
index fd7580ac1..fd7580ac1 100644
--- a/templates/web/default/report/display.html
+++ b/templates/web/base/report/display.html
diff --git a/templates/web/default/report/new/category.html b/templates/web/base/report/new/category.html
index ee47adc9e..ee47adc9e 100644
--- a/templates/web/default/report/new/category.html
+++ b/templates/web/base/report/new/category.html
diff --git a/templates/web/default/report/new/category_extras.html b/templates/web/base/report/new/category_extras.html
index 928b61041..928b61041 100644
--- a/templates/web/default/report/new/category_extras.html
+++ b/templates/web/base/report/new/category_extras.html
diff --git a/templates/web/default/report/new/councils_extra_text.html b/templates/web/base/report/new/councils_extra_text.html
index 1088b9f8b..1088b9f8b 100644
--- a/templates/web/default/report/new/councils_extra_text.html
+++ b/templates/web/base/report/new/councils_extra_text.html
diff --git a/templates/web/default/report/new/councils_text.html b/templates/web/base/report/new/councils_text.html
index f526beb28..f526beb28 100644
--- a/templates/web/default/report/new/councils_text.html
+++ b/templates/web/base/report/new/councils_text.html
diff --git a/templates/web/default/report/new/councils_text_all.html b/templates/web/base/report/new/councils_text_all.html
index e9a008e90..e9a008e90 100644
--- a/templates/web/default/report/new/councils_text_all.html
+++ b/templates/web/base/report/new/councils_text_all.html
diff --git a/templates/web/default/report/new/councils_text_none.html b/templates/web/base/report/new/councils_text_none.html
index 9293c03a7..9293c03a7 100644
--- a/templates/web/default/report/new/councils_text_none.html
+++ b/templates/web/base/report/new/councils_text_none.html
diff --git a/templates/web/default/report/new/councils_text_some.html b/templates/web/base/report/new/councils_text_some.html
index 8d4768612..8d4768612 100644
--- a/templates/web/default/report/new/councils_text_some.html
+++ b/templates/web/base/report/new/councils_text_some.html
diff --git a/templates/web/default/report/new/extra_name.html b/templates/web/base/report/new/extra_name.html
index dede1000c..dede1000c 100644
--- a/templates/web/default/report/new/extra_name.html
+++ b/templates/web/base/report/new/extra_name.html
diff --git a/templates/web/default/report/new/fill_in_details.html b/templates/web/base/report/new/fill_in_details.html
index 22d1ee739..22d1ee739 100644
--- a/templates/web/default/report/new/fill_in_details.html
+++ b/templates/web/base/report/new/fill_in_details.html
diff --git a/templates/web/default/report/new/fill_in_details_form.html b/templates/web/base/report/new/fill_in_details_form.html
index 5eff4e147..5eff4e147 100644
--- a/templates/web/default/report/new/fill_in_details_form.html
+++ b/templates/web/base/report/new/fill_in_details_form.html
diff --git a/templates/web/default/report/new/fill_in_details_text.html b/templates/web/base/report/new/fill_in_details_text.html
index 5d9716915..5d9716915 100644
--- a/templates/web/default/report/new/fill_in_details_text.html
+++ b/templates/web/base/report/new/fill_in_details_text.html
diff --git a/templates/web/default/report/new/form_heading.html b/templates/web/base/report/new/form_heading.html
index e69de29bb..e69de29bb 100644
--- a/templates/web/default/report/new/form_heading.html
+++ b/templates/web/base/report/new/form_heading.html
diff --git a/templates/web/default/report/new/notes.html b/templates/web/base/report/new/notes.html
index 68408acc7..68408acc7 100644
--- a/templates/web/default/report/new/notes.html
+++ b/templates/web/base/report/new/notes.html
diff --git a/templates/web/default/report/new/report_import.html b/templates/web/base/report/new/report_import.html
index 7aa105afe..7aa105afe 100644
--- a/templates/web/default/report/new/report_import.html
+++ b/templates/web/base/report/new/report_import.html
diff --git a/templates/web/default/report/photo.html b/templates/web/base/report/photo.html
index c463c34c4..c463c34c4 100644
--- a/templates/web/default/report/photo.html
+++ b/templates/web/base/report/photo.html
diff --git a/templates/web/default/report/update-form.html b/templates/web/base/report/update-form.html
index 50bc2906c..50bc2906c 100644
--- a/templates/web/default/report/update-form.html
+++ b/templates/web/base/report/update-form.html
diff --git a/templates/web/default/report/update.html b/templates/web/base/report/update.html
index 048968eae..048968eae 100644
--- a/templates/web/default/report/update.html
+++ b/templates/web/base/report/update.html
diff --git a/templates/web/default/report/updates.html b/templates/web/base/report/updates.html
index b0a015f03..b0a015f03 100644
--- a/templates/web/default/report/updates.html
+++ b/templates/web/base/report/updates.html
diff --git a/templates/web/default/report_created.html b/templates/web/base/report_created.html
index 81083654b..81083654b 100644
--- a/templates/web/default/report_created.html
+++ b/templates/web/base/report_created.html
diff --git a/templates/web/default/reports/_list-entry.html b/templates/web/base/reports/_list-entry.html
index 445a5315f..445a5315f 100755
--- a/templates/web/default/reports/_list-entry.html
+++ b/templates/web/base/reports/_list-entry.html
diff --git a/templates/web/default/reports/_rss.html b/templates/web/base/reports/_rss.html
index 9756f131d..9756f131d 100644
--- a/templates/web/default/reports/_rss.html
+++ b/templates/web/base/reports/_rss.html
diff --git a/templates/web/default/reports/_ward-list.html b/templates/web/base/reports/_ward-list.html
index e78ac7d90..e78ac7d90 100755
--- a/templates/web/default/reports/_ward-list.html
+++ b/templates/web/base/reports/_ward-list.html
diff --git a/templates/web/default/reports/body.html b/templates/web/base/reports/body.html
index 1b6a3a157..1b6a3a157 100755
--- a/templates/web/default/reports/body.html
+++ b/templates/web/base/reports/body.html
diff --git a/templates/web/default/reports/index.html b/templates/web/base/reports/index.html
index 1e4130a37..1e4130a37 100755
--- a/templates/web/default/reports/index.html
+++ b/templates/web/base/reports/index.html
diff --git a/templates/web/default/reports/ward.html b/templates/web/base/reports/ward.html
index 4b2ea29a5..4b2ea29a5 100755
--- a/templates/web/default/reports/ward.html
+++ b/templates/web/base/reports/ward.html
diff --git a/templates/web/default/static/about-en-gb.html b/templates/web/base/static/about-en-gb.html
index 9c319f051..9c319f051 100644
--- a/templates/web/default/static/about-en-gb.html
+++ b/templates/web/base/static/about-en-gb.html
diff --git a/templates/web/default/static/iphone.html b/templates/web/base/static/iphone.html
index 8f7992713..8f7992713 100755
--- a/templates/web/default/static/iphone.html
+++ b/templates/web/base/static/iphone.html
diff --git a/templates/web/default/static/posters.html b/templates/web/base/static/posters.html
index fc5202319..fc5202319 100644
--- a/templates/web/default/static/posters.html
+++ b/templates/web/base/static/posters.html
diff --git a/templates/web/default/tokens/abuse.html b/templates/web/base/tokens/abuse.html
index d1b952621..d1b952621 100644
--- a/templates/web/default/tokens/abuse.html
+++ b/templates/web/base/tokens/abuse.html
diff --git a/templates/web/default/tokens/confirm_alert.html b/templates/web/base/tokens/confirm_alert.html
index d23a658ec..d23a658ec 100644
--- a/templates/web/default/tokens/confirm_alert.html
+++ b/templates/web/base/tokens/confirm_alert.html
diff --git a/templates/web/default/tokens/confirm_problem.html b/templates/web/base/tokens/confirm_problem.html
index 723d515e1..723d515e1 100644
--- a/templates/web/default/tokens/confirm_problem.html
+++ b/templates/web/base/tokens/confirm_problem.html
diff --git a/templates/web/default/tokens/confirm_update.html b/templates/web/base/tokens/confirm_update.html
index 56f04e12a..56f04e12a 100644
--- a/templates/web/default/tokens/confirm_update.html
+++ b/templates/web/base/tokens/confirm_update.html
diff --git a/templates/web/default/tokens/error.html b/templates/web/base/tokens/error.html
index e3fa6c170..e3fa6c170 100644
--- a/templates/web/default/tokens/error.html
+++ b/templates/web/base/tokens/error.html