aboutsummaryrefslogtreecommitdiffstats
path: root/templates/email
Commit message (Collapse)AuthorAgeLines
* Merge tag 'v2.0.4' into fiksgatami-devMarius Halden2017-05-28-3/+89
|\
| * [fixmystreet.com] Avoid /about/council redirects.Zarino Zappia2017-03-03-3/+3
| |
| * [Oxfordshire] Old report archiving scriptpezholio2017-02-15-0/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This script can be used for the bulk closure of old reports that haven't been updated in a long time. Reports that haven't been updated in a *really* long time (since 2014, by default) are simply closed, and those that haven't been updated since 2015 (by default) are closed and an email explaining the closure is sent to the report creator. This script can be used for other cobrands, but they'll need an archive.{txt,html} template in order for the emails to be sent. For mysociety/fixmystreetforcouncils#51
* | Fix subject in e-mail confirmation e-mail for FiksGataMiMarius Halden2016-12-15-2/+3
|/
* Include any paragraphs in HTML contact submission.Matthew Somerville2016-09-13-1/+1
|
* [FixaMinGata] Change two "FixMyStreet" stringsJon Kristensen2016-09-07-2/+2
|
* [FixaMinGata] Switch from HTTP to HTTPS in some placesJon Kristensen2016-09-07-3/+3
|
* Feature to create report as body/other user.Zarino Zappia2016-08-10-0/+99
| | | | | | | | | | | | This allows users who have the correct permissions to add reports on behalf of the body or another user. We enable editing of the email box by default, so that if JavaScript isn't available, someone can still change the email for the 'another user' option. For mysociety/fixmystreetforcouncils#10 and mysociety/fixmystreetforcouncils#11
* Factor out HTML email sidebar to own template.Matthew Somerville2016-08-08-64/+28
|
* Try and ensure emails have no lines of spaces.Matthew Somerville2016-08-08-43/+43
| | | | | One mail server we send to appears to reject messages containing =20, even though those are perfectly acceptable quoted-printable messages.
* Move host/IP to footer in HTML contact email.Matthew Somerville2016-08-08-8/+1
|
* Avoid illegible email repliesZarino Zappia2016-08-08-2/+2
| | | | | | | | | HTML emails now have a white body background-color, so that replies sent from Outlook (which inserts the reply message inside the body of the original message) will have a white background. Part of #1469.
* [UK Councils] Email themes for 4 UK councilsZarino Zappia2016-08-01-0/+78
| | | | Email themes for Oxfordshire, Bromley, Warwickshire, and Greenwich.
* Add HTML email templates.Matthew Somerville2016-08-01-216/+871
| | | | | | | | | | | | | | | | | | | | | | | | Design is all Zarino. This adds the ability to send HTML emails, including attached inline images. When included, this is done as a multipart/related email containing a multipart/alternative (of plain and HTML) and any attached images, so that the images are available even if HTML mail is not. The alert emails list data has been improved so it can be constructed in the templates rather than the code. Various templates have been tidied. Various workarounds for email clients have been made, including: * <th> is used so that the Android 4.x mail client can give them `block` styling in the small screen media query. * Font settings defined on every table cell (<th>) so that sans-serif fonts are used in Outlook, rather than Times New Roman. * A three-column wrapper table to create a 620px centred content area that also shrinks down on narrow screens. (Outlook doesn’t like max-width, so this is the simplest alternative.) * Enforcing a sensible (500px) min-width for the main content area, on clients that don’t support media queries (eg: native Gmail app). * Giant borders on buttons so Outlook displays them * Image alignment with align rather than float.
* Clarify wording of two-tier confirmation emailDave Arter2016-07-08-1/+2
|
* Add two-tier responsibility note to confirm emailDave Arter2016-07-08-1/+3
|
* Tidy up some UK specific easting/northing handlingMatthew Somerville2016-06-22-9/+21
|
* Merge branch '360-change-email'Matthew Somerville2016-06-20-5/+16
|\
| * Allow users to update their email address.Matthew Somerville2016-06-20-0/+11
| |
| * [Bromley] Tweak questionnaire email text.Matthew Somerville2016-06-20-5/+5
| | | | | | | | Match more the default email. Fixes #1115.
* | [Bristol] Bristol City Council cobrand frontendDave Arter2016-06-17-0/+1
| | | | | | | | For mysociety/FixMyStreet-Commercial#766.
* | [UK Councils] Send correct confirm emails for updatesDave Arter2016-06-15-0/+0
|/ | | | | | | | | | | | | | | | | | | | | | Some UK councils with Open311 integrations (e.g. Bromley) have a custom wording in the confirmation email sent when updates are left on reports, to make the user aware that the update is sent to the council in question. Bromley noticed that some emails were being sent without this wording, leading at least one user to contact the council directly about the report. It turns out that although the email template contains an IF clause to use the appropriate wording for Bromley (and Stevenage) reports, the incorrect template file was being used when updates were made via the Bromley cobrand. This commit solves the problem by introducing a new `Cobrand::Default::path_to_email_templates` method, which is overridden by `Cobrand::UKCouncils` to include the `templates/email/fixmystreet` path. Paths returned by this method are used as the `additional_template_paths` param when templating emails. A regression test is included. Additionally moves email templates for fixmystreet.com to a directory name reflecting their purpose, in the same way the web templates are arranged.
* Move some cobrands into separate repository.Matthew Somerville2016-06-08-1/+0
|
* Strip line end spaces in emails.Matthew Somerville2016-06-07-1/+1
|
* [FixaMinGata] Make submit email easier to parse.Jon Kristensen2016-05-31-5/+5
|
* Use only one templating system for emails.Matthew Somerville2016-05-25-343/+347
| | | | | | | Historically, emails sent offline (alerts, questionnaires, etc) used a different templating system from those sent by the website (e.g. login emails), though the newer system was also being used for the site name and signature of offline emails.
* Remove some unused cobrands.Matthew Somerville2016-04-20-504/+0
|
* Add OpenStreetMap URL to report email.Matthew Somerville2016-02-09-0/+6
|
* [Zurich] Updated email templatesMatthew Somerville2015-10-06-75/+20
| | | | | | | - submit-external-wish.txt includes a link with report's coordinates, template values are interpolated Conflicts: perllib/FixMyStreet/SendReport/Zurich.pm
* [Zurich] admin workflow changes available statesHakim Cassimally2015-10-06-0/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | See mysociety/FixMyStreet-Commercial#690 - external_message for Extern/Wunsch states - as per PDF mockups, the "public response" field is now editable from more states, namely: - Ruckmeldung ausstehend - Extern - Zustandigkeit unbekannt - Wunsch - Nicht kontaktierbar - Unsichtbar - test fixes NB: slight hack to reorder Zurich report_display tests As these remove 'investigating' from hidden_states, these break tests for default cobrand (the FMS::App code expects to be called once on request start, not multiple times within one test) - Not contactable button and tests for this and the similar `send_back` functionality (previously untested). NB: Unsure why we need to specify form_number=2 just for these submits, but test won't find the buttons otherwise. - Make sure SDMs' "time_spent" figure is recorded. (See mysociety/FixMyStreet-Commercial#718)
* Fix handling From/To header in new Email::Simple.Matthew Somerville2015-10-06-16/+0
| | | | | | | Newer versions of Email::Simple (2.104+) treat arrayrefs in headers by fetching the first item only in scalar context. Our snapshot installs 2.102, so this shouldn't be an issue, but we might as well bypass Email::Simple for those headers.
* [Zurich] Vary confirmation email wording if address is confirmedHakim Cassimally2015-10-06-1/+1
| | | | See mysociety/FixMyStreet-Commercial#669
* Send altered confirmation email if not being sent.Matthew Somerville2015-09-28-0/+32
| | | | Fixes #1210.
* [ArreglaMiBarrio] Initial CSS/logo/FAQ.Matthew Somerville2015-03-24-0/+1
|
* Tweak wording of area local alert email.Matthew Somerville2015-02-25-2/+2
| | | | Fixes #1011.
* Switch easting/northing output to one line.Matthew Somerville2015-02-16-64/+1
| | | | | This is more friendly for e.g. copy and pasting by someone using the Dynamics CRM software. Fixes #997.
* [Oxfordshire] Update email template for cobrand.Matthew Somerville2015-01-21-2/+2
| | | | And update HTTPS link.
* Use site_name to genericise default submit.txt.Matthew Somerville2015-01-19-11/+47
|
* [Harrogate] custom form fieldsHakim Cassimally2015-01-08-0/+43
| | | | | | | | | | | | | | Requires previous (generic) commit to prevent information only categories (e.g. Dead animals message) from displaying a spurious textbox. Also support for sending these custom fields by email: Requires a hook in RS::Problem method, as by default, only a restricted number of hard-coded fields are send in the email. (And the template language is pseudo-PHP so we can't simply pass in the whole data-structure.)
* Update links to point to new /council page.Matthew Somerville2014-10-09-5/+5
|
* [EmptyHomes] survey template tweaksHakim Cassimally2014-09-09-8/+23
|
* Report moderationHakim Cassimally2014-08-13-0/+38
| | | | | | | | | | | - redaction marked with [...] - of report and comments - stores original data - uses a single form, on the report/_main view - requires additional permissions (user_body_permissions) - Hide report functionality - Moderation notification/contact form - Moderation writes to admin_log
* Removal old Southampton/Reading/Lichfield cobrands.Matthew Somerville2014-07-29-3/+0
|
* Update Zurich email templatesDave Arter2014-07-15-17/+17
|
* Bromley. signature and FAQ tweaksHakim Cassimally2014-07-14-1/+1
| | | | | | | | | | | As per mysociety/FixMyStreet-Commercial#524 to stem the flow of people responding to verification emails by clicking the support email at the bottom of Bromley's signature, we are instead redirecting to the FAQ -- which is also updated to contain the support email address, so the people can still find a contact if they need to. Also tweaking moderation FAQ line, in preparation for moderation trial.
* Make external links HTTPS where possible.Matthew Somerville2014-07-03-5/+5
| | | | And fix a couple that have redirected.
* Use https for UK site where appropriateStruan Donald2014-07-03-5/+5
| | | | | | | Council redirects, BASE_URL comparisons, hard coded links, email signatures For #488
* Merge branch 'master' of https://github.com/jonkri/fixmystreet into ↵Struan Donald2014-06-03-25/+27
|\ | | | | | | | | | | | | jonkri-master Conflicts: locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po
| * Put "no-reply" message in the FixaMinGata questionnaire updateJon Kristensen2014-05-28-4/+6
| |
| * Put "no-reply" message in the top of the FixaMinGata alert updateJon Kristensen2014-05-19-5/+5
| |
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-05 23:29:42 +0000