diff options
Diffstat (limited to 'templates/email')
118 files changed, 1554 insertions, 131 deletions
diff --git a/templates/email/bathnes/_email_top.html b/templates/email/bathnes/_email_top.html index ec3c80ce2..89dd1dcbf 100644 --- a/templates/email/bathnes/_email_top.html +++ b/templates/email/bathnes/_email_top.html @@ -51,7 +51,7 @@ </style> </head> <body style="[% body_style %]"> - <table [% wrapper_table %] style="[% wrapper_style %]"> + <table [% wrapper_table | safe %] style="[% wrapper_style %]"> <tr> <th class="spacer-cell"></th> <th width="[% wrapper_max_width %]" style="[% td_style %][% hint_style %]" class="hint"> @@ -60,11 +60,11 @@ <th class="spacer-cell"></th> </tr> </table> - <table [% wrapper_table %] style="[% wrapper_style %]"> + <table [% wrapper_table | safe %] style="[% wrapper_style %]"> <tr> <th class="spacer-cell"></th> <th width="[% wrapper_max_width %]" style="[% td_style %] min-width: [% wrapper_min_width %]px;" id="main"> - <table [% table_reset %]> + <table [% table_reset | safe %]> <tr> <th id="header" colspan="[% email_columns %]" style="[% td_style %][% header_style %]"> [%~ IF file_exists("web/cobrands/${ img_dir }/images/email-logo.gif") ~%] diff --git a/templates/email/bexley/_email_color_overrides.html b/templates/email/bexley/_email_color_overrides.html new file mode 100644 index 000000000..5645da3ef --- /dev/null +++ b/templates/email/bexley/_email_color_overrides.html @@ -0,0 +1,19 @@ +[% + +color_fuchsia = '#912B88' +color_spring = '#5DA70E' +color_white = '#fff' + +header_background_color = color_fuchsia +header_text_color = color_white + +secondary_column_background_color = color_white + +button_background_color = color_spring +button_text_color = color_white + +logo_width = "200" # pixel measurement, but without 'px' suffix +logo_height = "80" # pixel measurement, but without 'px' suffix +logo_file = "logo.png" + +%] diff --git a/templates/email/bexley/_problem-confirm_footer.html b/templates/email/bexley/_problem-confirm_footer.html new file mode 100644 index 000000000..5a7cc2782 --- /dev/null +++ b/templates/email/bexley/_problem-confirm_footer.html @@ -0,0 +1,12 @@ +<p style="border: 0.1em solid rgb(252, 13, 27); padding: 0.5em; background-color: rgb(237, 207, 206);"> + <strong>While we find ourselves in these unprecedented times.</strong> + All issues reported on Bexley’s FixMyStreet system will continue to be + actioned to keep our roads safe for critical workers to be able to continue + to support the London Borough of Bexley and its residents. We may take + longer to respond to you while we concentrate on getting issues resolved in + priority order and within available resources. Non-urgent defects may also + take longer than normal to fix. We will continue to serve you the best that + we can but urge everyone not to make journeys unless absolutely necessary + and not report to anything that is not urgent. Thank you for + your understanding. +</p> diff --git a/templates/email/buckinghamshire/_email_color_overrides.html b/templates/email/buckinghamshire/_email_color_overrides.html index 672a1ae3b..0795fdc0c 100644 --- a/templates/email/buckinghamshire/_email_color_overrides.html +++ b/templates/email/buckinghamshire/_email_color_overrides.html @@ -1,9 +1,9 @@ [% -color_bucks_green = '#97c34b' -color_bucks_dark_green = '#547f35' -color_bucks_text = '#2e3137' -color_bucks_grey = '#eaeaea' +color_bucks_green = '#9FC63B' +color_bucks_dark_green = '#00642F' +color_bucks_text = '#3C3C3B' +color_bucks_grey = '#eeeeee' body_background_color = color_white @@ -19,8 +19,8 @@ secondary_column_background_color = color_white secondary_column_text_color = color_bucks_text column_divider_color = color_bucks_grey -logo_width = '88' -logo_height = '94' +logo_width = '100' +logo_height = '100' logo_file = "email-logo.png" header_background_color = color_white diff --git a/templates/email/buckinghamshire/alert-update.html b/templates/email/buckinghamshire/alert-update.html index 8831fd379..16bac06dd 100644 --- a/templates/email/buckinghamshire/alert-update.html +++ b/templates/email/buckinghamshire/alert-update.html @@ -12,11 +12,11 @@ INCLUDE '_email_top.html'; %] <th style="[% td_style %][% primary_column_style %]" id="primary_column"> - [% start_padded_box %] + [% start_padded_box | safe %] <h1 style="[% h1_style %]">New updates on <a href="[% problem_url %]">[% category %] report</a></h1> [%~ INCLUDE '_email_comment_list.html' %] <p style="[% p_style %]"><a href="[% unsubscribe_url %]">Unsubscribe from alerts about this report</a></p> - [% end_padded_box %] + [% end_padded_box | safe %] </th> [% WRAPPER '_email_sidebar.html' object = report %] <h2 style="[% h2_style %]">[% title %]</h2> diff --git a/templates/email/buckinghamshire/other-reported.html b/templates/email/buckinghamshire/other-reported.html index 584c5b89e..8f790425f 100644 --- a/templates/email/buckinghamshire/other-reported.html +++ b/templates/email/buckinghamshire/other-reported.html @@ -9,19 +9,30 @@ INCLUDE '_email_top.html'; %] <th style="[% td_style %][% primary_column_style %]" id="primary_column"> - [% start_padded_box %] + [% start_padded_box | safe %] <h1 style="[% h1_style %]">Your report has been logged</h1> <p style="[% p_style %]">Your report to [% report.body %] has been logged on [% site_name %].</p> -[% 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 %] + +[% IF report.non_public %] +<p style="[% p_style %]">It has been marked as private and will not be visible +to the general public; you may view it using the link below, or if you sign in +using the email address associated with the report.</p> +[% END %] + +[% IF cobrand.owns_problem( report ) %] [% TRY %][% INCLUDE '_council_reference.html' problem=report %][% CATCH file %][% END %] [% END %] + +<p style="[% p_style %]"> +Due to the current COVID 19 crisis and associated restrictions regrettably we +must prioritise more urgent work, therefore we hope you will understand that +there may be a delay in fixing the defect. +</p> + <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> + <a style="[% button_style %]" href="[% cobrand.base_url_for_report(report) %][% report.view_url %]">View my report</a> </p> - [% end_padded_box %] + [% end_padded_box | safe %] </th> [% WRAPPER '_email_sidebar.html' object = report %] <h2 style="[% h2_style %]">[% report.title | html %]</h2> diff --git a/templates/email/buckinghamshire/other-reported.txt b/templates/email/buckinghamshire/other-reported.txt index 7f78617e0..8fa9cfb15 100644 --- a/templates/email/buckinghamshire/other-reported.txt +++ b/templates/email/buckinghamshire/other-reported.txt @@ -2,18 +2,26 @@ Subject: Your [% report.category | lower %] report has been logged Hello [% report.name %], -Your report to [% report.body %] has been logged on [% site_name %]. +Thank you for your report to [% report.body %] which has been logged on [% site_name %]. -[% 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 %] +[% IF report.non_public ~%] +It has been marked as private and will not be visible to the general public; +you may view it using the link below, or if you sign in using the email address +associated with the report. + +[% END ~%] + +[% IF cobrand.owns_problem( report ) %] [% TRY %][% INCLUDE '_council_reference.txt' problem=report %][% CATCH file %][% END %] [% END %] +Due to the current COVID 19 crisis and associated restrictions regrettably we +must prioritise more urgent work, therefore we hope you will understand that +there may be a delay in fixing the defect. + It is available to view at: -[% cobrand.base_url_for_report(report) %][% report.url %] +[% cobrand.base_url_for_report(report) %][% report.view_url %] Your report is at the following location: diff --git a/templates/email/cheshireeast/_council_reference.html b/templates/email/cheshireeast/_council_reference.html new file mode 100644 index 000000000..8a1a9e1ee --- /dev/null +++ b/templates/email/cheshireeast/_council_reference.html @@ -0,0 +1,3 @@ +<p style="[% p_style %]">The report's reference number is <strong>[% problem.id %]</strong>. + Please quote this if you need to contact the council about this report.</p> + diff --git a/templates/email/cheshireeast/_council_reference.txt b/templates/email/cheshireeast/_council_reference.txt new file mode 100644 index 000000000..75d7e93d2 --- /dev/null +++ b/templates/email/cheshireeast/_council_reference.txt @@ -0,0 +1,2 @@ +The report's reference number is [% problem.id %]. Please quote this if +you need to contact the council about this report. diff --git a/templates/email/cheshireeast/_council_reference_alert_update.html b/templates/email/cheshireeast/_council_reference_alert_update.html new file mode 100644 index 000000000..bc7e0282c --- /dev/null +++ b/templates/email/cheshireeast/_council_reference_alert_update.html @@ -0,0 +1,2 @@ +<p style="[% p_style %]">The report's reference number is <strong>[% problem.id %]</strong>. + Please quote this if you need to contact the council about this report.</p> diff --git a/templates/email/cheshireeast/_council_reference_alert_update.txt b/templates/email/cheshireeast/_council_reference_alert_update.txt new file mode 100644 index 000000000..75d7e93d2 --- /dev/null +++ b/templates/email/cheshireeast/_council_reference_alert_update.txt @@ -0,0 +1,2 @@ +The report's reference number is [% problem.id %]. Please quote this if +you need to contact the council about this report. diff --git a/templates/email/cheshireeast/_email_color_overrides.html b/templates/email/cheshireeast/_email_color_overrides.html new file mode 100644 index 000000000..794c7bbc6 --- /dev/null +++ b/templates/email/cheshireeast/_email_color_overrides.html @@ -0,0 +1,19 @@ +[% + +color_green = '#206c49' +color_gold = '#ffa100' +color_white = '#fff' + +header_background_color = color_green +header_text_color = color_white + +secondary_column_background_color = color_white + +button_background_color = color_green +button_text_color = color_white + +logo_width = "148" # pixel measurement, but without 'px' suffix +logo_height = "67" # pixel measurement, but without 'px' suffix +logo_file = "cec-navbar-logo-white.png" + +%] diff --git a/templates/email/cheshireeast/_email_setting_overrides.html b/templates/email/cheshireeast/_email_setting_overrides.html new file mode 100644 index 000000000..339a763f7 --- /dev/null +++ b/templates/email/cheshireeast/_email_setting_overrides.html @@ -0,0 +1,5 @@ +[% + +header_style = "padding: $header_padding; background: $header_background_color; color: $header_text_color; border-bottom: 8px solid $color_gold;" + +%] diff --git a/templates/email/cheshireeast/site-name.txt b/templates/email/cheshireeast/site-name.txt new file mode 100644 index 000000000..54bdfee40 --- /dev/null +++ b/templates/email/cheshireeast/site-name.txt @@ -0,0 +1 @@ +Cheshire East FixMyStreet diff --git a/templates/email/default/_email_bottom.html b/templates/email/default/_email_bottom.html index 4967dfaa2..13c5c019f 100644 --- a/templates/email/default/_email_bottom.html +++ b/templates/email/default/_email_bottom.html @@ -4,12 +4,12 @@ <th class="spacer-cell"></th> </tr> </table> - <table [% wrapper_table %] style="[% wrapper_style %]"> + <table [% wrapper_table | safe %] style="[% wrapper_style %]"> <tr> <th class="spacer-cell"></th> <th width="[% wrapper_max_width %]" style="[% td_style %][% hint_style %]" class="hint"> [%~ IF email_footer %] - [% email_footer %] + [% email_footer | safe %] [%~ ELSE %] This email was sent automatically, from an unmonitored email account. Please do not reply to it. [%~ END %] diff --git a/templates/email/default/_email_comment_list.html b/templates/email/default/_email_comment_list.html index efbb3e8da..346efadfb 100644 --- a/templates/email/default/_email_comment_list.html +++ b/templates/email/default/_email_comment_list.html @@ -5,7 +5,7 @@ <img style="[% list_item_photo_style %]" src="[% inline_image(update.get_first_image_fp) %]" alt=""> </a> [%~ END %] - <p style="[% list_item_p_style %]">“[% update.item_text | html %]”</p> + [% update.item_text | html_para | replace('<p>', '<p style="' _ list_item_p_style _ '">') %] <p style="[% list_item_date_style %]"> [%~ update.item_name | html IF update.item_name AND NOT update.item_anonymous -%] [% '(' _ cobrand.prettify_dt(update.confirmed) _ ') ' IF cobrand.include_time_in_update_alerts -%] diff --git a/templates/email/default/_email_report_list.html b/templates/email/default/_email_report_list.html index 5f7f67864..5a43ce7ea 100644 --- a/templates/email/default/_email_report_list.html +++ b/templates/email/default/_email_report_list.html @@ -10,7 +10,7 @@ [%~ report.title | html ~%] </a> </h2> - <p style="[% list_item_p_style %]">[% report.detail | html %]</p> + [% report.detail | html_para | replace('<p>', '<p style="' _ list_item_p_style _ '">') %] <p style="[% list_item_date_style %]"> [% cobrand.prettify_dt( report.confirmed ) %]. [% report.nearest %] diff --git a/templates/email/default/_email_report_list.txt b/templates/email/default/_email_report_list.txt index 3128e2f06..fed75a163 100644 --- a/templates/email/default/_email_report_list.txt +++ b/templates/email/default/_email_report_list.txt @@ -1,4 +1,4 @@ -[% FOR report IN data -%] +[% FOR report IN data %] [% cobrand.base_url_for_report(report) %]/report/[% report.id %] - [% report.title %] [% report.nearest ~%] diff --git a/templates/email/default/_email_settings.html b/templates/email/default/_email_settings.html index 94045bd3c..5bc7faa66 100644 --- a/templates/email/default/_email_settings.html +++ b/templates/email/default/_email_settings.html @@ -33,7 +33,7 @@ logo_font_size = "24px" primary_column_background_color = color_white primary_column_text_color = color_black secondary_column_background_color = color_blue_pale -secondary_column_text_color = color_black +secondary_column_text_color = color_gunmetal column_divider_color = color_grey column_padding = "20" # a single CSS pixel measurement without the "px" suffix @@ -51,6 +51,8 @@ button_text_color_notfixed = color_white button_text_color_dontknow = color_black button_font_weight = "bold" +text_input_border_color = "#999"; + submit_footer_td_style = "text-align: left; vertical-align: top; font-weight: normal; color: #000;" submit_footer_h2_style = "font-size: 16px; line-height: 18px; margin: 0 0 10px 0;"; submit_footer_link_style = "color: #9CD0EA;"; @@ -81,6 +83,8 @@ wrapper_min_width = 520 # in pixels without "px" suffix hint_min_width = wrapper_min_width - (column_padding * 2) hint_style = "min-width: ${ hint_min_width }px; padding: ${ column_padding }px; color: $body_text_color; font-size: 12px; line-height: 18px;" +warning_style = "min-width: ${ hint_min_width }x; padding: ${ column_padding }px; background-color: $color_red_dark; color: $color_white;" + header_style = "padding: $header_padding; background: $header_background_color; color: $header_text_color;" only_column_style = "padding: ${ column_padding }px; vertical-align: top; background-color: $primary_column_background_color; color: $primary_column_text_color;" @@ -108,6 +112,11 @@ list_item_photo_style = "float: right; margin: 0 0 1em 1em; border: none;" contact_meta_style = "padding: 15px ${ column_padding }px; vertical-align: top; background-color: $secondary_column_background_color; border-bottom: 1px solid $column_divider_color;" contact_th_style = "vertical-align: top; padding: 0.4em 1em 0 0; white-space: nowrap; text-align: left;" contact_td_style = "vertical-align: top; padding: 0.4em 0 0.4em 0; width: 100%;" +contact_admin_links_style = "display: block;" + +rss_meta_style = "padding: 5px ${ column_padding }px; vertical-align: top; background-color: $secondary_column_background_color; color: $secondary_column_text_color; border-bottom: 1px solid $column_divider_color; font-size: 14px;" + +text_input_style = "padding: 0.5em 0.75em; border-radius: 0.3em; border: 1px solid $text_input_border_color; box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3) inset; width: 30em; max-width: 100%; margin-top: 0.5em; font-size: 1em;"; # The below is so the buttons work okay in Outlook: https://litmus.com/blog/a-guide-to-bulletproof-buttons-in-email-design button_style = "display: inline-block; border: 10px solid $button_background_color; border-width: 10px 15px; border-radius: $button_border_radius; background-color: $button_background_color; color: $button_text_color; font-size: 18px; line-height: 21px; font-weight: $button_font_weight; text-decoration: underline;" diff --git a/templates/email/default/_email_sidebar.html b/templates/email/default/_email_sidebar.html index 7897d168c..b90a55c28 100644 --- a/templates/email/default/_email_sidebar.html +++ b/templates/email/default/_email_sidebar.html @@ -13,11 +13,13 @@ DEFAULT url = cobrand.base_url_for_report(report) _ report.url ~%] <th style="[% td_style %][% secondary_column_style %]" id="secondary_column"> + [% IF url %] <a href="[% url %]"><img style="[% map_image_style %]" src="[% inline_image(report.static_map, 'map.jpeg') %]" width="310" height="200" alt=""></a> - [% start_padded_box %] + [% END %] + [% start_padded_box | safe %] [%~ IF object.photo %] <img style="[% preview_photo_style %]" src="[% inline_image(object.get_first_image_fp) %]" alt="" align="right"> [%~ END %] - [%~ content %] - [% end_padded_box %] + [%~ content | safe %] + [% end_padded_box | safe %] </th> diff --git a/templates/email/default/_email_top.html b/templates/email/default/_email_top.html index 0191bacfc..943b522cb 100644 --- a/templates/email/default/_email_top.html +++ b/templates/email/default/_email_top.html @@ -8,10 +8,12 @@ ELSE; SET img_dir = cobrand; END -%] +[% IF NOT for_rss ~%] <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +[% END ~%] <html xmlns="http://www.w3.org/1999/xhtml"> <head> - <title></title> + <title>[% rss_title | safe %]</title> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <style type="text/css"> [%~ # Styles here will be applied by everything except Gmail.com %] @@ -45,7 +47,18 @@ </style> </head> <body style="[% body_style %]"> - <table [% wrapper_table %] style="[% wrapper_style %]"> +[% IF staging AND NOT for_rss %] + <table [% wrapper_table | safe %] style="[% td_style %]"> + <tr> + <th class="spacer-cell"></th> + <th width="[% wrapper_max_width %]" style="[% td_style %][% warning_style %]" class="hint"> + [% loc('This email was sent from a staging site.') %] + </th> + <th class="spacer-cell"></th> + </tr> + </table> +[% END %] + <table [% wrapper_table | safe %] style="[% wrapper_style %]"> <tr> <th class="spacer-cell"></th> <th width="[% wrapper_max_width %]" style="[% td_style %][% hint_style %]" class="hint"> @@ -54,15 +67,19 @@ <th class="spacer-cell"></th> </tr> </table> - <table [% wrapper_table %] style="[% wrapper_style %]"> + <table [% wrapper_table | safe %] style="[% wrapper_style %]"> <tr> <th class="spacer-cell"></th> <th width="[% wrapper_max_width %]" style="[% td_style %] min-width: [% wrapper_min_width %]px;" id="main"> - <table [% table_reset %]> + <table [% table_reset | safe %]> <tr> <th colspan="[% email_columns %]" style="[% td_style %][% header_style %]"> - [%~ IF file_exists("web/cobrands/${ img_dir }/images/${ logo_file }") ~%] - <img src="[% inline_image('web/cobrands/' _ img_dir _ '/images/' _ logo_file ) %]" width="[% logo_width %]" height="[% logo_height %]" alt="[% site_name %]" style="[% logo_style %]"/> + [%~ IF file_exists("web/cobrands/${ img_dir }/images/${ logo_file }") ~%] + [%~ IF for_rss ~%] + <img src="/cobrands/[% img_dir %]/images/[% logo_file %]" width="[% logo_width %]" height="[% logo_height %]" alt="[% site_name %]" style="[% logo_style %]"/> + [%~ ELSE ~%] + <img src="[% inline_image('web/cobrands/' _ img_dir _ '/images/' _ logo_file ) %]" width="[% logo_width %]" height="[% logo_height %]" alt="[% site_name %]" style="[% logo_style %]"/> + [%~ END ~%] [%~ ELSE ~%] <span style="[% logo_style %]">[% site_name %]</span> [%~ END %] diff --git a/templates/email/default/alert-update.html b/templates/email/default/alert-update.html index 082f5e369..0f7c30481 100644 --- a/templates/email/default/alert-update.html +++ b/templates/email/default/alert-update.html @@ -1,7 +1,7 @@ [% title = report.title | html; -email_summary = "New updates on “" _ title _ "”"; +email_summary = "New updates on “" _ title _ "”"; email_columns = 2; PROCESS '_email_settings.html'; @@ -11,11 +11,13 @@ INCLUDE '_email_top.html'; %] <th style="[% td_style %][% primary_column_style %]" id="primary_column"> - [% start_padded_box %] + [% start_padded_box | safe %] <h1 style="[% h1_style %]">New updates on <a href="[% problem_url %]">[% title %]</a></h1> [%~ INCLUDE '_email_comment_list.html' %] + [% IF unsubscribe_url %] <p style="[% p_style %]"><a href="[% unsubscribe_url %]">Unsubscribe from alerts about this report</a></p> - [% end_padded_box %] + [% END %] + [% end_padded_box | safe %] </th> [% WRAPPER '_email_sidebar.html' object = report %] <h2 style="[% h2_style %]">[% title %]</h2> diff --git a/templates/email/default/alert-update.txt b/templates/email/default/alert-update.txt index 952b2dbca..903c68e35 100644 --- a/templates/email/default/alert-update.txt +++ b/templates/email/default/alert-update.txt @@ -21,6 +21,7 @@ please do not reply to it. [% signature %] +[% IF unsubscribe_url %] Unsubscribe? We currently email you whenever someone leaves an update on the @@ -28,3 +29,4 @@ We currently email you whenever someone leaves an update on the If you no longer wish to receive an email whenever this report is updated, please follow this link: [% unsubscribe_url %] +[% END %] diff --git a/templates/email/default/contact.html b/templates/email/default/contact.html index 8dc9f3af0..301245f1b 100644 --- a/templates/email/default/contact.html +++ b/templates/email/default/contact.html @@ -2,7 +2,7 @@ subject_html = subject | html; name = form_name | html; -email_summary = "“" _ subject_html _ "” – Message from " _ name _ " on " _ host; +email_summary = "“" _ subject_html _ "” – Message from " _ name _ " on " _ host; email_footer = "Sent via " _ host _ ", IP " _ ip; email_columns = 1; @@ -13,10 +13,21 @@ INCLUDE '_email_top.html'; %] <th style="[% td_style %][% contact_meta_style %]"> - <table [% table_reset %]> + <table [% table_reset | safe %]> <tr> <th style="[% contact_th_style %]">From</th> - <td style="[% contact_td_style %]">[% name %] <<a href="mailto:[% em | html %]">[% em | html %]</a>></td> + <td style="[% contact_td_style %]"> + [% name %] <<a href="mailto:[% em | html %]">[% em | html %]</a>> + [%~ IF user_admin_url %] + <small style="[% contact_admin_links_style %]"> + <a href="[% user_admin_url | html %]">Edit user</a> – + [%~ IF user_latest_report_admin_url %] + <a href="[% user_latest_report_admin_url | html %]">Edit latest report</a> – + [%~ END %] + <a href="[% user_reports_admin_url | html %]">Show all reports</a> + </small> + [%~ END %] + </td> </tr> </table> </th> diff --git a/templates/email/default/contact.txt b/templates/email/default/contact.txt index bd97d17a6..67ff6f610 100644 --- a/templates/email/default/contact.txt +++ b/templates/email/default/contact.txt @@ -6,6 +6,14 @@ Subject: [% site_name %] message: [% subject %] [ [% complaint %] - [% problem_url %] - [% admin_url %] ] [% END %] +[%~ IF user_admin_url %] +[ Edit user: [% user_admin_url %] ] +[%~ IF user_latest_report_admin_url %] +[ Edit latest report: [% user_latest_report_admin_url %] ] +[%~ END %] +[ Show all reports: [% user_reports_admin_url %] ] +[%~ END %] + -- Sent by contact form on [% host %]. IP address [% ip %], user agent [% user_agent %] diff --git a/templates/email/default/login.html b/templates/email/default/login.html index b22838d4e..86bda2464 100644 --- a/templates/email/default/login.html +++ b/templates/email/default/login.html @@ -1,6 +1,6 @@ [% -email_summary = "Click this link to confirm your email address and log into " _ site_name; +email_summary = "Click the link below to confirm your email address and log into " _ site_name; email_columns = 1; PROCESS '_email_settings.html'; diff --git a/templates/email/default/other-reported.html b/templates/email/default/other-reported.html index 584c5b89e..c22bee231 100644 --- a/templates/email/default/other-reported.html +++ b/templates/email/default/other-reported.html @@ -9,19 +9,27 @@ INCLUDE '_email_top.html'; %] <th style="[% td_style %][% primary_column_style %]" id="primary_column"> - [% start_padded_box %] + [% start_padded_box | safe %] <h1 style="[% h1_style %]">Your report has been logged</h1> <p style="[% p_style %]">Your report to [% report.body %] has been logged on [% site_name %].</p> + +[% IF report.non_public %] +<p style="[% p_style %]">It has been marked as private and will not be visible +to the general public; you may view it using the link below, or if you sign in +using the email address associated with the report.</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> + <a style="[% button_style %]" href="[% cobrand.base_url_for_report(report) %][% report.view_url %]">View my report</a> </p> - [% end_padded_box %] + [% end_padded_box | safe %] </th> [% WRAPPER '_email_sidebar.html' object = report %] <h2 style="[% h2_style %]">[% report.title | html %]</h2> diff --git a/templates/email/default/other-reported.txt b/templates/email/default/other-reported.txt index 7b1230555..522a89b50 100644 --- a/templates/email/default/other-reported.txt +++ b/templates/email/default/other-reported.txt @@ -4,6 +4,13 @@ Hello [% report.name %], Your report to [% report.body %] has been logged on [% site_name %]. +[% IF report.non_public ~%] +It has been marked as private and will not be visible to the general public; +you may view it using the link below, or if you sign in using the email address +associated with the report. + +[% 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 %]. @@ -13,7 +20,7 @@ of report, so it will instead be sent to [% report.body %]. It is available to view at: -[% cobrand.base_url_for_report(report) %][% report.url %] +[% cobrand.base_url_for_report(report) %][% report.view_url %] Your report has the title: diff --git a/templates/email/default/other-updated.html b/templates/email/default/other-updated.html index e7f09e123..2609b0027 100644 --- a/templates/email/default/other-updated.html +++ b/templates/email/default/other-updated.html @@ -9,14 +9,14 @@ INCLUDE '_email_top.html'; %] <th style="[% td_style %][% primary_column_style %]" id="primary_column"> - [% start_padded_box %] + [% start_padded_box | safe %] <h1 style="[% h1_style %]">Your update has been logged</h1> <p style="[% p_style %]">Your update has been logged on [% site_name %].</p> [% TRY %][% INCLUDE '_council_reference.html' %][% CATCH file %][% END %] <p style="margin: 20px auto; text-align: center"> <a style="[% button_style %]" href="[% cobrand.base_url_for_report(problem) %][% update.url %]">View my update</a> </p> - [% end_padded_box %] + [% end_padded_box | safe %] </th> [% WRAPPER '_email_sidebar.html' object = update diff --git a/templates/email/default/problem-confirm-not-sending.html b/templates/email/default/problem-confirm-not-sending.html index 827a49d55..43a4c6372 100644 --- a/templates/email/default/problem-confirm-not-sending.html +++ b/templates/email/default/problem-confirm-not-sending.html @@ -10,7 +10,7 @@ INCLUDE '_email_top.html'; %] <th style="[% td_style %][% primary_column_style %]" id="primary_column"> - [% start_padded_box %] + [% start_padded_box | safe %] <h1 style="[% h1_style %]">Please confirm your report</h1> <p style="[% p_style %]">Please click on the link below to confirm that you want your report to appear on [% site_name %], despite not being sent to the @@ -20,7 +20,7 @@ council.</p> <a style="[% button_style %]" href="[% token_url %]">Yes, publish my report</a> </p> <p style="[% p_style %]">If you no longer wish to publish this report, please take no further action.</p> - [% end_padded_box %] + [% end_padded_box | safe %] </th> [% WRAPPER '_email_sidebar.html' object = report, url = token_url %] <h2 style="[% h2_style %]">[% report.title | html %]</h2> diff --git a/templates/email/default/problem-confirm.html b/templates/email/default/problem-confirm.html index f545d7385..40b83a5a0 100644 --- a/templates/email/default/problem-confirm.html +++ b/templates/email/default/problem-confirm.html @@ -10,7 +10,7 @@ INCLUDE '_email_top.html'; %] <th style="[% td_style %][% primary_column_style %]" id="primary_column"> - [% start_padded_box %] + [% start_padded_box | safe %] <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 [% report.body %]. [% IF c.cobrand.is_council && !c.cobrand.owns_problem( report ) %] @@ -20,12 +20,13 @@ of problem, so it will instead be sent to [% report.body %]. [% TRY %][% INCLUDE '_problem-confirm_extra.html' %][% CATCH file %][% END %] </p> - <p style="[% p_style %]">Your report will also appear on the [% site_name %] website.</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 %] + [% TRY %][% INCLUDE '_problem-confirm_footer.html' %][% CATCH file %][% END %] + [% end_padded_box | safe %] </th> [% WRAPPER '_email_sidebar.html' object = report, url = token_url %] <h2 style="[% h2_style %]">[% report.title | html %]</h2> diff --git a/templates/email/default/problem-confirm.txt b/templates/email/default/problem-confirm.txt index 693d7a131..7939a988a 100644 --- a/templates/email/default/problem-confirm.txt +++ b/templates/email/default/problem-confirm.txt @@ -3,8 +3,8 @@ 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 -[% report.body %]. Note that your report will also appear on the [% site_name %] -website: +[% report.body %].[% UNLESS report.non_public %] Note that your report will also +appear on the [% site_name %] website.[% END %] [% token_url %] diff --git a/templates/email/default/problem-moderated.html b/templates/email/default/problem-moderated.html index 142f27fc2..915bb4138 100644 --- a/templates/email/default/problem-moderated.html +++ b/templates/email/default/problem-moderated.html @@ -10,7 +10,7 @@ INCLUDE '_email_top.html'; %] <th style="[% td_style %][% primary_column_style %]" id="primary_column"> - [% start_padded_box %] + [% start_padded_box | safe %] <h1 style="[% h1_style %]">Your report has been moderated</h1> [% IF types == 'hide' -%] <p style="[% p_style %]">The report has been hidden from the site.</p> @@ -22,7 +22,7 @@ INCLUDE '_email_top.html'; [% END -%] <p style="[% p_style %]">If you do not think that this report should have been moderated, you may contact the team at <a href="[% report_complain_uri %]">[% report_complain_uri %]</a></p> - [% end_padded_box %] + [% end_padded_box | safe %] </th> [% WRAPPER '_email_sidebar.html' object = problem %] <h2 style="[% h2_style %]">[% moderated_data.title | html %]</h2> diff --git a/templates/email/default/questionnaire.html b/templates/email/default/questionnaire.html index eaa570ae0..bc0b6dbd5 100644 --- a/templates/email/default/questionnaire.html +++ b/templates/email/default/questionnaire.html @@ -11,7 +11,7 @@ INCLUDE '_email_top.html'; %] <th style="[% td_style %][% primary_column_style %]" id="primary_column"> - [% start_padded_box %] + [% start_padded_box | safe %] <h1 style="[% h1_style %]">Has your problem been fixed?</h1> <p style="[% p_style %]">[% created %] ago, you reported a problem using [% site_name %].</p> <p style="[% p_style %]">Help us keep [% site_name %] up to date by letting us know whether the problem has been fixed yet:</p> @@ -23,7 +23,7 @@ INCLUDE '_email_top.html'; <a style="[% dontknow_button_style %]" href="[% url %]?been_fixed=Unknown">Don’t know</a> </p> <p style="[% p_style %]">Thank you! Your feedback is really valuable.</p> - [% end_padded_box %] + [% end_padded_box | safe %] </th> [% WRAPPER '_email_sidebar.html' object = report, url = url %] <h2 style="[% h2_style %]">[% title %]</h2> diff --git a/templates/email/default/submit.html b/templates/email/default/submit.html index 8dc06041e..0fed5770f 100644 --- a/templates/email/default/submit.html +++ b/templates/email/default/submit.html @@ -11,7 +11,7 @@ INCLUDE '_email_top.html'; %] <th style="[% td_style %][% primary_column_style %]" id="primary_column"> - [% start_padded_box %] + [% start_padded_box | safe %] <h1 style="[% h1_style %]">New problem in your area</h1> <p style="[% p_style %]">[% missing %][% multiple %]A user of [% site_name %] has submitted the following report of a local problem that they believe might require your attention.</p> @@ -20,7 +20,7 @@ of a local problem that they believe might require your attention.</p> <a style="[% button_style %]" href="[% url %]">Show full report</a> </p> <h2 style="[% h2_style %] margin: 30px 0 10px 0">Reported by:</h2> - <table [% table_reset %]> + <table [% table_reset | safe %]> <tr> <th style="[% contact_th_style %]">Name</th> <td style="[% contact_td_style %]">[% report.name | html %]</td> @@ -43,7 +43,7 @@ of a local problem that they believe might require your attention.</p> [%~ END %] </table> <p style="[% p_style %] margin-top: 0.5em;">Replies to this message will go directly to [% report.name | html %], the user who reported the problem.</p> - [% end_padded_box %] + [% end_padded_box | safe %] </th> [% WRAPPER '_email_sidebar.html' object = report %] <h2 style="[% h2_style %]">[% report.title | html %]</h2> diff --git a/templates/email/default/update-confirm.html b/templates/email/default/update-confirm.html index c2a39c0e5..888511346 100644 --- a/templates/email/default/update-confirm.html +++ b/templates/email/default/update-confirm.html @@ -10,7 +10,7 @@ INCLUDE '_email_top.html'; %] <th style="[% td_style %][% primary_column_style %]" id="primary_column"> - [% start_padded_box %] + [% start_padded_box | safe %] <h1 style="[% h1_style %]">Please confirm your update</h1> <p style="[% p_style %]">Please click on the link below to confirm your update on [% site_name %].</p> <p style="margin: 20px auto; text-align: center"> @@ -18,7 +18,7 @@ INCLUDE '_email_top.html'; </p> <p style="[% p_style %]">[% INCLUDE 'update-confirm-donotsend.txt' %]</p> <p style="[% p_style %]">If you no longer wish to confirm this update, please take no further action.</p> - [% end_padded_box %] + [% end_padded_box | safe %] </th> [% WRAPPER '_email_sidebar.html' object = update diff --git a/templates/email/default/xsl.xsl b/templates/email/default/xsl.xsl new file mode 100644 index 000000000..09fc9adfe --- /dev/null +++ b/templates/email/default/xsl.xsl @@ -0,0 +1,48 @@ +[% +email_footer = site_name; +-%] +[% FILTER collapse %][% PROCESS '_email_settings.html' %][% END ~%] +<?xml version="1.0" encoding="UTF-8"?> +<xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> + <xsl:output method="html" /> + <xsl:variable name="title" select="/rss/channel/title"/> + <xsl:variable name="uri" select="/rss/channel/uri"/> + <xsl:template match="/"> + [% PROCESS '_email_top.html' for_rss=1 rss_title='<xsl:value-of select="$title"/> XML Feed' %] + + <th style="[% td_style %][% rss_meta_style %]"> + <p> + This is an RSS feed from the [% site_name %] website. RSS feeds allow you + to stay up to date with the latest changes and additions to the site. + <a href="https://www.bbc.co.uk/news/10628494">Learn more about RSS feeds.</a> + </p> + <p> + To subscribe to this RSS feed, copy this URL into your RSS feed reader: + <input type="text" style="[% text_input_style %]" onClick="this.setSelectionRange(0, this.value.length)"> + <xsl:attribute name="value"> + <xsl:value-of select="$uri"/> + </xsl:attribute> + </input> + </p> + </th> + + </tr> + <tr> + + <th style="[% td_style %][% only_column_style %]"> + <h1 style="[% h1_style %]"><xsl:value-of select="$title"/></h1> + <xsl:apply-templates select="rss/channel/item"/> + </th> + + [% PROCESS '_email_bottom.html' %] + + </xsl:template> + + <xsl:template match="item"> + <div style="[% list_item_style %]"> + <h2 style="[% list_item_h2_style %]"><a href="{link}"><xsl:value-of select="title"/></a></h2> + <xsl:value-of disable-output-escaping="yes" select="description" /> + </div> + </xsl:template> + +</xsl:stylesheet> diff --git a/templates/email/fixamingata/_email_bottom.html b/templates/email/fixamingata/_email_bottom.html index 0a8c95c1c..fb4ddc6dd 100644 --- a/templates/email/fixamingata/_email_bottom.html +++ b/templates/email/fixamingata/_email_bottom.html @@ -4,7 +4,7 @@ <th></th> </tr> </table> - <table [% wrapper_table %] style="[% wrapper_style %]"> + <table [% wrapper_table | safe %] style="[% wrapper_style %]"> <tr> <th></th> <th width="[% wrapper_max_width %]" style="[% td_style %][% hint_style %]" class="hint"> diff --git a/templates/email/fixamingata/_email_comment_list.html b/templates/email/fixamingata/_email_comment_list.html index efbb3e8da..346efadfb 100644 --- a/templates/email/fixamingata/_email_comment_list.html +++ b/templates/email/fixamingata/_email_comment_list.html @@ -5,7 +5,7 @@ <img style="[% list_item_photo_style %]" src="[% inline_image(update.get_first_image_fp) %]" alt=""> </a> [%~ END %] - <p style="[% list_item_p_style %]">“[% update.item_text | html %]”</p> + [% update.item_text | html_para | replace('<p>', '<p style="' _ list_item_p_style _ '">') %] <p style="[% list_item_date_style %]"> [%~ update.item_name | html IF update.item_name AND NOT update.item_anonymous -%] [% '(' _ cobrand.prettify_dt(update.confirmed) _ ') ' IF cobrand.include_time_in_update_alerts -%] diff --git a/templates/email/fixamingata/_email_report_list.html b/templates/email/fixamingata/_email_report_list.html index 5f7f67864..5a43ce7ea 100644 --- a/templates/email/fixamingata/_email_report_list.html +++ b/templates/email/fixamingata/_email_report_list.html @@ -10,7 +10,7 @@ [%~ report.title | html ~%] </a> </h2> - <p style="[% list_item_p_style %]">[% report.detail | html %]</p> + [% report.detail | html_para | replace('<p>', '<p style="' _ list_item_p_style _ '">') %] <p style="[% list_item_date_style %]"> [% cobrand.prettify_dt( report.confirmed ) %]. [% report.nearest %] diff --git a/templates/email/fixamingata/alert-update.html b/templates/email/fixamingata/alert-update.html index e24bb4e31..2dcec3273 100644 --- a/templates/email/fixamingata/alert-update.html +++ b/templates/email/fixamingata/alert-update.html @@ -11,11 +11,11 @@ INCLUDE '_email_top.html'; %] <th style="[% td_style %][% primary_column_style %]" id="primary_column"> - [% start_padded_box %] + [% start_padded_box | safe %] <h1 style="[% h1_style %]">Ny uppdatering i <a href="[% problem_url %]">[% title %]</a></h1> [%~ INCLUDE '_email_comment_list.html' %] <p style="[% p_style %]"><a href="[% unsubscribe_url %]">Avsluta min prenumeration kring denna rapport</a></p> - [% end_padded_box %] + [% end_padded_box | safe %] </th> [% WRAPPER '_email_sidebar.html' object = report %] <h2 style="[% h2_style %]">[% title | html %]</h2> diff --git a/templates/email/fixamingata/contact.html b/templates/email/fixamingata/contact.html index 47c828a36..b182e48a5 100644 --- a/templates/email/fixamingata/contact.html +++ b/templates/email/fixamingata/contact.html @@ -2,7 +2,7 @@ subject_html = subject | html; name = form_name | html; -email_summary = "“" _ subject_html _ "” – Meddelande från " _ name _ " hos " _ host; +email_summary = "“" _ subject_html _ "” – Meddelande från " _ name _ " hos " _ host; email_footer = "Skickat via " _ host _ " och IP-adressen " _ ip; email_columns = 1; @@ -13,7 +13,7 @@ INCLUDE '_email_top.html'; %] <th style="[% td_style %][% contact_meta_style %]"> - <table [% table_reset %]> + <table [% table_reset | safe %]> <tr> <th style="[% contact_th_style %]">Från</th> <td style="[% contact_td_style %]">[% name %] <<a href="mailto:[% em | html %]">[% em | html %]</a>></td> diff --git a/templates/email/fixamingata/other-reported.html b/templates/email/fixamingata/other-reported.html index 0b0160696..751da0cae 100644 --- a/templates/email/fixamingata/other-reported.html +++ b/templates/email/fixamingata/other-reported.html @@ -9,18 +9,25 @@ INCLUDE '_email_top.html'; %] <th style="[% td_style %][% primary_column_style %]" id="primary_column"> - [% start_padded_box %] + [% start_padded_box | safe %] <h1 style="[% h1_style %]">Din rapport har loggats</h1> <p style="[% p_style %]">Din rapport till [% report.body %] har blivit loggad på [% site_name %]. + +[% IF report.non_public %] +<p style="[% p_style %]">It has been marked as private and will not be visible +to the general public; you may view it using the link below, or if you sign in +using the email address associated with the report.</p> +[% END %] + [% IF cobrand.is_council && !cobrand.owns_problem( report ) %] Eftersom [% cobrand.council_name %] inte är ansvarig för den här typen av rapporter, så kommer rapporten istället att skickas till [% report.body %]. [% END %] </p> <p style="margin: 20px auto; text-align: center"> - <a style="[% button_style %]" href="[% cobrand.base_url_for_report(report) %][% report.url %]">Visa min rapport</a> + <a style="[% button_style %]" href="[% cobrand.base_url_for_report(report) %][% report.view_url %]">Visa min rapport</a> </p> - [% end_padded_box %] + [% end_padded_box | safe %] </th> [% WRAPPER '_email_sidebar.html' object = report %] <h2 style="[% h2_style %]">[% report.title | html %]</h2> diff --git a/templates/email/fixamingata/other-reported.txt b/templates/email/fixamingata/other-reported.txt index e39adf527..e9ed542d3 100644 --- a/templates/email/fixamingata/other-reported.txt +++ b/templates/email/fixamingata/other-reported.txt @@ -4,6 +4,13 @@ Hej [% report.name %], Din rapport till [% report.body %] har blivit loggad på [% site_name %]. +[% IF report.non_public ~%] +It has been marked as private and will not be visible to the general public; +you may view it using the link below, or if you sign in using the email address +associated with the report. + +[% END ~%] + [% IF cobrand.is_council && !cobrand.owns_problem( report ) %] Eftersom [% cobrand.council_name %] inte är ansvarig för den här typen av rapporter, så kommer rapporten istället att skickas till [% report.body %]. @@ -11,7 +18,7 @@ rapporter, så kommer rapporten istället att skickas till [% report.body %]. Du kan se din rapport på: -[% cobrand.base_url_for_report(report) %][% report.url %] +[% cobrand.base_url_for_report(report) %][% report.view_url %] Din rapport har titeln: diff --git a/templates/email/fixamingata/other-updated.html b/templates/email/fixamingata/other-updated.html index 7be360ef7..bb0a90416 100644 --- a/templates/email/fixamingata/other-updated.html +++ b/templates/email/fixamingata/other-updated.html @@ -9,13 +9,13 @@ INCLUDE '_email_top.html'; %] <th style="[% td_style %][% primary_column_style %]" id="primary_column"> - [% start_padded_box %] + [% start_padded_box | safe %] <h1 style="[% h1_style %]">Din uppdatering har loggats</h1> <p style="[% p_style %]">Din uppdatering har blivit loggad på [% site_name %]:</p> <p style="margin: 20px auto; text-align: center"> <a style="[% button_style %]" href="[% cobrand.base_url_for_report(problem) %][% problem.url %]#update_[% update.id %]">Visa min uppdatering</a> </p> - [% end_padded_box %] + [% end_padded_box | safe %] </th> [% WRAPPER '_email_sidebar.html' object = update diff --git a/templates/email/fixamingata/problem-confirm-not-sending.html b/templates/email/fixamingata/problem-confirm-not-sending.html index 665288a02..e0b991d98 100644 --- a/templates/email/fixamingata/problem-confirm-not-sending.html +++ b/templates/email/fixamingata/problem-confirm-not-sending.html @@ -10,7 +10,7 @@ INCLUDE '_email_top.html'; %] <th style="[% td_style %][% primary_column_style %]" id="primary_column"> - [% start_padded_box %] + [% start_padded_box | safe %] <h1 style="[% h1_style %]">Bekräfta din FixaMinGata-rapport</h1> <p style="[% p_style %]">För att bekräfta den rapport som du nyligen lade in på FixaMinGata måste du klicka på nedanstående länk. Notera att din rapport inte kommer att @@ -20,7 +20,7 @@ skickas till kommunen.</p> <a style="[% button_style %]" href="[% token_url %]">Skicka min rapport</a> </p> <p style="[% p_style %]">Om du inte vill skicka din rapport så behöver du inte göra något.</p> - [% end_padded_box %] + [% end_padded_box | safe %] </th> [% WRAPPER '_email_sidebar.html' object = report, url = token_url %] <h2 style="[% h2_style %]">[% report.title | html %]</h2> diff --git a/templates/email/fixamingata/problem-confirm.html b/templates/email/fixamingata/problem-confirm.html index 937743fc6..a6a7c9b88 100644 --- a/templates/email/fixamingata/problem-confirm.html +++ b/templates/email/fixamingata/problem-confirm.html @@ -10,7 +10,7 @@ INCLUDE '_email_top.html'; %] <th style="[% td_style %][% primary_column_style %]" id="primary_column"> - [% start_padded_box %] + [% start_padded_box | safe %] <h1 style="[% h1_style %]">Bekräfta din FixaMinGata-rapport</h1> <p style="[% p_style %]">För att bekräfta den rapport som du nyligen lade in på FixaMinGata måste du klicka på nedanstående knapp.</p> @@ -19,7 +19,7 @@ måste du klicka på nedanstående knapp.</p> <a style="[% button_style %]" href="[% token_url %]">Skicka min rapport</a> </p> <p style="[% p_style %]">Om du inte vill skicka din rapport så behöver du inte göra något.</p> - [% end_padded_box %] + [% end_padded_box | safe %] </th> [% WRAPPER '_email_sidebar.html' object = report, url = token_url %] <h2 style="[% h2_style %]">[% report.title | html %]</h2> diff --git a/templates/email/fixamingata/problem-moderated.html b/templates/email/fixamingata/problem-moderated.html index 02bace72f..4c927c11d 100644 --- a/templates/email/fixamingata/problem-moderated.html +++ b/templates/email/fixamingata/problem-moderated.html @@ -10,7 +10,7 @@ INCLUDE '_email_top.html'; %] <th style="[% td_style %][% primary_column_style %]" id="primary_column"> - [% start_padded_box %] + [% start_padded_box | safe %] <h1 style="[% h1_style %]">Din rapport har blivit modererad</h1> [% IF types == 'hide' -%] <p style="[% p_style %]">Din rapport har dolts från sajten.</p> @@ -22,7 +22,7 @@ INCLUDE '_email_top.html'; [% END -%] <p style="[% p_style %]">Om du inte tycker att rapporten skulle ha blivit modererad kan du kontakta FixaMinGata:s support på <a href="[% report_complain_uri %]">[% report_complain_uri %]</a></p> - [% end_padded_box %] + [% end_padded_box | safe %] </th> [% WRAPPER '_email_sidebar.html' object = problem %] <h2 style="[% h2_style %]">[% problem.moderation_original_data.title | html %]</h2> diff --git a/templates/email/fixamingata/questionnaire.html b/templates/email/fixamingata/questionnaire.html index d66c50535..fef76f0c2 100644 --- a/templates/email/fixamingata/questionnaire.html +++ b/templates/email/fixamingata/questionnaire.html @@ -11,7 +11,7 @@ INCLUDE '_email_top.html'; %] <th style="[% td_style %][% primary_column_style %]" id="primary_column"> - [% start_padded_box %] + [% start_padded_box | safe %] <h1 style="[% h1_style %]">Har ditt problem blivit fixat?</h1> <p style="[% p_style %]">[% created %] sedan lämnade du en rapport på FixaMinGata.</p> <p style="[% p_style %]">För att hålla alla rapporter uppdaterade skulle vi uppskatta om du kunde informera oss om huruvida problemet har blivit fixat än:</p> @@ -23,7 +23,7 @@ INCLUDE '_email_top.html'; <a style="[% dontknow_button_style %]" href="[% url %]?been_fixed=Unknown">Vet ej</a> </p> <p style="[% p_style %]">Tack! Din feedback är värdefull.</p> - [% end_padded_box %] + [% end_padded_box | safe %] </th> [% WRAPPER '_email_sidebar.html' object = report, url = url %] <h2 style="[% h2_style %]">[% title %]</h2> diff --git a/templates/email/fixamingata/submit.html b/templates/email/fixamingata/submit.html index 6a1208982..f04801bd6 100644 --- a/templates/email/fixamingata/submit.html +++ b/templates/email/fixamingata/submit.html @@ -11,7 +11,7 @@ INCLUDE '_email_top.html'; %] <th style="[% td_style %][% primary_column_style %]" id="primary_column"> - [% start_padded_box %] + [% start_padded_box | safe %] <h1 style="[% h1_style %]">Ny rapport för [% report.body %]</h1> <p style="[% p_style %]">[% missing %][% multiple %]Följande rapport tror medborgaren behöver er uppmärksamhet.</p> @@ -20,7 +20,7 @@ tror medborgaren behöver er uppmärksamhet.</p> <a style="[% button_style %]" href="[% url %]">Visa rapporten</a> </p> <h2 style="[% h2_style %] margin: 30px 0 10px 0">Rapporterad av:</h2> - <table [% table_reset %]> + <table [% table_reset | safe %]> <tr> <th style="[% contact_th_style %]">Namn</th> <td style="[% contact_td_style %]">[% report.name | html %]</td> @@ -42,7 +42,7 @@ tror medborgaren behöver er uppmärksamhet.</p> [%~ END %] </table> <p style="[% p_style %] margin-top: 0.5em;">Svar på det här brevet kommer att skickas till den person som lämnade rapporten.</p> - [% end_padded_box %] + [% end_padded_box | safe %] </th> [% WRAPPER '_email_sidebar.html' object = report %] <h2 style="[% h2_style %]">[% report.title | html %]</h2> diff --git a/templates/email/fixamingata/submit.txt b/templates/email/fixamingata/submit.txt index d2e7399b4..20a49706d 100644 --- a/templates/email/fixamingata/submit.txt +++ b/templates/email/fixamingata/submit.txt @@ -1,4 +1,4 @@ -Subject: Ny rapport: [% report.title %] +Subject: Ny rapport: [% IF problem.extra.building %][% problem.extra.building %], [% END %][% report.title %] Till [% bodies_name %], diff --git a/templates/email/fixamingata/update-confirm.html b/templates/email/fixamingata/update-confirm.html index 3953b16fd..178f5b79e 100644 --- a/templates/email/fixamingata/update-confirm.html +++ b/templates/email/fixamingata/update-confirm.html @@ -10,7 +10,7 @@ INCLUDE '_email_top.html'; %] <th style="[% td_style %][% primary_column_style %]" id="primary_column"> - [% start_padded_box %] + [% start_padded_box | safe %] <h1 style="[% h1_style %]">Bekräfta din uppdatering</h1> <p style="[% p_style %]">Vänligen klicka på knappen nedan för att bekräfta den uppdatering du just lämnade:</p> <p style="margin: 20px auto; text-align: center"> @@ -18,7 +18,7 @@ INCLUDE '_email_top.html'; </p> <p style="[% p_style %]">[% INCLUDE 'update-confirm-donotsend.txt' %]</p> <p style="[% p_style %]">Om du inte vill bekräfta din uppdatering behöver du inte göra något.</p> - [% end_padded_box %] + [% end_padded_box | safe %] </th> [% WRAPPER '_email_sidebar.html' object = update diff --git a/templates/email/fixmystreet.com/_submit_footer.html b/templates/email/fixmystreet.com/_submit_footer.html index cb0dbb165..0da75a3b7 100644 --- a/templates/email/fixmystreet.com/_submit_footer.html +++ b/templates/email/fixmystreet.com/_submit_footer.html @@ -1,4 +1,4 @@ -<table [% table_reset %]> +<table [% table_reset | safe %]> <tr> <th style="[% td_style %] padding: [% column_padding %]px; background-color: [% color_yellow %]; color: [% color_black %];"> <h2 style="[% h2_style %] margin-bottom: 15px;"> @@ -14,7 +14,7 @@ </tr> </table> -<table [% table_reset %] style="table-layout: fixed;"> +<table [% table_reset | safe %] style="table-layout: fixed;"> <tr> <th style="[% submit_footer_td_style %] padding: [% column_padding %]px 40px 0 0;"> <h2 style="[% submit_footer_h2_style %]"> diff --git a/templates/email/fixmystreet.com/submit.html b/templates/email/fixmystreet.com/submit.html index 2742c4b44..f8b2db0dc 100644 --- a/templates/email/fixmystreet.com/submit.html +++ b/templates/email/fixmystreet.com/submit.html @@ -11,7 +11,7 @@ INCLUDE '_email_top.html'; %] <th style="[% td_style %][% primary_column_style %]" id="primary_column"> - [% start_padded_box %] + [% start_padded_box | safe %] <h1 style="[% h1_style %]">New problem in your area</h1> <p style="[% p_style %]">[% missing %][% multiple %]A user of [% site_name %] has submitted the following report of a local problem that they believe might require your attention.</p> @@ -20,7 +20,7 @@ of a local problem that they believe might require your attention.</p> <a style="[% button_style %]" href="[% url %]">Show full report</a> </p> <h2 style="[% h2_style %] margin: 30px 0 10px 0">Reported by:</h2> - <table [% table_reset %]> + <table [% table_reset | safe %]> <tr> <th style="[% contact_th_style %]">Name</th> <td style="[% contact_td_style %]">[% report.name | html %]</td> @@ -43,7 +43,7 @@ of a local problem that they believe might require your attention.</p> [%~ END %] </table> <p style="[% p_style %] margin-top: 0.5em;">Replies to this message will go directly to [% report.name | html %], the user who reported the problem.</p> - [% end_padded_box %] + [% end_padded_box | safe %] </th> [% WRAPPER '_email_sidebar.html' object = report %] <h2 style="[% h2_style %]">[% report.title | html %]</h2> @@ -62,6 +62,18 @@ of a local problem that they believe might require your attention.</p> </a>) [% IF closest_address %]<br>[% closest_address | trim | replace("\n\n", "<br>") %][% END %] </p> + [% IF report.get_extra_field_value('road_name') %] + <p style="[% secondary_p_style %]"> + <strong>Road:</strong> + [% report.get_extra_field_value('road_name') %] + </p> + [% END %] + [% IF report.get_extra_field_value('sect_label') %] + <p style="[% secondary_p_style %]"> + <strong>Section:</strong> + [% report.get_extra_field_value('sect_label') %] + </p> + [% END %] [% END %] [% INCLUDE '_email_bottom.html' %] diff --git a/templates/email/fixmystreet.com/submit.txt b/templates/email/fixmystreet.com/submit.txt index 3eaf400a2..c22d83713 100644 --- a/templates/email/fixmystreet.com/submit.txt +++ b/templates/email/fixmystreet.com/submit.txt @@ -35,6 +35,13 @@ Latitude: [% report.latitude %] Longitude: [% report.longitude %] +[% IF report.get_extra_field_value('road_name') ~%] +Road: [% report.get_extra_field_value('road_name') %] +[% END %] +[% IF report.get_extra_field_value('sect_label') ~%] +Section: [% report.get_extra_field_value('sect_label') %] +[% END %] + View OpenStreetMap of this location: [% osm_url %] [% closest_address %]---------- diff --git a/templates/email/highwaysengland/_email_color_overrides.html b/templates/email/highwaysengland/_email_color_overrides.html new file mode 100644 index 000000000..999a90865 --- /dev/null +++ b/templates/email/highwaysengland/_email_color_overrides.html @@ -0,0 +1,36 @@ +[% + +color_he_darkblue = '#011e41'; +color_he_blue = '#0073a6'; +color_he_brightblue = '#0082c9'; +color_he_paleblue = '#99cceb'; +color_he_black = '#00050d'; +color_he_orange = '#f28a00'; +color_he_green = '#4a7529'; +color_he_red = '#d13339'; +color_he_yellow = '#ffc726'; +color_he_pink = '#cc2b99'; + +color_he_grey1 = '#f2f2f2'; +color_he_grey2 = '#eff0f2'; +color_he_grey3 = '#cfd1d1'; +color_he_grey4 = '#59595c'; +color_he_grey5 = '#38383b'; +color_he_grey6 = '#241f21'; + +body_background_color = color_he_grey3 +body_text_color = color_he_grey6 + +header_background_color = '#fff' +header_text_color = color_he_black + +secondary_column_background_color = color_he_grey2 + +button_background_color = color_he_blue +button_text_color = '#fff' + +logo_file = "email-logo.png" +logo_width = "118" # pixel measurement, but without 'px' suffix +logo_height = "35" # pixel measurement, but without 'px' suffix + +%] diff --git a/templates/email/highwaysengland/_email_setting_overrides.html b/templates/email/highwaysengland/_email_setting_overrides.html new file mode 100644 index 000000000..2359d2033 --- /dev/null +++ b/templates/email/highwaysengland/_email_setting_overrides.html @@ -0,0 +1,5 @@ +[% + +header_style = "${header_style} border-bottom: 4px solid ${color_he_blue};" + +%] diff --git a/templates/email/highwaysengland/submit.html b/templates/email/highwaysengland/submit.html new file mode 100644 index 000000000..a5c17c694 --- /dev/null +++ b/templates/email/highwaysengland/submit.html @@ -0,0 +1,50 @@ +[% + +email_summary = "A new problem in your area has been reported by a " _ site_name _ " user."; +email_footer = "Sent via FixMyStreet"; +email_columns = 2; + +PROCESS '_email_settings.html'; + +INCLUDE '_email_top.html'; + +%] + +<th style="[% td_style %][% primary_column_style %]" id="primary_column"> + [% start_padded_box | safe %] + <h1 style="[% h1_style %]">New problem in your area</h1> + <p style="[% p_style %]">[% missing %][% multiple %]A user of [% site_name %] has submitted the following report +of a local problem that they believe might require your attention.</p> + + <p style="margin: 20px auto; text-align: center"> + <a style="[% button_style %]" href="[% url %]">Show full report</a> + </p> + [% end_padded_box | safe %] +</th> +[% WRAPPER '_email_sidebar.html' object = report %] + <h2 style="[% h2_style %]">[% report.title | html %]</h2> + <p style="[% secondary_p_style %]">[% report.category | html %]</p> + <p style="[% secondary_p_style %]">[% report.detail | html %]</p> + <p style="[% secondary_p_style %]"> + <strong>Location:</strong> + <a href="[% osm_url %]" title="View OpenStreetMap of this location"> + [%~ report.latitude %], [% report.longitude ~%] + </a> + [% IF closest_address %]<br>[% closest_address | trim | replace("\n\n", "<br>") %][% END %] + </p> + <p style="[% secondary_p_style %]"> + <strong>Road:</strong> + [% report.get_extra_field_value('road_name') %] + </p> + <p style="[% secondary_p_style %]"> + <strong>Section:</strong> + [% report.get_extra_field_value('sect_label') %] + </p> + <p style="[% secondary_p_style %]"> + <strong>Heard from:</strong> + [% report.get_extra_metadata('where_hear') %] + </p> + +[% END %] + +[% INCLUDE '_email_bottom.html' %] diff --git a/templates/email/highwaysengland/submit.txt b/templates/email/highwaysengland/submit.txt new file mode 100644 index 000000000..aa32bd1be --- /dev/null +++ b/templates/email/highwaysengland/submit.txt @@ -0,0 +1,40 @@ +Subject: Problem Report: [% report.title %] + +Dear [% bodies_name %], + +[% missing %][% multiple %]A user of +[% site_name %] has submitted the following report +of a local problem that they believe might require your attention. + +[% fuzzy %], or to provide an update on the problem, +please visit the following link: + + [% url %] + +[% has_photo %]---------- + +Category: [% report.category %] + +Subject: [% report.title %] + +Details: [% report.detail %] + +Latitude: [% report.latitude %] + +Longitude: [% report.longitude %] + +Road: [% report.get_extra_field_value('road_name') %] + +Section: [% report.get_extra_field_value('sect_label') %] + +Heard from: [% report.get_extra_metadata('where_hear') %] + +View OpenStreetMap of this location: [% osm_url %] + +[% closest_address %]---------- + +[% signature %] + +If there is a more appropriate email address for messages about +[% category_footer %], please let us know. This will help improve the +service for local people. We also welcome any other feedback you may have. diff --git a/templates/email/hounslow/_council_reference.html b/templates/email/hounslow/_council_reference.html new file mode 100644 index 000000000..3b886a51e --- /dev/null +++ b/templates/email/hounslow/_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 Hounslow Highways about this report.</p> +[%~ END %] diff --git a/templates/email/hounslow/_council_reference.txt b/templates/email/hounslow/_council_reference.txt new file mode 100644 index 000000000..ebd7d4588 --- /dev/null +++ b/templates/email/hounslow/_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 Hounslow Highways about this report.[% END %] diff --git a/templates/email/hounslow/_council_reference_alert_update.html b/templates/email/hounslow/_council_reference_alert_update.html new file mode 100644 index 000000000..3b886a51e --- /dev/null +++ b/templates/email/hounslow/_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 Hounslow Highways about this report.</p> +[%~ END %] diff --git a/templates/email/hounslow/_council_reference_alert_update.txt b/templates/email/hounslow/_council_reference_alert_update.txt new file mode 100644 index 000000000..ebd7d4588 --- /dev/null +++ b/templates/email/hounslow/_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 Hounslow Highways about this report.[% END %] diff --git a/templates/email/hounslow/_email_color_overrides.html b/templates/email/hounslow/_email_color_overrides.html new file mode 100644 index 000000000..b08a92d86 --- /dev/null +++ b/templates/email/hounslow/_email_color_overrides.html @@ -0,0 +1,19 @@ +[% + +color_purple = '#7D2B80' +color_green = '#8BC54F' +color_white = '#fff' + +header_background_color = color_white +header_text_color = color_purple + +secondary_column_background_color = color_white + +button_background_color = color_purple +button_text_color = color_white + +logo_width = "231" # pixel measurement, but without 'px' suffix +logo_height = "102" # pixel measurement, but without 'px' suffix +logo_file = "logo.gif" + +%] diff --git a/templates/email/hounslow/archive.html b/templates/email/hounslow/archive.html new file mode 100644 index 000000000..45089caa6 --- /dev/null +++ b/templates/email/hounslow/archive.html @@ -0,0 +1,55 @@ +[% + +email_summary = "Your reports on " _ site_name; + +PROCESS '_email_settings.html'; + +INCLUDE '_email_top.html'; + +%] + +<th style="[% td_style %][% only_column_style %]"> + <h1 style="[% h1_style %]">Your reports on [% site_name %]</h1> + <p style="[% p_style %]"> + Hello [% user.name %], + </p> + <p style="[% p_style %]"> + FixMyStreet is being updated in Hounslow to + improve how problems get reported. + </p> + <p style="[% p_style %]"> + As part of this process we are closing all reports + made before the update. + </p> + <p style="[% p_style %]"> + We noticed that you have [% report_count %] old [% nget('report', 'reports', report_count) %] on the system, + which we've listed below. + </p> + <p style="[% p_style %]"> + All of your reports will have been received and reviewed by Hounslow, so if + your report is no longer an issue, you don't need to do anything. + </p> + <p style="[% p_style %]"> + If you believe that the issue has not been resolved you can <a href="https://fms.hounslowhighways.org/">report it again here.</a> + </p> + + [% FOR report IN reports %] + <div style="[% list_item_style %]"> + [% IF report.photo %] + <a href="[% cobrand.base_url_for_report( report ) %]/report/[% report.id %]"> + <img style="[% list_item_photo_style %]" src="[% inline_image(report.get_first_image_fp) %]" alt=""> + </a> + [% END %] + <h2 style="[% list_item_h2_style %]"><a href="[% cobrand.base_url_for_report( report ) %]/report/[% report.id %]"> + [%~ report.title | html ~%] + </a></h2> + <p style="[% list_item_p_style %]">[% report.detail | html %]</p> + <p style="[% list_item_date_style %]"> + Reported [% report.time_ago %] ago. + </p> + </div> + [% END %] + +</th> + +[% INCLUDE '_email_bottom.html' %] diff --git a/templates/email/hounslow/archive.txt b/templates/email/hounslow/archive.txt new file mode 100644 index 000000000..3573eb288 --- /dev/null +++ b/templates/email/hounslow/archive.txt @@ -0,0 +1,27 @@ +Subject: Your reports on [% site_name %] + +Hello [% user.name %], + +FixMyStreet is being updated in Hounslow to improve how problems get reported. + +As part of this process we are closing all reports made before the update. + +We noticed that you have [% report_count %] old [% nget('report', 'reports', report_count) %] on the system, which we've listed below. + +All of your reports will have been received and reviewed by Hounslow, so if your report is no longer an issue, you don't need to do anything. + +If you believe that the issue has not been resolved you can report it again here: https://fms.hounslowhighways.org/ + +[% FOR report IN reports %] + +[% report.title %] + +Reported [% report.time_ago %] ago. + +View report: [% cobrand.base_url_for_report( report ) %]/report/[% report.id %] + +---- + +[% END %] + +The FixMyStreet team and Hounslow Highways diff --git a/templates/email/hounslow/confirm_report_sent.html b/templates/email/hounslow/confirm_report_sent.html new file mode 100644 index 000000000..5a0c19f0d --- /dev/null +++ b/templates/email/hounslow/confirm_report_sent.html @@ -0,0 +1 @@ +[% INCLUDE 'other-reported.html' %]
\ No newline at end of file diff --git a/templates/email/hounslow/confirm_report_sent.txt b/templates/email/hounslow/confirm_report_sent.txt new file mode 100644 index 000000000..72fe01f6d --- /dev/null +++ b/templates/email/hounslow/confirm_report_sent.txt @@ -0,0 +1 @@ +[% INCLUDE 'other-reported.txt' %]
\ No newline at end of file diff --git a/templates/email/hounslow/other-reported.html b/templates/email/hounslow/other-reported.html new file mode 100644 index 000000000..b4b4faa99 --- /dev/null +++ b/templates/email/hounslow/other-reported.html @@ -0,0 +1,38 @@ +[% + +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 | safe %] + <h1 style="[% h1_style %]">Your report has been logged</h1> + <p style="[% p_style %]">Your report to [% cobrand.council_name %] has been logged on [% site_name %].</p> + +[% IF report.non_public %] +<p style="[% p_style %]">It has been marked as private and will not be visible +to the general public; you may view it using the link below, or if you sign in +using the email address associated with the report.</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.view_url %]">View my report</a> + </p> + [% end_padded_box | safe %] +</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/hounslow/other-reported.txt b/templates/email/hounslow/other-reported.txt new file mode 100644 index 000000000..a3b7e37c8 --- /dev/null +++ b/templates/email/hounslow/other-reported.txt @@ -0,0 +1,36 @@ +Subject: Your report has been logged: [% report.title %] + +Hello [% report.name %], + +Your report to [% cobrand.council_name %] has been logged on [% site_name %]. + +[% IF report.non_public ~%] +It has been marked as private and will not be visible to the general public; +you may view it using the link below, or if you sign in using the email address +associated with the report. + +[% 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.view_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/hounslow/problem-confirm.html b/templates/email/hounslow/problem-confirm.html new file mode 100644 index 000000000..08a7531ca --- /dev/null +++ b/templates/email/hounslow/problem-confirm.html @@ -0,0 +1,31 @@ +[% + +email_summary = "You need to confirm your " _ site_name _ " report before it can be sent to Hounslow Highways."; +email_columns = 2; + +PROCESS '_email_settings.html'; + +INCLUDE '_email_top.html'; + +%] + +<th style="[% td_style %][% primary_column_style %]" id="primary_column"> + [% start_padded_box | safe %] + <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 Hounslow Highways. + +[% 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 | safe %] +</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/hounslow/problem-confirm.txt b/templates/email/hounslow/problem-confirm.txt new file mode 100644 index 000000000..9343b2a6e --- /dev/null +++ b/templates/email/hounslow/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 +Hounslow Highways.[% 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/hounslow/submit.html b/templates/email/hounslow/submit.html new file mode 100644 index 000000000..5b9f2e255 --- /dev/null +++ b/templates/email/hounslow/submit.html @@ -0,0 +1,70 @@ +[% + +PROCESS '_email_settings.html'; + +email_summary = "A new problem in your area has been reported by a " _ site_name _ " user."; +email_footer = ""; +email_columns = 2; + +INCLUDE '_email_top.html'; + +%] + +<th style="[% td_style %][% primary_column_style %]" id="primary_column"> + [% start_padded_box | safe %] + <h1 style="[% h1_style %]">New problem in your area</h1> + <p style="[% p_style %]">[% multiple %]A user of [% site_name %] has submitted the following report +of a local problem that they believe might require your attention.</p> + + <p style="margin: 20px auto; text-align: center"> + <a style="[% button_style %]" href="[% url %]">Show full report</a> + </p> + <h2 style="[% h2_style %] margin: 30px 0 10px 0">Reported by:</h2> + <table [% table_reset | safe %]> + <tr> + <th style="[% contact_th_style %]">Name</th> + <td style="[% contact_td_style %]">[% report.name | html %]</td> + </tr> + <tr> + <th style="[% contact_th_style %]">Email</th> + <td style="[% contact_td_style %]"> + [%~ IF report.user.email ~%] + <a href="mailto:[% report.user.email | html %]">[% report.user.email | html %]</a> + [%~ ELSE ~%] + <strong>No email address provided, only phone number</strong> + [%~ END ~%] + </td> + </tr> + [%~ IF report.user.phone %] + <tr> + <th style="[% contact_th_style %]">Phone</th> + <td style="[% contact_td_style %]"><a href="tel:[% report.user.phone | html %]">[% report.user.phone | html %]</a></td> + </tr> + [%~ END %] + </table> + <p style="[% p_style %] margin-top: 0.5em;">Replies to this message will go directly to [% report.name | html %], the user who reported the problem.</p> + [% end_padded_box | safe %] +</th> +[% WRAPPER '_email_sidebar.html' object = report %] + <h2 style="[% h2_style %]">[% report.title | html %]</h2> + [% IF report.external_id %] + <p style="[% secondary_p_style %]"><strong>Enquiry ref:</strong> [% report.external_id | html %]</p> + [% END %] + <p style="[% secondary_p_style %]"><strong>Category:</strong> [% report.category | html %]</p> + <p style="[% secondary_p_style %]">[% report.detail | html %]</p> + [%~ IF additional_information %] + <p style="[% secondary_p_style %]">[% additional_information %]</p> + [%~ END %] + <p style="[% secondary_p_style %]"> + <strong>Location:</strong> + <br>Easting/Northing + [%~ " (IE)" IF coordsyst == "I" ~%] + : [% easting %]/[% northing %] + (<a href="[% osm_url %]" title="View OpenStreetMap of this location"> + [%~ report.latitude %], [% report.longitude ~%] + </a>) + [% IF closest_address %]<br>[% closest_address | trim | replace("\n\n", "<br>") %][% END %] + </p> +[% END %] + +[% INCLUDE '_email_bottom.html' %] diff --git a/templates/email/hounslow/submit.txt b/templates/email/hounslow/submit.txt new file mode 100644 index 000000000..3d9518e53 --- /dev/null +++ b/templates/email/hounslow/submit.txt @@ -0,0 +1,43 @@ +Subject: Problem Report: [% report.title %] + +[% multiple %]A user of +[% site_name %] has submitted the following report +of a local problem that they believe might require your attention. + +[% fuzzy %], or to provide an update on the problem, +please visit the following link: + + [% url %] + +[% has_photo %]---------- + +Name: [% report.name %] + +Email: [% report.user.email OR 'None provided' %] + +Phone: [% report.user.phone OR 'None provided' %] + +[% IF report.external_id %]Enquiry ref: [% report.external_id %][% END %] + +Category: [% report.category %] + +Subject: [% report.title %] + +Details: [% report.detail %] + +[% additional_information %] + +Easting/Northing +[%- " (IE)" IF coordsyst == "I" -%] +: [% easting %]/[% northing %] + +Latitude: [% report.latitude %] + +Longitude: [% report.longitude %] + +View OpenStreetMap of this location: [% osm_url %] + +[% closest_address %]---------- + +Replies to this email will go to the user who submitted the problem. + 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/archive.html b/templates/email/isleofwight/archive.html new file mode 100644 index 000000000..9b0bda0db --- /dev/null +++ b/templates/email/isleofwight/archive.html @@ -0,0 +1,48 @@ +[% + +email_summary = "Your reports on FixMyStreet"; + +PROCESS '_email_settings.html'; + +INCLUDE '_email_top.html'; + +%] + +<th style="[% td_style %][% only_column_style %]"> + <h1 style="[% h1_style %]">Your reports on FixMyStreet</h1> + <p style="[% p_style %]"> + Hello [% user.name %], + </p> + <p style="[% p_style %]"> + FixMyStreet is being updated for the Isle of Wight to improve how problems get reported. + </p> + <p style="[% p_style %]"> +As part of this process we are closing all enquiries made before the update. We noticed +that you have [% report_count %] old [% nget('report', 'reports', report_count) %] on the system, which we've listed below. + </p> + <p style="[% p_style %]"> +If your enquiry is no longer an issue, you don't need to do anything. If you believe +that the issue has not been resolved, please log it again on +<a href="https://fms.islandroads.com/">https://fms.islandroads.com/</a> or contact the Island Roads Help Desk via <a href="mailto:info@islandroads.com">info@islandroads.com</a> or 01983 822440. + </p> + + [% FOR report IN reports %] + <div style="[% list_item_style %]"> + [% IF report.photo %] + <a href="https://www.fixmystreet.com/report/[% report.id %]"> + <img style="[% list_item_photo_style %]" src="[% inline_image(report.get_first_image_fp) %]" alt=""> + </a> + [% END %] + <h2 style="[% list_item_h2_style %]"><a href="[% cobrand.base_url_for_report( report ) %]/report/[% report.id %]"> + [%~ report.title | html ~%] + </a></h2> + <p style="[% list_item_p_style %]">[% report.detail | html %]</p> + <p style="[% list_item_date_style %]"> + Reported [% report.time_ago %] ago. + </p> + </div> + [% END %] + +</th> + +[% INCLUDE '_email_bottom.html' %] diff --git a/templates/email/isleofwight/archive.txt b/templates/email/isleofwight/archive.txt new file mode 100644 index 000000000..1a2cd40d5 --- /dev/null +++ b/templates/email/isleofwight/archive.txt @@ -0,0 +1,26 @@ +Subject: Your reports on FixMyStreet + +Hello [% user.name %], + +FixMyStreet is being updated for the Isle of Wight to improve how problems get reported. + +As part of this process we are closing all enquiries made before the update. We noticed +that you have [% report_count %] old [% nget('report', 'reports', report_count) %] on the system, which we've listed below. + +If your enquiry is no longer an issue, you don't need to do anything. If you believe +that the issue has not been resolved, please log it again on +https://fms.islandroads.com/ or contact the Island Roads Help Desk via info@islandroads.com or 01983 822440. + +[% FOR report IN reports %] + +[% report.title %] + +Reported [% report.time_ago %] ago. + +View report: https://www.fixmystreet.com/report/[% report.id %] + +---- + +[% END %] + +The FixMyStreet team and Island Roads diff --git a/templates/email/isleofwight/confirm_report_sent.html b/templates/email/isleofwight/confirm_report_sent.html new file mode 100644 index 000000000..88838960e --- /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 | safe %] + <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 | safe %] +</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..551e42e31 --- /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 | safe %] + <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 | safe %] +</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/email/lincolnshire/contact.html b/templates/email/lincolnshire/contact.html index d9e9b060a..a1be947de 100644 --- a/templates/email/lincolnshire/contact.html +++ b/templates/email/lincolnshire/contact.html @@ -2,7 +2,7 @@ subject_html = subject | html; name = form_name | html; -email_summary = "“" _ subject_html _ "” – Message from " _ name _ " on " _ host; +email_summary = "“" _ subject_html _ "” – Message from " _ name _ " on " _ host; email_footer = "Sent via " _ host _ ", IP " _ ip; email_columns = 1; @@ -13,7 +13,7 @@ INCLUDE '_email_top.html'; %] <th style="[% td_style %][% contact_meta_style %]"> - <table [% table_reset %]> + <table [% table_reset | safe %]> <tr> <th style="[% contact_th_style %]">From</th> <td style="[% contact_td_style %]">[% name %] <<a href="mailto:[% em | html %]">[% em | html %]</a>></td> diff --git a/templates/email/oxfordshire/_problem-confirm_extra.html b/templates/email/oxfordshire/_problem-confirm_extra.html deleted file mode 100644 index 5e22be6b9..000000000 --- a/templates/email/oxfordshire/_problem-confirm_extra.html +++ /dev/null @@ -1,14 +0,0 @@ -[% IF c.cobrand.problem_response_days(report) == 'emergency' %] - <p> - Thank you for contacting Oxfordshire County Council [% report.category %], unfortunately we are currently only available to respond to emergency situations which may have an impact on the health and safety of members of the public, these will be dealt with within a 24 hour period.<br /> - Reported faults will continue to be registered on our management system and these will be tackled in coming months. - </p> -[% ELSIF c.cobrand.problem_response_days(report) > 0 %] - <p> - Problems in the - [% report.category %] - category are generally responded to within - [% c.cobrand.problem_response_days(report) %] - working days. - </p> -[% END %] diff --git a/templates/email/oxfordshire/_problem-confirm_extra.txt b/templates/email/oxfordshire/_problem-confirm_extra.txt deleted file mode 100644 index eb9ccfd12..000000000 --- a/templates/email/oxfordshire/_problem-confirm_extra.txt +++ /dev/null @@ -1,12 +0,0 @@ -[% IF c.cobrand.problem_response_days(report) == 'emergency' %] -Thank you for contacting Oxfordshire County Council [% report.category %], -unfortunately we are currently only available to respond to emergency -situations which may have an impact on the health and safety of members -of the public, these will be dealt with within a 24 hour period. - -Reported faults will continue to be registered on our management -system and these will be tackled in coming months. -[% ELSIF c.cobrand.problem_response_days(report) > 0 %] -Problems in the [% report.category %] category are generally responded -to within [% c.cobrand.problem_response_days(report) %] working days. -[% END %] diff --git a/templates/email/peterborough/_council_reference.html b/templates/email/peterborough/_council_reference.html new file mode 100644 index 000000000..8a1a9e1ee --- /dev/null +++ b/templates/email/peterborough/_council_reference.html @@ -0,0 +1,3 @@ +<p style="[% p_style %]">The report's reference number is <strong>[% problem.id %]</strong>. + Please quote this if you need to contact the council about this report.</p> + diff --git a/templates/email/peterborough/_council_reference.txt b/templates/email/peterborough/_council_reference.txt new file mode 100644 index 000000000..75d7e93d2 --- /dev/null +++ b/templates/email/peterborough/_council_reference.txt @@ -0,0 +1,2 @@ +The report's reference number is [% problem.id %]. Please quote this if +you need to contact the council about this report. diff --git a/templates/email/peterborough/_council_reference_alert_update.html b/templates/email/peterborough/_council_reference_alert_update.html new file mode 100644 index 000000000..bc7e0282c --- /dev/null +++ b/templates/email/peterborough/_council_reference_alert_update.html @@ -0,0 +1,2 @@ +<p style="[% p_style %]">The report's reference number is <strong>[% problem.id %]</strong>. + Please quote this if you need to contact the council about this report.</p> diff --git a/templates/email/peterborough/_council_reference_alert_update.txt b/templates/email/peterborough/_council_reference_alert_update.txt new file mode 100644 index 000000000..75d7e93d2 --- /dev/null +++ b/templates/email/peterborough/_council_reference_alert_update.txt @@ -0,0 +1,2 @@ +The report's reference number is [% problem.id %]. Please quote this if +you need to contact the council about this report. diff --git a/templates/email/peterborough/_email_color_overrides.html b/templates/email/peterborough/_email_color_overrides.html new file mode 100644 index 000000000..cc601869e --- /dev/null +++ b/templates/email/peterborough/_email_color_overrides.html @@ -0,0 +1,20 @@ +[% + +color_green = '#337b1c' +color_alt_green = '#328b15' +color_white = '#fff' + +header_background_color = color_white +header_text_color = color_alt_green +link_text_color = color_green + +secondary_column_background_color = color_white + +button_background_color = color_green +button_text_color = color_white + +logo_width = "162" # pixel measurement, but without 'px' suffix +logo_height = "56" # pixel measurement, but without 'px' suffix +logo_file = "logo.png" + +%] diff --git a/templates/email/tfl/_council_reference.html b/templates/email/tfl/_council_reference.html new file mode 100644 index 000000000..7013a1f9f --- /dev/null +++ b/templates/email/tfl/_council_reference.html @@ -0,0 +1,3 @@ +<p style="[% p_style %]">The report's reference number is <strong>FMS[% problem.id %]</strong>. + Please quote this if you need to contact Transport for London about this report.</p> + diff --git a/templates/email/tfl/_council_reference.txt b/templates/email/tfl/_council_reference.txt new file mode 100644 index 000000000..be82dc8d6 --- /dev/null +++ b/templates/email/tfl/_council_reference.txt @@ -0,0 +1,2 @@ +The report's reference number is FMS[% problem.id %]. Please quote this if +you need to contact Transport for London about this report. diff --git a/templates/email/tfl/_council_reference_alert_update.html b/templates/email/tfl/_council_reference_alert_update.html new file mode 100644 index 000000000..3e7a29dbf --- /dev/null +++ b/templates/email/tfl/_council_reference_alert_update.html @@ -0,0 +1 @@ +[% INCLUDE '_council-reference.html' %]
\ No newline at end of file diff --git a/templates/email/tfl/_council_reference_alert_update.txt b/templates/email/tfl/_council_reference_alert_update.txt new file mode 100644 index 000000000..2cc57a339 --- /dev/null +++ b/templates/email/tfl/_council_reference_alert_update.txt @@ -0,0 +1 @@ +[% INCLUDE '_council-reference.txt' %]
\ No newline at end of file diff --git a/templates/email/tfl/_email_color_overrides.html b/templates/email/tfl/_email_color_overrides.html new file mode 100644 index 000000000..2b9f798fc --- /dev/null +++ b/templates/email/tfl/_email_color_overrides.html @@ -0,0 +1,24 @@ +[% + +color_blue = '#001aa8' +color_black = '#000000' +color_white = '#FFFFFF' +color_tfl_grey = '#414b56' +color_tfl_pale_blue = '#eff6fd' + +body_background_color = color_tfl_pale_blue +body_text_color = color_tfl_grey + +header_background_color = color_blue +header_text_color = color_white + +secondary_column_background_color = color_white + +button_background_color = color_blue +button_text_color = color_white + +logo_width = "220" # pixel measurement, but without 'px' suffix +logo_height = "86" # pixel measurement, but without 'px' suffix +header_padding = "10px 20px" + +%] diff --git a/templates/email/tfl/_email_setting_overrides.html b/templates/email/tfl/_email_setting_overrides.html new file mode 100644 index 000000000..00eeed9cc --- /dev/null +++ b/templates/email/tfl/_email_setting_overrides.html @@ -0,0 +1,7 @@ +[% + +only_column_style = "$only_column_style border: 1px solid $column_divider_color; border-top: none;" +primary_column_style = "$primary_column_style border: 1px solid $column_divider_color; border-top: none;" +secondary_column_style = "vertical-align: top; width: 50%; background-color: $secondary_column_background_color; color: $secondary_column_text_color; border: 1px solid $column_divider_color; border-top: none; border-left: none;" + +%] diff --git a/templates/email/tfl/confirm_report_sent.html b/templates/email/tfl/confirm_report_sent.html new file mode 100644 index 000000000..b698520dd --- /dev/null +++ b/templates/email/tfl/confirm_report_sent.html @@ -0,0 +1 @@ +[% INCLUDE 'other-reported.html' %] diff --git a/templates/email/tfl/confirm_report_sent.txt b/templates/email/tfl/confirm_report_sent.txt new file mode 100644 index 000000000..3d566f89b --- /dev/null +++ b/templates/email/tfl/confirm_report_sent.txt @@ -0,0 +1 @@ +[% INCLUDE 'other-reported.txt' %] diff --git a/templates/email/tfl/other-reported.html b/templates/email/tfl/other-reported.html new file mode 100644 index 000000000..89e76b303 --- /dev/null +++ b/templates/email/tfl/other-reported.html @@ -0,0 +1,33 @@ +[% + +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 | safe %] + <h1 style="[% h1_style %]">Your report has been logged</h1> + <p style="[% p_style %]">Your report to Transport for London has been logged on [% site_name %].</p> + +[% IF report.non_public %] +<p style="[% p_style %]">It has been marked as private and will not be visible +to the general public; you may view it using the link below, or if you sign in +using the email address associated with the report.</p> +[% END %] + +[% TRY %][% INCLUDE '_council_reference.html' problem=report %][% CATCH file %][% END %] + <p style="margin: 20px auto; text-align: center"> + <a style="[% button_style %]" href="[% cobrand.base_url_for_report(report) %][% report.view_url %]">View my report</a> + </p> + [% end_padded_box | safe %] +</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/tfl/other-reported.txt b/templates/email/tfl/other-reported.txt new file mode 100644 index 000000000..e70c4eb1c --- /dev/null +++ b/templates/email/tfl/other-reported.txt @@ -0,0 +1,31 @@ +Subject: Your report has been logged: [% report.title %] + +Hello [% report.name %], + +Your report to Transport for London has been logged on [% site_name %]. + +[% IF report.non_public ~%] +It has been marked as private and will not be visible to the general public; +you may view it using the link below, or if you sign in using the email address +associated with the report. + +[% END ~%] + +[% TRY %][% INCLUDE '_council_reference.txt' problem=report %][% CATCH file %][% END %] + +It is available to view at: + +[% cobrand.base_url_for_report(report) %][% report.view_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/tfl/problem-confirm.html b/templates/email/tfl/problem-confirm.html new file mode 100644 index 000000000..7d083d82e --- /dev/null +++ b/templates/email/tfl/problem-confirm.html @@ -0,0 +1,28 @@ +[% + +email_summary = "You need to confirm your " _ site_name _ " report before it can be sent to Transport for London."; +email_columns = 2; + +PROCESS '_email_settings.html'; + +INCLUDE '_email_top.html'; + +%] + +<th style="[% td_style %][% primary_column_style %]" id="primary_column"> + [% start_padded_box | safe %] + <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 Transport for London.</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 | safe %] +</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/tfl/problem-confirm.txt b/templates/email/tfl/problem-confirm.txt new file mode 100644 index 000000000..212fa3f11 --- /dev/null +++ b/templates/email/tfl/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 +Transport for London.[% 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. + +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/tfl/reply-autoresponse b/templates/email/tfl/reply-autoresponse new file mode 100644 index 000000000..d2c34627e --- /dev/null +++ b/templates/email/tfl/reply-autoresponse @@ -0,0 +1,35 @@ +Subject: Automatic reply to your message to TfL Street Care + +Hello, + +You are receiving this message because you have tried to reply to an automated +email from TfL Street Care. + +This is an automatic response to your email. + +If you are trying to contact us about a report you have made, please +search your email for the latest communication (or auto-reply), and respond +to that. + +Alternatively, if you would like your comment to be published on the Street Care +website, you can post it as an update to the original report if it has not been +closed. In the event that the report has been closed on Street Care, you may +wish to open a new report if the issue is ongoing. + +If you are trying to reply to an update someone has left on your report, please +visit your report page on TfL Street Care and enter your response in the 'update' +box. + +If you are trying to confirm a report or an email alert, please click the link +in the email that we sent you, or, if you cannot click the link, copy and paste +it into the address bar of your web browser. + +If you're trying to unsubscribe from an email alert, there is an unsubscribe +link at the bottom of the email. + +All the best, + +The TfL Street Care team + +This email was sent automatically, from an unmonitored email account - so +please do not reply to it. diff --git a/templates/email/tfl/signature.txt b/templates/email/tfl/signature.txt new file mode 100644 index 000000000..ef8d7d667 --- /dev/null +++ b/templates/email/tfl/signature.txt @@ -0,0 +1 @@ +Street Care diff --git a/templates/email/tfl/site-name.txt b/templates/email/tfl/site-name.txt new file mode 100644 index 000000000..ef8d7d667 --- /dev/null +++ b/templates/email/tfl/site-name.txt @@ -0,0 +1 @@ +Street Care diff --git a/templates/email/tfl/submit.html b/templates/email/tfl/submit.html new file mode 100644 index 000000000..a1bd8f134 --- /dev/null +++ b/templates/email/tfl/submit.html @@ -0,0 +1,76 @@ +[% + +PROCESS '_email_settings.html'; + +email_summary = "A new problem in your area has been reported by a " _ site_name _ " user."; +email_footer = ""; +email_columns = 2; + +INCLUDE '_email_top.html'; + +%] + +<th style="[% td_style %][% primary_column_style %]" id="primary_column"> + [% start_padded_box | safe %] + <h1 style="[% h1_style %]">New problem in your area</h1> + <p style="[% p_style %]">[% multiple %]A user of [% site_name %] has submitted the following report +of a local problem that they believe might require your attention.</p> + + [% IF report.get_extra_field_value('safety_critical') == 'yes' %]<p>This report is marked as safety critical.</p>[% END %] + + <p style="margin: 20px auto; text-align: center"> + <a style="[% button_style %]" href="[% url %]">Show full report</a> + </p> + <h2 style="[% h2_style %] margin: 30px 0 10px 0">Reported by:</h2> + <table [% table_reset | safe %]> + <tr> + <th style="[% contact_th_style %]">Name</th> + <td style="[% contact_td_style %]">[% report.name | html %]</td> + </tr> + <tr> + <th style="[% contact_th_style %]">Email</th> + <td style="[% contact_td_style %]"> + [%~ IF report.user.email ~%] + <a href="mailto:[% report.user.email | html %]">[% report.user.email | html %]</a> + [%~ ELSE ~%] + <strong>No email address provided, only phone number</strong> + [%~ END ~%] + </td> + </tr> + [%~ IF report.user.phone %] + <tr> + <th style="[% contact_th_style %]">Phone</th> + <td style="[% contact_td_style %]"><a href="tel:[% report.user.phone | html %]">[% report.user.phone | html %]</a></td> + </tr> + [%~ END %] + </table> + <p style="[% p_style %] margin-top: 0.5em;">Replies to this message will go directly to [% report.name | html %], the user who reported the problem.</p> + [% end_padded_box | safe %] +</th> +[% WRAPPER '_email_sidebar.html' object = report %] + <h2 style="[% h2_style %]">[% report.title | html %]</h2> + <p style="[% secondary_p_style %]"><strong>Report reference:</strong> FMS[% report.id %]</p> + <p style="[% secondary_p_style %]"><strong>Category:</strong> [% report.category | html %]</p> + [% IF report.get_extra_field_value('stop_code') %] + <p style="[% secondary_p_style %]"><strong>Stop number:</strong> [% report.get_extra_field_value('stop_code') | html %]</p> + [% END %] + [% IF report.get_extra_field_value('site') %] + <p style="[% secondary_p_style %]"><strong>Signal site number:</strong> [% report.get_extra_field_value('site') | html %]</p> + [% END %] + <p style="[% secondary_p_style %]">[% report.detail | html %]</p> + [%~ IF additional_information %] + <p style="[% secondary_p_style %]">[% additional_information %]</p> + [%~ END %] + <p style="[% secondary_p_style %]"> + <strong>Location:</strong> + <br>Easting/Northing + [%~ " (IE)" IF coordsyst == "I" ~%] + : [% easting %]/[% northing %] + (<a href="[% osm_url %]" title="View OpenStreetMap of this location"> + [%~ report.latitude %], [% report.longitude ~%] + </a>) + [% IF closest_address %]<br>[% closest_address | trim | replace("\n\n", "<br>") %][% END %] + </p> +[% END %] + +[% INCLUDE '_email_bottom.html' %] diff --git a/templates/email/tfl/submit.txt b/templates/email/tfl/submit.txt new file mode 100644 index 000000000..b6af867ff --- /dev/null +++ b/templates/email/tfl/submit.txt @@ -0,0 +1,49 @@ +Subject: [% IF report.get_extra_field_value('safety_critical') == 'yes' %]Dangerous [% report.category %][% ELSE %]Problem[% END %] Report: [% report.title %] + +[% multiple %]A user of +[% site_name %] has submitted the following report +of a local problem that they believe might require your attention. + +[% IF report.get_extra_field_value('safety_critical') == 'yes' %]This report is marked as safety critical.[% END %] + +[% fuzzy %], or to provide an update on the problem, +please visit the following link: + + [% url %] + +[% has_photo %]---------- + +Name: [% report.name %] + +Email: [% report.user.email OR 'None provided' %] + +Phone: [% report.user.phone OR 'None provided' %] + +Report reference: FMS[% report.id %] + +Category: [% report.category %] + +[% IF report.get_extra_field_value('stop_code') %]Stop number: [% report.get_extra_field_value('stop_code') %] +[% END %] +[% IF report.get_extra_field_value('site') %]Signal site number: [% report.get_extra_field_value('site') %] +[% END %] +Subject: [% report.title %] + +Details: [% report.detail %] + +[% additional_information %] + +Easting/Northing +[%- " (IE)" IF coordsyst == "I" -%] +: [% easting %]/[% northing %] + +Latitude: [% report.latitude %] + +Longitude: [% report.longitude %] + +View OpenStreetMap of this location: [% osm_url %] + +[% closest_address %]---------- + +Replies to this email will go to the user who submitted the problem. + diff --git a/templates/email/tfl/update-confirm-donotsend.txt b/templates/email/tfl/update-confirm-donotsend.txt new file mode 100644 index 000000000..87ec67328 --- /dev/null +++ b/templates/email/tfl/update-confirm-donotsend.txt @@ -0,0 +1,2 @@ +This update will be sent to Transport for London and will +also be displayed on the [% site_name %] website. diff --git a/templates/email/warwickshire/_email_color_overrides.html b/templates/email/warwickshire/_email_color_overrides.html index 6528f0a5c..81369720f 100644 --- a/templates/email/warwickshire/_email_color_overrides.html +++ b/templates/email/warwickshire/_email_color_overrides.html @@ -1,7 +1,9 @@ [% -color_warwickshire_green = '#006d3c' -color_warwickshire_pale_green = '#F9FFF8' +color_warwickshire_green = '#096f48' +color_warwickshire_pale_green = '#e6ecea' + +body_background_color = '#f6f6f6' header_background_color = color_warwickshire_green header_text_color = color_white diff --git a/templates/email/westminster/_email_color_overrides.html b/templates/email/westminster/_email_color_overrides.html new file mode 100644 index 000000000..297d70f9e --- /dev/null +++ b/templates/email/westminster/_email_color_overrides.html @@ -0,0 +1,21 @@ +[% + +westminster_black = '#0d0e16' +westminster_blue = '#3065bd' +westminster_navy = '#0b2265' +westminster_yellow = '#fecb00' +westminster_grey = '#f7f5f6' + +body_background_color = westminster_grey +header_background_color = '#fff' +secondary_column_background_color = '#fff' + +link_text_color = westminster_blue + +header_padding = "20px" # a full CSS padding property (eg: top/right/bottom/left) + +logo_width = "139" # pixel measurement, but without 'px' suffix +logo_height = "35" # pixel measurement, but without 'px' suffix +logo_file = "wcc_logo.png" + +%] diff --git a/templates/email/westminster/_email_setting_overrides.html b/templates/email/westminster/_email_setting_overrides.html new file mode 100644 index 000000000..9dce49a83 --- /dev/null +++ b/templates/email/westminster/_email_setting_overrides.html @@ -0,0 +1,5 @@ +[% + +header_style = "padding: $header_padding; background: $header_background_color; color: $header_text_color; border-bottom: 3px solid $westminster_yellow;" + +%]
\ No newline at end of file diff --git a/templates/email/westminster/archive.html b/templates/email/westminster/archive.html new file mode 100644 index 000000000..0ecd5889c --- /dev/null +++ b/templates/email/westminster/archive.html @@ -0,0 +1,55 @@ +[% + +email_summary = "Your reports on " _ site_name; + +PROCESS '_email_settings.html'; + +INCLUDE '_email_top.html'; + +%] + +<th style="[% td_style %][% only_column_style %]"> + <h1 style="[% h1_style %]">Your reports on [% site_name %]</h1> + <p style="[% p_style %]"> + Hello [% user.name %], + </p> + <p style="[% p_style %]"> + FixMyStreet is being updated in Westminster to + improve how problems get reported. + </p> + <p style="[% p_style %]"> + As part of this process we are closing all reports + made before the update. + </p> + <p style="[% p_style %]"> + We noticed that you have [% report_count %] old [% nget('report', 'reports', report_count) %] on the system, + which we've listed below. + </p> + <p style="[% p_style %]"> + All of your reports will have been received and reviewed by Westminster, so if + your report is no longer an issue, you don't need to do anything. + </p> + <p style="[% p_style %]"> + If you believe that the issue has not been resolved you can <a href="https://report.westminster.gov.uk/">report it again here.</a> + </p> + + [% FOR report IN reports %] + <div style="[% list_item_style %]"> + [% IF report.photo %] + <a href="[% cobrand.base_url_for_report( report ) %]/report/[% report.id %]"> + <img style="[% list_item_photo_style %]" src="[% inline_image(report.get_first_image_fp) %]" alt=""> + </a> + [% END %] + <h2 style="[% list_item_h2_style %]"><a href="[% cobrand.base_url_for_report( report ) %]/report/[% report.id %]"> + [%~ report.title | html ~%] + </a></h2> + <p style="[% list_item_p_style %]">[% report.detail | html %]</p> + <p style="[% list_item_date_style %]"> + Reported [% report.time_ago %] ago. + </p> + </div> + [% END %] + +</th> + +[% INCLUDE '_email_bottom.html' %] diff --git a/templates/email/westminster/archive.txt b/templates/email/westminster/archive.txt new file mode 100644 index 000000000..657646d9c --- /dev/null +++ b/templates/email/westminster/archive.txt @@ -0,0 +1,27 @@ +Subject: Your reports on [% site_name %] + +Hello [% user.name %], + +FixMyStreet is being updated in Westminster to improve how problems get reported. + +As part of this process we are closing all reports made before the update. + +We noticed that you have [% report_count %] old [% nget('report', 'reports', report_count) %] on the system, which we've listed below. + +All of your reports will have been received and reviewed by Westminster, so if your report is no longer an issue, you don't need to do anything. + +If you believe that the issue has not been resolved you can report it again here: https://report.westminster.gov.uk/ + +[% FOR report IN reports %] + +[% report.title %] + +Reported [% report.time_ago %] ago. + +View report: [% cobrand.base_url_for_report( report ) %]/report/[% report.id %] + +---- + +[% END %] + +The FixMyStreet team and Westminster Council diff --git a/templates/email/zurich/problem-confirm.txt b/templates/email/zurich/problem-confirm.txt index 7a76332bd..f7216ea9c 100644 --- a/templates/email/zurich/problem-confirm.txt +++ b/templates/email/zurich/problem-confirm.txt @@ -6,7 +6,9 @@ Besten Dank für Ihre Meldung auf <<Züri wie neu>>. Klicken Sie bitte auf diese [% token_url %] -Wir werden Ihr Anliegen innerhalb der nächsten sechs Arbeitstage beantworten. +Wir bitten Sie um Verständnis, dass Meldungen und Schäden während der +Coronakrise weniger schnell als gewohnt beantwortet respektive repariert werden +können. Achtung: Notfälle müssen der Polizei gemeldet werden via Telefon 117. |