diff options
Diffstat (limited to 'templates/web/default')
20 files changed, 218 insertions, 125 deletions
diff --git a/templates/web/default/admin/council_contacts.html b/templates/web/default/admin/council_contacts.html index 60e270c7c..eb9606a31 100644 --- a/templates/web/default/admin/council_contacts.html +++ b/templates/web/default/admin/council_contacts.html @@ -1,5 +1,7 @@ [% INCLUDE 'admin/header.html' title=tprintf(loc('Council contacts for %s'), council_name) -%] +[% conf = open311.next %] + [% IF updated %] <p> <em>[% updated %]</em> @@ -36,6 +38,7 @@ <th>[% loc('Email') %]</th> <th>[% loc('Confirmed') %]</th> <th>[% loc('Deleted') %]</th> + <th>[% loc('Devolved') %]</th> <th>[% loc('Last editor') %]</th> <th>[% loc('Note') %]</th> <th>[% loc('Public') %]</th> @@ -48,6 +51,7 @@ <td>[% contact.email | html %]</td> <td>[% IF contact.confirmed %][% loc('Yes') %][% ELSE %][% loc('No') %][% END %]</td> <td>[% IF contact.deleted %][% loc('Yes') %][% ELSE %][% loc('No') %][% END %]</td> + <td>[% IF conf.can_be_devolved && contact.send_method %][% loc('Yes') %][% ELSE %][% loc('No') %][% END %]</td> <td>[% contact.editor %]</td> <td>[% contact.note | html %]</td> <td>[% contact.non_public ? loc('Non Public') : loc('Public') %]</td> @@ -111,7 +115,6 @@ <h2>[% loc('Configure Open311 integration') %]</h2> <form method="post" action="[% c.uri_for('council_contacts', area_id ) %]" enctype="application/x-www-form-urlencoded" accept-charset="utf-8"> - [% conf = open311.next %] <p> <label for="endpoint">Endpoint</label>: <input type="text" name="endpoint" id="endpoint" value="[% conf.endpoint %]" size="50"> @@ -153,6 +156,11 @@ </p> <p> + <label for="devolved">Endpoint lookup can be devolved to contacts</label>: + <input type="checkbox" name="devolved"[% ' checked' IF conf.can_be_devolved %]> + </p> + + <p> <input type="hidden" name="open311_id" value="[% conf.id %]"> <input type="hidden" name="area_id" value="[% area_id %]"> <input type="hidden" name="posted" value="open311"> diff --git a/templates/web/default/admin/council_edit.html b/templates/web/default/admin/council_edit.html index 9ec0578ff..408466b51 100644 --- a/templates/web/default/admin/council_edit.html +++ b/templates/web/default/admin/council_edit.html @@ -31,6 +31,33 @@ <strong>[% loc('Note:') %] </strong><textarea name="note" rows="3" cols="40">[% contact.note | html %]</textarea> <br> + <h2>[% loc('Configure Endpoint') %]</h2> + <form method="post" action="[% c.uri_for('council_contacts', area_id ) %]" enctype="application/x-www-form-urlencoded" accept-charset="utf-8"> + <p> + <label for="endpoint">Endpoint</label>: + <input type="text" name="endpoint" id="endpoint" value="[% contact.endpoint %]" size="50"> + </p> + + <p> + <label for="jurisdiction">Jurisdiction</label>: + <input type="text" name="jurisdiction" id="jurisdiction" value="[% contact.jurisdiction %]" size="50"> + </p> + + <p> + <label for="api_key">Api Key</label>: + <input type="text" name="api_key" id="api_key" value="[% contact.api_key %]" size="25"> + </p> + + <p> + <label for="send_method">Send Method</label>: + <select name="send_method"> + <option value=""> -- Select a method -- </option> + [% FOR method IN send_methods %] + <option value="[% method %]"[% ' selected' IF contact.send_method == method %]>[% method %]</option> + [% END %] + </select> + </p> + <input type="hidden" name="area_id" value="[% area_id %]"> <input type="hidden" name="posted" value="new"> <input type="submit" name="Save changes" value="[% loc('Save changes') %]"> diff --git a/templates/web/default/admin/index.html b/templates/web/default/admin/index.html index b1eddaa3a..2c5ee55db 100644 --- a/templates/web/default/admin/index.html +++ b/templates/web/default/admin/index.html @@ -21,7 +21,7 @@ [% IF c.cobrand.admin_show_creation_graph -%] <p> - <a href="[% c.config.BASE_URL %]/bci-live-creation.png">[% loc('Graph of problem creation by status over time') %]</a> + <a href="[% c.config.BASE_URL %]/fms-live-creation.png">[% loc('Graph of problem creation by status over time') %]</a> </p> [% END -%] diff --git a/templates/web/default/admin/report_edit.html b/templates/web/default/admin/report_edit.html index d283037c2..ea98a9be9 100644 --- a/templates/web/default/admin/report_edit.html +++ b/templates/web/default/admin/report_edit.html @@ -40,7 +40,7 @@ <li>[% loc('Extra data:') %] [% problem.extra ? 'Yes' : 'No' %]</li> <li>[% loc('Going to send questionnaire?') %] [% IF problem.send_questionnaire %][% loc('Yes') %][% ELSE %][% loc('No') %][% END %]</li> <li><label for="flagged">[% loc('Flagged:') %]</label> <input type="checkbox" name="flagged"[% ' checked' IF problem.flagged %]></li> -<li><label for="non_public">[% loc('Private:') %]</label> <input type="checkbox" name="non_public"[% ' checked' IF problem.non_public %]></li> +<li><label for="non_public">[% loc('Private') %]:</label> <input type="checkbox" name="non_public"[% ' checked' IF problem.non_public %]></li> [% IF problem.photo %] [% photo = problem.get_photo_params %] diff --git a/templates/web/default/admin/stats.html b/templates/web/default/admin/stats.html index 3b9f4a264..273a71aec 100644 --- a/templates/web/default/admin/stats.html +++ b/templates/web/default/admin/stats.html @@ -2,7 +2,7 @@ [% IF show_count %] <p> -<strong>[% tprintf( loc( '%sreports between %s and %s' ), ( unconfirmed ? loc( 'All' ) _ ' ' : loc( 'Confirmed' ) _ ' ' ), start_date.ymd, end_date.ymd ) | html %]</strong> +<strong>[% tprintf( unconfirmed ? loc( 'All reports between %s and %s' ) : loc( 'Confirmed reports between %s and %s' ), start_date.ymd, end_date.ymd ) | html %]</strong> </p> [% IF bymonth %] <table> diff --git a/templates/web/default/around/_report_banner.html b/templates/web/default/around/_report_banner.html new file mode 100755 index 000000000..024fe08d9 --- /dev/null +++ b/templates/web/default/around/_report_banner.html @@ -0,0 +1,10 @@ +<p id="text_map" class="banner"> + [% loc( 'To <strong>report a problem</strong>, 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> diff --git a/templates/web/default/around/_updates.html b/templates/web/default/around/_updates.html new file mode 100755 index 000000000..8110a6c7c --- /dev/null +++ b/templates/web/default/around/_updates.html @@ -0,0 +1,12 @@ +<h1>[% loc('Problems in this area') %]</h1> + +<p id="alert_links_area"> + <a id="email_alert" rel="nofollow" href="[% email_url | html %]"> + [%- loc('Email me new local problems') -%] +</a> | + <a href="[% rss_url | html %]" id="rss_alert"> + <span>[% rss_alt %]</span> + <img src="/i/feed.png" width="16" height="16" title="[% rss_title %]" alt="[% rss_alt %]" border="0" style="vertical-align: top"> + </a> +</p> + diff --git a/templates/web/default/around/display_location.html b/templates/web/default/around/display_location.html index 88f8b89ae..d50009299 100755 --- a/templates/web/default/around/display_location.html +++ b/templates/web/default/around/display_location.html @@ -32,97 +32,72 @@ INCLUDE 'header.html', title => loc('Viewing a location') rss => [ loc('Recent local problems, FixMyStreet'), rss_url ], + bodyclass => 'mappage', robots => 'noindex,nofollow'; + + allow_creation = !c.cobrand.only_authed_can_create || (c.user && c.user.from_council); %] +[% IF allow_creation %] <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 %]"> + [% 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 %]"> [% 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 %] -[% map_html %] + <p id='sub_map_links'> + [% IF c.req.params.no_pins %] + <a id='hide_pins_link' rel='nofollow' href='[% c.uri_with( { no_pins => 0 } ) %]'>[% loc('Show pins') %]</a> + [% ELSE %] + <a id='hide_pins_link' rel='nofollow' href='[% c.uri_with( { no_pins => 1 } ) %]'>[% loc('Hide pins') %]</a> + [% END %] + [% IF c.cobrand.country == 'GB' || c.cobrand.country == 'NO' %] + <span class="hidden">|</span> + [% IF c.req.params.all_pins %] + <a id='all_pins_link' rel='nofollow' href='[% c.uri_with( { no_pins => undef, all_pins => undef } ) %]'>[% loc('Hide old') %]</a> + [% ELSE %] + <a id='all_pins_link' rel='nofollow' href='[% c.uri_with( { no_pins => undef, all_pins => 1 } ) %]'>[% loc('Show old') %]</a> + [% END %] + [% END %] + </p> -<p id='sub_map_links'> - [% IF c.req.params.no_pins %] - <a id='hide_pins_link' rel='nofollow' href='[% c.uri_with( { no_pins => 0 } ) %]'>[% loc('Show pins') %]</a> - [% ELSE %] - <a id='hide_pins_link' rel='nofollow' href='[% c.uri_with( { no_pins => 1 } ) %]'>[% loc('Hide pins') %]</a> - [% END %] - [% IF c.cobrand.country == 'GB' || c.cobrand.country == 'NO' %] - | - [% IF c.req.params.all_pins %] - <a id='all_pins_link' rel='nofollow' href='[% c.uri_with( { no_pins => undef, all_pins => undef } ) %]'>[% loc('Hide old') %]</a> - [% ELSE %] - <a id='all_pins_link' rel='nofollow' href='[% c.uri_with( { no_pins => undef, all_pins => 1 } ) %]'>[% loc('Show old') %]</a> + </div> + + + + + <div id="side"> + + [% IF allow_creation %] + [% INCLUDE 'around/_report_banner.html' %] + [% TRY %][% INCLUDE 'around/extra_text.html' %][% CATCH file %][% END %] [% END %] - [% END %] -</p> - -</div> -<div id="side"> - -<p id="text_map" class="banner"> - [% loc( 'To <strong>report a problem</strong>, 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 - ) + + [% INCLUDE 'around/_updates.html' %] + + <section class="full-width"> + [% INCLUDE "around/tabbed_lists.html" %] + </section> + </div> + + [% IF allow_creation %] + <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 %] - <span id="text_map_arrow"></span> -</p> - -[% TRY %][% INCLUDE 'around/extra_text.html' %][% CATCH file %][% END %] - -<h1>[% loc('Problems in this area') %]</h1> - -<p id="alert_links_area"> - <a id="email_alert" rel="nofollow" href="[% email_url | html %]"> - [%- loc('Email me new local problems') -%] -</a> | - <a href="[% rss_url | html %]" id="rss_alert"> - <span>[% rss_alt %]</span> - <img src="/i/feed.png" width="16" height="16" title="[% rss_title %]" alt="[% rss_alt %]" border="0" style="vertical-align: top"> - </a> -</p> - -<div id="nearby_lists"> - - <h2>[% loc('Reports on and around the map') %]</h2> - - <ul id="current"> - [% INCLUDE "around/on_map_list_items.html" %] - </ul> - - - <h2> - [% - tprintf( - loc( 'Closest nearby problems <small>(within %skm)</small>' ), - distance - ) - %] - </h2> - - <ul id="current_near"> - [% INCLUDE "around/around_map_list_items.html" %] - </ul> - -</div> - -</div> - -<div style="display:none" id="side-form"> -[% INCLUDE "report/new/fill_in_details_form.html" - js = 1, - report.used_map = 1 -%] -</div> + </div> + [% END %] +[% IF allow_creation %] </form> +[% END %] [% INCLUDE 'footer.html' %] diff --git a/templates/web/default/around/tabbed_lists.html b/templates/web/default/around/tabbed_lists.html new file mode 100755 index 000000000..4ad7b35fc --- /dev/null +++ b/templates/web/default/around/tabbed_lists.html @@ -0,0 +1,23 @@ +<div id="nearby_lists"> + + <h2>[% loc('Reports on and around the map') %]</h2> + + <ul id="current"> + [% INCLUDE "around/on_map_list_items.html" %] + </ul> + + <h2> + [% + tprintf( + loc( 'Closest nearby problems <small>(within %skm)</small>' ), + distance + ) + %] + </h2> + + <ul id="current_near"> + [% INCLUDE "around/around_map_list_items.html" %] + </ul> + +</div> + diff --git a/templates/web/default/dashboard/index.html b/templates/web/default/dashboard/index.html index c2bfa9ea3..169d7d3fe 100644 --- a/templates/web/default/dashboard/index.html +++ b/templates/web/default/dashboard/index.html @@ -17,6 +17,7 @@ </hgroup> <div class="filters"> + [% IF c.cobrand.moniker != 'fixmybarangay' %] <p> <label for="ward">Ward:</label> <select name="ward"><option value=''>All</option> @@ -25,6 +26,7 @@ [% END %] </select> </p> + [% END %] <p> <label for="category">Report category:</label> diff --git a/templates/web/default/faq/faq-en-gb.html b/templates/web/default/faq/faq-en-gb.html index f0030dcb9..26f93afb8 100755 --- a/templates/web/default/faq/faq-en-gb.html +++ b/templates/web/default/faq/faq-en-gb.html @@ -190,7 +190,7 @@ 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.m247.com/">M247</a> (who kindly host all +href="http://www.bytemark.co.uk/">Bytemark</a> (who kindly host all our servers). Let us know if we’ve missed anyone.</dd> diff --git a/templates/web/default/index-steps.html b/templates/web/default/index-steps.html new file mode 100644 index 000000000..7129241d2 --- /dev/null +++ b/templates/web/default/index-steps.html @@ -0,0 +1,24 @@ +<h2>[% loc('How to report a problem') %]</h2> + +<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>Staff? <a href="/auth">Sign in</a> and click on the map! +[% ELSE %] + <li>[% question %]</li> + <li>[% loc('Locate the problem on a map of the area') %]</li> + <li>[% loc('Enter details of the problem') %]</li> + [% IF c.cobrand.is_council %] + <li>Confirm the report and [% c.cobrand.council_name %] will investigate</li> + [% ELSE %] + <li>[% loc('We send it to the council on your behalf') %]</li> + [% END %] +[% END %] +</ol> + +<section class="full-width"> +[% INCLUDE "front/stats.html" %] +[% TRY %][% INCLUDE "front/tips.html" %][% CATCH file %][% END %] +</section> + diff --git a/templates/web/default/index.html b/templates/web/default/index.html index 159a595bc..3698d6494 100644 --- a/templates/web/default/index.html +++ b/templates/web/default/index.html @@ -1,4 +1,4 @@ -[% INCLUDE 'header.html', title => '' %] +[% INCLUDE 'header.html', title = '' %] [% IF error %] <p class="error">[% error %]</p> @@ -24,19 +24,7 @@ [% PROCESS 'around/postcode_form.html' %] <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" %] - [% TRY %][% INCLUDE "front/tips.html" %][% CATCH file %][% END %] - + [% INCLUDE 'index-steps.html' %] </div> [% @@ -44,7 +32,6 @@ probs = c.cobrand.recent(); %] - [% IF probs.size || recent_photos.size %] <div id="front_recent"> <h2>[% loc('Recently reported problems') %]</h2> @@ -58,8 +45,6 @@ [% END %] [% IF probs.size %] - - <ul id="nearby_lists"> [% FOREACH p IN probs %] <li> diff --git a/templates/web/default/maps/openlayers.html b/templates/web/default/maps/openlayers.html index e815642f1..b75e2bbd8 100644 --- a/templates/web/default/maps/openlayers.html +++ b/templates/web/default/maps/openlayers.html @@ -8,7 +8,7 @@ <script type="text/javascript"> var fixmystreet = { 'page': '[% page %]', - 'area': '[% map.area %]', + 'area': [ [% map.area.join(',') %] ], 'all_pins': '[% all_pins %]', 'latitude': [% map.latitude %], 'longitude': [% map.longitude %], diff --git a/templates/web/default/questionnaire/completed-open.html b/templates/web/default/questionnaire/completed-open.html index 7c5469259..06e17cc0b 100644 --- a/templates/web/default/questionnaire/completed-open.html +++ b/templates/web/default/questionnaire/completed-open.html @@ -1,5 +1,11 @@ +[% IF c.cobrand.is_council %] +<p style="font-size: 150%"> +Thank you very much for filling in our questionnaire. +</p> +[% ELSE %] [% loc('<p style="font-size:150%">We’re sorry to hear that. We have two suggestions: why not try writing to your local representative or, if it’s a problem that could be fixed by local people working together, why not <a href="http://www.pledgebank.com/new">make and publicise a pledge</a>? </p>') %] +[% END %] diff --git a/templates/web/default/questionnaire/completed.html b/templates/web/default/questionnaire/completed.html index a125d48bd..52c20652c 100644 --- a/templates/web/default/questionnaire/completed.html +++ b/templates/web/default/questionnaire/completed.html @@ -10,12 +10,12 @@ get some more information about the status of your problem, please come back to the site and leave an update.</p>') %] -[% ELSIF new_state == 'confirmed' OR (!new_state AND problem.is_open) %] +[% ELSIF new_state == 'confirmed' OR (!new_state AND problem.is_open) OR (!new_state AND problem.is_closed) %] [% INCLUDE 'questionnaire/completed-open.html' %] [% advert_outcome = 0 %] -[% ELSE %] +[% ELSIF been_fixed == 'Yes' %] [% loc('<p style="font-size:150%">Thank you very much for filling in our questionnaire; glad to hear it’s been fixed.</p>') %] diff --git a/templates/web/default/report/_main.html b/templates/web/default/report/_main.html index 3a9e60e7b..b9779db69 100644 --- a/templates/web/default/report/_main.html +++ b/templates/web/default/report/_main.html @@ -1,20 +1,27 @@ -<h1>[% problem.title | html %]</h1> +<div class="problem-header cf"> + <h1>[% problem.title | html %]</h1> -<p><em>[% problem.meta_line(c) | html %] -[% IF problem.council %] - [% IF problem.whensent || problem.can_display_external_id %] - <small class="council_sent_info"><br> - [% problem.processed_summary_string(c) %] - </small> - [% END %] -[% ELSE %] -<br><small>[% loc('Not reported to council') %]</small> -[% END %] - -</em></p> - -[% add_links( problem.detail ) | html_para %] - -[% INCLUDE 'report/photo.html' object=problem center=1 %] + <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.council %] + [% IF problem.whensent || problem.can_display_external_id %] + <small class="council_sent_info"><br> + [% problem.processed_summary_string(c) %] + </small> + [% END %] + [% ELSE %] + <br><small>[% loc('Not reported to council') %]</small> + [% END %] + </em></p> + [% INCLUDE 'report/_support.html' %] + [% IF c.cobrand.moniker == 'southampton' %] + [% add_links( problem.detail ) | html_para %] + [% INCLUDE 'report/photo.html' object=problem %] + [% ELSE %] + [% INCLUDE 'report/photo.html' object=problem %] + [% add_links( problem.detail ) | html_para %] + [% END %] +</div> diff --git a/templates/web/default/report/_support.html b/templates/web/default/report/_support.html new file mode 100644 index 000000000..e8b958940 --- /dev/null +++ b/templates/web/default/report/_support.html @@ -0,0 +1,11 @@ +[% IF c.cobrand.can_support_problems %] +<p id="supporter"><small> + [% IF !problem.interest_count %][% text=loc('No supporters') %][% ELSIF problem.interest_count == 1 %][% text = loc('1 supporter') %][% ELSE %][% text = tprintf( loc('%d supporters' ), problem.interest_count ) %][% END %] + [% IF c.user && c.user.from_council %]<form action="[% c.uri_for( '/report/support' ) %]"> + [% text %] <input type="hidden" name="id" value="[% problem.id %]"><input type="submit" class="green-btn" value="Add support"> + </form> + [% ELSE %] + [% text %] + [% END %] +</small></p> +[% END %] diff --git a/templates/web/default/report/photo.html b/templates/web/default/report/photo.html index 451a0479c..02ab9228b 100644 --- a/templates/web/default/report/photo.html +++ b/templates/web/default/report/photo.html @@ -1,6 +1,8 @@ [% IF c.cobrand.allow_photo_display && object.photo %] [% photo = object.get_photo_params %] -<p[% ' align="center"' IF center %]> - <img alt="" height="[% photo.height %]" width="[% photo.width %]" src="[% photo.url %]"> -</p> +<div class="update-img"> + [% IF photo.url_full %]<a href="[% photo.url_full %]" rel="fancy">[% END + %]<img alt="Photo of this report" [% IF photo.height %]height="[% photo.height %]" width="[% photo.width %]"[% END %] src="[% photo.url %]"> + [%- IF photo.url_full %]<span>zoom</span></a>[% END %] +</div> [% END %] diff --git a/templates/web/default/reports/index.html b/templates/web/default/reports/index.html index 283df5285..76c2afcd2 100755 --- a/templates/web/default/reports/index.html +++ b/templates/web/default/reports/index.html @@ -34,6 +34,7 @@ <td class="data">[% fixed.${area.id}.new or 0 %]</td> <td class="data">[% fixed.${area.id}.old or 0 %]</td> </tr> +[% TRY %][% PROCESS "reports/_extras.html" %][% CATCH file %][% END %] [% END %] </tbody> </table> |