diff options
Diffstat (limited to 'templates')
21 files changed, 445 insertions, 292 deletions
diff --git a/templates/email/emptyhomes/cy/submit.txt b/templates/email/emptyhomes/cy/submit.txt index 57c0d58b7..061758d12 100644 --- a/templates/email/emptyhomes/cy/submit.txt +++ b/templates/email/emptyhomes/cy/submit.txt @@ -5,19 +5,9 @@ Annwyl Swyddog Eiddo Gwag, Dyma gyfeiriad newydd am eiddo gwag yn eich ardal, a wnaed gan ddefnyddiwr gwefan ReportEmptyHomes.com; dywedwyd wrth ddefnyddiwr y wefan fod yr achos wedi cael ei gyfeirio atoch. Byddem yn ddiolchgar petaech yn gwneud yr hyn y -gallwch i helpu adfer yr eiddo hwn i'w ddefnyddio eto. Byddwn yn cysylltu â'r -defnyddiwr ymhen mis ac eto ymhen chwe mis ac yn gofyn iddynt beth sydd wedi -digwydd i'r eiddo. +gallwch i helpu adfer yr eiddo hwn i'w ddefnyddio eto. -Hoffwn eich annog chi i ddweud wrthom beth rydych chi wedi'i wneud, a phan y -daw'r eiddo yn ôl mewn defnydd, trwy lenwi diweddariad wrth y cyfeiriad at yr -eiddo ar y wefan: - - <?=$values['url']?> - -Mae hyn yn rhoi adborth defnyddiol i ddefnyddwyr y wefan ac yn helpu iddynt -ddeall pa gamau yr ydych yn eu cymryd. Byddwn yn cynnig cyngor i'r defnyddiwr -ar gamau eraill y gall eu cymryd os nad eir i'r afael â'r eiddo'n llwyddiannus. +<?=$values['url']?> <?=$values['has_photo']?>Os hoffech gael help neu gyngor ar gael eiddo gwag yn ôl mewn defnydd mae llawer o wybodaeth ddefnyddiol ar wefan yr Asiantaeth Tai @@ -34,6 +24,8 @@ E-bost: <?=$values['email']?> Math o eiddo: <?=$values['category']?> +Address: <?=$values['address']?> + Manylion: <?=$values['detail']?> <?=$values['closest_address']?>---------- diff --git a/templates/email/emptyhomes/en-gb/submit.txt b/templates/email/emptyhomes/en-gb/submit.txt index 4bbaed408..2256732d5 100644 --- a/templates/email/emptyhomes/en-gb/submit.txt +++ b/templates/email/emptyhomes/en-gb/submit.txt @@ -5,18 +5,9 @@ Dear Empty Property Officer, This is a new referral of an empty property in your area made by a user of the website ReportEmptyHomes.com; the website user has been told that the case has been referred to you. We would be grateful if you could do whatever you can to -help get this property back into use. We will contact the user in a month and -again in six months and ask them what has happened to the property. +help get this property back into use. -We'd encourage you to tell us what you have done, and when the property comes -back into use, by filling in an update against the property referral on the -website: - - <?=$values['url']?> - -This gives useful feedback to website users and helps them understand what -action you are taking. We will offer advice to the user on other action they -might take if the property isn't successfully dealt with. +<?=$values['url']?> <?=$values['has_photo']?>If you would like help or advice on getting empty properties back into use there is lots of useful information on the Empty Homes Agency's website @@ -32,6 +23,8 @@ Email: <?=$values['email']?> Property type: <?=$values['category']?> +Address: <?=$values['address']?> + Details: <?=$values['detail']?> <?=$values['closest_address']?>---------- diff --git a/templates/web/barnet/faq/faq-en-gb.html b/templates/web/barnet/faq/faq-en-gb.html index 126a03314..08bb744a6 100755 --- a/templates/web/barnet/faq/faq-en-gb.html +++ b/templates/web/barnet/faq/faq-en-gb.html @@ -7,7 +7,7 @@ <li>flyposting or graffiti <li>flytipping or litter <li>streetcleaning, such as broken glass in a cycle lane - <li>unlit lamposts + <li>unlit lampposts <li>broken playground equipment <li>potholes </ul> diff --git a/templates/web/default/admin/report_edit.html b/templates/web/default/admin/report_edit.html index b76d1717a..91af70d14 100644 --- a/templates/web/default/admin/report_edit.html +++ b/templates/web/default/admin/report_edit.html @@ -22,6 +22,9 @@ [% IF problem.used_map %][% loc('used map') %][% ELSE %][% loc("didn't use map") %][% END %])</li> <li>[% loc('For council(s):') %] [% IF problem.bodies_str %][% problem.bodies_str %][% ELSE %]<em>[% loc('None' ) %]</em>[% END %] ([% loc('other areas:') %] [% problem.areas | remove('^,') | remove( ',$' ) %])</li> +[% IF problem.extra.address %] +<li>[% loc('Property address:') %] [% problem.extra.address | html %]</li> +[% END %] <li><label class="inline" for="state">[% loc('State:') %]</label> <select name="state" id="state"> [% FOREACH state IN [ ['confirmed', loc('Open')], ['investigating', loc('Investigating')], ['planned', loc('Planned')], ['in progress', diff --git a/templates/web/default/faq/faq-en-gb.html b/templates/web/default/faq/faq-en-gb.html index 26f93afb8..bf47a1420 100755 --- a/templates/web/default/faq/faq-en-gb.html +++ b/templates/web/default/faq/faq-en-gb.html @@ -18,7 +18,7 @@ or clearing</strong>, such as: <li>Flytipping or litter <li>Streetcleaning, such as broken glass in a cycle lane [% IF c.cobrand.moniker != 'southampton' %] - <li>Unlit lamposts + <li>Unlit lampposts [% END %] <li>Potholes </ul> diff --git a/templates/web/default/report/new/category.html b/templates/web/default/report/new/category.html index a701e0851..a6f2bf14d 100644 --- a/templates/web/default/report/new/category.html +++ b/templates/web/default/report/new/category.html @@ -3,7 +3,12 @@ [% IF category; category = category | lower; END; %] - <label for='form_category' id="form_category_label">[% category_label | html %]</label> + <label for='form_category' id="form_category_label"> + [%- IF c.cobrand.moniker == 'emptyhomes' %] + [%- loc('Property type:') %] + [%- ELSE %] + [%- loc('Category') %] + [%- END -%]</label> <select name='category' id='form_category'[% ' onchange="form_category_onchange()"' IF category_extras.size %]> [% FOREACH cat_op IN category_options %] [% cat_op_lc = cat_op | lower %] diff --git a/templates/web/default/report/updates.html b/templates/web/default/report/updates.html index f56ded735..83f746d56 100644 --- a/templates/web/default/report/updates.html +++ b/templates/web/default/report/updates.html @@ -28,14 +28,15 @@ [%- IF update.mark_open %][% update_state = ", " _ loc( 'reopened' ) %][% END %] [%- IF !update_state && update.problem_state %] [%- state = update.meta_problem_state %] - [%- IF ( c.cobrand.moniker == 'bromley' OR update.user.council == 'Bromley Council' ) AND update.problem_state == 'unable to fix' %] - [%- state = loc('no further action') %] - [% END %] + [%- IF c.cobrand.moniker == 'bromley' OR problem.bodies_str == '2482' %] + [%- SET state = loc('no further action') IF update.problem_state == 'unable to fix' %] + [%- SET state = loc('third party responsibility') IF update.problem_state == 'not responsible' %] + [%- END %] [%- IF update.problem_state == 'confirmed' AND global.last_state != '' %] [%- update_state = ", " _ loc('reopened') %] [%- ELSIF update.problem_state != 'confirmed' %] [%- update_state = ", " _ tprintf(loc( 'marked as %s' ), state ) %] - [% END %] + [%- END %] [%- END %] [%- update_state IF update_state != global.last_state %] [%- global.last_state = update_state %] diff --git a/templates/web/emptyhomes/header.html b/templates/web/emptyhomes/header.html index cc2f68ac0..d3f93b5ad 100644 --- a/templates/web/emptyhomes/header.html +++ b/templates/web/emptyhomes/header.html @@ -5,20 +5,24 @@ <!--[if gt IE 8]><!--><html lang="[% lang_code %]"><!--<![endif]--> <head> - <link rel="stylesheet" type="text/css" href="[% version('/css/core.css') %]"> - <link rel="stylesheet" type="text/css" href="[% version('/cobrands/emptyhomes/css.css') %]"> +[% SET start = c.config.ADMIN_BASE_URL IF admin %] + + <link rel="stylesheet" type="text/css" href="[% start %][% version('/css/core.css') %]"> + <link rel="stylesheet" type="text/css" href="[% start %][% version('/cobrands/emptyhomes/css.css') %]"> [% INCLUDE 'common_header_tags.html', site_title = loc('Report Empty Homes') %] </head> <body> <div id="header"> - <a href="http://www.emptyhomes.com/"><img id="eha-logo" border="0" src="/i/eha-logo.jpeg" alt="Empty Homes Agency" width="91" height="71" align="left"></a> + <a href="http://www.emptyhomes.com/"><img id="eha-logo" border="0" src="/cobrands/emptyhomes/eha-logo.jpeg" alt="Empty Homes Agency" width="91" height="71" align="left"></a> <div> <small><em>in conjunction with</em></small> <br> - <a href="http://www.sheltercymru.org.uk/"><img border="0" src="/i/Sheltercymru47s.png" alt="Shelter Cymru" width="80" height="33" align="bottom"></a> - <a href="http://scotland.shelter.org.uk/housing_issues/more_homes/empty_homes"><img border="0" src="/i/SEHPlogo-bwS.png" alt="Scottish Empty Homes Partnership" width="131" height="40" align="bottom"></a> + <a href="http://www.sheltercymru.org.uk/"><img border="0" src="/cobrands/emptyhomes/Sheltercymru47s.png" alt="Shelter Cymru" width="80" height="33" align="bottom"></a> + <a href="http://scotland.shelter.org.uk/housing_issues/more_homes/empty_homes"><img border="0" src="/cobrands/emptyhomes/SEHPlogo-bwS.png" alt="Scottish Empty Homes Partnership" width="131" height="40" align="bottom"></a> + <a href="http://www.channel4.com/"><img src="/cobrands/emptyhomes/c4logo.png" border="0" alt="Channel 4" align="bottom" width="30" height="40"></a> + <a href="http://www.tigeraspect.co.uk/"><img src="/cobrands/emptyhomes/tiger-aspect.png" border="0" alt="Tiger Aspect" align="bottom" width="113" height="30"></a> </div> </div> diff --git a/templates/web/emptyhomes/report/new/councils_text_all.html b/templates/web/emptyhomes/report/new/councils_text_all.html index 5769e6cd5..a2eae5efb 100644 --- a/templates/web/emptyhomes/report/new/councils_text_all.html +++ b/templates/web/emptyhomes/report/new/councils_text_all.html @@ -1,7 +1,7 @@ <p> [% tprintf( - loc('All the information you provide here will be sent to <strong>%s</strong>. On the site, we will show the subject and details of the problem.'), + loc('All the information you provide here will be sent to <strong>%s</strong>.') all_body_names.join( '</strong>' _ loc(' or ') _ '<strong>' ) ); %] diff --git a/templates/web/emptyhomes/report/new/fill_in_details_form.html b/templates/web/emptyhomes/report/new/fill_in_details_form.html new file mode 100644 index 000000000..b269267e1 --- /dev/null +++ b/templates/web/emptyhomes/report/new/fill_in_details_form.html @@ -0,0 +1,157 @@ +<h1>[% loc('Reporting a problem') %]</h1> + +[% IF report.used_map %] + [% IF partial_token %] + <p id="unknown">[% loc('Please note your report has <strong>not yet been sent</strong>. Choose a category and add further information below, then submit.') %]</p> + [% END %] +<p>[% loc('You have located the problem at the point marked with a green pin on the map. If this is not the correct location, simply click on the map again. ') %]</p> +[% END %] + +[% IF js %] + <p id="councils_text">[% + tprintf( + loc('All the information you provide here will be sent to <strong>%s</strong>.'), + loc('the local council') + ); + %] + </p> +[% ELSE %] + [% PROCESS 'report/new/councils_text.html' %] +[% END %] + +<p> +[% IF report.used_map %] + [% INCLUDE 'report/new/fill_in_details_text.html' %] +[% ELSE %] + [% loc('Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box.') %] +[% END %] +</p> + +[% INCLUDE 'errors.html' %] + +<div id="problem_form"> + +[% INCLUDE 'report/new/form_heading.html' %] + +<div class="fieldset"> + +[% IF field_errors.bodies %] + <div class='form-error'>[% field_errors.bodies %]</div> +[% END %] + +<div id="form_sign_in_yes"> + +<h3>[% loc('Public information (shown on site)') %]</h3> + +<p>[% loc('Please do not give address or personal information in this section.') %]</p> + +[% IF js %] + <div class="form-field" id="form_category_row"> + <label for="form_category">[% loc('Category:') %]</label> + <select name="category" id="form_category" required><option>[% loc('Loading...') %]</option></select> + </div> +[% ELSE %] + [% IF category_options.size %] + [% IF field_errors.category %] + <div class='form-error'>[% field_errors.category %]</div> + [% END %] + + <div class="form-field"> + [% PROCESS "report/new/category.html" %] + </div> + [% END %] +[% END %] + +[% IF field_errors.title %] + <div class='form-error'>[% field_errors.title %]</div> +[% END %] + +<div class="form-field"> + <label for="form_title">[% loc('Subject:') %]</label> + <input type="text" value="[% report.title | html %]" name="title" id="form_title" size="25" required> +</div> + +[% IF field_errors.detail %] + <div class='form-error'>[% field_errors.detail %]</div> +[% END %] + +<div class="form-field"> + <label for="form_detail">[% loc('Details:') %]</label> + <textarea name="detail" id="form_detail" rows="7" cols="26" required>[% report.detail | html %]</textarea> +</div> + +[% IF c.cobrand.allow_photo_upload %] + [% IF field_errors.photo %] + <div class='form-error'>[% field_errors.photo %]</div> + [% END %] + + <div class='form-field'> + [% IF upload_fileid || report.photo %] + <p>[% loc('You have already attached a photo to this report, attaching another one will replace it.') %]</p> + [% IF upload_fileid %] + <input type="hidden" name="upload_fileid" value="[% upload_fileid %]" /> + [% END %] + [% IF report.photo %] + <img align="right" src="/photo/[% report.id %].jpeg" hspace="5"> + [% END %] + [% END %] + + <label for="form_photo">[% loc('Photo:') %]</label> + <input type="file" name="photo" id="form_photo" style="width:20em"> + </div> +[% END %] + +</div> + +<div id="form_sign_in_no"> + +<h3>[% loc('Private information (not shown on site)') %]</h3> + +[% IF field_errors.address %] + <div class='form-error'>[% field_errors.address %]</div> +[% END %] + +<div class="form-field"> + <label for="form_address">[% loc('Property address:') %]</label> + <textarea name="address" id="form_address" rows="7" cols="26">[% report.extra.address | html %]</textarea> +</div> + + [% IF field_errors.name %] + <div class='form-error'>[% field_errors.name %]</div> + [% END %] + + <div class="form-field"> + <label for="form_name">[% loc('Your name:') %]</label> + <input type="text" required value="[% report.name | html %]" name="name" id="form_name" size="25"> + </div> + + [% IF field_errors.email %] + <div class='form-error'>[% field_errors.email %]</div> + [% END %] + + <div class="form-field"> + <label for="form_email">[% loc('Your email:') %]</label> + <input type="email" value="[% report.user.email | html %]" name="email" id="form_email" size="25" required> + </div> + + <div class="form-field"> + <label for="form_phone">[% loc('Phone:') %]</label> + <input type="text" value="[% report.user.phone | html %]" name="phone" id="form_phone" size="15"> + <small>[% loc('(optional)') %]</small> + </div> + + <p> + <input type="submit" value="[% loc('Submit') %]"> + </p> + +</div> + +[% IF partial_token %] + <input type="hidden" name="partial" value="[% partial_token.token %]"> +[% END %] + +<input type="hidden" name="submit_problem" value="1"> + +</div> +</div> + diff --git a/templates/web/fixmybarangay/report/_message_manager.html b/templates/web/fixmybarangay/report/_message_manager.html index 2860689be..b2537e907 100644 --- a/templates/web/fixmybarangay/report/_message_manager.html +++ b/templates/web/fixmybarangay/report/_message_manager.html @@ -1,10 +1,10 @@ [% IF c.user && c.user.from_body %] -[% IF problem.external_source_id && problem.external_source == c.config.MESSAGE_MANAGER_URL %] +[% IF problem.external_source_id && problem.external_source == c.config.MESSAGE_MANAGER_URL %] <p class="mm-submitted-by-sms"> [%# OK to link to Message Manager here because (currently) we're only showing this to staff users %] - <a href="[%= problem.external_source %]messages/view/[%= problem.external_source_id %]" - title="view in Message Manager admin"><img + <a href="[%= problem.external_source %]messages/view/[%= problem.external_source_id %]" + title="view in Message Manager admin"><img src="/cobrands/fixmybarangay/images/mobile-22x40.png" alt="SMS"></a> This report was submitted via SMS. </p> @@ -41,7 +41,7 @@ <input name="mm-htauth-password" id="mm-htauth-password" type="password"/> </div> <div class="submit"> - <input id="available-submit" type="submit" value="Get available messages" class="green-btn"/> + <input id="available-submit" type="submit" value="Get available messages" class="green-btn"/> </div> </div> </li> @@ -49,27 +49,27 @@ <div id="mm-message-list" style="min-height:1em;"></div> </li> </ul> - + <script type="text/javascript"> $(document).ready(function() { var $mm_message_list = $('#mm-message-list'); var mm_url = "[% c.config.MESSAGE_MANAGER_URL %]"; // from config - - [%# note that the presence of a problem id implies that this is a report view page, not a problem creation page %] + + [%# note that the presence of a problem id implies that this is a report view page, not a problem creation page %] var problem_id = "[% problem.id %]"; - + var dummy_busy = false; var fms_username = "[% c.user.email | replace('\@.*', '') %]"; var timeout_id = 0; var can_refresh = true; // disable refresh var refresh_period = 60000 * 3; // refresh messages every three minutes var has_archive_message = false; - + function sanitise_id(css_id) { - return css_id.replace(/\D/g, ""); + return css_id.replace(/\D/g, ""); } - + // call this to push the auto-refresh timeout off so it's only triggered // if there's no activity for a while function reset_timeout() { @@ -80,19 +80,19 @@ $(document).ready(function() { timeout_id = setTimeout(mm_refresh_messages, refresh_period); } } - + var mm_refresh_messages = function() { $('#mm-link-to-refresh').fadeOut(); $('#available-submit').click(); } - + var mm_populate_list = function(data) { $('#mm-status-message-container').find('p').text("Accessed Message Manager as " + data['username']); $('input[name=mm_text]').prop('checked', false); // uncheck all $('#mm-link-to-refresh').delay(2000).fadeIn(); reset_timeout(); } - + var mm_selected_message = function(data) { var msg_text = ""; var service_id = ""; @@ -108,7 +108,7 @@ $(document).ready(function() { $('#form_detail').val(msg_text); $('#external_source_id').val(service_id); } - + var reply_cleanup = function(data) { reset_timeout(); $('#reply_text').val(''); @@ -133,7 +133,7 @@ $(document).ready(function() { custom_tooltips = {tt_radio: "Select before clicking 'Copy to Update' to add this message as an update"}; } message_manager.config({ - url_root: mm_url, + url_root: mm_url, tooltips: custom_tooltips, want_nice_msgs: true }); @@ -142,51 +142,53 @@ $(document).ready(function() { // problem form hidden input "external_source_id": pass the MM id into FMS, if used var $problem_form = $('#problem_form').size()? $('#problem_form') : $('#form_update_form'); $('<input type="hidden"/>').attr({ - 'id': 'external_source_id', - 'name': 'external_source_id', - }).appendTo($problem_form); + 'id': 'external_source_id', + 'name': 'external_source_id', + }).appendTo($problem_form); $('#available-submit').click(function(e){ e.preventDefault(); reset_timeout(); message_manager.get_available_messages({ - callback: mm_populate_list, + callback: mm_populate_list, suggest_username: fms_username, fms_id: problem_id, anim_duration: 500 }); }); $('#available-submit').click(); - + $mm_message_list.on('mouseover', 'li.mm-msg', function(e){ e.stopPropagation(); // because replies are nested $('.mm-msg-action', $mm_message_list).stop().fadeOut(200); $(this).find('> .mm-msg-action').stop().show(); }); - + $('#mm-message-list').on('click', '.mm-info', function(e){ reset_timeout(); message_manager.show_info(sanitise_id($(this).parent().attr('id'))); }); - + $('#mm-hide-reasons').change(function(e){ - $('#reason_text').val($(this).val()); // load reason_text with boilerplate reason + $('#reason_text').val($(this).val()); // load reason_text with boilerplate reason }); $('#mm-boilerplate-replies').change(function(e){ - $('#reply_text').val($(this).val()); // load reason_text with boilerplate reason + var old_txt = $('#reply_text').val(); + var new_txt = $(this).val().replace(/(^\.\.\.|\.\.\.$)/, old_txt); + $('#reply_text').val(new_txt); // load reply_text with boilerplate reason }); - + $('#reply-submit').click(function(e) { e.preventDefault(); // TODO: pending fancybox callbacks working, force dummy_busy here - // this is possibly overly cautious anyway - dummy_busy = false; + // this is possibly overly cautious anyway + dummy_busy = false; if (! dummy_busy) { dummy_busy = true; message_manager.reply( - $('#reply_to_msg_id').val(), - $('#reply_text').val(), - {callback:reply_cleanup}); + $('#reply_to_msg_id').val(), + $('#reply_text').val(), + {callback:reply_cleanup}); } }); @@ -194,14 +196,14 @@ $(document).ready(function() { e.preventDefault(); reset_timeout(); // TODO: pending fancybox callbacks working, force dummy_busy here - // this is possibly overly cautious anyway - dummy_busy = false; + // this is possibly overly cautious anyway + dummy_busy = false; if (! dummy_busy) { dummy_busy = true; message_manager.hide( - $('#hide_msg_id').val(), - $('#reason_text').val(), - {callback:hide_cleanup}); + $('#hide_msg_id').val(), + $('#reason_text').val(), + {callback:hide_cleanup}); } }); @@ -210,8 +212,8 @@ $(document).ready(function() { if (! dummy_busy) { dummy_busy = true; message_manager.mark_as_not_a_reply( - $('#detach_msg_id').val(), - {callback:detach_cleanup}); + $('#detach_msg_id').val(), + {callback:detach_cleanup}); } }); @@ -236,7 +238,7 @@ $(document).ready(function() { $('#external_source_id').val(id); $('#form_update').val( $(this).val() ); $('#form_update_form').on('submit', function(e) { - message_manager.assign_fms_id( $('#external_source_id').val(), problem_id, { 'is_async': false } ); + message_manager.assign_fms_id( $('#external_source_id').val(), problem_id, { 'is_async': false } ); }); }); }); @@ -250,9 +252,9 @@ $(document).ready(function() { $('#show_messages').val('Show Messages'); $('#copy_to_update').stop(true,true).fadeOut(); } - + }); - + $('#mm-link-to-refresh').on('click', function(e) { e.preventDefault(); mm_refresh_messages(); @@ -277,8 +279,8 @@ $(document).ready(function() { .attr('title', 'show all available messages (for adding updates)'); $('#mm-link-to-toggle-archive').fadeIn(); can_refresh = false; - }) - }); + }) + }); } else { $('.mm-archive', $mm_message_list).stop(true,true).slideUp(1000, function(){ message_manager.say_status("Available messages:"); @@ -291,15 +293,15 @@ $(document).ready(function() { $('.mm-empty', $mm_message_list).stop(true,true).fadeIn(); can_refresh = true; reset_timeout(); - }) - }); + }) + }); } }); - + $("a#mm-link-to-help").fancybox(); message_manager.populate_boilerplate_strings('hide-reason'); - message_manager.populate_boilerplate_strings('reply'); + message_manager.populate_boilerplate_strings('reply'); }); </script> diff --git a/templates/web/fixmystreet/faq/faq-en-gb.html b/templates/web/fixmystreet/faq/faq-en-gb.html index 8628085e5..3fe8d5af9 100755 --- a/templates/web/fixmystreet/faq/faq-en-gb.html +++ b/templates/web/fixmystreet/faq/faq-en-gb.html @@ -32,7 +32,7 @@ or clearing</strong>, such as: <li>Flytipping or litter <li>Streetcleaning, such as broken glass in a cycle lane [% IF c.cobrand.moniker != 'southampton' %] - <li>Unlit lamposts + <li>Unlit lampposts [% END %] <li>Potholes </ul> @@ -80,12 +80,14 @@ href="https://secure.mysociety.org/donate/">please do</a>.</dd> the size of your screen automatically. We plan to release updated native apps in the near future. <ul> +<!-- <li><em>iPhone:</em> Our basic app from 2008 is available for download on the App Store: <a href="http://itunes.apple.com/gb/app/fixmystreet/id297456545">FixMyStreet</a>, <li><em>Android:</em> A volunteer, Anna Powell-Smith, has written an app available from the <a href="https://market.android.com/details?id=com.android.fixmystreet">Android Market</a>. +--> <li><em>Nokia:</em> A volunteer, Thomas Forth, has written an app available from the <a href="http://store.ovi.com/content/107557">Ovi Store</a>. </ul> diff --git a/templates/web/fixmystreet/report/banner.html b/templates/web/fixmystreet/report/banner.html index 2292352ad..83c780958 100644 --- a/templates/web/fixmystreet/report/banner.html +++ b/templates/web/fixmystreet/report/banner.html @@ -5,7 +5,7 @@ </div> [% END %] -[% IF c.cobrand.moniker != 'bromley' AND problem.council != '2482' AND problem.is_open AND date.now - problem.lastupdate.epoch > 8 * 7 * 24 * 60 * 60 %] +[% IF c.cobrand.moniker != 'bromley' AND problem.bodies_str != '2482' AND problem.is_open AND date.now - problem.lastupdate.epoch > 8 * 7 * 24 * 60 * 60 %] [% INCLUDE banner, id = 'unknown', text = loc('Unknown') %] [% END %] [% IF problem.is_fixed %] @@ -15,7 +15,7 @@ [% INCLUDE banner, id = 'closed', text = loc('Closed') %] [% END %] [% states = [ 'investigating', 'in progress', 'planned', 'action scheduled' ]; - IF c.cobrand.moniker != 'bromley' && states.grep(problem.state).size %] + IF c.cobrand.moniker != 'bromley' AND problem.bodies_str != '2482' && states.grep(problem.state).size %] [% INCLUDE banner, id = 'progress', text = loc('In progress') %] [% END %] diff --git a/templates/web/fixmystreet/reports/_extras.html b/templates/web/fixmystreet/reports/_extras.html index e210b9c07..ba81c676d 100755 --- a/templates/web/fixmystreet/reports/_extras.html +++ b/templates/web/fixmystreet/reports/_extras.html @@ -9,7 +9,7 @@ secure = { 'fix.bromley.gov.uk' = 's' } - site = fms_councils.${area.name} + site = fms_councils.${body.name} %] [% IF site %] <tr align="center" diff --git a/templates/web/oxfordshire/faq/faq-en-gb.html b/templates/web/oxfordshire/faq/faq-en-gb.html index 9361d5647..5aafa0bc4 100755 --- a/templates/web/oxfordshire/faq/faq-en-gb.html +++ b/templates/web/oxfordshire/faq/faq-en-gb.html @@ -13,71 +13,70 @@ </div> <h1><a name="faq"></a>Frequently Asked Questions</h1> - <dl> - <dt>What is FixMyStreet?</dt> - <dd> - <p> - FixMyStreet is a site to help people report, view, -or discuss local problems they’ve found to their local council by -simply locating them on a map. It launched in early February -2007. - </p> - <p> - We have now integrated with the Oxfordshire County Council website - to make it easier to report highways faults. - </p> - </dd> - - <dt>What sort of problems should I report with FixMyStreet?</dt> - <dd> - <p> - FixMyStreet is primarily for reporting things which are -<strong>broken or dirty or damaged or dumped, and need fixing, cleaning -or clearing</strong>, such as: - </p> - - <ul><li>Abandoned vehicles - <li>Dog Fouling - <li>Flyposting or graffiti - <li>Flytipping or litter - <li>Streetcleaning, such as broken glass in a cycle lane - <li>Unlit lamposts - <li>Potholes - </ul> +<dl> + <dt>What is FixMyStreet?</dt> + <dd> + <p> + FixMyStreet is an easy to use web site to help people report, view, or discuss + local problems to their council by simply locating them on a map. + </p> + <p> + We have now integrated FixMyStreet with the Oxfordshire County Council website + to make it easier for our customers to report highways faults directly to us by + using their computer or mobile phone. + </p> </dd> - <dt>What isn’t FixMyStreet for?</dt> + <dt>What sort of problems should I report with FixMyStreet?</dt> <dd> - <p> - FixMyStreet is not a way of getting in touch with the council for all - issues – please use FixMyStreet only for problems such as the above. We - often route problem reports via cleansing services or highways and so using - FixMyStreet for other matters may result in a delay in your report getting - to the right department. - </p> - <div style="margin-left:1.5em;"> <p> - <strong>You will need to contact the county council directly for</strong>: + FixMyStreet is primarily for reporting things which are broken or dirty, damaged + or dumped, and need fixing, cleaning or clearing, such as: </p> <ul> - <li>Any urgent or emergency problems - <li>Complaining about the council - <li>Proposals for speed bumps/ CCTV/ pedestrian crossings/ new road layouts/ etc. + <li>Abandoned vehicles + <li>Dog Fouling + <li>Flyposting or graffiti + <li>Flytipping or litter + <li>Streetcleaning, such as broken glass in a cycle lane + <li>Unlit lampposts + <li>Potholes </ul> + </dd> + <dt>What isn’t FixMyStreet for?</dt> + <dd> <p> - <strong>You will need to contact your district council directly for problems such as:</strong>: + FixMyStreet is not a way of getting in touch with the council for all issues — please use + FixMyStreet only for problems highlighted above. </p> - <ul> - <li>Anti-social behaviour - <li>Noise pollution or barking dogs - <li>Fires and smoke/smell pollution - <li>Missing wheelie bins or recycling boxes or missed rubbish collections - <li>Proposals for speed bumps/ CCTV/ pedestrian crossings/ new road layouts/ etc. - <li>Complaining about your neighbours - <li>Joy riding, drug taking, animal cruelty, or other criminal activity - </ul> - </div> + <p> + As we often route problems via our cleansing services or highways departments, using FixMyStreet + for other matters may result in a delay in your report getting to the right people. + </p> + <div style="margin-left:1.5em;"> + <p> + <strong>You will need to contact the county council directly for</strong>: + </p> + <ul> + <li>Any urgent or emergency problems + <li>Complaining about the council + <li>Proposals for speed bumps/ CCTV/ pedestrian crossings/ new road layouts/ etc. + </ul> + <p> + <strong>You will need to contact your district council directly for problems such as:</strong>: + </p> + <ul> + <li>Anti-social behaviour + <li>Noise pollution or barking dogs + <li>Fires and smoke/smell pollution + <li>Missing wheelie bins or recycling boxes or missed rubbish collections + <li>Proposals for speed bumps/ CCTV/ pedestrian crossings/ new road layouts/ etc. + <li>Complaining about your neighbours + <li>Joy riding, drug taking, animal cruelty, or other criminal activity + </ul> + </div> </dd> + <dt><a name="pothole"></a>Should I report a pothole on this site, or call?</dt> <dd> <p><strong>You must call us on 0845 310 1111 to report the pothole if it is:</strong></p> @@ -90,143 +89,105 @@ or clearing</strong>, such as: </ul> </dd> - <dt>How do I use the site?</dt> - <dd>After entering a postcode or location, you are presented -with a map of that area. You can view problems already reported in that area, -or report ones of your own simply by clicking on the map at the location of -the problem.</dd> + <dt>How do I use the FixMyStreet site?</dt> + <dd> + After entering a postcode or location, you will then be presented with a map of that area. + You can then view problems already reported in that area, or report new ones of your own + simply by clicking on the map at the location of the problem. + </dd> - <dt>How are the problems solved?</dt> - <dd>They are reported to the council by email. The -council can then resolve the problem the way they normally would. -Alternatively, you can discuss the problem on the website with others, and -then together lobby the council to fix it, or fix it directly yourselves.</dd> + <dt>How are the problems solved?</dt> + <dd> + They are reported to us automatically. We then resolve the problem the way we + normally would and update the fault on the map. + </dd> - <dt>What updates will I receive?</dt> - <dd>If you sign up to receive updates you will receive an email to acknowledge the report, an email when the problem is assigned to a representative to be inspected, one if the problem is either referred to the appropriate organisation and one when it is fixed.</dd> + <dt>What does the map show?</dt> + <dd> + The map shows all faults submitted online through FixMyStreet. You can view the + exact location of each fault and see its current status. + </dd> - <dt>Is it free?</dt> - <dd>The site is free to use, yes. FixMyStreet is run -by a registered charity, though, so if you want to make a contribution, <a -href="https://secure.mysociety.org/donate/">please do</a>.</dd> + <dt>How can I get an update on a fault?</dt> + <dd> + <p> + When you record a fault you can sign up to receive updates. You will then receive + an initial email to acknowledge the report. In time, you will receive a further email + when the problem is assigned for inspection, one if the problem needs to be referred + to another department or organisation, and a final email when it is fixed or requires + no further work. + </p> + <p> + These updates will also be posted on the mapped fault so that anyone can see the + status of any fault recorded via FixMyStreet by clicking on it on the map. + </p> + </dd> <dt>Can I use FixMyStreet on my mobile?</dt> <dd> - <p>The FixMyStreet website should work on your mobile phone, adapting to - the size of your screen automatically. We plan to release updated native - apps in the near future. - <ul> - <li><em>iPhone:</em> Our basic app from 2008 is available for download - on the App Store: - <a href="http://itunes.apple.com/gb/app/fixmystreet/id297456545">FixMyStreet</a>, - <li><em>Android:</em> A volunteer, Anna Powell-Smith, has written an app - available from the - <a href="https://market.android.com/details?id=com.android.fixmystreet">Android Market</a>. - <li><em>Nokia:</em> A volunteer, Thomas Forth, has written an app available from the - <a href="http://store.ovi.com/content/107557">Ovi Store</a>. - </ul> + <p> + Yes, you can view our website on your phone and it will automatically adapt + to the size of your screen. + </p> + <p> + The following apps are also available for the national FixMyStreet site, + and they plan to release updated native apps in the near future. + </p> + <ul> + <li><em>iPhone:</em> Our basic app from 2008 is available for download + on the App Store: + <a href="http://itunes.apple.com/gb/app/fixmystreet/id297456545">FixMyStreet</a>. + <li><em>Android:</em> A volunteer, Anna Powell-Smith, has written an app + available from the + <a href="https://market.android.com/details?id=com.android.fixmystreet">Android Market</a>. + <li><em>Nokia:</em> A volunteer, Thomas Forth, has written an app available from the + <a href="http://store.ovi.com/content/107557">Ovi Store</a>. + </ul> </dd> +</dl> - </dl> - - <h2><a name="practical"></a>Practical Questions</h2> - <p> - <em>Taken from the national website <a href="http://www.fixmystreet.com">www.fixmystreet.com</a></em> - </p> - <dl> - <dt>Do you remove silly or illegal content?</dt> - <dd>FixMyStreet is not responsible for the content and accuracy -of material submitted by its users. We reserve the right to edit or remove any -problems or updates which we consider to be inappropriate upon being informed -by a user of the site.</dd> +<h2><a name="practical"></a>Practical Questions</h2> +<dl> + <dt>Do you remove silly or illegal content?</dt> + <dd> + Oxfordshire County Council and FixMyStreet are not responsible for the content and + accuracy of material submitted by its users. We reserve the right to edit or remove + any problems or updates which we consider to be inappropriate upon being informed + by a user of the site. + </dd> <dt>Why does the site use kilometres for measurements?</dt> - <dd>Thanks for asking politely – we never quite understand why some of the rudest - emails we receive are on this topic. The British national - grid reference system, devised by Ordnance Survey (the British national - mapping agency) around the time of the second world war, uses eastings and - northings measured in metres and kilometres; the maps we use are from - Ordnance Survey and so this is what we use to display distances. - There you have it: not everything British is in miles!</dd> + <dd> + The maps FixMyStreet uses are from Ordnance Survey who based their grid reference + system on measurements in metres and kilometres. + </dd> - <dt>Why can’t I zoom out more on the reporting map?</dt> - <dd>We want to keep FixMyStreet locally focused, so restrict the ability to - move radically between areas. The map on Your Reports will let you see all - the reports you’ve made, wherever they are. If you’re from the - council then the emailed version of the problem report also contains the - closest road and postcode to the pin on the map.</dd> + <dt>How do I report a fault outside of Oxfordshire?</dt> + <dd> + The map only shows locations within Oxfordshire to keep it locally focussed. + You can report a fault outside of Oxfordshire on the national + <a href="http://www.fixmystreet.com/">FixMyStreet</a> website. + </dd> +</dl> - <dt>This site is great – why aren’t you better publicised?</dt> - <dd>As a tiny charity we simply don’t have a publicity budget, and we - rely on word of mouth to advertise the site. We have a whole <a - href="posters/">array of posters, flyers and badges</a> if you’d like - to publicise us on the web or in your local area, and why not write to your - local paper to let them know about us?</dd> </dl> - - <h2><a name="organisation"></a>Organisation Questions</h2> - <p> - <em>Taken from the national website <a href="http://www.fixmystreet.com">www.fixmystreet.com</a></em> - </p> - <dl> - <dt>Who built FixMyStreet?</dt> - <dd>This site was built by <a href="http://www.mysociety.org/">mySociety</a>, +<h2><a name="organisation"></a>Organisation Questions</h2> +<dl> + <dt>Who built FixMyStreet?</dt> + <dd> + This site was built by <a href="http://www.mysociety.org/">mySociety</a>, in conjunction with the <a href="http://www.youngfoundation.org.uk/">Young Foundation</a>. -mySociety is the project of a registered charity which has grown out of the community of -volunteers who built sites like <a href="http://www.theyworkforyou.com/">TheyWorkForYou.com</a>. -mySociety’s primary mission is to build Internet projects which give people simple, tangible -benefits in the civic and community aspects of their lives. Our first project -was <a href="http://www.writetothem.com/">WriteToThem</a>, where you can write to any of your -elected representatives, for free. The charity is called UK Citizens Online Democracy and is charity number 1076346. mySociety -can be contacted by email at <a href="mailto:hello@mysociety.org">hello@mysociety.org</a>, -or by post at mySociety, 483 Green Lanes, London, N13 4BS, UK.</dd> - <dt><img src="/i/moj.png" align="right" alt="Ministry of Justice" hspace="10">Who pays for it?</dt> - <dd>FixMyStreet was originally paid for via the Department for - Constitutional Affairs Innovations Fund. It is now funded by a variety of means, from commercial - work to <a href="http://www.mysociety.org/donate/">donations</a>.</dd> - <dt><a name="nfi"></a>Wasn’t this site called Neighbourhood Fix-It?</dt> - <dd>Yes, we changed the name mid June 2007. We decided -Neighbourhood Fix-It was a bit of a mouthful, hard to spell, and hard to publicise (does the URL have a dash in it or not?). The domain FixMyStreet became available, and everyone liked the name.</dd> - <dt>Do you need any help with the project?</dt> - <dd>Yes, we can use help in all sorts of ways, technical or -non-technical. Please see our <a -href="http://www.mysociety.org/helpus/">Get Involved page</a>.</dd> - <dt>I’d like a site like this for my own location/ where’s the "source code" to this site?</dt> - <dd> -The software behind this site is open source, and available -to you mainly under the GNU Affero GPL software license. You can <a -href="http://github.com/mysociety/fixmystreet">download the -source code</a> and help us develop it. -You’re welcome to use it in your own projects, although you must also -make available the source code to any such projects. -<a href="http://www.fiksgatami.no/">Fiksgatami</a> is an example of our code -being used in a Norwegian version of this site. -</dd> -<dt>I’d prefer code in a different language?</dt> -<dd> -VisibleGovernment.ca wrote their own code for -<a href="http://www.fixmystreet.ca/">http://www.fixmystreet.ca/</a>, which is -written in GeoDjango and available under an MIT licence at <a -href="http://github.com/visiblegovernment/django-fixmystreet/tree/master">github</a>. -Or <a href="http://www.fixmystreet.org.nz/">FixMyStreet.org.nz</a> is written in -Drupal. + mySociety is the project of a registered charity which has grown out of the community of + volunteers who built sites like <a href="http://www.theyworkforyou.com/">TheyWorkForYou.com</a>. + mySociety’s primary mission is to build Internet projects which give people simple, tangible + benefits in the civic and community aspects of their lives. Their first project + was <a href="http://www.writetothem.com/">WriteToThem</a>, where you can write to any of your + elected representatives, for free. The charity is called UK Citizens Online Democracy and is charity + number 1076346. + </dd> +</dl> +<p> + You can find out more about FixMyStreet at <a href="http://www.fixmystreet.com">www.fixmystreet.com</a>. </p> -</dd> - <dt>People build things, not organisations. Who <em>actually</em> built it?</dt> - <dd>Matthew Somerville and Francis Irving wrote the site, -Chris Lightfoot wrote the tileserver and map cutter, Richard Pope created -our pins, Deborah Kerr keeps things up-to-date and does user support, -Ayesha Garrett designed our posters, and Tom Steinberg managed it all. - -Thanks also to -<a href="http://www.ordnancesurvey.co.uk">Ordnance Survey</a> (for the maps, -UK postcodes, and UK addresses – data © Crown copyright, all -rights reserved, Ministry of Justice 100037819 2008), -Yahoo! for their BSD-licensed JavaScript libraries, the entire free software -community (this particular project was brought to you by Perl, PostgreSQL, -and the number 161.290) and <a -href="http://www.bytemark.co.uk/">Bytemark</a> (who kindly host all -our servers). +<p> <p> -Let us know if we’ve missed anyone.</dd> - </dl> [% INCLUDE 'footer.html' pagefooter = 'yes' %] diff --git a/templates/web/oxfordshire/footer.html b/templates/web/oxfordshire/footer.html index cfca706c8..ffe32a4a1 100644 --- a/templates/web/oxfordshire/footer.html +++ b/templates/web/oxfordshire/footer.html @@ -38,9 +38,6 @@ <a href="http://www.oxfordshire.gov.uk/cms/public-site/contact-oxfordshire-county-council" title="Contac the council">Contact the council</a> </address> <ul><!-- use | between items --> - <li> - <a href="/contact" title="Contact the FixMyStreet team">Contact</a> | - </li> <li class="powered-by-fms"> <a href="http://www.fixmystreet.com/">Powered by <img src="/cobrands/oxfordshire/images/fms-logo-inverse.png" alt="FixMyStreet"></a> </li> diff --git a/templates/web/oxfordshire/header.html b/templates/web/oxfordshire/header.html index 6c338452a..e9a592fd4 100644 --- a/templates/web/oxfordshire/header.html +++ b/templates/web/oxfordshire/header.html @@ -34,7 +34,7 @@ </head> <body class="[% bodyclass | html IF bodyclass %]"> <div id="oxford-wrapper"> - <div id="oxford-header" class="desk-only"> + <div id="oxford-header" class="desk-only oxford-left"> <a href="http://www.oxfordshire.gov.uk/" title="Home" class="logo">Oxfordshire County Council<span></span></a> <span id="oxford-links"> <a href="http://www.oxfordshire.gov.uk/" title="">Oxfordshire County Council home</a>|<a href="/" title="">FixMyStreet</a> @@ -49,21 +49,51 @@ [% END %] </p> </div> + + + <div id="navigation"> + <div class="menubar"> + <div class="menu-inner"> + <ul class="menu"> + <li> + <[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END %]>[% "Report" %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]> + </li> + <li> + <[% IF c.req.uri.path == '/my' OR ( c.req.uri.path == '/auth' AND c.req.params.r == 'my' ) %]span[% ELSE %]a href="/my"[% END + %]>[% loc("Your reports") %]</[% ( c.req.uri.path == '/my' OR ( c.req.uri.path == '/auth' AND c.req.params.r == 'my' ) ) ? 'span' : 'a' %]> + </li> + <li> + <[% IF c.req.uri.path == '/reports/Oxfordshire' %]span[% ELSE %]a href="/reports/Oxfordshire"[% END + %]>[% loc("All reports") %]</[% c.req.uri.path == '/reports' ? 'span' : 'a' %]> + </li> + <li> + <[% IF c.req.uri.path == '/alert' %]span[% ELSE %]a href="/alert[% pc ? '/list?pc=' : '' %][% pc | uri %]"[% END + %]>[% loc("Local alerts") %]</[% c.req.uri.path == '/alert' ? 'span' : 'a' %]> + </li> + <li> + <[% IF c.req.uri.path == '/faq' %]span[% ELSE %]a href="/faq"[% END + %]>[% loc("Help") %]</[% c.req.uri.path == '/faq' ? 'span' : 'a' %]> + </li> + </ul> + </div> + </div> + </div> + + + + </div> <!-- end of oxford header --> +<!-- <div id="oxford-main-menu" class="desk-only"> <ul class="tabs"> - <li class="home first"><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END %] class="report-a-problem-btn" - >[% "Report" %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>[% - %]<li><[% IF c.req.uri.path == '/my' OR ( c.req.uri.path == '/auth' AND c.req.params.r == 'my' ) %]span[% ELSE %]a href="/my"[% END - %]>[% loc("Your reports") %]</[% ( c.req.uri.path == '/my' OR ( c.req.uri.path == '/auth' AND c.req.params.r == 'my' ) ) ? 'span' : 'a' %]></li>[% - %]<li><[% IF c.req.uri.path == '/reports/Oxfordshire' %]span[% ELSE %]a href="/reports/Oxfordshire"[% END - %]>[% loc("All reports") %]</[% c.req.uri.path == '/reports' ? 'span' : 'a' %]></li>[% - %]<li><[% IF c.req.uri.path == '/alert' %]span[% ELSE %]a href="/alert[% pc ? '/list?pc=' : '' %][% pc | uri %]"[% END - %]>[% loc("Local alerts") %]</[% c.req.uri.path == '/alert' ? 'span' : 'a' %]></li>[% - %]<li class="last"><[% IF c.req.uri.path == '/faq' %]span[% ELSE %]a href="/faq"[% END - %]>[% loc("Help") %]</[% c.req.uri.path == '/faq' ? 'span' : 'a' %]></li> + <li class="home first"></li>[% + %]<li></li>[% + %]<li></li>[% + %]<li></li>[% + %]<li class="last"></li> </ul> </div> +--> <div class="wrapper"> diff --git a/templates/web/oxfordshire/report/new/councils_text_all.html b/templates/web/oxfordshire/report/new/councils_text_all.html index e71a400ac..638c9d7de 100644 --- a/templates/web/oxfordshire/report/new/councils_text_all.html +++ b/templates/web/oxfordshire/report/new/councils_text_all.html @@ -1,17 +1,23 @@ +<div class="oxfordshire-preamble"> + <p> + Please <strong>do not</strong> use this form for reporting + <strong>emergencies and urgent</strong> problems. + You should report these by contacting 0845 310 11 11. + </p> + <p> + Our opening hours are 8.30 to 5, Monday to Thursday and 8.30 to 4 on Fridays. + </p> + If your enquiry is related to Highways and is outside of our opening hours and + cannot wait, please contact Thames Valley Police on 101. + </p> +</div> + <p>You can use this form to report a problem or to make an enquiry about roads -and pavements in your area. All the information you provide here will be sent -to <strong>[% all_council_names.join( '</strong> or <strong>' ) %]</strong>. +and pavements in your area. The subject and details of the problem will be public, plus your name if you give us permission. If you report a fault on a road that is not owned by Oxfordshire County Council we will pass the report on to the relevant body. -<p>Our opening hours are 8.30 to 5, Monday to Thursday and 8.30 to 4 on -Fridays. Please <strong>do not</strong> use this form for reporting -<strong>emergencies and urgent</strong> problems. You should report these by -contacting 0845 310 11 11. If your enquiry is related to Highways and is -outside of our opening hours and cannot wait, please contact Thames Valley -Police on 101.</p> - <p>Please use <a href="/faq#pothole" target="_blank">our chart</a> to determine the size of any pot holes being reported and whether to submit a report using this online form or by telephone.</p> diff --git a/templates/web/oxfordshire/report/new/notes.html b/templates/web/oxfordshire/report/new/notes.html index e03fd8644..5fa154ed9 100644 --- a/templates/web/oxfordshire/report/new/notes.html +++ b/templates/web/oxfordshire/report/new/notes.html @@ -3,7 +3,7 @@ <ul class="plain-list"> <li>[% loc("We will only use your personal information in accordance with our <a href=\"/privacy\">privacy policy.</a>") %]</li> <li>[% loc("Please be polite, concise and to the point.") %]</li> - <li>[% loc("Please do not be abusive — abusing your council devalues the service for all users.") %]</li> + <li>[% loc("Please do not be abusive — abusing your council devalues the service for all users.") %]</li> <li>[% loc("Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation.") %]</li> <li>Remember that FixMyStreet is primarily for reporting physical problems that can be fixed. Remember that you can contact Oxfordshire County Council for additional issues that are not covered on this reporting facility.</li> </ul> diff --git a/templates/web/seesomething/report/new/category.html b/templates/web/seesomething/report/new/category.html index 26d750b52..8c837a047 100644 --- a/templates/web/seesomething/report/new/category.html +++ b/templates/web/seesomething/report/new/category.html @@ -3,7 +3,7 @@ [% IF category; category = category | lower; END; %] - <label for='form_category' class="select">[% category_label | html %]</label> + <label for='form_category' class="select">[% loc('Category') %]</label> <select name='category' data-theme="c" id='form_category'[% ' onchange="form_category_onchange()"' IF category_extras.size %]> [% FOREACH cat_op IN category_options %] [% cat_op_lc = cat_op | lower %] diff --git a/templates/web/southampton/report/new/category.html b/templates/web/southampton/report/new/category.html index 7c7748c78..0a7703bbb 100644 --- a/templates/web/southampton/report/new/category.html +++ b/templates/web/southampton/report/new/category.html @@ -1,6 +1,6 @@ [% FILTER collapse %] [% IF category_options.size %] - <label for='form_category'>[% category_label | html %]</label> + <label for='form_category'>[% loc('Category') %]</label> <select name='category' id='form_category'> [% FOREACH cat_op IN category_options %] [% NEXT IF cat_op == 'Abandoned vehicles' %] |