diff options
Diffstat (limited to 'templates/email')
69 files changed, 724 insertions, 168 deletions
diff --git a/templates/email/bathnes/_council_reference.html b/templates/email/bathnes/_council_reference.html new file mode 100644 index 000000000..8a1a9e1ee --- /dev/null +++ b/templates/email/bathnes/_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/bathnes/_council_reference.txt b/templates/email/bathnes/_council_reference.txt new file mode 100644 index 000000000..75d7e93d2 --- /dev/null +++ b/templates/email/bathnes/_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/bathnes/archive.html b/templates/email/bathnes/archive.html new file mode 100644 index 000000000..823d5dfbb --- /dev/null +++ b/templates/email/bathnes/archive.html @@ -0,0 +1,56 @@ +[% + +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 Bath & North East Somerset 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 Bath & North + East Somerset, 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://www.bathnes.gov.uk/reportit">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/bathnes/archive.txt b/templates/email/bathnes/archive.txt new file mode 100644 index 000000000..e14c049e2 --- /dev/null +++ b/templates/email/bathnes/archive.txt @@ -0,0 +1,27 @@ +Subject: Your reports on [% site_name %] + +Hello [% user.name %], + +FixMyStreet is being updated in Bath & North East Somerset 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 Bath & North East Somerset, 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://www.bathnes.gov.uk/reportit + +[% 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 Bath & North East Somerset Council diff --git a/templates/email/bathnes/confirm_report_sent.html b/templates/email/bathnes/confirm_report_sent.html new file mode 100644 index 000000000..5a0c19f0d --- /dev/null +++ b/templates/email/bathnes/confirm_report_sent.html @@ -0,0 +1 @@ +[% INCLUDE 'other-reported.html' %]
\ No newline at end of file diff --git a/templates/email/bathnes/confirm_report_sent.txt b/templates/email/bathnes/confirm_report_sent.txt new file mode 100644 index 000000000..72fe01f6d --- /dev/null +++ b/templates/email/bathnes/confirm_report_sent.txt @@ -0,0 +1 @@ +[% INCLUDE 'other-reported.txt' %]
\ No newline at end of file diff --git a/templates/email/bathnes/other-updated.html b/templates/email/bathnes/other-updated.html new file mode 100644 index 000000000..fb68c86ee --- /dev/null +++ b/templates/email/bathnes/other-updated.html @@ -0,0 +1,28 @@ +[% + +email_summary = "Thanks for logging your update"; +email_columns = 2; + +PROCESS '_email_settings.html'; +INCLUDE '_email_top.html'; + +%] + +<th style="[% td_style %][% primary_column_style %]" id="primary_column"> + [% start_padded_box %] + <h1 style="[% h1_style %]">Your update has been logged</h1> + <p style="[% p_style %]">Your update has been logged on [% site_name %].</p> + <p style="[% p_style %]">The report's reference number is <strong>[% update.problem_id %]</strong>. + Please quote this if you need to contact the council about this report.</p> + <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 %] +</th> +[% WRAPPER '_email_sidebar.html' + object = update + report = problem %] + <p style="[% secondary_p_style %]">[% update.text | html %]</p> +[% END %] + +[% INCLUDE '_email_bottom.html' %] diff --git a/templates/email/bathnes/other-updated.txt b/templates/email/bathnes/other-updated.txt new file mode 100644 index 000000000..57d5f44cf --- /dev/null +++ b/templates/email/bathnes/other-updated.txt @@ -0,0 +1,19 @@ +Subject: Your update has been logged + +Hello [% update.name %], + +Your update has been logged on [% site_name %]: + +[% cobrand.base_url_for_report(problem) %][% update.url %] + +The report's reference number is [% update.problem_id %]. Please quote this if +you need to contact the council about this report. + +Your update reads: + +[% update.text %] + +[% signature %] + +This email was sent automatically, from an unmonitored email account - so +please do not reply to it. diff --git a/templates/email/bromley/_problem-confirm_extra.html b/templates/email/bromley/_problem-confirm_extra.html new file mode 100644 index 000000000..92605f8d2 --- /dev/null +++ b/templates/email/bromley/_problem-confirm_extra.html @@ -0,0 +1,6 @@ +</p> +<p style="[% p_style %]"> +By clicking validate you consent that for the purposes of investigating and +resolving the reported issue, your provided information can be shared with the +council, their contractors, partners or other organisations deemed to have +responsibility or bearing on the issue. diff --git a/templates/email/bromley/_problem-confirm_extra.txt b/templates/email/bromley/_problem-confirm_extra.txt new file mode 100644 index 000000000..1cb494de2 --- /dev/null +++ b/templates/email/bromley/_problem-confirm_extra.txt @@ -0,0 +1,4 @@ +By clicking validate you consent that for the purposes of investigating and +resolving the reported issue, your provided information can be shared with the +council, their contractors, partners or other organisations deemed to have +responsibility or bearing on the issue. diff --git a/templates/email/buckinghamshire/_council_reference.html b/templates/email/buckinghamshire/_council_reference.html new file mode 100644 index 000000000..56944f954 --- /dev/null +++ b/templates/email/buckinghamshire/_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 the council about this report.</p> +[%~ END %] diff --git a/templates/email/buckinghamshire/_council_reference.txt b/templates/email/buckinghamshire/_council_reference.txt new file mode 100644 index 000000000..3dd3f1e9f --- /dev/null +++ b/templates/email/buckinghamshire/_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 the council about this report.[% END %] diff --git a/templates/email/buckinghamshire/alert-update.html b/templates/email/buckinghamshire/alert-update.html new file mode 100644 index 000000000..48e6871c2 --- /dev/null +++ b/templates/email/buckinghamshire/alert-update.html @@ -0,0 +1,27 @@ +[% + +title = report.title | html; +category = report.category | html; +email_summary = "New updates on " _ category _ " report"; +email_columns = 2; + +PROCESS '_email_settings.html'; + +INCLUDE '_email_top.html'; + +%] + +<th style="[% td_style %][% primary_column_style %]" id="primary_column"> + [% start_padded_box %] + <h1 style="[% h1_style %]">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 %] +</th> +[% WRAPPER '_email_sidebar.html' object = report %] + <h2 style="[% h2_style %]">[% title | html %]</h2> + <p style="[% secondary_p_style %]">[% report.detail | html %]</p> + [%~ INCLUDE '_council_reference.html' problem=report p_style=secondary_p_style %] +[% END %] + +[% INCLUDE '_email_bottom.html' %] diff --git a/templates/email/buckinghamshire/alert-update.txt b/templates/email/buckinghamshire/alert-update.txt new file mode 100644 index 000000000..a77f3a2a0 --- /dev/null +++ b/templates/email/buckinghamshire/alert-update.txt @@ -0,0 +1,30 @@ +Subject: New [% site_name %] updates on [% report.category %] report + +You asked us to send you an email every time an update was made to the +[% site_name %] report: [% report.title %]. + +The following updates have been left on this report: + +[% INCLUDE '_email_comment_list.txt' %] + +[% state_message %] + +If you would like to view or reply to these updates, please visit the following URL: + + [% problem_url %] + +[% INCLUDE '_council_reference.txt' problem=report %] + +This email was sent automatically, from an unmonitored email account - so +please do not reply to it. + +[% signature %] + + +Unsubscribe? + +We currently email you whenever someone leaves an update on the +[% site_name %] report: [% report.title %]. + +If you no longer wish to receive an email whenever this report is updated, +please follow this link: [% unsubscribe_url %] diff --git a/templates/email/buckinghamshire/confirm_report_sent.html b/templates/email/buckinghamshire/confirm_report_sent.html new file mode 100644 index 000000000..5a0c19f0d --- /dev/null +++ b/templates/email/buckinghamshire/confirm_report_sent.html @@ -0,0 +1 @@ +[% INCLUDE 'other-reported.html' %]
\ No newline at end of file diff --git a/templates/email/buckinghamshire/confirm_report_sent.txt b/templates/email/buckinghamshire/confirm_report_sent.txt new file mode 100644 index 000000000..72fe01f6d --- /dev/null +++ b/templates/email/buckinghamshire/confirm_report_sent.txt @@ -0,0 +1 @@ +[% INCLUDE 'other-reported.txt' %]
\ No newline at end of file diff --git a/templates/email/buckinghamshire/other-reported.txt b/templates/email/buckinghamshire/other-reported.txt new file mode 100644 index 000000000..50a879d79 --- /dev/null +++ b/templates/email/buckinghamshire/other-reported.txt @@ -0,0 +1,29 @@ +Subject: Your [% report.category | lower %] report has been logged + +Hello [% report.name %], + +Your report to [% report.body %] has been logged on [% site_name %]. + +[% IF c.cobrand.is_council && !c.cobrand.owns_problem( report ) %] +Please note that [% c.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 is at the following location: + +[% 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/default/_email_bottom.html b/templates/email/default/_email_bottom.html index 76e381201..4967dfaa2 100644 --- a/templates/email/default/_email_bottom.html +++ b/templates/email/default/_email_bottom.html @@ -1,16 +1,20 @@ </tr> - <tr> - <th colspan="[% email_columns %]" style="[% td_style %][% hint_style %]" class="hint"> - [%~ IF email_footer %] - [% email_footer %] - [%~ ELSE %] - This email was sent automatically, from an unmonitored email account. Please do not reply to it. - [%~ END %] - </th> - </tr> </table> </th> - <th></th> + <th class="spacer-cell"></th> + </tr> + </table> + <table [% wrapper_table %] 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 %] + [%~ ELSE %] + This email was sent automatically, from an unmonitored email account. Please do not reply to it. + [%~ END %] + </th> + <th class="spacer-cell"></th> </tr> </table> </body> diff --git a/templates/email/default/_email_settings.html b/templates/email/default/_email_settings.html index d94466c02..f6db8334c 100644 --- a/templates/email/default/_email_settings.html +++ b/templates/email/default/_email_settings.html @@ -43,9 +43,11 @@ button_border_radius = "4px" # a full CSS border-radius property button_background_color = color_yellow button_background_color_fixed = color_green_dark button_background_color_notfixed = color_red_dark +button_background_color_dontknow = color_yellow button_text_color = color_black button_text_color_fixed = color_white button_text_color_notfixed = color_white +button_text_color_dontknow = color_black button_font_weight = "bold" %] @@ -58,7 +60,7 @@ button_font_weight = "bold" # Variables used inside the email templates. table_reset = 'cellspacing="0" cellpadding="0" border="0" width="100%"' -wrapper_table = 'cellspacing="0" cellpadding="5" border="0" width="100%"' +wrapper_table = table_reset link_style = "color: $link_text_color;" link_hover_style = "text-decoration: none; color: $link_hover_text_color;" @@ -68,7 +70,12 @@ td_style = "font-family: $body_font_family; font-size: 16px; line-height: 21px; body_style = "margin: 0;" wrapper_style = "$td_style background: $body_background_color; color: $body_text_color;" -hint_style = "padding: ${ column_padding }px 0; color: $body_text_color; font-size: 12px; line-height: 18px;" +wrapper_max_width = 620 # in pixels without "px" suffix +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;" + 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;" @@ -101,6 +108,7 @@ contact_td_style = "vertical-align: top; padding: 0.4em 0 0.4em 0; width: 100%;" 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;" fixed_button_style = "$button_style border-color: $button_background_color_fixed; background-color: $button_background_color_fixed; color: $button_text_color_fixed; margin: 0 0.2em;" notfixed_button_style = "$button_style border-color: $button_background_color_notfixed; background-color: $button_background_color_notfixed; color: $button_text_color_notfixed; margin: 0 0.2em;" +dontknow_button_style = "$button_style border-color: $button_background_color_dontknow; background-color: $button_background_color_dontknow; color: $button_text_color_dontknow; margin: 0 0.2em;" %] diff --git a/templates/email/default/_email_top.html b/templates/email/default/_email_top.html index 102e23e59..75dec6788 100644 --- a/templates/email/default/_email_top.html +++ b/templates/email/default/_email_top.html @@ -22,14 +22,11 @@ font-family: [% body_font_family %] !important; } - [%~ # 550px = 5+5+5+520+5+5+5 %] - @media only screen and (max-width: 549px) { - #main { + @media only screen and (max-width: [% wrapper_min_width - 1 %]px) { + #main, .hint { min-width: 0 !important; } - } - @media only screen and (max-width: 500px) { #main table, #main tr, #main th { display: block !important; } @@ -39,20 +36,30 @@ width: auto !important; } } + + @media only screen and (min-width: [% wrapper_max_width %]px) { + .spacer-cell { + background-color: [% body_background_color %]; + } + } </style> </head> <body style="[% body_style %]"> <table [% wrapper_table %] style="[% wrapper_style %]"> <tr> - <th></th> - <th width="620" style="[% td_style %] min-width: 520px;" id="main"> + <th class="spacer-cell"></th> + <th width="[% wrapper_max_width %]" style="[% td_style %][% hint_style %]" class="hint"> + [% email_summary %] + </th> + <th class="spacer-cell"></th> + </tr> + </table> + <table [% wrapper_table %] 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 %]> <tr> - <th colspan="[% email_columns %]" style="[% td_style %][% hint_style %]" class="hint"> - [% email_summary %] - </th> - </tr> - <tr> <th colspan="[% email_columns %]" style="[% td_style %][% header_style %]"> [%~ IF file_exists("web/cobrands/${ img_dir }/images/email-logo.gif") ~%] <img src="[% inline_image('web/cobrands/' _ img_dir _ '/images/email-logo.gif') %]" width="[% logo_width %]" height="[% logo_height %]" alt="[% site_name %]" style="[% logo_style %]"/> diff --git a/templates/email/default/alert-confirm.txt b/templates/email/default/alert-confirm.txt index 886b04b00..74fe7e64e 100644 --- a/templates/email/default/alert-confirm.txt +++ b/templates/email/default/alert-confirm.txt @@ -1,6 +1,6 @@ -Subject: Confirm your [% INCLUDE 'site-name.txt' | trim %] alert +Subject: Confirm your [% site_name %] alert -Please click on the link below to confirm your [% INCLUDE 'site-name.txt' | trim %] alert. +Please click on the link below to confirm your [% site_name %] alert. [% token_url %] @@ -8,11 +8,11 @@ If you can't click the link, copy and paste it to the address bar of your web browser. This confirms that you'd like to receive an email when someone makes a -[% INCLUDE 'site-name.txt' | trim %] report within your chosen area. +[% site_name %] report within your chosen area. -Email alerts are a free service from [% INCLUDE 'site-name.txt' | trim %]. +Email alerts are a free service from [% site_name %]. -[% INCLUDE 'signature.txt' %] +[% signature %] This email was sent automatically, from an unmonitored email account - so please do not reply to it. diff --git a/templates/email/default/alert-update.html b/templates/email/default/alert-update.html index 8c392685d..a2f1c69a9 100644 --- a/templates/email/default/alert-update.html +++ b/templates/email/default/alert-update.html @@ -1,6 +1,6 @@ [% -title = title | html; +title = report.title | html; email_summary = "New updates on “" _ title _ "”"; email_columns = 2; @@ -14,12 +14,14 @@ INCLUDE '_email_top.html'; [% start_padded_box %] <h1 style="[% h1_style %]">New updates on <a href="[% problem_url %]">[% title %]</a></h1> [%~ INCLUDE '_email_comment_list.html' %] + [% UNLESS hide_unsubscribe %] <p style="[% p_style %]"><a href="[% unsubscribe_url %]">Unsubscribe from alerts about this report</a></p> + [% END %] [% end_padded_box %] </th> [% WRAPPER '_email_sidebar.html' object = report %] - <h2 style="[% h2_style %]">[% title | html %]</h2> - <p style="[% secondary_p_style %]">[% detail | html %]</p> + <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/default/alert-update.txt b/templates/email/default/alert-update.txt index 3bf9e4377..cfeba2e36 100644 --- a/templates/email/default/alert-update.txt +++ b/templates/email/default/alert-update.txt @@ -1,7 +1,7 @@ -Subject: New [% site_name %] updates on report: '[% title %]' +Subject: New [% site_name %] updates on report: '[% report.title %]' You asked us to send you an email every time an update was made to the -[% site_name %] report: [% title %]. +[% site_name %] report: [% report.title %]. The following updates have been left on this report: @@ -19,10 +19,12 @@ please do not reply to it. [% signature %] +[% IF NOT hide_unsubscribe %] Unsubscribe? We currently email you whenever someone leaves an update on the -[% site_name %] report: [% title %]. +[% site_name %] report: [% report.title %]. 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/change_email.txt b/templates/email/default/change_email.txt index 8db6b105e..3d3328b8f 100644 --- a/templates/email/default/change_email.txt +++ b/templates/email/default/change_email.txt @@ -5,7 +5,7 @@ email address on [% site_name %]. [% c.uri_for_action( 'auth/token', token ) %] -[% INCLUDE 'signature.txt' %] +[% signature %] This email was sent automatically, from an unmonitored email account - so please do not reply to it. diff --git a/templates/email/default/inactive-account.html b/templates/email/default/inactive-account.html new file mode 100644 index 000000000..78b277877 --- /dev/null +++ b/templates/email/default/inactive-account.html @@ -0,0 +1,26 @@ +[% + +email_summary = "Your inactive account on " _ site_name; +email_columns = 1; + +PROCESS '_email_settings.html'; + +INCLUDE '_email_top.html'; + +%] + +<th style="[% td_style %][% only_column_style %]"> + <h1 style="[% h1_style %]">Your inactive account</h1> + <p style="[% p_style %]"> +Your account on [% site_name %] has been inactive for [% email_from %] +[% nget('month', 'months', email_from) %], and we automatically remove +accounts that have been inactive after [% anonymize_from %] +[% nget('month', 'months', anonymize_from) %]. If you wish to keep your +account, please log in to the site and that will keep it active: +</p> + <p style="margin: 20px auto; text-align: center"> + <a style="[% button_style %]" href="[% url %]">Visit [% site_name %]</a> + </p> + <p style="[% p_style %]">Thanks for using the site.</p> + +[% INCLUDE '_email_bottom.html' %] diff --git a/templates/email/default/inactive-account.txt b/templates/email/default/inactive-account.txt new file mode 100644 index 000000000..1b6b8b5bd --- /dev/null +++ b/templates/email/default/inactive-account.txt @@ -0,0 +1,18 @@ +Subject: Your inactive account on [% site_name %] + +Hello [% user.name %], + +Your account on [% site_name %] has been inactive for [% email_from %] +[% nget('month', 'months', email_from) %], and we automatically remove +accounts that have been inactive after [% anonymize_from %] +[% nget('month', 'months', anonymize_from) %]. If you wish to keep your +account, please log in to the site and that will keep it active: + +[% url %] + +Thanks for using the site. + +[% INCLUDE 'signature.txt' %] + +This email was sent automatically, from an unmonitored email account - so +please do not reply to it. diff --git a/templates/email/default/login.txt b/templates/email/default/login.txt index 9a57c4fd9..61920daf7 100644 --- a/templates/email/default/login.txt +++ b/templates/email/default/login.txt @@ -7,7 +7,7 @@ Please click on the link below to confirm your email address. Once you've done this, you'll be able to view and manage all reports and updates you've made on [% site_name %]. -[% INCLUDE 'signature.txt' %] +[% signature %] This email was sent automatically, from an unmonitored email account - so please do not reply to it. diff --git a/templates/email/default/other-reported.txt b/templates/email/default/other-reported.txt index b626e56d9..559b0933b 100644 --- a/templates/email/default/other-reported.txt +++ b/templates/email/default/other-reported.txt @@ -21,7 +21,7 @@ And details: [% report.detail %] -[% INCLUDE 'signature.txt' %] +[% signature %] This email was sent automatically, from an unmonitored email account - so please do not reply to it. diff --git a/templates/email/default/other-updated.html b/templates/email/default/other-updated.html index 27eba9007..e7f09e123 100644 --- a/templates/email/default/other-updated.html +++ b/templates/email/default/other-updated.html @@ -11,7 +11,8 @@ INCLUDE '_email_top.html'; <th style="[% td_style %][% primary_column_style %]" id="primary_column"> [% start_padded_box %] <h1 style="[% h1_style %]">Your update has been logged</h1> - <p style="[% p_style %]">Your update has been logged on [% site_name %]:</p> + <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> diff --git a/templates/email/default/other-updated.txt b/templates/email/default/other-updated.txt index 7e5631ef1..5b5195f80 100644 --- a/templates/email/default/other-updated.txt +++ b/templates/email/default/other-updated.txt @@ -6,11 +6,13 @@ Your update has been logged on [% site_name %]: [% cobrand.base_url_for_report(problem) %][% update.url %] +[% TRY %][% INCLUDE '_council_reference.txt' %][% CATCH file %][% END %] + Your update reads: [% update.text %] -[% INCLUDE 'signature.txt' %] +[% signature %] This email was sent automatically, from an unmonitored email account - so please do not reply to it. diff --git a/templates/email/default/partial.txt b/templates/email/default/partial.txt index fb5e17c10..ea405f0b4 100644 --- a/templates/email/default/partial.txt +++ b/templates/email/default/partial.txt @@ -1,8 +1,8 @@ -Subject: Confirm your report on [% INCLUDE 'site-name.txt' | trim %] +Subject: Confirm your report on [% site_name %] Hello [% report.name || report.email %], -To confirm the report you have uploaded to [% INCLUDE 'site-name.txt' | trim %] +To confirm the report you have uploaded to [% site_name %] via [% report.service %], and to check or add any details, please visit the following URL: @@ -10,7 +10,7 @@ following URL: Thanks! -[% INCLUDE 'signature.txt' %] +[% signature %] This email was sent automatically, from an unmonitored email account - so please do not reply to it. diff --git a/templates/email/default/problem-confirm-not-sending.txt b/templates/email/default/problem-confirm-not-sending.txt index d27b47677..06e84e6d5 100644 --- a/templates/email/default/problem-confirm-not-sending.txt +++ b/templates/email/default/problem-confirm-not-sending.txt @@ -25,7 +25,7 @@ Thank you for supporting [% site_name %]. -[% INCLUDE 'signature.txt' %] +[% signature %] This email was sent automatically, from an unmonitored email account - so please do not reply to it. diff --git a/templates/email/default/problem-confirm.txt b/templates/email/default/problem-confirm.txt index e9e7378d1..693d7a131 100644 --- a/templates/email/default/problem-confirm.txt +++ b/templates/email/default/problem-confirm.txt @@ -29,7 +29,7 @@ Thank you for submitting a report through [% site_name %]. -[% INCLUDE 'signature.txt' %] +[% signature %] This email was sent automatically, from an unmonitored email account - so please do not reply to it. diff --git a/templates/email/default/problem-moderated.txt b/templates/email/default/problem-moderated.txt index f69004be2..7c1c3b5c2 100644 --- a/templates/email/default/problem-moderated.txt +++ b/templates/email/default/problem-moderated.txt @@ -31,7 +31,7 @@ the team at [% report_complain_uri %] Thank you for submitting a report through [% site_name %]. -[% INCLUDE 'signature.txt' %] +[% signature %] This email was sent automatically, from an unmonitored email account - so please do not reply to it. diff --git a/templates/email/default/questionnaire.html b/templates/email/default/questionnaire.html index 6d9c32af4..eaa570ae0 100644 --- a/templates/email/default/questionnaire.html +++ b/templates/email/default/questionnaire.html @@ -16,8 +16,11 @@ INCLUDE '_email_top.html'; <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> <p style="margin: 20px auto; text-align: center"> - <a style="[% fixed_button_style %]" href="[% url %]">Fixed</a> - <a style="[% notfixed_button_style %]" href="[% url %]">Not fixed</a> + <a style="[% fixed_button_style %]" href="[% url %]?been_fixed=Yes">Fixed</a> + <a style="[% notfixed_button_style %]" href="[% url %]?been_fixed=No">Not fixed</a> + </p> + <p style="margin: 20px auto; text-align: center"> + <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 %] diff --git a/templates/email/default/submit.html b/templates/email/default/submit.html index 582670f98..8dc06041e 100644 --- a/templates/email/default/submit.html +++ b/templates/email/default/submit.html @@ -23,38 +23,36 @@ of a local problem that they believe might require your attention.</p> <table [% table_reset %]> <tr> <th style="[% contact_th_style %]">Name</th> - <td style="[% contact_td_style %]">[% name | html %]</td> + <td style="[% contact_td_style %]">[% report.name | html %]</td> </tr> <tr> <th style="[% contact_th_style %]">Email</th> <td style="[% contact_td_style %]"> - [%~ IF email ~%] - <a href="mailto:[% email | html %]">[% email | html %]</a> + [%~ 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 phone %] + [%~ IF report.user.phone %] <tr> <th style="[% contact_th_style %]">Phone</th> - <td style="[% contact_td_style %]"><a href="tel:[% phone | html %]">[% phone | html %]</a></td> + <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 [% name | html %], the user who reported the problem.</p> + <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 %] </th> [% WRAPPER '_email_sidebar.html' object = report %] - <h2 style="[% h2_style %]">[% title | html %]</h2> - [%~ IF category_line %] - <p style="[% secondary_p_style %]">[% category | html %]</p> - [%~ END %] - <p style="[% secondary_p_style %]">[% detail | html %]</p> + <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"> - [%~ latitude %], [% longitude ~%] + [%~ report.latitude %], [% report.longitude ~%] </a> [% IF closest_address %]<br>[% closest_address | trim | replace("\n\n", "<br>") %][% END %] </p> diff --git a/templates/email/default/submit.txt b/templates/email/default/submit.txt index 8c88a17f8..f08e723a8 100644 --- a/templates/email/default/submit.txt +++ b/templates/email/default/submit.txt @@ -1,4 +1,4 @@ -Subject: Problem Report: [% title %] +Subject: Problem Report: [% report.title %] Dear [% bodies_name %], @@ -13,19 +13,21 @@ please visit the following link: [% has_photo %]---------- -Name: [% name %] +Name: [% report.name %] -Email: [% email OR "None provided" %] +Email: [% report.user.email OR "None provided" %] -Phone: [% phone OR "None provided" %] +Phone: [% report.user.phone OR "None provided" %] -[% category_line %]Subject: [% title %] +Category: [% report.category %] -Details: [% detail %] +Subject: [% report.title %] -Latitude: [% latitude %] +Details: [% report.detail %] -Longitude: [% longitude %] +Latitude: [% report.latitude %] + +Longitude: [% report.longitude %] View OpenStreetMap of this location: [% osm_url %] diff --git a/templates/email/default/update-confirm.txt b/templates/email/default/update-confirm.txt index 039a3bb39..669645f0a 100644 --- a/templates/email/default/update-confirm.txt +++ b/templates/email/default/update-confirm.txt @@ -1,8 +1,8 @@ -Subject: Confirm your update on [% INCLUDE 'site-name.txt' | trim %] +Subject: Confirm your update on [% site_name %] Hello [% update.name %], -Please click on the link below to confirm your update on [% INCLUDE 'site-name.txt' | trim %]: +Please click on the link below to confirm your update on [% site_name %]: [% token_url %] @@ -15,7 +15,7 @@ Your update reads: [% INCLUDE 'update-confirm-donotsend.txt' %] -[% INCLUDE 'signature.txt' %] +[% signature %] This email was sent automatically, from an unmonitored email account - so please do not reply to it. diff --git a/templates/email/fiksgatami/nn/submit.txt b/templates/email/fiksgatami/nn/submit.txt index dfbdd9457..0e3f453ba 100644 --- a/templates/email/fiksgatami/nn/submit.txt +++ b/templates/email/fiksgatami/nn/submit.txt @@ -1,4 +1,4 @@ -Subject: Problemrapport: [% title %] +Subject: Problemrapport: [% report.title %] Til [% bodies_name %], @@ -13,19 +13,21 @@ problemet, ver venleg og besøk følgjande lenkje: [% has_photo %]---------- -Namn: [% name %] +Namn: [% report.name %] -E-post: [% email OR '-' %] +E-post: [% report.user.email OR '-' %] -Telefon: [% phone OR '-' %] +Telefon: [% report.user.phone OR '-' %] -[% category_line %]Tema: [% title %] +Kategori: [% report.category %] -Detaljer: [% detail %] +Tema: [% report.title %] -Breiddegrad: [% latitude %] +Detaljer: [% report.detail %] -Lengdegrad: [% longitude %] +Breiddegrad: [% report.latitude %] + +Lengdegrad: [% report.longitude %] [% closest_address %]---------- diff --git a/templates/email/fiksgatami/submit.txt b/templates/email/fiksgatami/submit.txt index 165b804f1..114f4cf50 100644 --- a/templates/email/fiksgatami/submit.txt +++ b/templates/email/fiksgatami/submit.txt @@ -1,4 +1,4 @@ -Subject: Problemrapport: [% title %] +Subject: Problemrapport: [% report.title %] Til [% bodies_name %], @@ -13,19 +13,21 @@ vennligst besøk følgende lenke: [% has_photo %]---------- -Navn: [% name %] +Navn: [% report.name %] -E-post: [% email OR '-' %] +E-post: [% report.user.email OR '-' %] -Telefon: [% phone OR '-' %] +Telefon: [% report.user.phone OR '-' %] -[% category_line %]Tema: [% title %] +Kategori: [% report.category %] -Detajer: [% detail %] +Tema: [% report.title %] -Breddegrad: [% latitude %] +Detajer: [% report.detail %] -Lengegrad: [% longitude %] +Breddegrad: [% report.latitude %] + +Lengegrad: [% report.longitude %] [% closest_address %]---------- diff --git a/templates/email/fixamingata/_email_bottom.html b/templates/email/fixamingata/_email_bottom.html index dab4486cd..0a8c95c1c 100644 --- a/templates/email/fixamingata/_email_bottom.html +++ b/templates/email/fixamingata/_email_bottom.html @@ -1,17 +1,21 @@ </tr> - <tr> - <th colspan="[% email_columns %]" style="[% td_style %][% hint_style %]" class="hint"> - [%~ IF email_footer %] - [% email_footer %] - [%~ ELSE %] - Det går inte att svara på detta mail - [%~ END %] - </th> - </tr> </table> </th> <th></th> </tr> </table> + <table [% wrapper_table %] style="[% wrapper_style %]"> + <tr> + <th></th> + <th width="[% wrapper_max_width %]" style="[% td_style %][% hint_style %]" class="hint"> + [%~ IF email_footer %] + [% email_footer %] + [%~ ELSE %] + Det går inte att svara på detta mail + [%~ END %] + </th> + <th></th> + </tr> + </table> </body> </html> diff --git a/templates/email/fixamingata/alert-confirm.txt b/templates/email/fixamingata/alert-confirm.txt index 8f17765b6..4ada66e9d 100644 --- a/templates/email/fixamingata/alert-confirm.txt +++ b/templates/email/fixamingata/alert-confirm.txt @@ -10,4 +10,4 @@ just valde att prenumerera till på FixaMinGata: Om du inte kan klicka på länken kan du kopiera den och klistra in den i adressfältet på din webbläsare. -[% INCLUDE 'signature.txt' %] +[% signature %] diff --git a/templates/email/fixamingata/change_email.txt b/templates/email/fixamingata/change_email.txt index c83c9bd3f..e59565aaf 100644 --- a/templates/email/fixamingata/change_email.txt +++ b/templates/email/fixamingata/change_email.txt @@ -5,6 +5,6 @@ e-postadress på [% site_name %]. [% c.uri_for_action( 'auth/token', token ) %] -[% INCLUDE 'signature.txt' %] +[% signature %] Det går inte att svara på detta mail. diff --git a/templates/email/fixamingata/login.txt b/templates/email/fixamingata/login.txt index e3d8f9f27..4aa5b9785 100644 --- a/templates/email/fixamingata/login.txt +++ b/templates/email/fixamingata/login.txt @@ -8,5 +8,5 @@ webbsidan. [% c.uri_for_action( 'auth/token', token ) %] -[% INCLUDE 'signature.txt' %] +[% signature %] diff --git a/templates/email/fixamingata/other-reported.txt b/templates/email/fixamingata/other-reported.txt index f530f788e..2c50c765c 100644 --- a/templates/email/fixamingata/other-reported.txt +++ b/templates/email/fixamingata/other-reported.txt @@ -21,6 +21,6 @@ Och detaljerna: [% report.detail %] -[% INCLUDE 'signature.txt' %] +[% signature %] Det går inte att svara på detta mail. diff --git a/templates/email/fixamingata/other-updated.txt b/templates/email/fixamingata/other-updated.txt index 2010511e9..a5d9c6288 100644 --- a/templates/email/fixamingata/other-updated.txt +++ b/templates/email/fixamingata/other-updated.txt @@ -10,6 +10,6 @@ Din uppdatering: [% update.text %] -[% INCLUDE 'signature.txt' %] +[% signature %] Det går inte att svara på detta mail. diff --git a/templates/email/fixamingata/partial.txt b/templates/email/fixamingata/partial.txt index f29b6b914..b93942324 100644 --- a/templates/email/fixamingata/partial.txt +++ b/templates/email/fixamingata/partial.txt @@ -9,4 +9,4 @@ via [% report.service %] måste du klicka på: Tack! -[% INCLUDE 'signature.txt' %] +[% signature %] diff --git a/templates/email/fixamingata/problem-confirm-not-sending.txt b/templates/email/fixamingata/problem-confirm-not-sending.txt index 0ec162063..d631eac75 100644 --- a/templates/email/fixamingata/problem-confirm-not-sending.txt +++ b/templates/email/fixamingata/problem-confirm-not-sending.txt @@ -1,4 +1,4 @@ -Subject: Bekräfta din rapport på [% INCLUDE 'site-name.txt' | trim %] +Subject: Bekräfta din rapport på [% site_name %] Hej [% report.name %], @@ -17,6 +17,6 @@ Du har angivit följande information om problemet: [% report.detail %] -[% INCLUDE 'signature.txt' %] +[% signature %] Det går inte att svara på detta mail. diff --git a/templates/email/fixamingata/problem-confirm.txt b/templates/email/fixamingata/problem-confirm.txt index 8d020ce5d..3db8c0b7e 100644 --- a/templates/email/fixamingata/problem-confirm.txt +++ b/templates/email/fixamingata/problem-confirm.txt @@ -1,4 +1,4 @@ -Subject: Bekräfta din rapport på [% INCLUDE 'site-name.txt' | trim %] +Subject: Bekräfta din rapport på [% site_name %] Hej [% report.name %], @@ -16,4 +16,4 @@ Du har angivit följande information om problemet: [% report.detail %] -[% INCLUDE 'signature.txt' %] +[% signature %] diff --git a/templates/email/fixamingata/problem-moderated.txt b/templates/email/fixamingata/problem-moderated.txt index ad03ba421..010a0949c 100644 --- a/templates/email/fixamingata/problem-moderated.txt +++ b/templates/email/fixamingata/problem-moderated.txt @@ -28,6 +28,6 @@ Du kan se rapporten på [% report_uri %] Om du inte tycker att rapporten skulle ha blivit modererad kan du kontakta FixaMinGata:s support på [% report_complain_uri %] -[% INCLUDE 'signature.txt' %] +[% signature %] Det går inte att svara på detta mail. diff --git a/templates/email/fixamingata/questionnaire.html b/templates/email/fixamingata/questionnaire.html index 0f15b478e..d66c50535 100644 --- a/templates/email/fixamingata/questionnaire.html +++ b/templates/email/fixamingata/questionnaire.html @@ -16,8 +16,11 @@ INCLUDE '_email_top.html'; <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> <p style="margin: 20px auto; text-align: center"> - <a style="[% fixed_button_style %]" href="[% url %]">Fixat</a> - <a style="[% notfixed_button_style %]" href="[% url %]">Ej fixat</a> + <a style="[% fixed_button_style %]" href="[% url %]?been_fixed=Yes">Fixat</a> + <a style="[% notfixed_button_style %]" href="[% url %]?been_fixed=No">Ej fixat</a> + </p> + <p style="margin: 20px auto; text-align: center"> + <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 %] diff --git a/templates/email/fixamingata/submit.html b/templates/email/fixamingata/submit.html index 65a692058..6a1208982 100644 --- a/templates/email/fixamingata/submit.html +++ b/templates/email/fixamingata/submit.html @@ -23,21 +23,21 @@ tror medborgaren behöver er uppmärksamhet.</p> <table [% table_reset %]> <tr> <th style="[% contact_th_style %]">Namn</th> - <td style="[% contact_td_style %]">[% name | html %]</td> + <td style="[% contact_td_style %]">[% report.name | html %]</td> </tr> <tr> <th style="[% contact_th_style %]">Epost</th> <td style="[% contact_td_style %]"> - [%~ IF email ~%] - <a href="mailto:[% email | html %]">[% email | html %]</a> + [%~ IF report.user.email ~%] + <a href="mailto:[% report.user.email | html %]">[% report.user.email | html %]</a> [%~ ELSE ~%] [%~ END ~%] </td> </tr> - [%~ IF phone %] + [%~ IF report.user.phone %] <tr> <th style="[% contact_th_style %]">Telefon</th> - <td style="[% contact_td_style %]"><a href="tel:[% phone | html %]">[% phone | html %]</a></td> + <td style="[% contact_td_style %]"><a href="tel:[% report.user.phone | html %]">[% report.user.phone | html %]</a></td> </tr> [%~ END %] </table> @@ -45,15 +45,13 @@ tror medborgaren behöver er uppmärksamhet.</p> [% end_padded_box %] </th> [% WRAPPER '_email_sidebar.html' object = report %] - <h2 style="[% h2_style %]">[% title | html %]</h2> - [%~ IF category_line %] - <p style="[% secondary_p_style %]">[% category | html %]</p> - [%~ END %] - <p style="[% secondary_p_style %]">[% detail | html %]</p> + <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>Plats:</strong> <a href="[% osm_url %]" title="Se den här platsen på OpenStreetMap"> - [%~ latitude %], [% longitude ~%] + [%~ report.latitude %], [% report.longitude ~%] </a> [% IF closest_address %]<br>[% closest_address | trim | replace("\n\n", "<br>") %][% END %] </p> diff --git a/templates/email/fixamingata/submit.txt b/templates/email/fixamingata/submit.txt index fc8b65886..d2e7399b4 100644 --- a/templates/email/fixamingata/submit.txt +++ b/templates/email/fixamingata/submit.txt @@ -1,4 +1,4 @@ -Subject: Ny rapport: [% title %] +Subject: Ny rapport: [% report.title %] Till [% bodies_name %], @@ -14,25 +14,27 @@ tror medborgaren behöver er uppmärksamhet. ** Uppgiftslämnare -Namn: [% name %] +Namn: [% report.name %] -Epost: [% email OR '-' %] +Epost: [% report.user.email OR '-' %] -Telefonnummer: [% phone OR '-' %] +Telefonnummer: [% report.user.phone OR '-' %] ** Information om ärendet -ID: [% id %] +ID: [% report.id %] -[% category_line %]Ärende: [% title %] +Kategori: [% report.category %] -[% detail %] +Ärende: [% report.title %] + +[% report.detail %] ** Geografisk position -Latitude: [% latitude %] +Latitude: [% report.latitude %] -Longitude: [% longitude %] +Longitude: [% report.longitude %] ** Övrigt diff --git a/templates/email/fixamingata/update-confirm.txt b/templates/email/fixamingata/update-confirm.txt index 6670bd0ea..314870396 100644 --- a/templates/email/fixamingata/update-confirm.txt +++ b/templates/email/fixamingata/update-confirm.txt @@ -1,4 +1,4 @@ -Subject: Bekräfta din uppdatering på [% INCLUDE 'site-name.txt' | trim %] +Subject: Bekräfta din uppdatering på [% site_name %] Hej [% update.name %], @@ -14,4 +14,4 @@ Din uppdatering var: [% update.text %] -[% INCLUDE 'signature.txt' %] +[% signature %] diff --git a/templates/email/fixmystreet.com/_submit_footer.html b/templates/email/fixmystreet.com/_submit_footer.html index 346ab8b66..acf14b285 100644 --- a/templates/email/fixmystreet.com/_submit_footer.html +++ b/templates/email/fixmystreet.com/_submit_footer.html @@ -10,12 +10,13 @@ submit_footer_link_style = "color: #9CD0EA;"; <tr> <th style="[% td_style %] padding: [% column_padding %]px; background-color: [% color_yellow %]; color: [% color_black %];"> <h2 style="[% h2_style %] margin-bottom: 15px;"> - Never retype another FixMyStreet report + In-depth stats from our new, exclusive dashboard </h2> <p style="margin: 0;"> - Good news: we can now send these reports from FixMyStreet - directly into your customer service queue. - <a href="https://www.fixmystreet.com/pro/">Find out how</a>. + What do people report most in your area? + How’s your response rate? + And how do you compare to other UK councils? + <a href="https://www.fixmystreet.com/about/council-dashboard/?utm_source=council_submit_email&utm_content=[% "View FixMyStreet stats for your area" | uri %]&utm_medium=email&utm_campaign=fms_stats_dashboard_promo">View FixMyStreet stats for your area.</a> </p> </th> </tr> diff --git a/templates/email/fixmystreet.com/bathnes/submit-street-light-fault.html b/templates/email/fixmystreet.com/bathnes/submit-street-light-fault.html new file mode 100644 index 000000000..8af8ea1b0 --- /dev/null +++ b/templates/email/fixmystreet.com/bathnes/submit-street-light-fault.html @@ -0,0 +1,79 @@ +<h2>Customer Details</h2> + +<table> +<tr> +<th>Name</th> +<td>[% name %]</td> +</tr> +<tr> +<th>Email</th> +<td>[% email OR 'None provided' %]</td> +</tr> +<tr> +<th>Phone</th> +<td>[% phone OR 'None provided' %]</td> +</tr> +</table> + + +<h2>Enquiry Details</h2> + +<table> +<tr> +<th>Date & Time logged</th> +<td>[% confirmed %]</td> +</tr> +<tr> +<th>Report type</th> +<td>[% report.get_extra_field_value('FaultType') %]</td> +</tr> +<tr> +<th>5 or more lights affected</th> +<td>[% report.get_extra_field_value('5Lights') %]</td> +</tr> +<tr> +<th>Unit Number</th> +<td>[% report.get_extra_field_value('unitid') %]</td> +</tr> +<tr> +<th>Title</th> +<td>[% title %]</td> +</tr> +<tr> +<th>Description</th> +<td>[% detail %]</td> +</tr> +<tr> +<th>URL</th> +<td>[% url %]</td> +</tr> +</table> +[% additional_information %] + + +<h2>Location Details</h2> + +<table> +<tr> +<th>Unit description and location</th> +<td>[% report.get_extra_field_value('asset_details') %]</td> +</tr> +<tr> +<th>Easting/Northing</th> +<td>[% easting %] [% northing %]</td> +</tr> +<tr> +<th>Latitude</th> +<td>[% latitude %]</td> +</tr> +<tr> +<th>Longitude</th> +<td>[% longitude %]</td> +</tr> +<tr> +<th></th> +<td>[% closest_address %]</td> +</tr> +</table> + +<strong>NB:</strong> Replies to this email will go to the user who submitted the problem. diff --git a/templates/email/fixmystreet.com/bathnes/submit-street-light-fault.txt b/templates/email/fixmystreet.com/bathnes/submit-street-light-fault.txt new file mode 100644 index 000000000..a860c0a34 --- /dev/null +++ b/templates/email/fixmystreet.com/bathnes/submit-street-light-fault.txt @@ -0,0 +1,44 @@ +Subject: Street Light Fault: [% title %] + +Customer Details + +Name: [% name %] + +Email: [% email OR 'None provided' %] + +Phone: [% phone OR 'None provided' %] + + +Enquiry Details + +Date & Time logged: [% confirmed %] + +Report type: [% report.get_extra_field_value('FaultType') %] + +5 or more lights affected: [% report.get_extra_field_value('5Lights') %] + +Unit Number: [% report.get_extra_field_value('unitid') %] + + +Title: [% title %] + +Description: [% detail %] + +[% additional_information %] + +[% url %] + +Location Details + +Unit description and location: [% report.get_extra_field_value('asset_details') %] + +Easting/Northing: [% easting %]/[% northing %] + +Latitude: [% latitude %] + +Longitude: [% longitude %] + +[% closest_address %] + + +Replies to this email will go to the user who submitted the problem. diff --git a/templates/email/fixmystreet.com/other-reported.html b/templates/email/fixmystreet.com/other-reported.html new file mode 100644 index 000000000..0fcb46e41 --- /dev/null +++ b/templates/email/fixmystreet.com/other-reported.html @@ -0,0 +1,31 @@ +[% + +email_summary = "Thanks for logging your report"; +email_columns = 2; + +PROCESS '_email_settings.html'; +INCLUDE '_email_top.html'; + +%] + +<th style="[% td_style %][% primary_column_style %]" id="primary_column"> + [% start_padded_box %] + <h1 style="[% h1_style %]">Your report has been logged</h1> + <p style="[% p_style %]">Your report to [% report.body %] has been logged on [% site_name %].</p> +[% IF c.cobrand.is_council && !c.cobrand.owns_problem( report ) %] +<p style="[% p_style %]">Please note that [% c.cobrand.council_name %] is not responsible for this type +of report, so it will instead be sent to [% report.body %].</p> +[% ELSE %] +[% TRY %][% INCLUDE '_council_reference.html' problem=report %][% CATCH file %][% END %] +[% END %] + <p style="margin: 20px auto; text-align: center"> + <a style="[% button_style %]" href="[% cobrand.base_url_for_report(report) %][% report.url %]">View my report</a> + </p> + [% end_padded_box %] +</th> +[% WRAPPER '_email_sidebar.html' object = report %] + <h2 style="[% h2_style %]">[% report.title | html %]</h2> + <p style="[% secondary_p_style %]">[% report.detail | html %]</p> +[% END %] + +[% INCLUDE '_email_bottom.html' %]
\ No newline at end of file diff --git a/templates/email/fixmystreet.com/other-reported.txt b/templates/email/fixmystreet.com/other-reported.txt new file mode 100644 index 000000000..1dc8d0b44 --- /dev/null +++ b/templates/email/fixmystreet.com/other-reported.txt @@ -0,0 +1,29 @@ +Subject: Your report has been logged: [% report.title %] + +Hello [% report.name %], + +Your report to [% report.body %] has been logged on [% site_name %]. + +[% IF c.cobrand.is_council && !c.cobrand.owns_problem( report ) %] +Please note that [% c.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/fixmystreet.com/submit.html b/templates/email/fixmystreet.com/submit.html index 24bb5f86f..2742c4b44 100644 --- a/templates/email/fixmystreet.com/submit.html +++ b/templates/email/fixmystreet.com/submit.html @@ -23,34 +23,32 @@ of a local problem that they believe might require your attention.</p> <table [% table_reset %]> <tr> <th style="[% contact_th_style %]">Name</th> - <td style="[% contact_td_style %]">[% name | html %]</td> + <td style="[% contact_td_style %]">[% report.name | html %]</td> </tr> <tr> <th style="[% contact_th_style %]">Email</th> <td style="[% contact_td_style %]"> - [%~ IF email ~%] - <a href="mailto:[% email | html %]">[% email | html %]</a> + [%~ 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 phone %] + [%~ IF report.user.phone %] <tr> <th style="[% contact_th_style %]">Phone</th> - <td style="[% contact_td_style %]"><a href="tel:[% phone | html %]">[% phone | html %]</a></td> + <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 [% name | html %], the user who reported the problem.</p> + <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 %] </th> [% WRAPPER '_email_sidebar.html' object = report %] - <h2 style="[% h2_style %]">[% title | html %]</h2> - [%~ IF category_line %] - <p style="[% secondary_p_style %]"><strong>Category:</strong> [% category | html %]</p> - [%~ END %] - <p style="[% secondary_p_style %]">[% detail | html %]</p> + <h2 style="[% h2_style %]">[% report.title | html %]</h2> + <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 %] @@ -60,7 +58,7 @@ of a local problem that they believe might require your attention.</p> [%~ " (IE)" IF coordsyst == "I" ~%] : [% easting %]/[% northing %] (<a href="[% osm_url %]" title="View OpenStreetMap of this location"> - [%~ latitude %], [% longitude ~%] + [%~ report.latitude %], [% report.longitude ~%] </a>) [% IF closest_address %]<br>[% closest_address | trim | replace("\n\n", "<br>") %][% END %] </p> diff --git a/templates/email/fixmystreet.com/submit.txt b/templates/email/fixmystreet.com/submit.txt index 5bcbef87b..3eaf400a2 100644 --- a/templates/email/fixmystreet.com/submit.txt +++ b/templates/email/fixmystreet.com/submit.txt @@ -1,4 +1,4 @@ -Subject: Problem Report: [% title %] +Subject: Problem Report: [% report.title %] Dear [% bodies_name %], @@ -13,15 +13,17 @@ please visit the following link: [% has_photo %]---------- -Name: [% name %] +Name: [% report.name %] -Email: [% email OR 'None provided' %] +Email: [% report.user.email OR 'None provided' %] -Phone: [% phone OR 'None provided' %] +Phone: [% report.user.phone OR 'None provided' %] -[% category_line %]Subject: [% title %] +Category: [% report.category %] -Details: [% detail %] +Subject: [% report.title %] + +Details: [% report.detail %] [% additional_information %] @@ -29,9 +31,9 @@ Easting/Northing [%- " (IE)" IF coordsyst == "I" -%] : [% easting %]/[% northing %] -Latitude: [% latitude %] +Latitude: [% report.latitude %] -Longitude: [% longitude %] +Longitude: [% report.longitude %] View OpenStreetMap of this location: [% osm_url %] diff --git a/templates/email/rutland/_email_color_overrides.html b/templates/email/rutland/_email_color_overrides.html new file mode 100644 index 000000000..12ec97bc3 --- /dev/null +++ b/templates/email/rutland/_email_color_overrides.html @@ -0,0 +1,21 @@ +[% + +color_rutland_dark_green = '#265123' +color_rutland_mid_green = '#A7B980' +color_rutland_pale_green = '#DCE6C9' +color_rutland_dark_grey = '#3C3C3C' + +body_font_family = "'PT Sans', Verdana, sans-serif" + +header_background_color = color_rutland_mid_green +header_text_color = color_black + +secondary_column_background_color = color_rutland_pale_green + +button_background_color = color_rutland_dark_green +button_text_color = color_white + +logo_width = "150" # pixel measurement, but without 'px' suffix +logo_height = "77" # pixel measurement, but without 'px' suffix + +%] diff --git a/templates/email/warwickshire/archive.txt b/templates/email/warwickshire/archive.txt new file mode 100644 index 000000000..51ad37453 --- /dev/null +++ b/templates/email/warwickshire/archive.txt @@ -0,0 +1,26 @@ +Subject: Your reports on Warwickshire FixMyStreet + +Hello [% user.name %], + +FixMyStreet is being updated in Warwickshire to improve how problems get fixed. + +As part of these updates, we are closing old reports that appear to be resolved but remain open in the system. + +We noticed that you have [% report_count %] old [% nget('report', 'reports', report_count) %] on the system, which we've listed below. + +If your report is no longer an issue, you don't need to do anything. + +If you believe that your report is still a problem, you can reopen it by clicking or copying and pasting +the link marked 'View report' by a report and leaving an update. + +[% FOR report IN reports %] + +[% report.title %] + +Reported [% report.time_ago %] ago. + +View report: [% cobrand.base_url_for_report( report ) %][% report.tokenised_url( user, { reopen => 'true' } ) %]#update_form + +---- + +[% END %] diff --git a/templates/email/zurich/submit-external-personal.txt b/templates/email/zurich/submit-external-personal.txt index 820ccfb70..701d7eaab 100644 --- a/templates/email/zurich/submit-external-personal.txt +++ b/templates/email/zurich/submit-external-personal.txt @@ -1,4 +1,4 @@ -Subject: Züri wie neu: Weitergeleitete Meldung #[% id %] +Subject: Züri wie neu: Weitergeleitete Meldung #[% report.id %] Grüezi [% bodies_name %], @@ -7,11 +7,11 @@ Grüezi [% bodies_name %], Öffentliche URL: [% url %] -Name des Meldenden: [% name %] +Name des Meldenden: [% report.name %] -Email des Meldenden: [% email %] +Email des Meldenden: [% report.user.email %] -Telefonnummer des Meldenden: [% phone %] +Telefonnummer des Meldenden: [% report.user.phone %] Bei Fragen zu "Züri wie neu" wenden Sie sich bitte an gis-zentrum@zuerich.ch. diff --git a/templates/email/zurich/submit-external-wish.txt b/templates/email/zurich/submit-external-wish.txt index a81d13893..3ac0ea58c 100644 --- a/templates/email/zurich/submit-external-wish.txt +++ b/templates/email/zurich/submit-external-wish.txt @@ -1,17 +1,17 @@ -Subject: Züri wie neu: Weitergeleitete Meldung #[% id %] +Subject: Züri wie neu: Weitergeleitete Meldung #[% report.id %] Grüezi [% bodies_name %], [% external_message %] -Name des Meldenden: [% name %] +Name des Meldenden: [% report.name %] -Email des Meldenden: [% email %] +Email des Meldenden: [% report.user.email %] -Telefonnummer des Meldenden: [% phone %] +Telefonnummer des Meldenden: [% report.user.phone %] -Meldung: [% detail %] +Meldung: [% report.detail %] Standort in AV-Online anzeigen: http://webgis.intra.stzh.ch/AV_Online/Direct.asp?Map=AV&Search=Koord&West=[% west %]&Nord=[% nord %]&B=300 diff --git a/templates/email/zurich/submit-external.txt b/templates/email/zurich/submit-external.txt index a747a001c..ec2053f35 100644 --- a/templates/email/zurich/submit-external.txt +++ b/templates/email/zurich/submit-external.txt @@ -1,4 +1,4 @@ -Subject: Züri wie neu: Weitergeleitete Meldung #[% id %] +Subject: Züri wie neu: Weitergeleitete Meldung #[% report.id %] Grüezi [% bodies_name %], diff --git a/templates/email/zurich/submit-feedback-pending.txt b/templates/email/zurich/submit-feedback-pending.txt index bd95e3812..58d35ed36 100644 --- a/templates/email/zurich/submit-feedback-pending.txt +++ b/templates/email/zurich/submit-feedback-pending.txt @@ -1,4 +1,4 @@ -Subject: Züri wie neu: Meldung #[% id %] bereit für Feedback +Subject: Züri wie neu: Meldung #[% report.id %] bereit für Feedback Guten Tag [% bodies_name %], diff --git a/templates/email/zurich/submit-in-progress.txt b/templates/email/zurich/submit-in-progress.txt index 7be06cf13..3c3ac65ff 100644 --- a/templates/email/zurich/submit-in-progress.txt +++ b/templates/email/zurich/submit-in-progress.txt @@ -1,4 +1,4 @@ -Subject: Züri wie neu: Neue Meldung #[% id %] +Subject: Züri wie neu: Neue Meldung #[% report.id %] Guten Tag [% bodies_name %], diff --git a/templates/email/zurich/submit.txt b/templates/email/zurich/submit.txt index ef4acaafe..c9c84f90c 100644 --- a/templates/email/zurich/submit.txt +++ b/templates/email/zurich/submit.txt @@ -1,4 +1,4 @@ -Subject: Züri wie neu: Neue Meldung #[% id %] +Subject: Züri wie neu: Neue Meldung #[% report.id %] Guten Tag [% bodies_name %], |