Commit graph

118 commits

Author SHA1 Message Date
Tom Hughes
f9109b7a75 Fix styling of email notifications in RTL languages
Fixes #2297
2019-07-03 09:49:46 +01:00
Tom Hughes
9f931ca1e3 erblint: add rel=noopener to links that open in a new tab 2019-03-27 19:11:49 +00:00
Tom Hughes
3af16f6337 erblint: fix remaining single quoted strings 2019-03-27 16:15:19 +00:00
Andy Allan
040c0184a4 erblint: use hash rocket syntax 2019-03-27 10:03:56 +01:00
Andy Allan
68a5aa5ed8 Whitespace fixes for notifier erb views 2019-03-26 20:23:35 +00:00
Andy Allan
d102c9aaf4 Move all settings to settings.yml
We leave the STATUS setting alone, since it's required before rails
boots. The test-specific settings now live in config/settings/test.yml
2019-03-13 18:06:23 +01:00
Andy Allan
5bed217823 Use lazy translations where possible 2018-04-25 14:10:59 +08:00
Andy Allan
713de1fadb Set default_url_options for action_mailer
This saves having to repeat the same host and protocol options
throughout the notifiers
2018-04-11 15:53:30 +08:00
Herve Saint-Amand
2ae479e3f3 Fix indentation in email template
The plain text templates had nice indentation in the source however that
got reflected in the output, which was visibly and needlessly indented.

Closes #1512
2017-04-08 16:36:40 +01:00
Herve Saint-Amand
b69e8b5c42 Included greeting string in changeset_comment_notification email 2017-02-27 22:36:09 +00:00
Herve Saint-Amand
a520f1251c merging master into html-mail-fixes 2017-02-12 21:05:38 +00:00
Herve Saint-Amand
fcba1a9857 A better way to contrain the width of the message box whilst also allowing it to shrink on narrow displays
Setting a hard "width" it very compatible, but won't squeeze on narrow screens. Setting max-width works well, except in Outlook and Hotmail. We resort to old skool table tricks: a table with width=100%, with 3 columns, only oneof which, the middle one, had content, and a fixed with. This works.
2017-02-12 12:04:43 +00:00
Herve Saint-Amand
6964c44584 Two more "nowrap" instructions removed to accommodate narrower displays 2017-02-11 21:08:36 +00:00
Herve Saint-Amand
acf933055f Remove nowrap on footer text, to accommodate narrow screens 2017-02-11 20:51:03 +00:00
Herve Saint-Amand
82a6bb0d5a Make the mails squeezable on narrow screens 2017-02-09 21:39:49 +00:00
Herve Saint-Amand
5a6c0eb49e Even out the widths of the white bars around the message box 2017-02-08 23:00:52 +00:00
Herve Saint-Amand
448a68447f Don't display a box at all if the note event doesn't include a comment body
Before this it just displays en empty box, which looks wrong.
2017-02-08 22:22:21 +00:00
Herve Saint-Amand
68a4002366 Removed italic styling on message body
Contributor BushmanK pointed out quite rightly that italic isn't appropriate for a full body of text.
2017-02-08 21:34:10 +00:00
Herve Saint-Amand
60e1895da1 Tweak cell width for proper centering on narrow screens 2017-02-08 21:34:10 +00:00
Herve Saint-Amand
223a12caf8 That new message in the HTML version of the mail should also be added to the plain text version of the mail
Duh.
2017-01-28 23:29:44 +00:00
Herve Saint-Amand
f83b719f03 Set border=0 on that img
IE9 shows a big nasty blue border on linked images if you don't specify border=0
2017-01-27 23:20:11 +00:00
Herve Saint-Amand
cf11913d58 Apply inline styling to all <p> tags
Solved the problem of <p> tags being given different padding or color by different clients, without having to copy-paste a string of CSS into every <p> tag in the templates.
2017-01-25 22:50:52 +00:00
Herve Saint-Amand
25d80789dd Put the user avatar in a <p> block
This improves rendering on those clients that set the margin to 0 on <p> blocks.
2017-01-23 22:26:34 +00:00
Herve Saint-Amand
1285c9f14b Convert those <nobr> tags to CSS 2017-01-16 22:53:04 +00:00
Herve Saint-Amand
e3e5ad4c5f Refactored the code to invoke the message body partial layout, as suggested in the PR 2017-01-16 22:50:01 +00:00
Herve Saint-Amand
1e19e80d0e Renamed @user_message_author to @author as suggested 2017-01-16 21:13:52 +00:00
Herve Saint-Amand
a0627ec0c6 Revert "Added a greeting to the changeset comment message"
This reverts commit 39c3fa427e.
2017-01-14 21:48:46 +00:00
Herve Saint-Amand
433b7c5dfa Remove that ugly style="margin: 0"
It's really only needed for rendering in Yahoo. Let's try to do without having to copy-paste that into every html template.
2017-01-13 22:58:57 +00:00
Herve Saint-Amand
c94213847b Simplified the partial layout
Rather than wrap the body in a :body block, just make it the default, unnamed block, which keeps the markup more lightweight.
2017-01-13 22:43:23 +00:00
Herve Saint-Amand
7ef57b2fe8 Dressed up note comment messages 2017-01-12 23:02:57 +00:00
Herve Saint-Amand
235e77fc26 Dressed up lost password mail 2017-01-12 22:30:31 +00:00
Herve Saint-Amand
6d1c10afbc Dressed up gpx notification mails 2017-01-12 22:28:09 +00:00
Herve Saint-Amand
22f7c1f721 Dressed up friend_notification mail 2017-01-12 22:11:23 +00:00
Herve Saint-Amand
39c3fa427e Added a greeting to the changeset comment message
The greeting includes the recipient's user name (as for the message notification mail), which should increase the recipient's trust that the message isn't spam. Greetings were reused from each language's respective locale flie.
2017-01-12 21:52:17 +00:00
Herve Saint-Amand
31778fd155 Removed unbalanced tag HTML tag 2017-01-11 22:03:00 +00:00
Herve Saint-Amand
3aa69ffbdd Dressed up a few more messages.
email_confirm, message_notification and signup_confirm now use the new templates. This fixes some, but not all, of the currently broken tests.
2017-01-09 23:42:43 +00:00
Herve Saint-Amand
417176f868 Moved message table HTMl to a partial template
Several notifications are about a message having been sent from one user to another via OSM. I've moved the code for the HTML table that holds the actual user message, with the avatar and the body text, to its own partial template, so that it can be reused. I've updated a second notifier message to the new template, diary_comment_notification.
2017-01-08 22:09:10 +00:00
Herve Saint-Amand
479a4bd0d7 First steps towards using layouts
Since all HTML mails will presumably share the same overall layout, and the markup is fairly dense, it makes sense to use Rails layouts to share the structure across mail templates. This commit moves the core structure of the HTML mail to a layout. It will need to be further refined so that notifications that involve a text message sent by another user can share the avatar-and-message-text structure.
2017-01-06 22:37:28 +00:00
Herve Saint-Amand
ac081305f2 Remove HTML markup from locale file
Rather than including HTML markup in the locale file (which also has the inconvenience of requiring both a plain-text and an HTML duplicate of the same string), move the markup to the template. Also added a helper to reduce clutter in the template slightly.
2017-01-03 22:38:58 +00:00
Herve Saint-Amand
b5fd9f5fbe Use parameterised server root URL rather than hardcoded 2017-01-01 22:35:59 +00:00
Herve Saint-Amand
20bd72d9e9 Move localised text to locale file
Moved a string of English text that will require translation from the HTML template to the locale I18N file.
2017-01-01 22:30:41 +00:00
Herve Saint-Amand
b5ef2be021 Better loading of attached images
Got rid of that big ugly base64 blob which was only a temporary crutch anyway. Added a png file instead. Use File.read rather than File.open for a 66% reduction in verbosity.
2017-01-01 22:11:56 +00:00
Herve Saint-Amand
5f663b765a Tweaked cell padding
Tweaked cell padding to align the top of the avatar and of the message text a bit better.
2016-12-31 00:14:24 +00:00
Herve Saint-Amand
94062a17b3 Cleaned up HTML
Removed some cargo-cult HTML attributes and CSS. Styling HTML for email clients is trickier than for browsers, I'm trying to keep the code as succinct but also as compatible as possible.
2016-12-30 23:45:32 +00:00
Herve Saint-Amand
1f0f7ba621 avatar inline attachment; text alignment 2016-12-29 23:37:39 +00:00
Herve Saint-Amand
e6d19586df intial commit, for 'en' locale only, for changeset_comment_notification only, doesn't load images properly yet 2016-12-29 21:54:46 +00:00
Tom Hughes
a22c3525e4 Add HTML version of friend notification email
Fixes #995
2015-06-25 00:16:15 +01:00
Tom Hughes
8598db3233 Tidy up changeset comment code 2014-10-23 21:24:51 +01:00
Łukasz Gurdek
14ac1babc2 Changeset discussions
Add support for commenting on changesets with RSS feeds and email
notification of comments to other commenters and people that have
chosen to subscribe to a changeset.
2014-10-23 21:24:51 +01:00
Tom Hughes
a8d8e750da Double quote strings that need to be interpolated 2013-09-24 09:59:04 +01:00