diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/web/base/admin/open311-form-fields.html | 126 | ||||
| -rw-r--r-- | templates/web/base/report/_inspect.html | 3 | ||||
| -rw-r--r-- | templates/web/bathnes/header_extra.html | 1 | ||||
| -rw-r--r-- | templates/web/bathnes/tracking_code.html | 12 |
4 files changed, 88 insertions, 54 deletions
diff --git a/templates/web/base/admin/open311-form-fields.html b/templates/web/base/admin/open311-form-fields.html index 954c38b08..b716cf175 100644 --- a/templates/web/base/admin/open311-form-fields.html +++ b/templates/web/base/admin/open311-form-fields.html @@ -76,6 +76,52 @@ <label for="send_comments" class="inline">[% loc('Use Open311 update-sending extension') %]</label> </p> + <div class="admin-open311-section"> + <div class="admin-hint"> + <p> + [% loc( + "If you've enabled Open311 update-sending above, you must identify which + FixMyStreet <strong>user</strong> will be attributed as the creator of those updates + when they are shown on the site. Enter the ID (number) of that user." + ) %] + </p> + </div> + <p> + <label for"comment_user_id">[% loc('User ID to attribute fetched comments to') %]</label> + <input type="text" class="form-control" name="comment_user_id" value="[% object.comment_user_id %]"> + [% IF object.comment_user_id %] + <a href="[% c.uri_for('user_edit', object.comment_user_id) %]">[% loc('edit user') %]</a> + [% END %] + </p> + + <div class="admin-hint"> + <p> + [% loc( + "If you've enabled Open311 update-sending above, enable <strong>suppression of alerts</strong> + if you do <strong>not</strong> want that user to be notified whenever these updates are created." + ) %] + </p> + </div> + <p> + <input type="checkbox" id="suppress_alerts" name="suppress_alerts"[% ' checked' IF object.suppress_alerts %]> + <label for="suppress_alerts" class="inline">[% loc('Do not send email alerts on fetched comments to problem creator') %]</label> + </p> + + <div class="admin-hint"> + <p> + [% loc( + "If you've enabled Open311 update-sending above, Open311 usually only accepts OPEN or CLOSED status in + its updates. Enable <strong>extended Open311 stauses</strong> if you want to allow extra states to be passed. + Check that your cobrand supports this feature before switching it on." + ) %] + </p> + </div> + <p> + <input type="checkbox" id="send_extended_statuses" name="send_extended_statuses"[% ' checked' IF object.send_extended_statuses %]> + <label for="send_extended_statuses" class="inline">[% loc('Send extended Open311 statuses with service request updates') %]</label> + </p> + </div> + <div class="admin-hint"> <p> [% loc( @@ -91,61 +137,33 @@ <label for="fetch_problems" class="inline">[% loc('Use Open311 problem fetching') %]</label> </p> - <div class="admin-hint"> - <p> - [% loc( - "If you've enabled Open311 update-sending above, you must identify which - FixMyStreet <strong>user</strong> will be attributed as the creator of those updates - when they are shown on the site. Enter the ID (number) of that user." - ) %] - </p> - </div> - <p> - <label for"comment_user_id">[% loc('User ID to attribute fetched comments to') %]</label> - <input type="text" class="form-control" name="comment_user_id" value="[% object.comment_user_id %]"> - [% IF object.comment_user_id %] - <a href="[% c.uri_for('user_edit', object.comment_user_id) %]">[% loc('edit user') %]</a> - [% END %] - </p> + <div class="admin-open311-section"> + <div class="admin-hint"> + <p> + [% loc( + "Enable <strong>Convert location from Easting/Northing</strong> if you've enabled Open311 problem-fetching above + and problems fetching from the endpoint have the location in Easting/Northings and not Latitude/Longitude." + ) %] + </p> + </div> + <p> + <input type="checkbox" id="convert_latlong" name="convert_latlong"[% ' checked' IF object.convert_latlong %]> + <label for="convert_latlong" class="inline">[% loc('Convert location from Easting/Northing') %]</label> + </p> - <div class="admin-hint"> - <p> - [% loc( - "If you've enabled Open311 update-sending above, enable <strong>suppression of alerts</strong> - if you do <strong>not</strong> want that user to be notified whenever these updates are created." - ) %] - </p> + <div class="admin-hint"> + <p> + [% loc( + "Enable <strong>Always fetch all problems</strong> if you've enabled Open311 problem-fetching above + and the endpoint always returns a list of all problems. This will suppress error messages about + bad dates in the problems fetched." + ) %] + </p> + </div> + <p> + <input type="checkbox" id="fetch_all_problems" name="fetch_all_problems"[% ' checked' IF object.get_extra_metadata('fetch_all_problems') %]> + <label for="fetch_all_problems" class="inline">[% loc('Always fetch all problems') %]</label> + </p> </div> - <p> - <input type="checkbox" id="suppress_alerts" name="suppress_alerts"[% ' checked' IF object.suppress_alerts %]> - <label for="suppress_alerts" class="inline">[% loc('Do not send email alerts on fetched comments to problem creator') %]</label> - </p> - - <div class="admin-hint"> - <p> - [% loc( - "If you've enabled Open311 update-sending above, Open311 usually only accepts OPEN or CLOSED status in - its updates. Enable <strong>extended Open311 stauses</strong> if you want to allow extra states to be passed. - Check that your cobrand supports this feature before switching it on." - ) %] - </p> - </div> - <p> - <input type="checkbox" id="send_extended_statuses" name="send_extended_statuses"[% ' checked' IF object.send_extended_statuses %]> - <label for="send_extended_statuses" class="inline">[% loc('Send extended Open311 statuses with service request updates') %]</label> - </p> - - <div class="admin-hint"> - <p> - [% loc( - "Enable <strong>Convert location from Easting/Northing</strong> if you've enabled Open311 problem-fetching above - and problems fetching from the endpoint have the location in Easting/Northings and not Latitude/Longitude." - ) %] - </p> - </div> - <p> - <input type="checkbox" id="convert_latlong" name="convert_latlong"[% ' checked' IF object.convert_latlong %]> - <label for="convert_latlong" class="inline">[% loc('Convert location from Easting/Northing') %]</label> - </p> [% END %] </div> diff --git a/templates/web/base/report/_inspect.html b/templates/web/base/report/_inspect.html index 4c285e330..8708b08de 100644 --- a/templates/web/base/report/_inspect.html +++ b/templates/web/base/report/_inspect.html @@ -16,6 +16,9 @@ <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> diff --git a/templates/web/bathnes/header_extra.html b/templates/web/bathnes/header_extra.html new file mode 100644 index 000000000..8a977495f --- /dev/null +++ b/templates/web/bathnes/header_extra.html @@ -0,0 +1 @@ +[% INCLUDE 'tracking_code.html' %] diff --git a/templates/web/bathnes/tracking_code.html b/templates/web/bathnes/tracking_code.html new file mode 100644 index 000000000..e6f20b90f --- /dev/null +++ b/templates/web/bathnes/tracking_code.html @@ -0,0 +1,12 @@ +[% IF c.config.BASE_URL == "https://www.fixmystreet.com" %] +<script async src="https://www.googletagmanager.com/gtag/js?id=UA-418184-9"></script> +<script> + window.dataLayer = window.dataLayer || []; + function gtag(){dataLayer.push(arguments);} + gtag('js', new Date()); + + gtag('config', 'UA-418184-9'); +</script> +[% ELSE %] +<!-- Tracking code not inserted as "[% c.config.BASE_URL %]" not "https://www.fixmystreet.com" --> +[% END %] |