diff options
Diffstat (limited to 'templates')
33 files changed, 571 insertions, 76 deletions
diff --git a/templates/email/isleofwight/_council_reference.html b/templates/email/isleofwight/_council_reference.html new file mode 100644 index 000000000..5b73ee7e7 --- /dev/null +++ b/templates/email/isleofwight/_council_reference.html @@ -0,0 +1,4 @@ +[% IF problem.external_id ~%] +<p style="[% p_style %]">The report's reference number is <strong>[% problem.external_id %]</strong>. + Please quote this if you need to contact Island Roads about this report.</p> +[%~ END %] diff --git a/templates/email/isleofwight/_council_reference.txt b/templates/email/isleofwight/_council_reference.txt new file mode 100644 index 000000000..d6922217d --- /dev/null +++ b/templates/email/isleofwight/_council_reference.txt @@ -0,0 +1,2 @@ +[% IF problem.external_id %]The report's reference number is [% problem.external_id %]. Please quote this if +you need to contact Island Roads about this report.[% END %] diff --git a/templates/email/isleofwight/_council_reference_alert_update.html b/templates/email/isleofwight/_council_reference_alert_update.html new file mode 100644 index 000000000..5b73ee7e7 --- /dev/null +++ b/templates/email/isleofwight/_council_reference_alert_update.html @@ -0,0 +1,4 @@ +[% IF problem.external_id ~%] +<p style="[% p_style %]">The report's reference number is <strong>[% problem.external_id %]</strong>. + Please quote this if you need to contact Island Roads about this report.</p> +[%~ END %] diff --git a/templates/email/isleofwight/_council_reference_alert_update.txt b/templates/email/isleofwight/_council_reference_alert_update.txt new file mode 100644 index 000000000..d6922217d --- /dev/null +++ b/templates/email/isleofwight/_council_reference_alert_update.txt @@ -0,0 +1,2 @@ +[% IF problem.external_id %]The report's reference number is [% problem.external_id %]. Please quote this if +you need to contact Island Roads about this report.[% END %] diff --git a/templates/email/isleofwight/_email_color_overrides.html b/templates/email/isleofwight/_email_color_overrides.html new file mode 100644 index 000000000..3d6218ca4 --- /dev/null +++ b/templates/email/isleofwight/_email_color_overrides.html @@ -0,0 +1,19 @@ +[% + +color_cyan = '#00aeef' +color_blue = '#00478c' +color_green = '#75c044' +color_white = '#fff' + +header_background_color = color_white +header_text_color = color_blue + +secondary_column_background_color = color_white + +button_background_color = color_green +button_text_color = color_white + +logo_width = "282" # pixel measurement, but without 'px' suffix +logo_height = "76" # pixel measurement, but without 'px' suffix + +%] diff --git a/templates/email/isleofwight/confirm_report_sent.html b/templates/email/isleofwight/confirm_report_sent.html new file mode 100644 index 000000000..8e85c5729 --- /dev/null +++ b/templates/email/isleofwight/confirm_report_sent.html @@ -0,0 +1,42 @@ +[% + +email_summary = "Thanks for logging your report"; +email_columns = 2; + +PROCESS '_email_settings.html'; +INCLUDE '_email_top.html'; + +%] + +<th style="[% td_style %][% primary_column_style %]" id="primary_column"> + [% start_padded_box %] + <h1 style="[% h1_style %]">Your report has been logged</h1> + [% IF report.state == 'for triage' %] + <p style="[% p_style %]">Thank you for submitting your report to FixMyStreet, it will be submitted to Island Roads for review.</p> + [% ELSE %] + <p style="[% p_style %]">Thank you, your enquiry has been received by Island Roads and appropriate action will be taken.</p> + + <p style="[% p_style %]">We don't routinely contact customers regarding their enquiries, unless we have a specific query about + the issue. Any status updates for the issue can be tracked via FixMyStreet, if you contact us again about this issue, + please quote your 8-digit reference number.</p> + + <p style="[% p_style %]">Thank you for submitting your enquiry to us via FixMyStreet.</p> + [% END %] + +[% IF cobrand.is_council && !cobrand.owns_problem( report ) %] +<p style="[% p_style %]">Please note that [% cobrand.council_name %] is not responsible for this type +of report, so it will instead be sent to [% report.body %].</p> +[% ELSE %] +[% TRY %][% INCLUDE '_council_reference.html' problem=report %][% CATCH file %][% END %] +[% END %] + <p style="margin: 20px auto; text-align: center"> + <a style="[% button_style %]" href="[% cobrand.base_url_for_report(report) %][% report.url %]">View my report</a> + </p> + [% end_padded_box %] +</th> +[% WRAPPER '_email_sidebar.html' object = report %] + <h2 style="[% h2_style %]">[% report.title | html %]</h2> + <p style="[% secondary_p_style %]">[% report.detail | html %]</p> +[% END %] + +[% INCLUDE '_email_bottom.html' %] diff --git a/templates/email/isleofwight/confirm_report_sent.txt b/templates/email/isleofwight/confirm_report_sent.txt new file mode 100644 index 000000000..a368bd95e --- /dev/null +++ b/templates/email/isleofwight/confirm_report_sent.txt @@ -0,0 +1,43 @@ +Subject: Your report has been logged: [% report.title %] + +Hello [% report.name %], + +[% IF report.state == 'for triage' %] +Thank you for submitting your report to FixMyStreet, it will be +submitted to Island Roads for review. +[% ELSE %] +Thank you, your enquiry has been received by Island Roads and +appropriate action will be taken. + +We don't routinely contact customers regarding their enquiries, +unless we have a specific query about the issue. Any status +updates for the issue can be tracked via FixMyStreet, if you +contact us again about this issue, please quote your 8-digit +reference number. + +Thank you for submitting your enquiry to us via FixMyStreet. +[% END %] + +[% IF cobrand.is_council && !cobrand.owns_problem( report ) %] +Please note that [% cobrand.council_name %] is not responsible for this type +of report, so it will instead be sent to [% report.body %]. +[% ELSE %] +[% TRY %][% INCLUDE '_council_reference.txt' problem=report %][% CATCH file %][% END %] +[% END %] + +It is available to view at: + +[% cobrand.base_url_for_report(report) %][% report.url %] + +Your report has the title: + +[% report.title %] + +And details: + +[% report.detail %] + +[% signature %] + +This email was sent automatically, from an unmonitored email account - so +please do not reply to it. diff --git a/templates/email/isleofwight/problem-confirm.html b/templates/email/isleofwight/problem-confirm.html new file mode 100644 index 000000000..ccdefc7aa --- /dev/null +++ b/templates/email/isleofwight/problem-confirm.html @@ -0,0 +1,31 @@ +[% + +email_summary = "You need to confirm your " _ site_name _ " report before it can be sent to Island Roads."; +email_columns = 2; + +PROCESS '_email_settings.html'; + +INCLUDE '_email_top.html'; + +%] + +<th style="[% td_style %][% primary_column_style %]" id="primary_column"> + [% start_padded_box %] + <h1 style="[% h1_style %]">Please confirm your report</h1> + <p style="[% p_style %]">Please click on the link below to confirm that you want to send your report to Island Roads. + +[% TRY %][% INCLUDE '_problem-confirm_extra.html' %][% CATCH file %][% END %] + </p> + [% UNLESS report.non_public %]<p style="[% p_style %]">Your report will also appear on the [% site_name %] website.</p>[% END %] + <p style="margin: 20px auto; text-align: center"> + <a style="[% button_style %]" href="[% token_url %]">Yes, send my report</a> + </p> + <p style="[% p_style %]">If you no longer wish to send this report, please take no further action.</p> + [% end_padded_box %] +</th> +[% WRAPPER '_email_sidebar.html' object = report, url = token_url %] + <h2 style="[% h2_style %]">[% report.title | html %]</h2> + <p style="[% secondary_p_style %]">[% report.detail | html %]</p> +[% END %] + +[% INCLUDE '_email_bottom.html' %] diff --git a/templates/email/isleofwight/problem-confirm.txt b/templates/email/isleofwight/problem-confirm.txt new file mode 100644 index 000000000..20a871453 --- /dev/null +++ b/templates/email/isleofwight/problem-confirm.txt @@ -0,0 +1,31 @@ +Subject: Confirm your report on [% site_name %] + +Hello [% report.name %], + +Please click on the link below to confirm that you want to send your report to +Island Roads.[% UNLESS report.non_public %] Note that your report will also +appear on the [% site_name %] website.[% END %] + +[% token_url %] + +If your email program does not let you click on this link, copy and paste it +into your web browser and press return. +[% TRY %][% INCLUDE '_problem-confirm_extra.txt' %][% CATCH file %][% END %] +Your problem had the title: + +[% report.title %] + +And details: + +[% report.detail %] + +If you no longer wish to send this report, please take no further action. + +Thank you for submitting a report through [% site_name %]. + + + +[% signature %] + +This email was sent automatically, from an unmonitored email account - so +please do not reply to it. diff --git a/templates/email/isleofwight/signature.txt b/templates/email/isleofwight/signature.txt new file mode 100644 index 000000000..e375a0402 --- /dev/null +++ b/templates/email/isleofwight/signature.txt @@ -0,0 +1,2 @@ + +Island Roads diff --git a/templates/web/base/admin/report-category.html b/templates/web/base/admin/report-category.html index 0416d71c0..64aa474b9 100644 --- a/templates/web/base/admin/report-category.html +++ b/templates/web/base/admin/report-category.html @@ -1,4 +1,7 @@ -<select class="form-control" name="category" id="category"> +[%~ IF NOT select_name %] + [%~ select_name = 'category' %] +[%~ END %] +<select class="form-control" name="[% select_name %]" id="[% select_name %]"> [% IF NOT problem.category OR NOT categories_hash.${problem.category} %] <optgroup label="[% loc('Existing category') %]"> <option selected value="[% problem.category | html %]">[% (problem.category_display OR '-') | html %]</option> diff --git a/templates/web/base/admin/triage/_inspect.html b/templates/web/base/admin/triage/_inspect.html new file mode 100644 index 000000000..926197ceb --- /dev/null +++ b/templates/web/base/admin/triage/_inspect.html @@ -0,0 +1,77 @@ +[% BLOCK category_list %] +<select class="form-control" name="[% field_name %]" id="[% field_name %]"> + [% IF category_options.size %] + [%~ IF category_groups.size ~%] + [%~ FOREACH group IN category_groups ~%] + [% IF group.name %]<optgroup label="[% group.name %]">[% END %] + [% group_select = 0 %] + [% selected = 0 %] + [%~ FOREACH cat_op IN group.categories ~%] + [% IF group_select == 0 AND problem.category == group.name %] + [% selected = 1; group_select = 1 %] + [% END %] + <option value="[% cat_op.category | html %]"[% ' selected' IF selected OR problem.category == cat_op.category %]>[% cat_op.category_display | html %] ([% cat_op.email | html %])</option> + [% selected = 0 %] + [%~ END ~%] + [% IF group.name %]</optgroup>[% END %] + [%~ END =%] + [% ELSE %] + [% FOREACH cat IN category_options %] + <option value="[% cat.category | html %]"[% ' selected' IF problem.category == cat.category %]>[% cat.category_display | html %]</option> + [% END %] + [% END %] + [% END %] +</select> +[% END %] + +[% permissions = c.user.permissions(problem) %] +[% second_column = BLOCK -%] + <div id="side-inspect"> + + <h2 class="inspect-form-heading">[% loc('Inspect report') %]</h2> + + [% INCLUDE 'errors.html' %] + + <form name="report_inspect_form" id="report_inspect_form" method="post" action="[% c.uri_for( '/report', problem.id ) %]" class="validate"> + + [% INCLUDE 'report/inspect/information.html' no_relocate=1 %] + + [% IF permissions.report_edit_category OR permissions.report_inspect OR permissions.triage %] + <div class="inspect-section"> + <p> + <strong>Holding category:</strong> [% problem.category %] + </p> + + <p> + <label for="category">CONFIRM Subject</label> + [% PROCESS category_list category_groups=end_groups field_name="category" categories_hash=end_categories category_options=end_options %] + </p> + + </div> + [% END %] + + <div class="inspect-section"> + [%- extra_fields = problem.get_extra_fields -%] + [% FOR field IN extra_fields %] + [% NEXT IF field.name == 'urgent' %] + <p> + <label for="[% field.name %]">[% field.description %]</label> + <input class="form-control" name="[% field.name %]" type="text" value="[% field.value | html %]" disabled> + </p> + [% END %] + + [% IF permissions.report_inspect OR permissions.triage %] + [% INCLUDE 'report/inspect/public_update.html' public_update_defaulted=0 %] + [% END %] + + <p> + <input type="hidden" name="token" value="[% csrf_token %]" /> + <input class="btn btn-primary" type="submit" value="[% loc('Save changes') %]" data-value-original="[% loc('Save changes') %]" data-value-duplicate="[% loc('Save + close as duplicate') %]" name="save" /> + </p> + </div> + + <input type="hidden" name="js" value=""> + <input type="hidden" name="triage" value="1"> + </form> + </div> +[%- END %] diff --git a/templates/web/base/admin/triage/_list-filters.html b/templates/web/base/admin/triage/_list-filters.html new file mode 100644 index 000000000..f6bedcb80 --- /dev/null +++ b/templates/web/base/admin/triage/_list-filters.html @@ -0,0 +1,53 @@ +[% select_category = BLOCK %] + [% IF filter_categories.size %] + <select class="form-control js-multiple" name="filter_category" id="filter_categories" multiple data-all="[% loc('Everything') %]"> + [% FOR cat IN filter_categories %] + <option value="[% cat.category | html %]"[% ' selected' IF filter_category.${cat.category} %]> + [% cat.category_display | html %] + [%~ IF cat.get_extra_metadata('help_text') %] ([% cat.get_extra_metadata('help_text') %])[% END ~%] + </option> + [% END %] + </select> + [% ELSE %] + [% loc('Everything') %] + [% END %] +[% END %] + +<div class="report-list-filters-wrapper"> + +[% IF use_form_wrapper %] + <form method="get" action=""> +[% END %] + + <p class="report-list-filters"> + [% tprintf(loc('<label for="statuses">Show</label> %s reports <label for="filter_categories">about</label> %s', "The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories"), 'untriaged', select_category) %] + <input type="submit" name="filter_update" value="[% loc('Go') %]"> + </p> + + <p class="report-list-filters"> + <label for="sort">[% loc('Sort by') %]</label> + <select class="form-control" name="sort" id="sort"> + [% IF shortlist %] + <option value="shortlist"[% ' selected' IF sort_key == 'shortlist' %]>[% loc('Manual order') %]</option> + [% END %] + <option value="created-desc"[% ' selected' IF sort_key == 'created-desc' %]>[% loc('Newest') %]</option> + <option value="created-asc"[% ' selected' IF sort_key == 'created-asc' %]>[% loc('Oldest') %]</option> + <option value="updated-desc"[% ' selected' IF sort_key == 'updated-desc' %]>[% loc('Recently updated') %]</option> + <option value="updated-asc"[% ' selected' IF sort_key == 'updated-asc' %]>[% loc('Least recently updated') %]</option> + <option value="comments-desc"[% ' selected' IF sort_key == 'comments-desc' %]>[% loc('Most commented') %]</option> + </select> + <input type="submit" name="filter_update" value="[% loc('Go') %]"> + </p> + [% IF page == 'around' %] + <p id="show_old_reports_wrapper" class="report-list-filters[% ' hidden' UNLESS num_old_reports > 0 %]"> + <label for="show_old_reports">[% loc('Show older reports') %]</label> + <input type="checkbox" name="show_old_reports" id="show_old_reports" value="1"[% ' checked' IF show_old_reports %]> + <input type="submit" name="filter_update" value="[% loc('Go') %]"> + </p> + [% END %] + +[% IF use_form_wrapper %] + </form> +[% END %] + +</div> diff --git a/templates/web/base/admin/triage/index.html b/templates/web/base/admin/triage/index.html new file mode 100644 index 000000000..f00bbc1fa --- /dev/null +++ b/templates/web/base/admin/triage/index.html @@ -0,0 +1,42 @@ +[% SET body_name = body.name %] +[% IF c.cobrand.moniker == 'hounslow' %] + [% SET body_name = 'Hounslow Highways' %] +[% ELSIF c.cobrand.moniker == 'isleofwight' %] + [% SET body_name = 'Island Roads' %] +[% END %] + +[% + PROCESS "report/photo-js.html"; + PROCESS "maps/${map.type}.html"; + SET bodyclass = 'mappage'; + INCLUDE 'header.html', + title = 'Awaiting triage' + rss = [ tprintf(loc('Problems within %s, %s', "First %s is the body name, second %s the site name"), name, site_name), rss_url ] +%] + +[% map_html %] + +</div> +<div id="map_sidebar"> + <div id="side"> + + <h1 id="reports_heading"> + Awaiting triage + </h1> + +<section class="full-width"> +[% INCLUDE "admin/triage/_list-filters.html", use_form_wrapper = 1 %] +<div class="js-pagination"> +[% INCLUDE 'pagination.html', param = 'p' %] +</div> +<div id="js-reports-list"> + [% INCLUDE 'reports/_problem-list.html' %] +</div> +<div class="js-pagination"> +[% INCLUDE 'pagination.html', param = 'p' %] +</div> +</section> + + </div> +</div> +[% INCLUDE 'footer.html' %] diff --git a/templates/web/base/report/_inspect.html b/templates/web/base/report/_inspect.html index fa79d9912..10f3b6b84 100644 --- a/templates/web/base/report/_inspect.html +++ b/templates/web/base/report/_inspect.html @@ -11,60 +11,7 @@ <form name="report_inspect_form" id="report_inspect_form" method="post" action="[% c.uri_for( '/report', problem.id ) %]" class="validate"> - <div class="inspect-section"> - <p style="float: right"> - <label for="non_public">[% loc('Private') %]</label> - <input type="checkbox" id="non_public" name="non_public" value="1"[% ' checked' IF problem.non_public %]> - </p> - <p> - <strong>[% loc('Report ID:') %]</strong> - <span class="js-report-id">[% problem.id %]</span> - [% IF c.user_exists AND c.cobrand.admin_allow_user(c.user) AND c.user.has_permission_to('report_edit', problem.bodies_str_ids) %] - (<a href="[% c.uri_for_action( "admin/report_edit", problem.id ) %]">[% loc('admin') %]</a>) - [% END %] - </p> - [% IF permissions.report_inspect AND problem.user.phone %] - <p> - <strong>[% loc('Phone Reporter:') %]</strong> - <a href="tel:[% problem.user.phone | html %]">[% problem.user.phone_display | html %]</a> - </p> - [% END %] - <p> - [% SET local_coords = problem.local_coords; %] - [% IF local_coords %] - <strong>[% loc('Easting/Northing:') %]</strong> - <span id="problem_easting">[% local_coords.0 %]</span>, - <span id="problem_northing">[% local_coords.1 %]</span> - [% ELSE %] - <strong>[% loc('Latitude/Longitude:') %]</strong> - <span id="problem_latitude">[% problem.latitude %]</span>, - <span id="problem_longitude">[% problem.longitude %]</span> - [% END %] - <input type="hidden" name="longitude" value="[% problem.longitude %]"> - <input type="hidden" name="latitude" value="[% problem.latitude %]"> - </p> - [% IF problem.nearest_address() %] - <p> - <strong>[% loc('Nearest calculated address:') %]</strong> - [% problem.nearest_address() %] - </p> - [% END %] - <p> - <a target="_blank" href="https://www.google.com/maps/dir/?api=1&destination=[% problem.latitude %],[% problem.longitude %]" class="btn btn--block btn--navigate">[% loc('Navigate to this problem') %]</a> - </p> - <p> - <a href="#" class="btn btn--block btn--geolocate">[% loc('Set to my current location') %]</a> - </p> - [% IF permissions.report_reject %] - [% TRY %] - [% INCLUDE 'report/_inspect_reject_button.html' %] - [% CATCH file %] - <p> - <a href="[% c.uri_for( '/contact', { id => problem.id, reject => 1 } ) %]" class="btn btn--block">[% loc('Reject report') %]</a> - </p> - [% END %] - [% END %] - </div> + [% INCLUDE 'report/inspect/information.html' %] [% IF permissions.report_edit_category OR permissions.report_inspect %] <div class="inspect-section"> @@ -182,17 +129,7 @@ <div class="inspect-section"> [% IF permissions.report_inspect %] - <p> - <label class="label-containing-checkbox"> - <input type="checkbox" name="include_update" value="1" class="js-toggle-public-update" checked> - [% loc('Save with a public update') %] - </label> - </p> - <p> - <label for="public_update">[% loc('Public update:') %]</label> - [% INCLUDE 'admin/response_templates_select.html' for='public_update' %] - <textarea rows="2" name="public_update" id="public_update" class="form-control">[% public_update | html %]</textarea> - </p> + [% INCLUDE 'report/inspect/public_update.html' %] [% END %] [% IF problem.get_extra_metadata('inspected') %] diff --git a/templates/web/base/report/inspect/information.html b/templates/web/base/report/inspect/information.html new file mode 100644 index 000000000..cc8989522 --- /dev/null +++ b/templates/web/base/report/inspect/information.html @@ -0,0 +1,56 @@ + <div class="inspect-section"> + <p style="float: right"> + <label for="non_public">[% loc('Private') %]</label> + <input type="checkbox" id="non_public" name="non_public" value="1"[% ' checked' IF problem.non_public %]> + </p> + <p> + <strong>[% loc('Report ID:') %]</strong> + <span class="js-report-id">[% problem.id %]</span> + [% IF c.user_exists AND c.cobrand.admin_allow_user(c.user) AND c.user.has_permission_to('report_edit', problem.bodies_str_ids) %] + (<a href="[% c.uri_for_action( "admin/report_edit", problem.id ) %]">[% loc('admin') %]</a>) + [% END %] + </p> + [% IF permissions.report_inspect AND problem.user.phone %] + <p> + <strong>[% loc('Phone Reporter:') %]</strong> + <a href="tel:[% problem.user.phone | html %]">[% problem.user.phone_display | html %]</a> + </p> + [% END %] + <p> + [% SET local_coords = problem.local_coords; %] + [% IF local_coords %] + <strong>[% loc('Easting/Northing:') %]</strong> + <span id="problem_easting">[% local_coords.0 %]</span>, + <span id="problem_northing">[% local_coords.1 %]</span> + [% ELSE %] + <strong>[% loc('Latitude/Longitude:') %]</strong> + <span id="problem_latitude">[% problem.latitude %]</span>, + <span id="problem_longitude">[% problem.longitude %]</span> + [% END %] + <input type="hidden" name="longitude" value="[% problem.longitude %]"> + <input type="hidden" name="latitude" value="[% problem.latitude %]"> + </p> + [% IF problem.nearest_address() %] + <p> + <strong>[% loc('Nearest calculated address:') %]</strong> + [% problem.nearest_address() %] + </p> + [% END %] + <p> + <a target="_blank" href="https://www.google.com/maps/dir/?api=1&destination=[% problem.latitude %],[% problem.longitude %]" class="btn btn--block btn--navigate">[% loc('Navigate to this problem') %]</a> + </p> + [% UNLESS no_relocate %] + <p> + <a href="#" class="btn btn--block btn--geolocate">[% loc('Set to my current location') %]</a> + </p> + [% END %] + [% IF permissions.report_reject %] + [% TRY %] + [% INCLUDE 'report/_inspect_reject_button.html' %] + [% CATCH file %] + <p> + <a href="[% c.uri_for( '/contact', { id => problem.id, reject => 1 } ) %]" class="btn btn--block">[% loc('Reject report') %]</a> + </p> + [% END %] + [% END %] + </div> diff --git a/templates/web/base/report/inspect/public_update.html b/templates/web/base/report/inspect/public_update.html new file mode 100644 index 000000000..be07d7b89 --- /dev/null +++ b/templates/web/base/report/inspect/public_update.html @@ -0,0 +1,14 @@ +[% IF NOT public_update_defaulted.defined %] + [% public_update_defaulted = 1 %] +[% END %] + <p> + <label class="label-containing-checkbox"> + <input type="checkbox" name="include_update" value="1" class="js-toggle-public-update"[% ' checked' IF public_update_defaulted %]> + [% loc('Save with a public update') %] + </label> + </p> + <p> + <label for="public_update">[% loc('Public update:') %]</label> + [% INCLUDE 'admin/response_templates_select.html' for='public_update' %] + <textarea rows="2" name="public_update" id="public_update" class="form-control">[% public_update | html %]</textarea> + </p> diff --git a/templates/web/base/report/new/category_extras.html b/templates/web/base/report/new/category_extras.html index c7bdad94d..8e5b02952 100644 --- a/templates/web/base/report/new/category_extras.html +++ b/templates/web/base/report/new/category_extras.html @@ -1,4 +1,4 @@ -[% SET default_list = [] %][% FOR b IN bodies_to_list.values %][% default_list.push(b.name) %][% END %] +[% SET default_list = [] %][% FOR b IN bodies_to_list.values %][% default_list.push(b.cobrand_name) %][% END %] [% DEFAULT list_of_names = default_list %] <div id="category_meta"> diff --git a/templates/web/base/report/new/councils_text_all.html b/templates/web/base/report/new/councils_text_all.html index 8b9abf1f3..63f4125f4 100644 --- a/templates/web/base/report/new/councils_text_all.html +++ b/templates/web/base/report/new/councils_text_all.html @@ -1,4 +1,4 @@ -[% SET default_list = [] %][% FOR b IN bodies_to_list.values %][% default_list.push(b.name) %][% END %] +[% SET default_list = [] %][% FOR b IN bodies_to_list.values %][% default_list.push(b.cobrand_name) %][% END %] [% DEFAULT list_of_names = default_list %] <p> diff --git a/templates/web/base/report/updates.html b/templates/web/base/report/updates.html index 817cc7eb4..93bae4d64 100644 --- a/templates/web/base/report/updates.html +++ b/templates/web/base/report/updates.html @@ -6,6 +6,9 @@ [%- END %] [%- NEXT %] [%- END %] +[%- IF update.get_extra_metadata('triage_report') == 1 AND ( NOT c.user OR ( NOT c.user.from_body AND NOT c.user.is_superuser ) ) %] + [%- NEXT %] +[%- END %] [% INCLUDE 'report/update.html' %] [% END %] diff --git a/templates/web/base/reports/body.html b/templates/web/base/reports/body.html index 02791ba3b..23540104b 100755 --- a/templates/web/base/reports/body.html +++ b/templates/web/base/reports/body.html @@ -1,6 +1,8 @@ [% SET body_name = body.name %] [% IF c.cobrand.moniker == 'hounslow' %] [% SET body_name = 'Hounslow Highways' %] +[% ELSIF c.cobrand.moniker == 'isleofwight' %] + [% SET body_name = 'Island Roads' %] [% END %] [% IF ward %] diff --git a/templates/web/fixmystreet.com/footer_extra_js.html b/templates/web/fixmystreet.com/footer_extra_js.html index 3f3e61c52..6fcb5d59c 100644 --- a/templates/web/fixmystreet.com/footer_extra_js.html +++ b/templates/web/fixmystreet.com/footer_extra_js.html @@ -10,6 +10,7 @@ IF bodyclass.match('mappage'); scripts.push( version('/cobrands/bristol/assets.js') ); scripts.push( version('/cobrands/bromley/assets.js') ); scripts.push( version('/cobrands/buckinghamshire/assets.js') ); + scripts.push( version('/cobrands/isleofwight/assets.js') ); scripts.push( version('/cobrands/lincolnshire/assets.js') ); scripts.push( version('/cobrands/northamptonshire/assets.js') ); scripts.push( version('/cobrands/hounslow/assets.js') ); diff --git a/templates/web/hounslow/report/new/councils_text_all.html b/templates/web/hounslow/report/new/councils_text_all.html deleted file mode 100644 index c434813f8..000000000 --- a/templates/web/hounslow/report/new/councils_text_all.html +++ /dev/null @@ -1,8 +0,0 @@ -<p> - [% UNLESS non_public_categories.$category %] - These will be sent to <strong>Hounslow Highways</strong> and also published online for others to see, in accordance with our - <a href="[% c.cobrand.privacy_policy_url %]">privacy policy</a>. - [% ELSE %] - These will be sent to <strong>Hounslow Highways</strong> but not published online. - [% END %] -</p> diff --git a/templates/web/isleofwight/about/mapterms.html b/templates/web/isleofwight/about/mapterms.html new file mode 100644 index 000000000..04c0aeb09 --- /dev/null +++ b/templates/web/isleofwight/about/mapterms.html @@ -0,0 +1,24 @@ +[% INCLUDE header.html + title = 'Map Terms and Conditions' +%] + +<h1>Map Terms and Conditions</h1> + +<ul> + <li> + I. You are granted a non-exclusive, royalty free revocable licence + solely to view the licensed data for non-commercial purposes for the + period during which mySociety Ltd. makes it available; + </li> + <li> + II. You are not permitted to copy, sub-license, distribute, sell or + otherwise make available the Licensed Data to third parties in any form; + and + </li> + <li> + III. Third party rights to enforce the terms of this licence shall be + reserved to OS. + </li> +</ul> +[% INCLUDE footer.html %] + diff --git a/templates/web/isleofwight/footer_extra_js.html b/templates/web/isleofwight/footer_extra_js.html new file mode 100644 index 000000000..0ad3525e6 --- /dev/null +++ b/templates/web/isleofwight/footer_extra_js.html @@ -0,0 +1,10 @@ +[% IF bodyclass.match('mappage'); + scripts.push( + version('/vendor/OpenLayers.Projection.OrdnanceSurvey.js'), + version('/cobrands/fixmystreet/assets.js'), + version('/cobrands/fixmystreet-uk-councils/roadworks.js'), + version('/cobrands/fixmystreet-uk-councils/js.js'), + version('/cobrands/isleofwight/js.js'), + version('/cobrands/isleofwight/assets.js'), + ); +END %] diff --git a/templates/web/isleofwight/header_extra.html b/templates/web/isleofwight/header_extra.html new file mode 100644 index 000000000..8a977495f --- /dev/null +++ b/templates/web/isleofwight/header_extra.html @@ -0,0 +1 @@ +[% INCLUDE 'tracking_code.html' %] diff --git a/templates/web/isleofwight/header_logo.html b/templates/web/isleofwight/header_logo.html new file mode 100644 index 000000000..e563007a7 --- /dev/null +++ b/templates/web/isleofwight/header_logo.html @@ -0,0 +1,2 @@ +<a href="http://www.islandroads.com" id="site-logo">Island Roads</a> +<a href="/" id="report-cta" title="[%- loc('Report a problem') -%]">[%- loc('Report') -%]</a> diff --git a/templates/web/isleofwight/main_nav_items.html b/templates/web/isleofwight/main_nav_items.html new file mode 100644 index 000000000..5b794a99d --- /dev/null +++ b/templates/web/isleofwight/main_nav_items.html @@ -0,0 +1,59 @@ +[%~ IF problem ~%] + [%~ INCLUDE navitem uri='/report/new?longitude=' _ problem.longitude _ '&latitude=' _ problem.latitude label=loc('Report another problem here') attrs='class="report-a-problem-btn"' ~%] +[%~ ELSIF latitude AND longitude ~%] + [%~ INCLUDE navitem uri='/report/new?longitude=' _ longitude _ '&latitude=' _ latitude label=loc('Report a problem here') attrs='class="report-a-problem-btn"' ~%] +[%~ ELSIF homepage_template ~%] + [%~ INCLUDE navitem uri='/report' label=loc('Report a problem') attrs='class="report-a-problem-btn"' ~%] +[%~ ELSE ~%] + [%~ INCLUDE navitem uri='/' label=loc('Report a problem') attrs='class="report-a-problem-btn"' ~%] +[%~ END ~%] + +[%~ IF c.user_exists ~%] + [%~ INCLUDE navitem uri='/my' label=loc('Your account') ~%] +[%~ ELSE ~%] + [%~ INCLUDE navitem uri='/auth' label=loc('Sign in') ~%] +[%~ END ~%] + +[%~ IF c.user_exists AND c.user.has_body_permission_to('planned_reports') ~%] + [%~ INCLUDE navitem always_url=1 uri='/my/planned' label=loc('Shortlist') ~%] +[%~ END ~%] + +[%~ IF c.user_exists AND c.user.has_body_permission_to('triage') ~%] + [%~ INCLUDE navitem always_url=1 uri='/admin/triage' label=loc('Awaiting triage') ~%] +[%~ END ~%] + +[%~ UNLESS hide_all_reports_link ~%] + [%~ + IF c.user_exists AND c.user.categories.size; + categories = c.user.categories_string | uri; + cat_suffix = "?filter_category=" _ categories; + END; + + reports_uri = '/reports'; + IF c.cobrand.council_area; + body_name = c.cobrand.council_area | uri; + reports_uri = "${reports_uri}/${body_name}"; + END; + + INCLUDE navitem uri=reports_uri label=loc('All reports') suffix=cat_suffix; + ~%] +[%~ END ~%] + +[%~ + IF pc; + pc_uri = pc | uri; + pc_suffix = "/list?pc=" _ pc_uri; + END; + + INCLUDE navitem uri='/alert' label=loc('Local alerts') suffix=pc_suffix; +~%] + +[%~ INCLUDE navitem uri='/faq' label=loc('Help') ~%] + +[%~ UNLESS hide_privacy_link ~%] + [%~ INCLUDE navitem uri=c.cobrand.privacy_policy_url label=loc('Privacy') liattrs='class="nav-menu__item--privacy"' ~%] +[%~ END ~%] + +[%~ IF c.user_exists AND c.cobrand.admin_allow_user(c.user) ~%] + [%~ INCLUDE navitem uri='/admin' label=loc('Admin') ~%] +[%~ END ~%] diff --git a/templates/web/isleofwight/report/_updates_disallowed_message.html b/templates/web/isleofwight/report/_updates_disallowed_message.html new file mode 100644 index 000000000..af56f73b1 --- /dev/null +++ b/templates/web/isleofwight/report/_updates_disallowed_message.html @@ -0,0 +1,8 @@ +<p> + Only the original reporter may leave updates. + [% IF NOT c.user_exists %] + If you made the original report please + <a href="/auth?r=report/[% problem.id %]">log in</a> + to leave an update. + [% END %] +</p> diff --git a/templates/web/isleofwight/report/inspect.html b/templates/web/isleofwight/report/inspect.html new file mode 100644 index 000000000..6cecff926 --- /dev/null +++ b/templates/web/isleofwight/report/inspect.html @@ -0,0 +1,10 @@ +[% + SET bodyclass = 'mappage with-actions'; + SET two_column_sidebar = 1; + IF problem.state == 'for triage'; + PROCESS 'admin/triage/_inspect.html'; + ELSE; + PROCESS 'report/_inspect.html'; + END; + INCLUDE 'report/display.html' +%] diff --git a/templates/web/isleofwight/report/new/_form_labels.html b/templates/web/isleofwight/report/new/_form_labels.html new file mode 100644 index 000000000..a666ab0a3 --- /dev/null +++ b/templates/web/isleofwight/report/new/_form_labels.html @@ -0,0 +1,3 @@ +[% +SET form_title = 'Summarise the problem and location'; +%] diff --git a/templates/web/isleofwight/tokens/_confirm_problem_council_id.html b/templates/web/isleofwight/tokens/_confirm_problem_council_id.html new file mode 100644 index 000000000..703fbd1b6 --- /dev/null +++ b/templates/web/isleofwight/tokens/_confirm_problem_council_id.html @@ -0,0 +1,2 @@ +<h2>Your issue has been sent.</h2> +<p>You will receive an email with a reference number for this report soon, please quote it in any enquiries.</p> diff --git a/templates/web/isleofwight/tracking_code.html b/templates/web/isleofwight/tracking_code.html new file mode 100644 index 000000000..26358b589 --- /dev/null +++ b/templates/web/isleofwight/tracking_code.html @@ -0,0 +1,16 @@ +[% IF c.config.BASE_URL == "https://www.fixmystreet.com" %] + +<script> + (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ + (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), + m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) + })(window,document,'script','//www.google-analytics.com/analytics.js','ga'); + + ga('create', 'UA-136557400-2', 'auto'); + ga('send', 'pageview'); + +</script> + +[% ELSE %] +<!-- Tracking code not inserted as "[% c.config.BASE_URL %]" not "https://www.fixmystreet.com" --> +[% END %] |