diff options
Diffstat (limited to 'templates/web')
23 files changed, 271 insertions, 85 deletions
diff --git a/templates/web/base/around/_postcode_form_post.html b/templates/web/base/around/_postcode_form_post.html new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/templates/web/base/around/_postcode_form_post.html diff --git a/templates/web/base/around/postcode_form.html b/templates/web/base/around/postcode_form.html index c1f1bb793..52aa177a9 100644 --- a/templates/web/base/around/postcode_form.html +++ b/templates/web/base/around/postcode_form.html @@ -24,5 +24,9 @@ [% END %] </form> <a href="[% c.uri_for('/around') %]" id="geolocate_link">… [% loc('or locate me automatically') %]</a> + + [% UNLESS possible_location_matches %] + [% INCLUDE 'around/_postcode_form_post.html' %] + [% END %] </div> </div> diff --git a/templates/web/base/common_header_tags.html b/templates/web/base/common_header_tags.html index 541bb1a56..153272cf7 100644 --- a/templates/web/base/common_header_tags.html +++ b/templates/web/base/common_header_tags.html @@ -41,7 +41,7 @@ <link rel="prefetch" href="[% version('/cobrands/fixmystreet/fixmystreet.js') %]"> [% END %] [% IF NOT bodyclass.match('mappage') %] - [% FOR script IN map_js %] + [% FOR script IN map_js.merge(c.cobrand.call_hook('map_js_extra', c)) %] <link rel="prefetch" href="[% IF script.match('^/'); version(script); ELSE; script; END %]"> [% END %] <link rel="prefetch" href="[% version('/cobrands/fixmystreet/map.js') %]"> diff --git a/templates/web/base/common_scripts.html b/templates/web/base/common_scripts.html index cf9692128..3d923f33f 100644 --- a/templates/web/base/common_scripts.html +++ b/templates/web/base/common_scripts.html @@ -46,7 +46,7 @@ IF c.user_exists AND (c.user.from_body OR c.user.is_superuser); END; IF bodyclass.match('mappage'); - FOR script IN map_js; + FOR script IN map_js.merge(c.cobrand.call_hook('map_js_extra', c)); IF script.match('^/'); scripts.push(version(script)); ELSE; diff --git a/templates/web/base/maps/osm.html b/templates/web/base/maps/osm.html index 51c3ad388..70d05929f 100644 --- a/templates/web/base/maps/osm.html +++ b/templates/web/base/maps/osm.html @@ -1,3 +1,4 @@ [% +map.copyright = ''; # This is handled with OpenLayers.Control.Attribution map_html = INCLUDE maps/openlayers.html %] diff --git a/templates/web/base/report/_inspect.html b/templates/web/base/report/_inspect.html index 6923dbb1a..4c285e330 100644 --- a/templates/web/base/report/_inspect.html +++ b/templates/web/base/report/_inspect.html @@ -49,6 +49,11 @@ <p> <a href="#" class="btn btn--block btn--geolocate">[% loc('Set to my current location') %]</a> </p> + [% IF permissions.report_reject %] + <p> + <a href="[% c.uri_for( '/contact', { id => problem.id, reject => 1 } ) %]" class="btn btn--block">[% loc('Reject report') %]</a> + </p> + [% END %] </div> [% IF permissions.report_edit_category OR permissions.report_inspect %] diff --git a/templates/web/base/report/_show_name_label.html b/templates/web/base/report/_show_name_label.html new file mode 100644 index 000000000..1e62b5fc0 --- /dev/null +++ b/templates/web/base/report/_show_name_label.html @@ -0,0 +1,5 @@ +[%# 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 name_public %]> + <label class="inline" for="form_may_show_name">[% loc('Show my name publicly') %]</label> +</div> diff --git a/templates/web/base/report/new/form_report.html b/templates/web/base/report/new/form_report.html index 9fce25248..3c7012348 100644 --- a/templates/web/base/report/new/form_report.html +++ b/templates/web/base/report/new/form_report.html @@ -6,6 +6,7 @@ [% PROCESS "report/new/category_wrapper.html" %] [% TRY %][% PROCESS 'report/new/after_category.html' %][% CATCH file %][% END %] +[% TRY %][% PROCESS 'report/new/_form_labels.html' %][% CATCH file %][% END %] <h2 class="form-section-heading">[% loc( 'Public details' ) %]</h2> <div class="form-section-description" id="js-councils_text"> @@ -16,11 +17,13 @@ [% END %] </div> - <label for="form_title">[% loc('Summarise the problem') %]</label> + [% DEFAULT form_title = loc('Summarise the problem') %] + <label for="form_title">[% form_title %]</label> [% IF field_errors.title %] <p class='form-error'>[% field_errors.title %]</p> [% END %] - <input class="form-control" type="text" value="[% report.title | html %]" name="title" id="form_title" placeholder="[% loc('10 inch pothole on Example St, near post box') %]" required> + [% DEFAULT form_title_placeholder = loc('10 inch pothole on Example St, near post box') %] + <input class="form-control" type="text" value="[% report.title | html %]" name="title" id="form_title" placeholder="[% form_title_placeholder %]" required> [% TRY %][% PROCESS 'report/new/after_title.html' %][% CATCH file %][% END %] @@ -55,7 +58,8 @@ [% IF field_errors.detail %] <p class='form-error'>[% field_errors.detail %]</p> [% END %] - <textarea class="form-control" rows="7" cols="26" name="detail" id="form_detail" placeholder="[% loc('This pothole has been here for two months and…') %]" required>[% report.detail | html %]</textarea> + [% DEFAULT form_detail_placeholder = loc('This pothole has been here for two months and…') %] + <textarea class="form-control" rows="7" cols="26" name="detail" id="form_detail" placeholder="[% form_detail_placeholder %]" required>[% report.detail | html %]</textarea> [% TRY %][% PROCESS 'report/new/inline-tips.html' %][% CATCH file %][% END %] diff --git a/templates/web/base/report/new/form_user_loggedin.html b/templates/web/base/report/new/form_user_loggedin.html index efe19864c..b82be3202 100644 --- a/templates/web/base/report/new/form_user_loggedin.html +++ b/templates/web/base/report/new/form_user_loggedin.html @@ -57,11 +57,7 @@ [% END %] <input type="text" class="form-control validName js-form-name" value="[% report.name | html %]" name="name" id="form_name"> - [%# 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 name_public %]> - <label class="inline" for="form_may_show_name">[% loc('Show my name publicly') %] </label> - </div> + [% INCLUDE 'report/_show_name_label.html' %] [% IF NOT c.user.phone_verified AND NOT c.cobrand.call_hook('disable_phone_number_entry') %] <label for="form_phone">[% loc('Phone number (optional)') %]</label> diff --git a/templates/web/base/report/new/form_user_loggedout_by_email.html b/templates/web/base/report/new/form_user_loggedout_by_email.html index 334bb0552..6ec0278ce 100644 --- a/templates/web/base/report/new/form_user_loggedout_by_email.html +++ b/templates/web/base/report/new/form_user_loggedout_by_email.html @@ -20,11 +20,7 @@ <input type="text" class="form-control form-focus-trigger validName js-form-name" value="[% report.name | html %]" name="name" id="form_name" placeholder="[% loc('Your name') %]"> - [%# 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 name_public %]> - <label class="inline" for="form_may_show_name">[% loc('Show my name publicly') %]</label> - </div> + [% INCLUDE 'report/_show_name_label.html' %] [% UNLESS c.cobrand.call_hook('disable_phone_number_entry') %] <div id="js-hide-if-username-phone"> diff --git a/templates/web/base/report/update/form_name.html b/templates/web/base/report/update/form_name.html index f366895a5..218ce4149 100644 --- a/templates/web/base/report/update/form_name.html +++ b/templates/web/base/report/update/form_name.html @@ -32,10 +32,7 @@ <input type="text" class="form-control validNameU js-form-name" 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' IF name_public %]> - <label class="inline" for="form_may_show_name">[% loc('Show my name publicly') %]</label> -</div> +[% INCLUDE 'report/_show_name_label.html' %] <div class="checkbox-group"> <input type="checkbox" name="add_alert" id="form_add_alert" value="1"[% ' checked' IF add_alert %]> diff --git a/templates/web/bathnes/around/_postcode_form_post.html b/templates/web/bathnes/around/_postcode_form_post.html new file mode 100644 index 000000000..aef8e7b0c --- /dev/null +++ b/templates/web/bathnes/around/_postcode_form_post.html @@ -0,0 +1,2 @@ +<h2 style='margin-top:1em'><a href="https://www.bathnes.gov.uk/reportit">Report other issues or make enquiries</a></h2> +<h2>Report emergencies on 01225 39 40 41 (option 9).</h2> diff --git a/templates/web/bathnes/around/intro.html b/templates/web/bathnes/around/intro.html new file mode 100644 index 000000000..06965b0ac --- /dev/null +++ b/templates/web/bathnes/around/intro.html @@ -0,0 +1 @@ +<h1>Report problems on the road</h1> diff --git a/templates/web/bathnes/contact/index.html b/templates/web/bathnes/contact/index.html new file mode 100644 index 000000000..d9947cbec --- /dev/null +++ b/templates/web/bathnes/contact/index.html @@ -0,0 +1,139 @@ +[% INCLUDE 'header.html', + title = loc('Contact Us') + robots = 'noindex,nofollow' + bodyclass = 'twothirdswidthpage' +%] + +[% INCLUDE 'about/_sidebar.html' %] + +[% IF c.cobrand.moniker == 'fixmystreet' %] +<h1>FixMyStreet technical support</h1> +[% ELSIF rejecting_report %] +<h1>[% loc('Reject report') %]</h1> +[% ELSE %] +<h1>[% loc('Contact the team') %]</h1> +[% END %] + +<form method="post" action="/contact/submit" class="validate"> + <fieldset> + [% INCLUDE 'errors.html' %] + + [% IF update %] + + <p> + [% loc('You are reporting the following update for being abusive, containing personal information, or similar:') %] + </p> + + <blockquote> + <p> + [% IF update.anonymous %] + [% tprintf( loc('Update below added anonymously at %s'), prettify_dt( update.confirmed ) ) %] + [% ELSE %] + [% tprintf( loc('Update below added by %s at %s'), update.name, prettify_dt( update.confirmed ) ) | html %] + [% END %] + </p> + + <p> + [% update.text | html %] + </p> + + </blockquote> + <input type="hidden" name="update_id" value="[% update.id %]"> + <input type="hidden" name="id" value="[% update.problem_id %]"> + + [% ELSIF problem %] + [% IF moderation_complaint %] + <input type="hidden" name="m" value="[% moderation_complaint %]"> + <p>[% loc('You are complaining that this problem report was unnecessarily moderated:') %]</p> + [% ELSIF rejecting_report %] + [% INCLUDE 'contact/rejecting-text.html' %] + [% ELSE %] + [% INCLUDE 'contact/unsuitable-text.html' %] + [% END %] + + <blockquote> + <h2>[% problem.title_safe | html %]</h2> + + <p> + [% IF problem.anonymous %] + [% tprintf( loc('Reported anonymously at %s'), prettify_dt( problem.confirmed ) ) %] + [% ELSE %] + [% tprintf( loc('Reported by %s at %s'), problem.user.name, prettify_dt( problem.confirmed ) ) | html %] + [% END %] + </p> + + <p> + [% problem.detail | html %] + </p> + + </blockquote> + <input type="hidden" name="id" value="[% problem.id %]"> + + [% ELSE %] + + [% INCLUDE 'contact/blurb.html' %] + + [% END %] + + [% IF NOT rejecting_report %] + <label for="form_name">[% loc('Your name') %]</label> + [% IF field_errors.name %] + <div class="form-error">[% field_errors.name %]</div> + [% END %] + <input type="text" class="form-control required" name="name" id="form_name" value="[% form_name | html %]" size="30"> + + <label for="form_email">[% loc('Your email') %]</label> + [% IF field_errors.em %] + <div class="form-error">[% field_errors.em %]</div> + [% END %] + <input type="text" class="form-control required email" name="em" id="form_email" value="[% em | html %]" size="30"> + + <div class="form-group"> + <label for="form_phone">[% loc('Your phone number') %]</label> + <span class="required-text required-text--optional">optional</span> + <input type="text" class="form-control extra.phone" name="extra.phone" id="form_phone" value="" size="30"> + </div> + + <label for="form_subject">[% loc('Subject') %]</label> + [% IF field_errors.subject %] + <div class="form-error">[% field_errors.subject %]</div> + [% END %] + <input type="text" class="form-control required" name="subject" id="form_subject" value="[% subject | html %]" size="30"> + [% ELSE %] + <input type="hidden" name="name" value="[% c.user.name | html %]" /> + <input type="hidden" name="em" value="[% c.user.email | html %]" /> + <input type="hidden" name="subject" value="[% loc("Report rejected") %]" /> + <input type="hidden" name="reject" value="1" /> + [% END %] + + + [% INCLUDE 'contact/who.html' %] + + [% IF rejecting_report %] + <label for="form_message">[% loc('Rejection reason') %]</label> + [% ELSE %] + <label for="form_message">[% loc('Message') %]</label> + [% END %] + [% IF field_errors.message %] + <div class="form-error">[% field_errors.message %]</div> + [% END %] + <textarea class="form-control required" name="message" id="form_message" rows="7" cols="50">[% message | html %]</textarea> + + + [% IF rejecting_report %] + <div class="form-group"> + <label for="form_service_area">[% loc('Service area for re-allocation') %]</label> + <input type="text" class="form-control extra.service_area" name="extra.service_area" id="form_service_area" value="" size="30"> + </div> + [% END %] + + + + <input class="final-submit green-btn" type="submit" value="[% loc('Send') %]"> + + </fieldset> +</form> + +[% TRY %][% INCLUDE 'contact/address.html' %][% CATCH file %][% END %] + +[% INCLUDE 'footer.html' pagefooter = 'yes' %] diff --git a/templates/web/bathnes/contact/rejecting-text.html b/templates/web/bathnes/contact/rejecting-text.html new file mode 100644 index 000000000..a6c62fdad --- /dev/null +++ b/templates/web/bathnes/contact/rejecting-text.html @@ -0,0 +1,3 @@ +<p> + [% loc('You are rejecting the following problem report for being outside the council’s responsibility, or similar:') %] +</p> diff --git a/templates/web/bathnes/footer_extra.html b/templates/web/bathnes/footer_extra.html new file mode 100644 index 000000000..4651fdaa5 --- /dev/null +++ b/templates/web/bathnes/footer_extra.html @@ -0,0 +1,26 @@ +[%# +* Taken from https://style.bathnes.gov.uk/02-components.html#footer +* Image path changed +* Footer links updated +%] +<footer class="global-footer"> + <div class="footer-wrapper"> + <div class="grid-row"> + <div class="column-two-thirds"> + <div class="footer-logo"> + <img src="/cobrands/bathnes/bathnes-logo-mono.png" alt="Bath & North East Somerset Council" /> + </div> + + <ul class="footer-list"> + <li><a href="http://www.bathnes.gov.uk/contact-us">Contact Us</a></li> + <li><a href="/privacy">Privacy and Cookies</a></li> + </ul> + </div> + + <div class="column-one-thirds"> + + </div> + + </div> + </div> +</footer> diff --git a/templates/web/bathnes/header_site.html b/templates/web/bathnes/header_site.html new file mode 100644 index 000000000..e39882b58 --- /dev/null +++ b/templates/web/bathnes/header_site.html @@ -0,0 +1,36 @@ +[%# +* Taken from https://style.bathnes.gov.uk/02-components.html#headers +* Image path updated +* Menu button changed to link, and other FMS Report link added +* Seach box made functional +* .visually-hidden to .visuallyhidden +%] +<header id="site-header" role="banner"> + <div class="header-wrapper"> + <div class="header-global"> + <div class="header-logo"> + <a href="https://www.bathnes.gov.uk/" id="logo"> + <img src="/cobrands/bathnes/bathnes-logo-colour.png" alt="Bath & North East Somerset Council" /> + </a> + </div> + + <a href="[% c.cobrand.base_url IF admin %]/" id="report-cta" title="[%- loc('Report a problem') -%]">[%- loc('Report') -%]</a> + <a href="#main-nav" class="navigation-trigger">Menu</a> + + <div class="header-search header-search--desktop"> + <form id="search" class="site-search" action="http://www.bathnes.gov.uk/search/site/" method="post"> + <label class="form-label visuallyhidden" for="search-site">Search across the site</label> + <input class="form-control" id="search-site" type="text" name="search_block_form" placeholder="Search bathnes.gov.uk"> + <input type="hidden" name="form_id" value="search_block_form"> + <input class="button" type="submit" value="Search"> + </form> + </div> + </div> + </div> + + <nav role="navigation" id="navigation-primary" class="navigation-primary"> + [% INCLUDE 'main_nav.html' omit_wrapper=1 ul_class='navigation-primary-list' liattrs='class="navigation-primary-list__item"' %] + </nav> + + <div class="header-marque"></div> +</header> diff --git a/templates/web/bathnes/report/_council_sent_info.html b/templates/web/bathnes/report/_council_sent_info.html new file mode 100644 index 000000000..1963020bc --- /dev/null +++ b/templates/web/bathnes/report/_council_sent_info.html @@ -0,0 +1,17 @@ +[% SET duration_clause = problem.duration_string(c) %] +[% IF duration_clause || problem.whensent %] + <p class="council_sent_info"> + [%- IF problem.whensent %] + [%- IF duration_clause %] + [%- external_ref_clause = tprintf(loc('Council ref: %s'), problem.id) %] + [%- ELSE %] + [%- external_ref_clause = tprintf(loc('%s ref: %s'), problem.external_body, problem.id) %] + [%- END %] + [%- END -%] + [% duration_clause %] + [%- IF external_ref_clause %] + [%- IF duration_clause %]. [% END %] + <strong>[% external_ref_clause %].</strong> + [%- END %] + </p> +[% END %] diff --git a/templates/web/bathnes/report/_show_name_label.html b/templates/web/bathnes/report/_show_name_label.html new file mode 100644 index 000000000..8e58f816a --- /dev/null +++ b/templates/web/bathnes/report/_show_name_label.html @@ -0,0 +1,5 @@ +[%# 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 name_public %]> + <label class="inline" for="form_may_show_name">Tick here to show my name publicly</label> +</div> diff --git a/templates/web/bathnes/report/new/_form_labels.html b/templates/web/bathnes/report/new/_form_labels.html new file mode 100644 index 000000000..de2e1dfb3 --- /dev/null +++ b/templates/web/bathnes/report/new/_form_labels.html @@ -0,0 +1,5 @@ +[% +SET form_title = 'Summarise the problem and location'; +SET form_title_placeholder = 'e.g. ‘pothole on Example St, near post box’'; +SET form_detail_placeholder = 'e.g. ‘This pothole has been here for two months and…’'; +%]
\ No newline at end of file diff --git a/templates/web/bathnes/report/new/councils_extra_text.html b/templates/web/bathnes/report/new/councils_extra_text.html new file mode 100644 index 000000000..690d7301f --- /dev/null +++ b/templates/web/bathnes/report/new/councils_extra_text.html @@ -0,0 +1,5 @@ +<p style='font-size: 85%; color: #F8F8F8; background-color:#00aeef; padding: 0.25em;'> +Report other issues or make enquiries using our +<a style='color:#fff; text-decoration:underline' href="https://www.bathnes.gov.uk/reportit">report it</a> forms. +Report emergencies by calling 01225 39 40 41 (option 9) +</p> diff --git a/templates/web/buckinghamshire/report/new/_form_labels.html b/templates/web/buckinghamshire/report/new/_form_labels.html new file mode 100644 index 000000000..1fb1201ce --- /dev/null +++ b/templates/web/buckinghamshire/report/new/_form_labels.html @@ -0,0 +1,5 @@ +[% +SET form_title = 'Location of the problem'; +SET form_title_placeholder = 'Exact location, including any landmarks'; +SET form_detail_placeholder = 'Dimensions, landmarks, direction of travel etc.'; +%]
\ No newline at end of file diff --git a/templates/web/buckinghamshire/report/new/form_report.html b/templates/web/buckinghamshire/report/new/form_report.html deleted file mode 100644 index 729b0e807..000000000 --- a/templates/web/buckinghamshire/report/new/form_report.html +++ /dev/null @@ -1,66 +0,0 @@ -[% INCLUDE 'report/new/form_heading.html' %] - -[% IF field_errors.bodies %] - <p class='form-error'>[% field_errors.bodies %]</p> -[% END %] - -[% PROCESS "report/new/category_wrapper.html" %] -[% TRY %][% PROCESS 'report/new/after_category.html' %][% CATCH file %][% END %] - - <h2 class="form-section-heading">[% loc( 'Public details' ) %]</h2> - <div class="form-section-description" id="js-councils_text"> - [% IF js %] - [% PROCESS 'report/new/councils_text_all.html' list_of_names = [ loc('the local council') ] %] - [% ELSE %] - [% PROCESS 'report/new/councils_text.html' %] - [% END %] - </div> - - <label for="form_title">[% loc('Location of the problem') %]</label> -[% IF field_errors.title %] - <p class='form-error'>[% field_errors.title %]</p> -[% END %] - <input class="form-control" type="text" value="[% report.title | html %]" name="title" id="form_title" placeholder="Exact location, including any landmarks" required> - -[% TRY %][% PROCESS 'report/new/after_title.html' %][% CATCH file %][% END %] - -[% IF c.cobrand.allow_photo_upload %] - <input type="hidden" name="upload_fileid" value="[% upload_fileid %]"> - <label for="form_photo"> - <span data-singular="[% loc('Photo') %]" data-plural="[% loc('Photos') %]">[% loc('Photo') %]</span> - </label> - - [% IF field_errors.photo %] - <p class='form-error'>[% field_errors.photo %]</p> - [% END %] - - <div id="form_photos"> - [% IF upload_fileid %] - <p>[% loc('You have already attached photos to this report. Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed).') %]</p> - [% FOREACH id IN upload_fileid.split(',') %] - <img align="right" src="/photo/temp.[% id %]" alt=""> - [% END %] - [% END %] - <input type="file" name="photo1" id="form_photo"> - <label for="form_photo2">[% loc('Photo') %]</label> - <input type="file" name="photo2" id="form_photo2"> - <label for="form_photo3">[% loc('Photo') %]</label> - <input type="file" name="photo3" id="form_photo3"> - </div> -[% END %] - -[% TRY %][% PROCESS 'report/new/after_photo.html' %][% CATCH file %][% END %] - - <label for="form_detail">[% loc('Explain what’s wrong') %]</label> -[% IF field_errors.detail %] - <p class='form-error'>[% field_errors.detail %]</p> -[% END %] - <textarea class="form-control" rows="7" cols="26" name="detail" id="form_detail" placeholder="Dimensions, landmarks, direction of travel etc." required>[% report.detail | html %]</textarea> - -[% TRY %][% PROCESS 'report/new/inline-tips.html' %][% CATCH file %][% END %] - -[% IF partial_token %] - <input type="hidden" name="partial" value="[% partial_token.token %]"> -[% END %] - - <input type="hidden" name="submit_problem" value="1"> |