aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Somerville <matthew@mysociety.org>2012-03-28 17:45:10 +0100
committerMatthew Somerville <matthew@mysociety.org>2012-03-28 17:45:25 +0100
commit58908e67709f7a584712296dad93ae873f7ecef4 (patch)
tree5bb94bb316f4b2986160a1868ff5222e245500b4
parent651f8d304bb77e09b60317fcdc1cc777de5816bd (diff)
Tweaks to category display.
-rw-r--r--perllib/FixMyStreet/App/Controller/Report/New.pm4
-rw-r--r--templates/web/fixmystreet/report/new/councils_text_all.html4
-rw-r--r--templates/web/fixmystreet/report/new/fill_in_details_form.html2
3 files changed, 5 insertions, 5 deletions
diff --git a/perllib/FixMyStreet/App/Controller/Report/New.pm b/perllib/FixMyStreet/App/Controller/Report/New.pm
index ff0c64dc9..9baee5eb4 100644
--- a/perllib/FixMyStreet/App/Controller/Report/New.pm
+++ b/perllib/FixMyStreet/App/Controller/Report/New.pm
@@ -553,7 +553,7 @@ sub setup_categories_and_councils : Private {
_('-- Pick a category --'),
sort keys %{ Utils::london_categories() }
);
- $category_label = _('Category:');
+ $category_label = _('Category');
} else {
@@ -583,7 +583,7 @@ sub setup_categories_and_councils : Private {
if (@category_options) {
@category_options =
( _('-- Pick a category --'), @category_options, _('Other') );
- $category_label = _('Category:');
+ $category_label = _('Category');
}
}
diff --git a/templates/web/fixmystreet/report/new/councils_text_all.html b/templates/web/fixmystreet/report/new/councils_text_all.html
index fb10ec4fd..2f06686d8 100644
--- a/templates/web/fixmystreet/report/new/councils_text_all.html
+++ b/templates/web/fixmystreet/report/new/councils_text_all.html
@@ -1,5 +1,5 @@
<p>
-[% IF all_councils.${area_ids_to_list.0}.type == 'LBO' %]
+[% IF all_councils.${area_ids_to_list.0}.type == 'LBO' AND area_ids_to_list.0 != 2482 %]
[%
tprintf(
loc('All the information you provide here will be sent to <strong>%s</strong> or a relevant local body such as <strong>TfL</strong>, via the London Report-It system.'),
@@ -16,4 +16,4 @@
[% END %]
[% loc('The subject and details of the problem will be public, plus your name if you give us permission.') %]
-</p> \ No newline at end of file
+</p>
diff --git a/templates/web/fixmystreet/report/new/fill_in_details_form.html b/templates/web/fixmystreet/report/new/fill_in_details_form.html
index 5ee11fb57..4ee634677 100644
--- a/templates/web/fixmystreet/report/new/fill_in_details_form.html
+++ b/templates/web/fixmystreet/report/new/fill_in_details_form.html
@@ -69,7 +69,7 @@
[% IF js %]
<div id="form_category_row">
- <label class="inline" for="form_category">[% loc('Category') %]</label>
+ <label for="form_category">[% loc('Category') %]</label>
<select name="category" id="form_category" required><option>[% loc('Loading...') %]</option></select>
</div>
[% ELSE %]