diff options
Diffstat (limited to 'templates')
71 files changed, 1203 insertions, 389 deletions
diff --git a/templates/email/default/confirm_report_sent.txt b/templates/email/default/confirm_report_sent.txt new file mode 100644 index 000000000..42f200213 --- /dev/null +++ b/templates/email/default/confirm_report_sent.txt @@ -0,0 +1,9 @@ +Subject: Problem Report Sent: <?=$values['title']?> + +Hi, + +Your report about "<?=$values['title']?>" has been sent to <?=$values['councils_name']?>. + +Thanks + +<?=$values['signature']?> diff --git a/templates/email/seesomething/confirm_report_sent.txt b/templates/email/seesomething/confirm_report_sent.txt new file mode 100644 index 000000000..d62a50c49 --- /dev/null +++ b/templates/email/seesomething/confirm_report_sent.txt @@ -0,0 +1,10 @@ +Subject: See Something, Say Something report sent + +Thank you for your report. It will help us to direct our policing activity to make public transport even safer. Find out more of what we are doing at: + +Safer Travel Partnership + +http://www.safertravel.info + +Follow us on Twitter: https://www.twitter.com/ST_Police +or on Facebook: http://www.facebook.com/safertravelpolice diff --git a/templates/email/seesomething/submit.txt b/templates/email/seesomething/submit.txt new file mode 100644 index 000000000..0682425fe --- /dev/null +++ b/templates/email/seesomething/submit.txt @@ -0,0 +1,25 @@ +Subject: Report on See Something, Say Something + +A user of +See Something, Say Something has submitted the following report +of a problem that they believe might require your attention. + +<?=$values['image_url']?> +---------- + +<?=$values['user_details']?> + +<?=$values['phone_line']?><?=$values['category_line']?><?=$values['subcategory_line']?> + +Details: <?=$values['detail']?> + +<?=$values['easting_northing']?>Latitude: <?=$values['latitude']?> + +Longitude: <?=$values['longitude']?> + +<?=$values['closest_address']?>---------- + +Replies to this email will go to the user who submitted the problem +unless it is an anonymous report in which case they will be discarded. + +<?=$values['signature']?> diff --git a/templates/web/bromley/report/display.html b/templates/web/bromley/report/display.html index be5fd1ed4..329d7ace9 100644 --- a/templates/web/bromley/report/display.html +++ b/templates/web/bromley/report/display.html @@ -77,9 +77,11 @@ [% IF c.user && c.user.belongs_to_body( problem.bodies_str ) %] <label for="form_state">[% loc( 'State' ) %]</label> <select name="state" id="form_state"> - [% FOREACH state IN [ ['confirmed', loc('Open')], ['investigating', - loc('Investigating')], ['planned', loc('Planned')], ['in progress', - loc('In progress')], ['closed', loc('Closed')], ['fixed', loc('Fixed')] ] %] + [% FOREACH state IN [ ['confirmed', loc('Open')], ['investigating', + loc('Investigating')], ['action scheduled', loc('Action Scheduled')], + ['in progress', loc('In Progress')], ['duplicate', loc('Duplicate')], + ['unable to fix', loc('Unable to fix')], ['not responsible', loc('Not Responsible')], + ['fixed', loc('Fixed')] ] %] <option [% 'selected ' IF state.0 == problem.state %] value="[% state.0 %]">[% state.1 %]</option> [% END %] </select> diff --git a/templates/web/default/admin/body-form.html b/templates/web/default/admin/body-form.html index 7653f2884..039d83ae2 100644 --- a/templates/web/default/admin/body-form.html +++ b/templates/web/default/admin/body-form.html @@ -72,6 +72,11 @@ </p> <p> + <label for="send_extended_statuses">Send extended open311 statuses with service request updates</label>: + <input type="checkbox" id="send_extended_statuses" name="send_extended_statuses"[% ' checked' IF conf.send_extended_statuses %]> + </p> + + <p> <input type="hidden" name="posted" value="body"> <input type="hidden" name="token" value="[% token %]"> <input type="submit" value="[% body ? loc('Update body') : loc('Add body') %]"> diff --git a/templates/web/default/around/around_index.html b/templates/web/default/around/around_index.html index f58d13d80..a143e90a2 100644 --- a/templates/web/default/around/around_index.html +++ b/templates/web/default/around/around_index.html @@ -1,34 +1,24 @@ -[% INCLUDE 'header.html', title => loc('Reporting a problem') %] - -[% - # NOTE ON PARTIAL REPORTS: - # - # partial reports get a bit of extra text added, the form goes to - # '/report/new' and the partial hidden field is added to the form. -%] - -[% INCLUDE 'around/postcode_form.html' %] - -[% IF location_error %] - <p class="error">[% location_error %]</p> -[% END %] - -[% IF possible_location_matches %] - <p>[% loc('We found more than one match for that location. We show up to ten matches, please try a different search if yours is not here.') %]</p> - <ul class="pc_alternatives"> - [% FOREACH match IN possible_location_matches %] - <li><a href="/around?latitude=[% match.latitude | uri %];longitude=[% match.longitude | uri %]">[% match.address | html %]</a></li> - [% END %] - </ul> -[% END %] - -[% IF partial_token %] - <p style="margin-top: 0; color: #cc0000;"> - <img align="right" src="/photo/[% report.id %].jpeg" hspace="5"> - [% loc("Thanks for uploading your photo. We now need to locate your problem, so please enter a nearby street name or postcode in the box below :") %] - </p> -[% END %] - - +[% INCLUDE 'header.html', title => loc('Reporting a problem'), bodyclass = 'mappage' %] + +<form action="[% c.uri_for('/around') %]" method="get" name="mapForm" id="mapForm"> + <div id="side-form"> + <div id="report-a-problem-main"> + [% INCLUDE 'around/postcode_form.html' %] + + [% IF location_error %] + <p class="error">[% location_error %]</p> + [% END %] + + [% IF possible_location_matches %] + <p>[% loc('We found more than one match for that location. We show up to ten matches, please try a different search if yours is not here.') %]</p> + <ul class="pc_alternatives"> + [% FOREACH match IN possible_location_matches %] + <li><a href="/around?latitude=[% match.latitude | uri %];longitude=[% match.longitude | uri %]">[% match.address | html %]</a></li> + [% END %] + </ul> + [% END %] + </div> + </div> +</form> [% INCLUDE 'footer.html' %] diff --git a/templates/web/default/around/display_location.html b/templates/web/default/around/display_location.html index c9586c393..c8c6935de 100755 --- a/templates/web/default/around/display_location.html +++ b/templates/web/default/around/display_location.html @@ -29,9 +29,9 @@ PROCESS "maps/${map.type}.html"; + SET rss = [ loc('Recent local problems, FixMyStreet'), rss_url ] IF c.cobrand.moniker != 'emptyhomes'; INCLUDE 'header.html', title => loc('Viewing a location') - rss => [ loc('Recent local problems, FixMyStreet'), rss_url ], bodyclass => 'mappage', robots => 'noindex,nofollow'; @@ -51,6 +51,7 @@ [% map_html %] + [% IF c.cobrand.moniker != 'emptyhomes' %] <p id='sub_map_links'> [% IF c.cobrand.moniker == 'zurich' %] <a class="hidden-nojs" id="map_layer_toggle" href="">Stadtplan</a> @@ -69,6 +70,7 @@ [% END %] [% END %] </p> + [% END %] </div> @@ -82,11 +84,13 @@ [% TRY %][% INCLUDE 'around/extra_text.html' %][% CATCH file %][% END %] [% END %] + [% IF c.cobrand.moniker != 'emptyhomes' %] [% INCLUDE 'around/_updates.html' %] <section class="full-width"> [% INCLUDE "around/tabbed_lists.html" %] </section> + [% END %] </div> [% IF allow_creation %] diff --git a/templates/web/default/common_header_tags.html b/templates/web/default/common_header_tags.html index 6582c19cc..346d53693 100644 --- a/templates/web/default/common_header_tags.html +++ b/templates/web/default/common_header_tags.html @@ -1,6 +1,7 @@ [% USE date %][% USE Math %] <meta http-equiv="content-type" content="text/html; charset=utf-8"> +<script type="text/javascript" src="/js/validation_rules.js?[% Math.int( date.now / 3600 ) %]"></script> <script type="text/javascript" src="/js/translation_strings.[% lang_code %].js?[% Math.int( date.now / 3600 ) %]"></script> <script type="text/javascript" src="/jslib/jquery-1.7.2.min.js"></script> diff --git a/templates/web/default/dashboard/index.html b/templates/web/default/dashboard/index.html index b26bd48cd..f5a3cfba3 100644 --- a/templates/web/default/dashboard/index.html +++ b/templates/web/default/dashboard/index.html @@ -81,7 +81,7 @@ [% rows = { '0' => [ "in progress", "Council has marked as in progress" ] - '1' => [ "planned", "Council has marked as planned" ] + '1' => [ "action scheduled", "Council has marked as planned" ] '2' => [ "investigating", "Council has marked as investigating" ] '3' => [ "closed", "Council has marked as closed" ] }; @@ -98,10 +98,14 @@ <tr class='subtotal' id="marked"> <th scope="row">Total marked</th> - <td>[% problems.wtd.${"in progress"} + problems.wtd.planned + problems.wtd.investigating + problems.wtd.closed %]</td> - <td>[% problems.week.${"in progress"} + problems.week.planned + problems.week.investigating + problems.wtd.closed %]</td> - <td>[% problems.weeks.${"in progress"} + problems.weeks.planned + problems.weeks.investigating + problems.wtd.closed %]</td> - <td>[% problems.ytd.${"in progress"} + problems.ytd.planned + problems.ytd.investigating + problems.wtd.closed %]</td> + <td>[% problems.wtd.${"in progress"} + problems.wtd.${"action scheduled"} + + problems.wtd.investigating + problems.wtd.closed %]</td> + <td>[% problems.week.${"in progress"} + problems.week.${"action scheduled"} + + problems.week.investigating + problems.wtd.closed %]</td> + <td>[% problems.weeks.${"in progress"} + problems.weeks.${"action scheduled"} + + problems.weeks.investigating + problems.wtd.closed %]</td> + <td>[% problems.ytd.${"in progress"} + problems.ytd.${"action scheduled"} + + problems.ytd.investigating + problems.wtd.closed %]</td> </tr> <tr id="avg_fixed"> @@ -136,8 +140,8 @@ <p>Report state: <select name="state"> <option value=''>All</option> [% FOREACH state IN [ ['confirmed', loc('Open')], ['investigating', - loc('Investigating')], ['planned', loc('Planned')], ['in progress', - loc('In progress')], ['closed', loc('Closed')], ['fixed', loc('Fixed')] ] %] + loc('Investigating')], ['action scheduled', loc('Planned')], ['in progress', + loc('In Progress')], ['closed', loc('Closed')], ['fixed', loc('Fixed')] ] %] <option [% 'selected ' IF state.0 == q_state %] value="[% state.0 %]">[% state.1 %]</option> [% END %] </select> diff --git a/templates/web/default/front/stats.html b/templates/web/default/front/stats.html index 927ae4eb1..eae66018b 100644 --- a/templates/web/default/front/stats.html +++ b/templates/web/default/front/stats.html @@ -38,8 +38,8 @@ <div>[% tprintf( new_text, stats.new ) | comma %]</div> [% IF c.cobrand.moniker != 'emptyhomes' %] <div>[% tprintf( fixed_text, stats.fixed ) | comma %]</div> - [% END %] [% IF c.cobrand.moniker != 'zurich' %] <div>[% tprintf( updates_text, stats.updates ) | comma %]</div> [% END %] + [% END %] </div> diff --git a/templates/web/default/index-steps.html b/templates/web/default/index-steps.html index 8a83abf07..6fae921b7 100644 --- a/templates/web/default/index-steps.html +++ b/templates/web/default/index-steps.html @@ -2,8 +2,23 @@ <ol class="big-numbers"> [% IF c.cobrand.moniker == 'fixmybarangay' %] - <li>Text LUZ or BSN followed by your report to 12345</li> - <li>Visit the Barangay Center in person</li> + <li>Text <span class="promo-big">FMB LUZ</span> or <span class="promo-big">FMB BSN</span> followed by your report to + <ul id="promo-list"> + <li> + <span class="promo-bigger">391-FMB</span> (391362) SMART short code + </li> + <li> + <span class="promo-bigger">0908 896 8278</span> for all networks + </li> + </ul> + <div class="promo-example"> + For example:<br/> + <div> + FMB LUZ Busted streetlamp, P. Cabantan St., Pole # 12345, near Sto. Antonio Chapel + </div> + </div> + </li> + <li>Or visit the Barangay Center in person</li> <li>Staff? <a href="/auth">Sign in</a> and click on the map! [% ELSE %] <li>[% question %]</li> diff --git a/templates/web/default/index.html b/templates/web/default/index.html index 3cfc07591..beaeefb20 100644 --- a/templates/web/default/index.html +++ b/templates/web/default/index.html @@ -5,10 +5,13 @@ [% END %] <p id="expl"> + [% IF c.cobrand.moniker == 'emptyhomes' %] + <strong>[% loc('Report empty properties') %]</strong> + [% ELSE %] [% subhead = c.cobrand.moniker == 'southampton' - ? '(like graffiti, fly tipping, or broken paving slabs)' + ? '' : loc('(like graffiti, fly tipping, broken paving slabs, or street lighting)'); %] @@ -17,6 +20,7 @@ [% IF subhead != ' ' %] <small>[% subhead %]</small> [% END %] + [% END %] </p> [% TRY %][% INCLUDE 'front/news.html' %][% CATCH file %][% END %] diff --git a/templates/web/default/js/validation_rules.html b/templates/web/default/js/validation_rules.html new file mode 100644 index 000000000..409d0971f --- /dev/null +++ b/templates/web/default/js/validation_rules.html @@ -0,0 +1,7 @@ + validation_rules = { + title: { required: true }, + detail: { required: true }, + email: { required: true }, + update: { required: true }, + rznvy: { required: true } + }; diff --git a/templates/web/default/questionnaire/index.html b/templates/web/default/questionnaire/index.html index 5b48f8915..6783bca57 100644 --- a/templates/web/default/questionnaire/index.html +++ b/templates/web/default/questionnaire/index.html @@ -80,9 +80,13 @@ href="http://www.emptyhomes.com/getinvolved/campaign.html">http://www.emptyhomes </p> [% END %] +[% IF c.cobrand.moniker == 'southampton' %] +<p>Add a public update (please note it will not be sent to the council)</p> +[% ELSE %] <p>[% loc('If you wish to leave a public update on the problem, please enter it here (please note it will not be sent to the council). For example, what was your experience of getting the problem fixed?') %]</p> +[% END %] <p><textarea name="update" style="max-width:90%" rows="7" cols="30">[% update | html %]</textarea></p> diff --git a/templates/web/default/report/_main.html b/templates/web/default/report/_main.html index 9b637b83c..789f8e43e 100644 --- a/templates/web/default/report/_main.html +++ b/templates/web/default/report/_main.html @@ -3,7 +3,7 @@ <p><em> [% problem.meta_line(c) | html %] - [%- IF !problem.used_map %]; <strong>[% loc('there is no pin shown as the user did not use the map') %]</strong>[% END %] + [%- IF !problem.used_map AND c.cobrand.moniker != 'emptyhomes' %]; <strong>[% loc('there is no pin shown as the user did not use the map') %]</strong>[% END %] [% IF problem.bodies_str %] [% IF problem.whensent || problem.can_display_external_id %] <small class="council_sent_info"><br> diff --git a/templates/web/default/report/banner.html b/templates/web/default/report/banner.html index 85aaed82d..52bfa6e67 100644 --- a/templates/web/default/report/banner.html +++ b/templates/web/default/report/banner.html @@ -14,7 +14,7 @@ [% IF problem.is_closed %] [% INCLUDE banner, id = 'closed', text = loc('This problem has been closed') %] [% END %] -[% states = [ 'investigating', 'in progress', 'planned' ]; +[% states = [ 'investigating', 'in progress', 'planned', 'action scheduled' ]; IF states.grep(problem.state).size %] [% INCLUDE banner, id = 'progress', text = loc('This problem is in progress') %] [% END %] diff --git a/templates/web/default/report/display.html b/templates/web/default/report/display.html index 18b4bf51a..2ade45a8a 100644 --- a/templates/web/default/report/display.html +++ b/templates/web/default/report/display.html @@ -2,15 +2,18 @@ PROCESS "maps/${map.type}.html"; problem_title = problem.title _ ' - ' _ loc('Viewing a problem'); + SET rss = [ loc('Updates to this problem, FixMyStreet'), "/rss/$problem.id" ] IF c.cobrand.moniker != 'emptyhomes'; + SET robots = 'index, nofollow'; + SET robots = 'noindex, nofollow' IF c.cobrand.moniker == 'emptyhomes'; INCLUDE 'header.html' title = problem_title - rss = [ loc('Updates to this problem, FixMyStreet'), "/rss/$problem.id" ] - robots = 'index, nofollow' %] -[% map_html %] +[% IF c.cobrand.moniker != 'emptyhomes' %] + [% map_html %] + </div> +[% END %] -</div> <div id="side"> [% INCLUDE 'report/banner.html' %] @@ -22,6 +25,7 @@ </small> </p> +[% IF c.cobrand.moniker != 'emptyhomes' %] <p style="padding-bottom: 0.5em; border-bottom: dotted 1px #999999;" align="right"> <a href="[% c.uri_for( '/around', { lat => short_latitude, lon => short_longitude } ) %]">[% loc( 'More problems nearby' ) %]</a> </p> @@ -45,6 +49,7 @@ [% INCLUDE 'report/updates.html' %] [% INCLUDE 'report/update-form.html' %] +[% END %] </div> diff --git a/templates/web/default/report/new/category.html b/templates/web/default/report/new/category.html index f2ef529f2..a701e0851 100644 --- a/templates/web/default/report/new/category.html +++ b/templates/web/default/report/new/category.html @@ -3,7 +3,7 @@ [% IF category; category = category | lower; END; %] - <label for='form_category'>[% category_label | html %]</label> + <label for='form_category' id="form_category_label">[% category_label | html %]</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/new/fill_in_details_form.html b/templates/web/default/report/new/fill_in_details_form.html index 4af0baccd..5eff4e147 100644 --- a/templates/web/default/report/new/fill_in_details_form.html +++ b/templates/web/default/report/new/fill_in_details_form.html @@ -206,7 +206,7 @@ <div class="checkbox"> [%# if there is nothing in the name field then set check box as default on form %] - <input type="checkbox" name="may_show_name" id="form_may_show_name" value="1"[% ' checked' IF !report.anonymous %]> + <input type="checkbox" name="may_show_name" id="form_may_show_name" value="1"[% ' checked' IF report.anonymous==0 OR (c.cobrand.default_show_name AND report.anonymous=='') %]> <label for="form_may_show_name">[% loc('Show my name publicly') %]</label> <br><small>[% loc('(we never show your email address or phone number)') %]</small> </div> diff --git a/templates/web/default/report/update-form.html b/templates/web/default/report/update-form.html index eeaec7915..50bc2906c 100644 --- a/templates/web/default/report/update-form.html +++ b/templates/web/default/report/update-form.html @@ -28,8 +28,10 @@ <label for="form_state">[% loc( 'State:' ) %]</label> <select name="state" id="form_state"> [% FOREACH state IN [ ['confirmed', loc('Open')], ['investigating', - loc('Investigating')], ['planned', loc('Planned')], ['in progress', - loc('In progress')], ['closed', loc('Closed')], ['fixed', loc('Fixed')] ] %] + loc('Investigating')], ['action scheduled', loc('Action Scheduled')], + ['in progress', loc('In Progress')], ['duplicate', loc('Duplicate')], + ['unable to fix', loc('Unable to fix')], ['not responsible', loc('Not Responsible')], + ['fixed', loc('Fixed')] ] %] <option [% 'selected ' IF state.0 == problem.state %] value="[% state.0 %]">[% state.1 %]</option> [% END %] </select> @@ -151,7 +153,7 @@ </div> <div class="checkbox"> - <input type="checkbox" name="may_show_name" id="form_may_show_name" value="1"[% ' checked' UNLESS update.anonymous %]> + <input type="checkbox" name="may_show_name" id="form_may_show_name" value="1"[% ' checked' IF update.anonymous==0 OR (c.cobrand.default_show_name AND update.anonymous=='') %]> <label for="form_may_show_name">[% loc('Show my name publicly') %]</label> <small>[% loc('(we never show your email)') %]</small> </div> diff --git a/templates/web/default/report/updates.html b/templates/web/default/report/updates.html index a892e0e69..04a8bec33 100644 --- a/templates/web/default/report/updates.html +++ b/templates/web/default/report/updates.html @@ -1,3 +1,4 @@ +[% global.last_state = '' %] [% FOREACH update IN updates %] [% INCLUDE 'report/update.html' %] [% END %] @@ -22,8 +23,20 @@ [%- ELSE %] [% tprintf( loc( 'Posted by %s at %s' ), update.name, prettify_dt( update.confirmed_local ) ) | html -%] [%- END -%] - [%- ", " _ loc( 'marked as fixed' ) IF update.mark_fixed %] - [%- ", " _ loc( 'reopened' ) IF update.mark_open OR update.problem_state == 'confirmed' %] - [%- ", " _ tprintf(loc( 'marked as %s' ), update.meta_problem_state) IF update.problem_state AND update.problem_state != 'confirmed' %] + [%- update_state = '' %] + [%- IF update.mark_fixed %][% update_state = ", " _ loc( 'marked as fixed' ) %][% END %] + [%- 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 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 %] + [%- update_state IF update_state != global.last_state %] + [%- global.last_state = update_state %] [% END %] - diff --git a/templates/web/default/report_created.html b/templates/web/default/report_created.html new file mode 100644 index 000000000..81083654b --- /dev/null +++ b/templates/web/default/report_created.html @@ -0,0 +1,9 @@ +[% INCLUDE 'header.html', title => loc('Report created') %] + +<h1>[% loc("Report created") %]</h1> + +<p> +[% loc('Your report has been created and will shortly be sent.') %] +</p> + +[% INCLUDE 'footer.html' %] diff --git a/templates/web/default/reports/body.html b/templates/web/default/reports/body.html index 284915571..da184c6e9 100755 --- a/templates/web/default/reports/body.html +++ b/templates/web/default/reports/body.html @@ -1,9 +1,3 @@ -[% IF c.cobrand.moniker == 'fixmystreet' OR c.cobrand.moniker == 'bromley'; - style = 'new'; - ELSE; - style = 'old'; - END; -%] [% IF ward %] [% name = "$ward.name, $body.name" thing = loc('ward') @@ -24,7 +18,6 @@ PROCESS "maps/${map.type}.html"; INCLUDE 'header.html', title = tprintf(loc('%s - Summary reports'), name) - context = 'reports' bodyclass = 'mappage' rss = [ tprintf(loc('Problems within %s, FixMyStreet'), name), rss_url ] %] diff --git a/templates/web/emptyhomes/around/display_location.html b/templates/web/emptyhomes/around/display_location.html deleted file mode 100755 index 888c8717e..000000000 --- a/templates/web/emptyhomes/around/display_location.html +++ /dev/null @@ -1,56 +0,0 @@ -[% - - url_skip = c.uri_for( - '/report/new', - { - pc => pc - latitude => short_latitude, - longitude => short_longitude, - skipped => 1, - } - ); - - PROCESS "maps/${map.type}.html"; - - INCLUDE 'header.html', - title => loc('Viewing a location') - robots => 'noindex,nofollow'; -%] - -<form action="[% c.uri_for('/report/new') %]" method="post" name="mapForm" id="mapForm" enctype="multipart/form-data"> -[% IF c.req.params.map_override %] -<input type="hidden" name="map_override" value="[% c.req.params.map_override | html %]"> -[% END %] -<input type="hidden" name="pc" value="[% pc | html %]"> - -<input type="hidden" name="latitude" id="fixmystreet.latitude" value="[% short_latitude | html %]"> -<input type="hidden" name="longitude" id="fixmystreet.longitude" value="[% short_longitude | html %]"> - -[% map_html %] - -</div> -<div id="side"> - -<p id="text_map" class="banner"> - [% loc( 'To <strong>report a problem</strong>, simply click on the map at the correct location.' ) %] - [% - tprintf( - loc("<small>If you cannot see the map, <a href='%s' rel='nofollow'>skip this step</a>.</small>"), - url_skip - ) - %] - <span id="text_map_arrow"></span> -</p> - -</div> - -<div style="display:none" id="side-form"> -[% INCLUDE "report/new/fill_in_details_form.html" - js = 1, - report.used_map = 1 -%] -</div> - -</form> - -[% INCLUDE 'footer.html' %] diff --git a/templates/web/emptyhomes/front/stats.html b/templates/web/emptyhomes/front/stats.html deleted file mode 100644 index cbb26fee1..000000000 --- a/templates/web/emptyhomes/front/stats.html +++ /dev/null @@ -1,27 +0,0 @@ -[% - USE Comma; - # Note - if we want to i18n the commas we should try - # 'Template::Plugin::Number::Format' -%] - -[% - stats = c.cobrand.front_stats_data(); - - new_text = - stats.recency == '1 week' - ? nget( - "<big>%s</big> report in past week", - "<big>%s</big> reports in past week", - stats.new - ) - : nget( - "<big>%s</big> report recently", - "<big>%s</big> reports recently", - stats.new - ); - -%] - -<div id="front_stats"> - <div>[% tprintf( new_text, stats.new ) | comma %]</div> -</div> diff --git a/templates/web/emptyhomes/header.html b/templates/web/emptyhomes/header.html index 96ad1040c..cc2f68ac0 100644 --- a/templates/web/emptyhomes/header.html +++ b/templates/web/emptyhomes/header.html @@ -25,6 +25,7 @@ <div id="navigation"> <ul> <li><a href="/">[% loc("Report a problem") %]</a></li> + <li><a href="/reports">[% loc("All reports") %]</a></li> <li><a href="/faq">[% loc("Help") %]</a></li> <li><a href="/about">[% loc('About us') %]</a></li> [% IF lang_code == 'en-gb' %] diff --git a/templates/web/emptyhomes/index.html b/templates/web/emptyhomes/index.html deleted file mode 100644 index 9ca771fc0..000000000 --- a/templates/web/emptyhomes/index.html +++ /dev/null @@ -1,68 +0,0 @@ -[% INCLUDE 'header.html', title => '' %] - -[% IF c.req.uri.host == 'reportemptyhomes.com' or c.req.uri.host == 'emptyhomes.matthew.fixmystreet.com' %] - -<h2>Channel 4: The Great British Property Scandal</h2> - -<div class="video"><object id="flashObj" width="480" height="270" classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=9,0,47,0"><param name="movie" value="http://c.brightcove.com/services/viewer/federated_f9?isVid=1&isUI=1" /><param name="bgcolor" value="#FFFFFF" /><param name="flashVars" value="@videoPlayer=1293919404001&playerID=1242807532001&playerKey=AQ~~,AAABIWs5YNk~,K8Yb_Dc0PlMA8gCUiCBbnEcXR1bU7HRm&domain=embed&dynamicStreaming=true" /><param name="base" value="http://admin.brightcove.com" /><param name="seamlesstabbing" value="false" /><param name="allowFullScreen" value="true" /><param name="swLiveConnect" value="true" /><param name="allowScriptAccess" value="always" /><embed src="http://c.brightcove.com/services/viewer/federated_f9?isVid=1&isUI=1" bgcolor="#FFFFFF" flashVars="@videoPlayer=1293919404001&playerID=1242807532001&playerKey=AQ~~,AAABIWs5YNk~,K8Yb_Dc0PlMA8gCUiCBbnEcXR1bU7HRm&domain=embed&dynamicStreaming=true" base="http://admin.brightcove.com" name="flashObj" width="480" height="270" seamlesstabbing="false" type="application/x-shockwave-flash" allowFullScreen="true" allowScriptAccess="always" swLiveConnect="true" pluginspage="http://www.macromedia.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash"></embed></object></div> - -<p> -Empty Homes were offical advisors to the recent empty homes TV series <strong>The Great British Property Scandal</strong>! -</p> - -<p> -The series highlighted the nearly two million British families who don’t have adequate housing, and the million-odd homes lying empty across the UK. -</p> - -<p> -The TV series launched a campaign for action and while this is running, our <a href="[% uri => '/' %]">www.reportemptyhomes.com</a> website has been merged with the campaign's reporting system so that all reports are gathered together and sent on to the local councils. Please use these links to report empty properties which you know of: -</p> - -<ul class="channel4"> - -<li><a href="http://www.channel4.com/programmes/the-great-british-property-scandal/articles/report-an-empty">Report an empty property</a></li> -<li><a href="http://cy.reportemptyhomes.com/">Rhoi gwybod am eiddo gwag</a></li> - -<li><a href="http://itunes.apple.com/gb/app/empty-homes-spotter/id482550587?mt=8"><img src="/i/appstore.png" hspace="5" alt="" align="right">Download the iPhone app</a> from the App Store.</li> - -</ul> - -[% ELSE %] - -[% IF error %] - <p class="error">[% error %]</p> -[% END %] - -<p id="expl"> - <strong>[% loc('Report empty properties') %]</strong> -</p> - -[% - question = loc("Enter a nearby GB postcode, or street name and area"); -%] - -<form action="[% c.uri_for('/around') %]" method="get" name="postcodeForm" id="postcodeForm"> - <label for="pc">[% question %]:</label> - <span><input type="text" name="pc" value="" id="pc" size="10" maxlength="200"> - <input type="submit" value="[% loc('Go') %]" id="sub"> - </span> -</form> - -<div id="front_intro"> - - <h2>[% loc('How to report a problem') %]</h2> - - <ol> - <li>[% question %]</li> - <li>[% loc('Locate the problem on a map of the area') %]</li> - <li>[% loc('Enter details of the problem') %]</li> - <li>[% loc('We send it to the council on your behalf') %]</li> - </ol> - - [% INCLUDE "front/stats.html" %] - -</div> - -[% END %] - -[% INCLUDE 'footer.html' %] diff --git a/templates/web/emptyhomes/report/banner.html b/templates/web/emptyhomes/report/banner.html new file mode 100644 index 000000000..d473a777e --- /dev/null +++ b/templates/web/emptyhomes/report/banner.html @@ -0,0 +1,6 @@ +[% IF problem.is_fixed %] +<p class="banner" id="fixed"> + [% loc('This problem has been fixed') %]. +</p> +[% END %] + diff --git a/templates/web/emptyhomes/report/display.html b/templates/web/emptyhomes/report/display.html deleted file mode 100644 index 911908d2b..000000000 --- a/templates/web/emptyhomes/report/display.html +++ /dev/null @@ -1,32 +0,0 @@ -[% - problem_title = loc('Viewing a problem'); - INCLUDE 'header.html' - title = problem_title - robots = 'noindex, nofollow' -%] - -<div id="side"> - -[% IF problem.is_fixed %] -<p class="banner" id="fixed"> - [% loc('This problem has been fixed') %]. -</p> -[% END %] - -<h1>Empty property report</h1> - -<p><em>[% problem.meta_line(c) | html %] -[% IF problem.bodies_str %] - [% IF problem.whensent %] - <small class="council_sent_info"><br>[% problem.duration_string(c) %]</small> - [% END %] -[% ELSE %] -<br><small>[% loc('Not reported to council') %]</small> -[% END %] - -</em></p> - -</div> - -[% INCLUDE 'footer.html' %] - diff --git a/templates/web/emptyhomes/report/new/councils_text_all.html b/templates/web/emptyhomes/report/new/councils_text_all.html index cd892212c..5769e6cd5 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, plus your name if you give us permission.'), + 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.'), all_body_names.join( '</strong>' _ loc(' or ') _ '<strong>' ) ); %] diff --git a/templates/web/emptyhomes/reports/_ward-list.html b/templates/web/emptyhomes/reports/_ward-list.html new file mode 100755 index 000000000..e69de29bb --- /dev/null +++ b/templates/web/emptyhomes/reports/_ward-list.html diff --git a/templates/web/emptyhomes/reports/body.html b/templates/web/emptyhomes/reports/body.html deleted file mode 100755 index eff87d823..000000000 --- a/templates/web/emptyhomes/reports/body.html +++ /dev/null @@ -1,73 +0,0 @@ -[% IF ward %] - [% name = "$ward.name, $council.name" - thing = loc('ward') - %] -[% ELSE %] - [% name = council.name - thing = loc('council') - %] -[% END %] - -[% - INCLUDE 'header.html', - title = tprintf(loc('%s - Summary reports'), name) - context = 'reports' -%] - -[% IF children.size %] -<h2 style="clear:right">[% loc('Wards of this council') %]</h2> -<p>[% loc('Follow a ward link to view only reports within that ward.') %]</p> -<ul> -[% FOR child IN children.values.sort('name') %] -<li><a href="[% child.url %]">[% child.name %]</a></li> -[% END %] -</ul> -[% END %] - -<div id="side"> - -[% IF NOT body.areas AND c.cobrand.country == 'GB' %] -<p id="unknown">This council no longer exists. -[% IF council.name.match('Penwith|Kerrier|Carrick|Restormel|Caradon|North Cornwall') %] -Its area is now covered by <a href="/reports/Cornwall">Cornwall Council</a>. -[% ELSIF council.name.match('Durham|Easington|Sedgefield|Teesdale|Wear Valley|Derwentside|Chester le Street') %] -Its area is now covered by <a href="/reports/Durham+County">Durham County Council</a>. -[% ELSIF council.name.match('Blyth Valley|Wansbeck|Castle Morpeth|Tynedale|Alnwick|Berwick upon Tweed') %] -Its area is now covered by <a href="/reports/Northumberland">Northumberland County Council</a>. -[% ELSIF council.name.match('North Shropshire|Oswestry|Shrewsbury and Atcham|South Shropshire|Bridgnorth') %] -Its area is now covered by <a href="/reports/Shropshire">Shropshire Council</a>. -[% ELSIF council.name.match('Salisbury|West Wiltshire|Kennet|North Wiltshire') %] -Its area is now covered by <a href="/reports/Wiltshire">Wiltshire Council</a>. -[% ELSIF council.name.match('Ellesmere Port and Neston|Vale Royal|Chester') %] -Its area is now covered by <a href="/reports/Cheshire+West+and+Chester">Cheshire West and Chester Council</a>. -[% ELSIF council.name.match('Macclesfield|Congleton|Crewe and Nantwich') %] -Its area is now covered by <a href="/reports/Cheshire+East">Cheshire East Council</a>. -[% ELSIF council.name.match('Mid Bedfordshire|South Bedfordshire') %] -Its area is now covered by <a href="/reports/Central+Bedfordshire">Central Bedfordshire Council</a>. -[% ELSIF council.name.match('Cheshire') %] -Its area is now covered by <a href="/reports/Cheshire+West+and+Chester">Cheshire West and Chester Council</a> or -<a href="/reports/Cheshire+East">Cheshire East Council</a>. -[% ELSIF council.name.match('Bedfordshire') %] -Its area is now covered by <a href="/reports/Bedford">Bedford Borough Council</a> or -<a href="/reports/Central+Bedfordshire">Central Bedfordshire Council</a>. -[% END %] -</p> -[% END %] - -[% IF c.cobrand.all_councils_report %] - [% tprintf( loc('This is a summary of all reports for one %s.'), thing ) %] -[% ELSE %] - [% tprintf( loc('This is a summary of all reports for this %s.'), thing ) %] -[% END %] - -[% IF ward %] -[% tprintf( loc('You can <a href="%s">view all reports for the council</a> or <a href="/reports">show all councils</a>.'), council_url ) %] -[% ELSE %] -[% loc('You can <a href="/reports">show all councils</a>.') %] -[% END %] - -<h2>[% name %]</h2> - -</div> -[% INCLUDE 'footer.html' %] - diff --git a/templates/web/emptyhomes/reports/index.html b/templates/web/emptyhomes/reports/index.html index 9ce2b66ca..3029bcd1c 100755 --- a/templates/web/emptyhomes/reports/index.html +++ b/templates/web/emptyhomes/reports/index.html @@ -10,8 +10,6 @@ <th>[% loc('Name') %]</th> <th>[% loc('New problems') %]</th> <th>[% loc('Older problems') %]</th> -<th>[% loc('Recently fixed') %]</th> -<th>[% loc('Older fixed') %]</th> </tr> [% FOREACH body IN bodies %] @@ -20,12 +18,11 @@ [%- ELSIF loop.count % 2 %] class="a" [%- END -%] > -<td align="left">[% body.name %]</td> +<td align="left"><a href="[% body.url(c) %]">[% body.name %]</a></td> <td>[% open.${body.id}.new or 0 %]</td> -<td>[% (open.${body.id}.older or 0) + (open.${body.id}.unknown or 0) %]</td> -<td>[% fixed.${body.id}.new or 0 %]</td> -<td>[% fixed.${body.id}.old or 0 %]</td> +<td>[% (open.${body.id}.older or 0) + (open.${body.id}.unknown or 0) + (fixed.${body.id}.new or 0) + (fixed.${body.id}.old or 0) %]</td> </tr> + [% END %] </table> diff --git a/templates/web/emptyhomes/tracking_code.html b/templates/web/emptyhomes/tracking_code.html deleted file mode 100644 index 73526d3bd..000000000 --- a/templates/web/emptyhomes/tracking_code.html +++ /dev/null @@ -1,12 +0,0 @@ -<!-- Piwik --> -<script type="text/javascript"> -var pkBaseURL = (("https:" == document.location.protocol) ? "https://piwik.mysociety.org/" : "http://piwik.mysociety.org/"); -document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E")); -</script><script type="text/javascript"> -try { -var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 12); -piwikTracker.trackPageView(); -piwikTracker.enableLinkTracking(); -} catch( err ) {} -</script><noscript><img width=1 height=1 src="http://piwik.mysociety.org/piwik.php?idsite=12" style="border:0" alt=""></noscript> -<!-- End Piwik Tag --> diff --git a/templates/web/fixmybarangay/faq/faq-en-gb.html b/templates/web/fixmybarangay/faq/faq-en-gb.html index 320a7528e..771569e23 100644 --- a/templates/web/fixmybarangay/faq/faq-en-gb.html +++ b/templates/web/fixmybarangay/faq/faq-en-gb.html @@ -54,7 +54,8 @@ the problem.</dd> <dd> You can use your email address and set a password right away, but your account won't be enabled as a <em>staff account</em> until one of the - system administrators has checked it. TODO: contact details. + system administrators has checked it. If you're not sure who to contact, try + <a href="mailto:[% c.config.CONTACT_EMAIL %]">[% c.config.CONTACT_EMAIL %]</a>. </dd> <dt>I've forgotten my password, what do I do?</dt> <dd> @@ -68,10 +69,32 @@ the problem.</dd> or quit the browser (just closing the window without quitting the browser is not enough). </dd> <dt>Reporting</dt> - <dd>TODO</dd> + <dd><p> + To make a new report, start by clicking on the button for either barangay <em>BSN</em> or <em>Luz</em>. + </p> + <ul> + <li> + <strong>To create a standalone report</strong> simply click on the map where the problem is. + </li> + <li> + <strong>To create a report from a text message</strong> log into Message Manager (see below), + then select the message you want to use (click on the radio button). When the message has gone + green, you can click on the map and the message will automatically be used to create the report. + You can edit the text, but that report will be associated with that incoming message. + </li> + </ul> + <p> + Once you've placed the pin, but before you press <em>Submit</em>, you can drag or reposition the pin + if you want to change its position. + </p> + <p> + Choose the category for this report ‐ obviously, this helps FixMyBarangay decide to which + department the report will be sent. + </p> + </dd> <dt>How do I see the SMS messages people have sent?</dt> - <dd>When you look at the barangay problems, click on "Problems via text" - (or, if you're viewing a specific report, click "Show messages") to see the + <dd>When you look at the barangay problems, click on <em>Problems via text</em> + (or, if you're viewing a specific report, click <em>Show messages</em>) to see the currently available messages. You'll need a username and password for the Message Manager (your manager will have told you what these are). Note that you can only see messages that have not yet been used to @@ -82,31 +105,40 @@ the problem.</dd> No, it's a separate account (some FMB users don't have any access to the SMS messages). Your manager will tell you what your login for Message Manager system is, if you have one. </dd> - <dt>I tried to work with a message but it said "lock not granted". What's up?</dt> + <dt>I tried to work with a message but it said "Someone is working with that message right now!" What's up?</dt> <dd> - This means another staff member is working on the message. To prevent you both creating + This means another staff member has a "lock" on the message. To prevent you both creating a report, or sending a reply, we use a first-come-first-serve locking mechanism. Collisions like this are rare, but if they do happen, try again a few minutes later because the lock may have expired by then. </dd> <dt>Can I delete a message?</dt> <dd> - Yes. Click on the red cross when you hover over it (although really you're only hiding it). - You need an <em>administrator</em> account in the Message Manager to be able to see the + Yes. Click on the red cross when you hover over it (although really you're only hiding it so + it never gets shown within FixMyBarangay). + You need a manager's account in the Message Manager to be able to see any messages that have been hidden, so hiding them is as good as deleting them. </dd> <dt>It looks like an incoming message is wrongly shown as a reply. Can I fix it?</dt> <dd> FixMyBarangay tries to recognise SMS replies, and automatically matches them to the right thread. If it - gets this wrong, the reply may appear as a new "available" message, or a new message might be - mistaken for a reply. You need to ask an administrator to log into Message Manager to sort this out for you. + gets this wrong you can click on the <em>detach</em> button. The message will then be a new "available" + message. If Message Manager got it wrong the other way round, and missed a reply, you can fix this too + but you need to log into Message Manager with a manager's account to do it. </dd> <dt>How do the replies get back to the original sender?</dt> <dd> Although you're replying from within FixMyBarangay, the replies are sent by SMS. - There may be a delay of a few minutes between the moment you press <strong>reply</strong> + There may be a delay of a several minutes between the moment you press <strong>reply</strong> and the message's arrival. </dd> + <dt>How can I tell the original sender their problem has been fixed?</dt> + <dd> + Go to the report. If the report is marked "this report was submitted by SMS", you can send a reply. + Click on <em>Show Messages</em>. When the messages appear, click on <em>Show messages for + <strong>this</strong> report</em>. Hover over the message you want to send the message to, and + click <em>Reply</em>. + </dd> <h2><a name="organisation"></a>Organisation Questions</h2> <dl> diff --git a/templates/web/fixmybarangay/footer.html b/templates/web/fixmybarangay/footer.html index 88f18db4b..5bac32e98 100644 --- a/templates/web/fixmybarangay/footer.html +++ b/templates/web/fixmybarangay/footer.html @@ -75,6 +75,29 @@ </div> </div> <div style="display:none"> + <div id="detach-form-container" class="fancybox-popup"> + <p> + Are you sure you want to detach this message? + </p> + <p> + Message Manager probably thinks this message is a reply because + it came in from a number to which we'd recently sent an outward reply. + </p> + <p> + If you detach the message, it will appear as a new, available message (instead of being a reply). + </p> + <form action="/dummy" id="detach-form" onsubmit="event.returnValue = false; return false;" method="post" accept-charset="utf-8"> + <div style="display:none;"> + <input type="hidden" name="_method" value="POST"> + </div> + <input type="hidden" name="msg_id" id="detach_msg_id"> + <div class="submit"> + <input id="detach-submit" type="submit" value="Detach Message"> + </div> + </form> + </div> + </div> + <div style="display:none"> <div id="mm-help" style="font-size:90%;"> <h2> Accessing Message Manager from FixMyBarangay (FMB)</h2> <h3> @@ -125,14 +148,23 @@ </p> [% END %] <h3> - Replying to a message + <span class="demo_detach_btn">detach</span> Detaching a message ("not a reply") + </h3> + <p> + Message Manager tries to notice when an incoming message is a reply. Sometimes it guesses wrong. To detach a + message from its parent — that is, to mark it as <em>not a reply</em>, hover over the message and click + <span class="demo_detach_btn">detach</span>. + </p> + + <h3> + <span class="demo_reply_btn">reply</span> Replying to a message </h3> <p> You can send an SMS back to the original sender: just hover over the message and click <span class="demo_reply_btn">reply</span>. It will usually take a few minutes for the message to arrive. </p> <h3> - Getting message info + <span class="demo_info_btn">i</span> Getting message info </h3> <p> Hover over a message and click on its <span class="demo_info_btn">i</span> button to see when it was sent. @@ -140,7 +172,7 @@ actual number (instead the number is scrambled, but will be the <em>same scrambled number</em> on other messages they've sent). </p> <h3> - Hiding a message + <span class="demo_hide_btn">X</span> Hiding a message </h3> <p> If a message can't be used to create a report, you can hide it by hovering over it and clicking its <span class="demo_hide_btn">X</span> button. If you're not diff --git a/templates/web/fixmybarangay/report/_message_manager.html b/templates/web/fixmybarangay/report/_message_manager.html index 08f333cad..2860689be 100644 --- a/templates/web/fixmybarangay/report/_message_manager.html +++ b/templates/web/fixmybarangay/report/_message_manager.html @@ -109,19 +109,25 @@ $(document).ready(function() { $('#external_source_id').val(service_id); } - var dummy_reply_cleanup = function(data) { + var reply_cleanup = function(data) { reset_timeout(); $('#reply_text').val(''); dummy_busy = false; mm_refresh_messages(); } - var dummy_hide_cleanup = function(data) { + var hide_cleanup = function(data) { reset_timeout(); $('#reason_text').val(''); dummy_busy = false; } + var detach_cleanup = function(data) { + reset_timeout(); + dummy_busy = false; + mm_refresh_messages(); // refresh because detached message now appears in the list + } + var custom_tooltips; if (problem_id) { // this page is viewing, not creating custom_tooltips = {tt_radio: "Select before clicking 'Copy to Update' to add this message as an update"}; @@ -180,7 +186,7 @@ $(document).ready(function() { message_manager.reply( $('#reply_to_msg_id').val(), $('#reply_text').val(), - {callback:dummy_reply_cleanup}); + {callback:reply_cleanup}); } }); @@ -195,9 +201,20 @@ $(document).ready(function() { message_manager.hide( $('#hide_msg_id').val(), $('#reason_text').val(), - {callback:dummy_hide_cleanup}); + {callback:hide_cleanup}); } }); + + $('#detach-submit').click(function(e) { + e.preventDefault(); + if (! dummy_busy) { + dummy_busy = true; + message_manager.mark_as_not_a_reply( + $('#detach_msg_id').val(), + {callback:detach_cleanup}); + } + }); + $("a#reply").fancybox({onClosed: function(){dummy_busy=false;}}); // only show on problem display page diff --git a/templates/web/fixmybarangay/report/new/councils_text.html b/templates/web/fixmybarangay/report/new/councils_text.html index 24c54ea50..0001b0e68 100644 --- a/templates/web/fixmybarangay/report/new/councils_text.html +++ b/templates/web/fixmybarangay/report/new/councils_text.html @@ -1,5 +1,5 @@ <p> The information provided here will be displayed publicly on the site as well as being sent to the -relevant authority (DPWH, DEPW, or DPS). If you select the Fix Locally category then the -information will not be sent anywhere. +relevant authority (DPWH, DEPW, or DPS). +If you select a "bgy. will fix" category, then your report will be emailed to the barangay team. </p> diff --git a/templates/web/fixmybarangay/reports/index.html b/templates/web/fixmybarangay/reports/index.html index a99878c27..cda1fd6fd 100755 --- a/templates/web/fixmybarangay/reports/index.html +++ b/templates/web/fixmybarangay/reports/index.html @@ -7,10 +7,6 @@ [% loc('This is a summary of all reports on this site; select a particular barangay to see the reports sent there.') %] </p> -<p> - [%# (this will change when we have 'body' logic in place, meanwhile: hardcoded) %] - See also the <a href="/reports/dps">map of DPS reports</a>. -</p> </div> <table cellpadding="3" cellspacing="1" border="0" class="nicetable"> @@ -42,4 +38,21 @@ </tbody> </table> + +<p> +[%# (this will change when we have 'body' logic in place, meanwhile: hardcoded) %] +See also the maps of reports submitted to these departments: +</p> +<ul> +<li> +<a href="/reports/depw" title="Department of Engineering and Public Works">DEPW</a> — city road maintenance +</li> +<li> +<a href="/reports/dps" title="Department of Public Services">DPS</a> — streetlight maintenance +</li> +<li> +<a href="/reports/dpwh" title="Department of Public Works and Highways">DPWH</a> — national road maintenance +</li> +</ul> +</p> [% INCLUDE 'footer.html', pagefooter = 'yes' %] diff --git a/templates/web/fixmystreet/header.html b/templates/web/fixmystreet/header.html index f9c146bc0..85ed2c0e1 100644 --- a/templates/web/fixmystreet/header.html +++ b/templates/web/fixmystreet/header.html @@ -22,7 +22,7 @@ <script src="[% start %][% version('/js/modernizr.custom.js') %]" charset="utf-8"></script> <script src="[% start %][% version('/cobrands/fixmystreet/position_map.js') %]" charset="utf-8"></script> - [% INCLUDE 'common_header_tags.html', js_override = '/cobrands/fixmystreet/fixmystreet.js', site_title = 'FixMyStreet' %] + [% INCLUDE 'common_header_tags.html', js_override = '/cobrands/fixmystreet/fixmystreet.js', site_title = c.cobrand.site_title %] [% extra_js %] [% IF c.req.uri.host == 'osm.fixmystreet.com' %] @@ -32,13 +32,14 @@ [% INCLUDE 'tracking_code.html' %] </head> + [% TRY %][% PROCESS 'set_body_class.html' %][% CATCH file %][% END %] <body class="[% bodyclass | html IF bodyclass %]"> <div class="wrapper"> <div class="table-cell"> <header id="site-header" role="banner"> <div class="container"> - <a href="/" id="site-logo">FixMyStreet</a> + <a href="/" id="site-logo">[% c.cobrand.site_title | html %]</a> <a href="#main-nav" id="nav-link">Main Navigation</a> </div> </header> diff --git a/templates/web/fixmystreet/report/banner.html b/templates/web/fixmystreet/report/banner.html index 58712604e..25c9db424 100644 --- a/templates/web/fixmystreet/report/banner.html +++ b/templates/web/fixmystreet/report/banner.html @@ -5,7 +5,7 @@ </div> [% END %] -[% IF problem.is_open AND date.now - problem.lastupdate_local.epoch > 8 * 7 * 24 * 60 * 60 %] +[% IF c.cobrand.moniker != 'bromley' AND problem.council != '2482' AND problem.is_open AND date.now - problem.lastupdate_local.epoch > 8 * 7 * 24 * 60 * 60 %] [% INCLUDE banner, id = 'unknown', text = loc('Unknown') %] [% END %] [% IF problem.is_fixed %] @@ -14,8 +14,8 @@ [% IF problem.is_closed %] [% INCLUDE banner, id = 'closed', text = loc('Closed') %] [% END %] -[% states = [ 'investigating', 'in progress', 'planned' ]; - IF states.grep(problem.state).size %] +[% states = [ 'investigating', 'in progress', 'planned', 'action scheduled' ]; + IF c.cobrand.moniker != 'bromley' && states.grep(problem.state).size %] [% INCLUDE banner, id = 'progress', text = loc('In progress') %] [% END %] 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 ceba7a6ba..e2e091460 100644 --- a/templates/web/fixmystreet/report/new/fill_in_details_form.html +++ b/templates/web/fixmystreet/report/new/fill_in_details_form.html @@ -125,17 +125,7 @@ [%# if there is nothing in the name field then set check box as default on form %] <div class="checkbox-group"> - <input type="checkbox" name="may_show_name" id="form_may_show_name" value="1" - [% IF c.cobrand.moniker == 'fixmybarangay' && c.user.from_body %] - [%# - FMB staff reports are anonymous by default; so may_show_name is checked only if explicitly set to 0. - If the user has not set it (that is, it is null) TemplateToolkit sees an empty string. - %] - [% 'checked' IF report.anonymous==0 %] - [% ELSE %] - [% 'checked' IF !report.anonymous %] - [% END %] - > + <input type="checkbox" name="may_show_name" id="form_may_show_name" value="1"[% ' checked' IF report.anonymous==0 OR (c.cobrand.default_show_name AND report.anonymous=='') %]> <label class="inline" for="form_may_show_name">[% loc('Show my name publicly') %] </label> </div> @@ -203,7 +193,7 @@ [%# if there is nothing in the name field then set check box as default on form %] <div class="checkbox-group"> - <input type="checkbox" name="may_show_name" id="form_may_show_name" value="1"[% ' checked' IF !report.anonymous %]> + <input type="checkbox" name="may_show_name" id="form_may_show_name" value="1"[% ' checked' IF report.anonymous==0 OR (c.cobrand.default_show_name AND report.anonymous=='') %]> <label class="inline" for="form_may_show_name">[% loc('Show my name publicly') %]</label> </div> diff --git a/templates/web/fixmystreet/report/update-form.html b/templates/web/fixmystreet/report/update-form.html index e8115ee00..add176549 100644 --- a/templates/web/fixmystreet/report/update-form.html +++ b/templates/web/fixmystreet/report/update-form.html @@ -26,8 +26,10 @@ <label for="form_state">[% loc( 'State' ) %]</label> <select name="state" id="form_state"> [% FOREACH state IN [ ['confirmed', loc('Open')], ['investigating', - loc('Investigating')], ['planned', loc('Planned')], ['in progress', - loc('In progress')], ['closed', loc('Closed')], ['fixed', loc('Fixed')] ] %] + loc('Investigating')], ['action scheduled', loc('Action Scheduled')], + ['in progress', loc('In Progress')], ['duplicate', loc('Duplicate')], + ['unable to fix', loc('Unable to fix')], ['not responsible', loc('Not Responsible')], + ['fixed', loc('Fixed')] ] %] <option [% 'selected ' IF state.0 == problem.state %] value="[% state.0 %]">[% state.1 %]</option> [% END %] </select> @@ -138,7 +140,7 @@ <input type="text" [% IF problem.bodies_str == '2482' %]class="validName" [% END %]name="name" id="form_name" value="[% update.name || c.user.name | html %]" placeholder="[% loc('Your name') %]"> <div class="checkbox-group"> - <input type="checkbox" name="may_show_name" id="form_may_show_name" value="1"[% ' checked' UNLESS update.anonymous %]> + <input type="checkbox" name="may_show_name" id="form_may_show_name" value="1"[% ' checked' IF update.anonymous==0 OR (c.cobrand.default_show_name AND update.anonymous=='') %]> <label class="inline" for="form_may_show_name">[% loc('Show my name publicly') %]</label> </div> <div class="checkbox-group"> diff --git a/templates/web/oxfordshire/around/intro.html b/templates/web/oxfordshire/around/intro.html new file mode 100644 index 000000000..81b2569f6 --- /dev/null +++ b/templates/web/oxfordshire/around/intro.html @@ -0,0 +1 @@ + <h1 class="main">Reporting a problem in Oxfordshire</h1> diff --git a/templates/web/oxfordshire/faq/faq-en-gb.html b/templates/web/oxfordshire/faq/faq-en-gb.html new file mode 100755 index 000000000..9361d5647 --- /dev/null +++ b/templates/web/oxfordshire/faq/faq-en-gb.html @@ -0,0 +1,232 @@ +[% INCLUDE 'header.html', title => loc('Frequently Asked Questions'), bodyclass => 'twothirdswidthpage' %] + +<div class="sticky-sidebar"> + <aside> + <ul class="plain-list"> + <li><a href="#faq">Frequently Asked Questions</a></li> + <li><a href="#practical">Practical Questions</a></li> + <li><a href="#organisation">Organisation Questions</a></li> + <li><a href="/privacy">Privacy and cookies</a></li> + <li><a href="/contact">Contact FixMyStreet</a></li> + </ul> + </aside> +</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> + </dd> + + <dt>What isn’t FixMyStreet for?</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>: + </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> + <ul> + <li>The depth of a milk bottle + <li>The size of a dustbin lid + <li>The depth of a tennis ball, size of a dinner plate <strong>and</strong> on a busy carriageway + <li>The depth of a coke can on a pathway or busy carriageway + <li>The depth of a coke can <strong>and</strong> size of a dinner plate on a quiet carriageway + </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 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>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>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>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> + </dd> + + </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> + + <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> + + <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>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>, + 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. +</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). + +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 new file mode 100644 index 000000000..cfca706c8 --- /dev/null +++ b/templates/web/oxfordshire/footer.html @@ -0,0 +1,51 @@ + [% IF pagefooter %] + <footer role="content-info"> + <p><a href="/privacy">Privacy and cookies</a></p> + </footer> + [% END %] + </div><!-- .content role=main --> + </div><!-- .container --> + </div><!-- .table-cell --> + + <div class="nav-wrapper"> + <div class="nav-wrapper-2"> + <div id="main-nav" role="navigation"> + <ul id="mysoc-menu"> + <li><a id="mysoc-logo" href="http://www.fixmystreet.com/">Powered by <img src="/cobrands/oxfordshire/images/fms-logo-105x20.png" alt="FixMyStreet"></a></li> + </ul> + + <ul id="main-menu"> + <li><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END %] class="report-a-problem-btn" + >[% loc("Report a problem") %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>[% + %]<li><[% IF c.req.uri.path == '/my' %]span[% ELSE %]a href="/my"[% END + %]>[% loc("Your reports") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[% + %]<li><[% IF c.req.uri.path == '/reports' %]span[% ELSE %]a href="/reports"[% 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> + +<!-- [% INCLUDE 'debug_footer.html' %] --> + </div> <!-- .wrapper --> + <div id="oxford-footer" class="desk-only"> + <address> + <strong>Oxfordshire County Council</strong><br> + <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> + </ul> + </div> +</div> <!-- oxford-wrapper --> +</body> +</html> diff --git a/templates/web/oxfordshire/header.html b/templates/web/oxfordshire/header.html new file mode 100644 index 000000000..6c338452a --- /dev/null +++ b/templates/web/oxfordshire/header.html @@ -0,0 +1,94 @@ +<!doctype html> +<!--[if lt IE 7]><html class="no-js ie6 oldie" lang="[% lang_code %]"><![endif]--> +<!--[if IE 7]> <html class="no-js ie7 oldie" lang="[% lang_code %]"><![endif]--> +<!--[if IE 8]> <html class="no-js ie8 oldie" lang="[% lang_code %]"><![endif]--> +<!--[if IE 9]> <html class="no-js ie9 oldie" lang="[% lang_code %]"><![endif]--> +<!--[if gt IE 9]><!--><html class="no-js" lang="[% lang_code %]"><!--<![endif]--> + <head> + <meta name="viewport" content="initial-scale=1.0"> + + <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1"> + <meta name="HandHeldFriendly" content="true"> + <meta name="mobileoptimized" content="0"> + +[% SET start = c.config.ADMIN_BASE_URL IF admin %] + + <link rel="stylesheet" href="[% start %][% version('/cobrands/' _ c.cobrand.moniker _ '/base.css') %]"> + <link rel="stylesheet" href="[% start %][% version('/cobrands/' _ c.cobrand.moniker _ '/layout.css') %]" media="(min-width:48em)"> + [% extra_css %] + <!--[if (lt IE 9) & (!IEMobile)]> + <link rel="stylesheet" href="[% start %][% version('/cobrands/' _ c.cobrand.moniker _ '/layout.css') %]"> + <![endif]--> + + <script src="[% start %][% version('/js/modernizr.custom.js') %]" charset="utf-8"></script> + <script src="[% start %][% version('/cobrands/oxfordshire/position_map.js') %]" charset="utf-8"></script> + [% INCLUDE 'common_header_tags.html', js_override = '/cobrands/fixmystreet/fixmystreet.js', site_title = 'FixMyStreet' %] + [% extra_js %] + + [% IF c.req.uri.host == 'osm.fixmystreet.com' %] + <link rel="canonical" href="http://www.fixmystreet.com[% c.req.uri.path_query %]"> + [% END %] + + [% INCLUDE 'tracking_code.html' %] + + </head> + <body class="[% bodyclass | html IF bodyclass %]"> +<div id="oxford-wrapper"> + <div id="oxford-header" class="desk-only"> + <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> + </span> + <div style="clear:both"></div> + <span class="header"><a href="/">FixMyStreet</a></span> + <div class="oxford-user"> + <p> + [% IF c.user_exists %] + [% tprintf(loc('Hi %s'), c.user.name || c.user.email) %] + <a href="/auth/sign_out">[% loc('sign out') %]</a> + [% END %] + </p> + </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> + </ul> + </div> + + <div class="wrapper"> + + <div class="table-cell"> + <header id="site-header" role="banner"> + <div class="container"> + <a href="/" id="site-logo">Oxfordshire FixMyStreet</a> + <a href="#main-nav" id="nav-link">Main Navigation</a> + </div> + </header> + + <div id="user-meta"> + [% IF c.user_exists %] + <p> + [% tprintf(loc('Hi %s'), c.user.name || c.user.email) %] + <a href="/auth/sign_out">[% loc('sign out') %]</a> + </p> + [% ELSE %] + <!-- <a href="/auth">[% loc('Sign in') %]</a> --> + [% END %] + </div> + + [% pre_container_extra %] + + <div class="container"> + <div class="content[% " $mainclass" | html IF mainclass %]" role="main"> + + <!-- [% INCLUDE 'debug_header.html' %] --> diff --git a/templates/web/oxfordshire/report/new/councils_text_all.html b/templates/web/oxfordshire/report/new/councils_text_all.html new file mode 100644 index 000000000..e71a400ac --- /dev/null +++ b/templates/web/oxfordshire/report/new/councils_text_all.html @@ -0,0 +1,18 @@ +<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>. +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/fill_in_details_text.html b/templates/web/oxfordshire/report/new/fill_in_details_text.html new file mode 100644 index 000000000..065005956 --- /dev/null +++ b/templates/web/oxfordshire/report/new/fill_in_details_text.html @@ -0,0 +1,6 @@ +Oxfordshire County Council won’t be able to help unless you leave as much +detail as you can. Please describe the exact location of the problem (e.g. in +the carriageway), what it is, how long it has been there, a description and a +photo of the problem if you have one. Please be aware that you can only attach +one picture so ensure that you provide a picture that clearly shows the +location not just the fault. diff --git a/templates/web/oxfordshire/report/new/notes.html b/templates/web/oxfordshire/report/new/notes.html new file mode 100644 index 000000000..e03fd8644 --- /dev/null +++ b/templates/web/oxfordshire/report/new/notes.html @@ -0,0 +1,10 @@ +<p>[% loc("Please note:") %]</p> + +<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("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/admin/footer.html b/templates/web/seesomething/admin/footer.html new file mode 100644 index 000000000..bdd42e2e4 --- /dev/null +++ b/templates/web/seesomething/admin/footer.html @@ -0,0 +1,7 @@ + </div><!-- .content role=main --> + </div><!-- .container --> + </div><!-- .table-cell --> +<!-- [% INCLUDE 'debug_footer.html' %] --> + </div> <!-- .wrapper --> +</body> +</html> diff --git a/templates/web/seesomething/admin/header.html b/templates/web/seesomething/admin/header.html new file mode 100644 index 000000000..40bea25bf --- /dev/null +++ b/templates/web/seesomething/admin/header.html @@ -0,0 +1,2 @@ +[% INCLUDE 'header.html' admin = 1, bodyclass = 'admin fullwidthpage' %] + <h1>[% title %]</h1> diff --git a/templates/web/seesomething/admin/stats.html b/templates/web/seesomething/admin/stats.html new file mode 100644 index 000000000..713c3fb6d --- /dev/null +++ b/templates/web/seesomething/admin/stats.html @@ -0,0 +1,63 @@ +[% INCLUDE 'admin/header.html' title=loc('Reports') %] +[% PROCESS 'admin/report_blocks.html' %] + +[% BLOCK options %] + [% FOR option IN option_list %] + <option value="[% option %]"[% ' selected' IF selected == option %]>[% option %]</opytion> + [% END %] +[% END %] + +<form method="post" action="[% c.uri_for('stats') %]" enctype="application/x-www-form-urlencoded" accept-charset="utf-8" id="filter-form"> + <label for="form_category">Transport Type: </label> + <select name="category" id="form_category"> + <option value="">Select</option> + [% PROCESS options, option_list = [ 'Bus', 'Metro', 'Train' ], selected = category %] + </select> + + <label for="form_subcategory">Incident Type: </label> + <select name="subcategory" id="form_subcategory"> + <option value="">Select</option> + [% PROCESS options, option_list = ['Smoking', 'Drugs', 'Anti-social Behaviour', 'Loud Music', 'Damage', 'Feet on Seats', 'Other'], selected = subcategory %] + </select> + + <label for="form_service">Device: </label> + <select name="service" id="form_service"> + <option value="">Select</option> + [% PROCESS options, option_list = [ 'Android', 'iPhone' ], selected = service %] + </select> + + <input type="submit" name="getcounts" size="30" id="getcounts" value="Look Up" /> +</form> + +[% IF pager.total_entries == 0 %] +<p align="center"> +No Results found +</p> +[% ELSE %] +<table class="admin-report"> + <thead> + <tr> + <th>Device</th> + <th>Transport Category</th> + <th>Incident Category</th> + <th>Area</th> + <th>Submitted</th> + </tr> + </thead> + <tbody> + [%- WHILE (report = reports.next) %] + <tr> + <td>[% report.service || 'Other' %]</td> + <td>[% report.category %]</td> + <td class="nowrap">[% report.subcategory %]</td> + <td class="nowrap">[% council_details.${report.council}.name %]</td> + <td class="nowrap">[% PROCESS format_time time=report.confirmed %]</td> + </tr> + [%- END %] + </tbody> +</table> +[% END %] + +[% INCLUDE 'pagination.html', param = 'p' %] + +[% INCLUDE 'admin/footer.html' %] diff --git a/templates/web/seesomething/around/around_index.html b/templates/web/seesomething/around/around_index.html new file mode 100644 index 000000000..a143e90a2 --- /dev/null +++ b/templates/web/seesomething/around/around_index.html @@ -0,0 +1,24 @@ +[% INCLUDE 'header.html', title => loc('Reporting a problem'), bodyclass = 'mappage' %] + +<form action="[% c.uri_for('/around') %]" method="get" name="mapForm" id="mapForm"> + <div id="side-form"> + <div id="report-a-problem-main"> + [% INCLUDE 'around/postcode_form.html' %] + + [% IF location_error %] + <p class="error">[% location_error %]</p> + [% END %] + + [% IF possible_location_matches %] + <p>[% loc('We found more than one match for that location. We show up to ten matches, please try a different search if yours is not here.') %]</p> + <ul class="pc_alternatives"> + [% FOREACH match IN possible_location_matches %] + <li><a href="/around?latitude=[% match.latitude | uri %];longitude=[% match.longitude | uri %]">[% match.address | html %]</a></li> + [% END %] + </ul> + [% END %] + </div> + </div> +</form> + +[% INCLUDE 'footer.html' %] diff --git a/templates/web/seesomething/around/display_location.html b/templates/web/seesomething/around/display_location.html new file mode 100644 index 000000000..e90d1aa0e --- /dev/null +++ b/templates/web/seesomething/around/display_location.html @@ -0,0 +1,49 @@ +[% + + url_skip = c.uri_for( + '/report/new', + { + pc => pc + latitude => short_latitude, + longitude => short_longitude, + skipped => 1, + } + ); + + PROCESS "maps/${map.type}.html"; + + INCLUDE 'header.html', + title => loc('Viewing a location') + bodyclass => 'mappage', + robots => 'noindex,nofollow'; + +%] + +<form action="[% c.uri_for('/report/new') %]" method="post" name="mapForm" id="mapForm" enctype="multipart/form-data" class="validate"> + [% IF c.req.params.map_override %] + <input type="hidden" name="map_override" value="[% c.req.params.map_override | html %]"> + [% END %] + <input type="hidden" name="pc" value="[% pc | html %]"> + + <input type="hidden" name="latitude" id="fixmystreet.latitude" value="[% short_latitude | html %]"> + <input type="hidden" name="longitude" id="fixmystreet.longitude" value="[% short_longitude | html %]"> + + [% map_html %] + + </div> + + <div id="side"> + [% INCLUDE 'around/_report_banner.html' %] + </div> + + <div style="display:none" id="side-form"> + [% INCLUDE "report/new/fill_in_details_form.html" + js = 1, + report.used_map = 1 + report.name = c.user.name + %] + </div> + +</form> + +[% INCLUDE 'footer.html' %] diff --git a/templates/web/seesomething/around/postcode_form.html b/templates/web/seesomething/around/postcode_form.html new file mode 100644 index 000000000..56fcdca97 --- /dev/null +++ b/templates/web/seesomething/around/postcode_form.html @@ -0,0 +1,17 @@ +<div id="front-main"> + <div id="front-main-container"> + [% + question = c.cobrand.enter_postcode_text || loc('Enter a nearby street name and area'); + %] + + <label for="pc">[% question %]:</label> + <div> + <input type="text" name="pc" value="[% pc | html %]" id="pc" size="10" maxlength="200" placeholder="[% tprintf(loc('e.g. ‘%s’ or ‘%s’'), c.cobrand.example_places) %]"> + <input type="submit" value="[% loc('Go') %]" id="submit"> + </div> + + [% IF partial_token %] + <input type="hidden" name="partial" value="[% partial_token.token %]"> + [% END %] + </div> +</div> diff --git a/templates/web/seesomething/auth/general.html b/templates/web/seesomething/auth/general.html new file mode 100644 index 000000000..4fe2829d3 --- /dev/null +++ b/templates/web/seesomething/auth/general.html @@ -0,0 +1,46 @@ +[% INCLUDE 'header.html', title = loc('Sign in or create an account') %] + +<h1>[% loc('Sign in') %]</h1> + +<form action="[% c.uri_for() %]" method="post" name="general_auth" class="validate"> + <fieldset> + <input type="hidden" name="r" value="[% c.req.params.r | html %]"> + + [% IF email_error; + + # other keys include fqdn, mxcheck if you'd like to write a custom error message + + errors = { + missing => loc('Please enter your email'), + other => loc('Please check your email address is correct') + }; + + loc_email_error = errors.$email_error || errors.other; + END %] + <label class="n" for="email">[% loc('Email') %]</label> + [% IF loc_email_error %] + <div class="form-error">[% loc_email_error %]</div> + [% ELSIF sign_in_error %] + <div class="form-error">[% loc('There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form.') %]</div> + [% END %] + <input type="email" class="required email" id="email" name="email" value="[% email | html %]" placeholder="[% loc('Your email address') %]"> + + <div class="form-txt-submit-box"> + <label class="n" for="password_sign_in">Password</label> + <input type="password" name="password_sign_in" id="password_sign_in" value="" placeholder="[% loc('Your password') %]"> + </div> + + <div class="form-txt-submit-box"> + <input type="checkbox" id="remember_me" name="remember_me" value='1'[% ' checked' IF remember_me %]> + <label class="inline n" for="remember_me">[% loc('Keep me signed in on this computer') %]</label> + </div> + + <div class="form-txt-submit-box"> + <input class="green-btn" type="submit" name="sign_in" value="[% loc('Sign in') %]"> + </div> + + </fieldset> +</form> + + +[% INCLUDE 'footer.html' %] diff --git a/templates/web/seesomething/auth/sign_out.html b/templates/web/seesomething/auth/sign_out.html new file mode 100644 index 000000000..ef1d11b58 --- /dev/null +++ b/templates/web/seesomething/auth/sign_out.html @@ -0,0 +1,7 @@ +[% INCLUDE 'header.html', title = loc('Sign out'), bodyclass = 'fullwidthpage' %] + +<h1>[% loc('You have been signed out') %]</h1> + +<p>Please feel free to <a href="[% c.uri_for('/auth', { r => 'admin/stats' } ) %]">sign in again</a></p> + +[% INCLUDE 'footer.html' %] diff --git a/templates/web/seesomething/footer.html b/templates/web/seesomething/footer.html new file mode 100644 index 000000000..95297f33d --- /dev/null +++ b/templates/web/seesomething/footer.html @@ -0,0 +1,22 @@ + </div><!-- .content role=main --> + </div><!-- .container --> + </div><!-- .table-cell --> + + <div class="nav-wrapper"> + <div class="nav-wrapper-2"> + <div id="main-nav" role="navigation"> + + <ul id="main-menu"> + <li><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END %] class="report-a-problem-btn" + >[% loc("Report a problem") %]</[% c.req.uri.path == '/' ? '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> + +<!-- [% INCLUDE 'debug_footer.html' %] --> + </div> <!-- .wrapper --> +</body> +</html> diff --git a/templates/web/seesomething/front/stats.html b/templates/web/seesomething/front/stats.html new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/templates/web/seesomething/front/stats.html diff --git a/templates/web/seesomething/front/tips.html b/templates/web/seesomething/front/tips.html new file mode 100644 index 000000000..34712656d --- /dev/null +++ b/templates/web/seesomething/front/tips.html @@ -0,0 +1,3 @@ + <p> + If you are unsure about where the incident took place as you where on a moving train or bus then use the location of the start of your journey and mention which bus or train you where on in your report. + </p> diff --git a/templates/web/seesomething/index.html b/templates/web/seesomething/index.html new file mode 100644 index 000000000..cccd15709 --- /dev/null +++ b/templates/web/seesomething/index.html @@ -0,0 +1,43 @@ +[%# Assumes fixmystreet cobrand is using FMS map template - for bonus points preload all the right map elements. %] + +[% PROCESS "maps/fms.html" %] +[% INCLUDE 'header.html', title = '', bodyclass = 'mappage' %] + +<form action="[% c.uri_for('/around') %]" method="get" name="mapForm" id="mapForm"> +<script type="text/javascript"> +var fixmystreet = { + 'page': '', + 'latitude': 52.505241, + 'longitude': -1.815285, + 'zoom': 3, + 'numZoomLevels': 5, + 'zoomOffset': 13, + 'map_type': "" + +} +</script> +<div id="map_box"> + <div id="map"></div> + </div> + + <div id="side-form"> + <div id="report-a-problem-main"> + [% form = PROCESS 'around/postcode_form.html' %] + [% form %] + + [% IF error %] + <p class="form-error">[% error %]</p> + [% END %] + + <div class="tablewrapper"> + <div id="front-howto"> + [% INCLUDE 'index-steps.html' %] + </div> + + </div> + + </div> + </div> +</form> + +[% INCLUDE 'footer.html' pagefooter = 'yes' %] diff --git a/templates/web/seesomething/js/translation_strings.html b/templates/web/seesomething/js/translation_strings.html new file mode 100644 index 000000000..0ae40bf97 --- /dev/null +++ b/templates/web/seesomething/js/translation_strings.html @@ -0,0 +1,15 @@ + translation_strings = { + detail: '[% loc('Please enter some details') | replace("'", "\\'") %]', + name: { + validName: '[% loc('Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below') | replace("'", "\\'") %]' + }, + category: '[% loc('Please choose a transport category') | replace("'", "\\'") %]', + subcategory: '[% loc('Please choose an incident category') | replace("'", "\\'") %]', + rznvy: { + required: '[% loc('Please enter your email') | replace("'", "\\'") %]', + email: '[% loc('Please enter a valid email') | replace("'", "\\'") %]' + }, + email: { + email: '[% loc('Please enter a valid email') | replace("'", "\\'") %]' + } + }; diff --git a/templates/web/seesomething/js/validation_rules.html b/templates/web/seesomething/js/validation_rules.html new file mode 100644 index 000000000..cef5fce7e --- /dev/null +++ b/templates/web/seesomething/js/validation_rules.html @@ -0,0 +1,13 @@ + validation_rules = { + detail: { required: true }, + category: { required: true }, + subcategory: { required: true } + }; + + $(function(){ + $('#submit_noname').click( function(e) { + $('#form_category').addClass('required validCategory').removeClass('valid'); + $('#form_subcategory').addClass('required validCategory').removeClass('valid'); + }); + }); + diff --git a/templates/web/seesomething/report/display.html b/templates/web/seesomething/report/display.html new file mode 100644 index 000000000..93b0048a2 --- /dev/null +++ b/templates/web/seesomething/report/display.html @@ -0,0 +1,9 @@ +[% + INCLUDE 'header.html' + robots = 'index, nofollow', + bobyclass = 'mappage'; +%] + +Reports to this site are private + +[% INCLUDE 'footer.html' %] diff --git a/templates/web/seesomething/report/new/category.html b/templates/web/seesomething/report/new/category.html new file mode 100644 index 000000000..26d750b52 --- /dev/null +++ b/templates/web/seesomething/report/new/category.html @@ -0,0 +1,14 @@ +[% FILTER collapse %] +[% IF category_options.size %] + [% IF category; + category = category | lower; + END; %] + <label for='form_category' class="select">[% category_label | html %]</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 %] + <option value='[% cat_op | html %]'[% ' selected' IF report.category == cat_op || category == cat_op_lc %]>[% cat_op | html %]</option> + [% END %] + </select> +[% END %] +[% END -%] diff --git a/templates/web/seesomething/report/new/fill_in_details_form.html b/templates/web/seesomething/report/new/fill_in_details_form.html new file mode 100644 index 000000000..659fadd04 --- /dev/null +++ b/templates/web/seesomething/report/new/fill_in_details_form.html @@ -0,0 +1,104 @@ +<div id="report-a-problem-main"> + <p>Click and drag on the map to reposition the pin.</p> + <h1>[% loc('Reporting a problem') %]</h1> + + + [% INCLUDE 'errors.html' %] + <fieldset> + <div id="problem_form"> + + [% INCLUDE 'report/new/form_heading.html' %] + + [% IF field_errors.council %] + <p class='form-error'>[% field_errors.council %]</p> + [% END %] + + <label for="form_detail">[% loc('Details') %]</label> + [% IF field_errors.detail %] + <p class='form-error'>[% field_errors.detail %]</p> + [% END %] + <textarea rows="7" cols="26" name="detail" id="form_detail" placeholder="[% loc('Please fill in details of the problem.') %]" required>[% report.detail | html %]</textarea> + + [% IF js %] + <div id="form_category_row"> + <label for="form_category">[% loc('Transport Category') %]</label> + <select name="category" id="form_category" required><option>[% loc('Loading...') %]</option></select> + </div> + [% ELSE %] + [% IF category_options.size %] + [% IF field_errors.category %] + <p class='form-error'>[% field_errors.category %]</p> + [% END %] + + [% PROCESS "report/new/category.html" %] + [% END %] + [% END %] + + <div id="form_subcategory_row"> + <label for="form_subcategory">[% loc('Incident Category') %]</label> + <select name="subcategory" id="form_subcategory" required> + <option value="">-- Pick a category --</option> + <option value="Smoking/other drugs">Smoking/other drugs</option> + <option value="Drugs">Drugs</option> + <option value="Anti-social behaviour">Anti-social behaviour</option> + <option value="Loud music">Loud music</option> + <option value="Damage">Damage</option> + <option value="Feet on seats">Feet on seats</option> + <option value="Other">Other</option> + </select> + </div> + + [% IF c.cobrand.allow_photo_upload %] + <label for="form_photo">[% loc('Photo') %]</label> + [% IF upload_fileid || report.photo %] + [% IF upload_fileid %] + <img align="right" src="/photo/[% upload_fileid %].temp.jpeg" alt=""> + <input type="hidden" name="upload_fileid" value="[% upload_fileid %]"> + [% END %] + + <p>[% loc('You have already attached a photo to this report, attaching another one will replace it.') %]</p> + + [% IF report.photo %] + <img align="right" src="/photo/[% report.id %].jpeg"> + [% END %] + [% END %] + + [% IF field_errors.photo %] + <p class='form-error'>[% field_errors.photo %]</p> + [% END %] + <input type="file" name="photo" id="form_photo"> + [% END %] + + <h2>Personal Details:</h2> + + <label for="form_name">[% loc('Name (optional)') %]</label> + [% IF field_errors.name %] + <p class='form-error'>[% field_errors.name %]</p> + [% END %] + + <input type="text" class="form-focus-trigger validName" value="[% report.name | html %]" name="name" id="form_name" placeholder="[% loc('Your name') %]"> + + <label for="form_email">[% loc('Your email (optional)') %]</label> + [% IF field_errors.email %] + <p class='form-error'>[% field_errors.email %]</p> + [% END %] + <input type="email" value="[% report.user.email | html %]" name="email" id="form_email" placeholder="[% loc('Please enter your email address') %]"> + + + + <label class="" for="form_phone">[% loc('Phone number (optional)') %]</label> + <input class="" type="text" value="[% report.user.phone | html %]" name="phone" id="form_phone" placeholder="[% loc('Your phone number') %]"> + + <div class="form-txt-submit-box "> + <input class="green-btn" type="submit" id="submit_noname" name="submit_noname" value="[% loc('Submit') %]"> + </div> + + </div> + </fieldset> + + [% IF partial_token %] + <input type="hidden" name="partial" value="[% partial_token.token %]"> + [% END %] + + <input type="hidden" name="submit_problem" value="1"> +</div> diff --git a/templates/web/seesomething/report_created.html b/templates/web/seesomething/report_created.html new file mode 100644 index 000000000..4a11d14b4 --- /dev/null +++ b/templates/web/seesomething/report_created.html @@ -0,0 +1,29 @@ +[% + + IF report.used_map; + PROCESS "maps/${map.type}.html"; + END; + + INCLUDE 'header.html', + title => loc('Report created') + bodyclass => 'mappage', + robots => 'noindex,nofollow'; +%] + + + [% IF report.used_map %] + [% map_html %] + + </div> + [% END %] + + <div id="side"> +<div id="report-a-problem-main"> + <h1>Complete</h1> + <p>Your report has been sent. If you included contact details we may be in touch to follow up or request more details.</p> + <p>Thank you for saying something and making our transport safer.</p> + <p><img src="../cobrands/seesomething/images/btp-wmp-logos.png" alt="British Transport Police and the West Midlands Police" width="271" height="116"></p> +</div> + </div> + +[% INCLUDE 'footer.html' %] diff --git a/templates/web/seesomething/set_body_class.html b/templates/web/seesomething/set_body_class.html new file mode 100644 index 000000000..b613706f2 --- /dev/null +++ b/templates/web/seesomething/set_body_class.html @@ -0,0 +1 @@ +[% bodyclass = ( bodyclass ? bodyclass : 'mappage' ) %] diff --git a/templates/web/southampton/front/news.html b/templates/web/southampton/front/news.html new file mode 100644 index 000000000..79d51542c --- /dev/null +++ b/templates/web/southampton/front/news.html @@ -0,0 +1,9 @@ +<div class="news"> +<p>Fix My Street is for reporting non-urgent, local problems like graffiti, fly +tipping, or broken paving slabs; reports will be reviewed within 48 working +hours.</p> + +<p>If you are reporting an urgent or dangerous matter, for example a fallen +tree or a very deep pot hole that may cause damage, please contact us +directly on 023 8083 3008</p> +</div> diff --git a/templates/web/stevenage/around/intro.html b/templates/web/stevenage/around/intro.html index 488b587da..0298ee6e6 100644 --- a/templates/web/stevenage/around/intro.html +++ b/templates/web/stevenage/around/intro.html @@ -1,2 +1,2 @@ <h1>[% loc('Report, view, or discuss local problems') %]</h1> - <h2>(like Graffiti, Fly Tipping and Abandoned Vehicles)</h2> + <h2>(Like Graffiti, Fly Tipping, Refuse & Recycling and Abandoned Vehicles)</h2> |