aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZarino Zappia <mail@zarino.co.uk>2016-09-13 16:25:19 +0100
committerMatthew Somerville <matthew-github@dracos.co.uk>2016-09-20 15:43:18 +0100
commite43551de34c3db8a9a01fe0931e0d91af194cb9b (patch)
tree3ee24d13eaae22fd537c18caca41062db99143b9
parente62ffdafb421deacc68ed9da888a7a3737c514f1 (diff)
Category selector at top of reporting form
Previously only Bristol, Angus, and FMS.com had the category select box at the top of the form. In our experience, this has worked well, and hasn’t affected the usability of the form, so let’s standardize and put it at the top of the form for all cobrands.
-rw-r--r--templates/web/angus/report/new/category_at_top.html1
-rw-r--r--templates/web/base/report/new/form_report.html15
-rw-r--r--templates/web/bristol/report/new/category_at_top.html1
-rw-r--r--templates/web/fixmystreet.com/report/new/category_at_top.html1
4 files changed, 2 insertions, 16 deletions
diff --git a/templates/web/angus/report/new/category_at_top.html b/templates/web/angus/report/new/category_at_top.html
deleted file mode 100644
index 8002eb37a..000000000
--- a/templates/web/angus/report/new/category_at_top.html
+++ /dev/null
@@ -1 +0,0 @@
-[% PROCESS "report/new/category_wrapper.html" %] \ No newline at end of file
diff --git a/templates/web/base/report/new/form_report.html b/templates/web/base/report/new/form_report.html
index d9320d166..0fdccf163 100644
--- a/templates/web/base/report/new/form_report.html
+++ b/templates/web/base/report/new/form_report.html
@@ -4,13 +4,8 @@
<p class='form-error'>[% field_errors.bodies %]</p>
[% END %]
-[% TRY %]
- [%# Useful for amending form contents based on category selection %]
- [% PROCESS 'report/new/category_at_top.html' %]
- [% need_to_show_category_selector = 0 %]
-[% CATCH file %]
- [% need_to_show_category_selector = 1 %]
-[% END %]
+[% PROCESS "report/new/category_wrapper.html" %]
+[% TRY %][% PROCESS 'report/new/after_category.html' %][% CATCH file %][% END %]
<label for="form_title">[% loc('Summarise the problem') %] [% INCLUDE 'report/public_label.html' %]</label>
[% IF field_errors.title %]
@@ -54,12 +49,6 @@
[% TRY %][% PROCESS 'report/new/inline-tips.html' %][% CATCH file %][% END %]
-[% IF need_to_show_category_selector %]
- [% PROCESS "report/new/category_wrapper.html" %]
-[% END %]
-
-[% TRY %][% PROCESS 'report/new/after_category.html' %][% CATCH file %][% END %]
-
[% IF partial_token %]
<input type="hidden" name="partial" value="[% partial_token.token %]">
[% END %]
diff --git a/templates/web/bristol/report/new/category_at_top.html b/templates/web/bristol/report/new/category_at_top.html
deleted file mode 100644
index 8002eb37a..000000000
--- a/templates/web/bristol/report/new/category_at_top.html
+++ /dev/null
@@ -1 +0,0 @@
-[% PROCESS "report/new/category_wrapper.html" %] \ No newline at end of file
diff --git a/templates/web/fixmystreet.com/report/new/category_at_top.html b/templates/web/fixmystreet.com/report/new/category_at_top.html
deleted file mode 100644
index f131f37a1..000000000
--- a/templates/web/fixmystreet.com/report/new/category_at_top.html
+++ /dev/null
@@ -1 +0,0 @@
-[% PROCESS "report/new/category_wrapper.html" %]