From bad9b1d550f9f386608b4ca08ad890adf0458231 Mon Sep 17 00:00:00 2001 From: James Brooks Date: Fri, 27 May 2016 12:17:00 +0100 Subject: [PATCH 1/3] Improve email designs, use theme colours --- .../Providers/ComposerServiceProvider.php | 2 +- composer.json | 1 + composer.lock | 209 +++++++++++---- config/app.php | 1 + public/img/button-email--dark-grey.png | Bin 0 -> 3814 bytes resources/lang/en/cachet.php | 28 +-- .../emails/components/update-html.blade.php | 24 +- .../emails/components/update-text.blade.php | 4 +- .../incidents/maintenance-html.blade.php | 43 ++-- .../incidents/maintenance-text.blade.php | 8 +- .../views/emails/incidents/new-html.blade.php | 46 ++-- .../views/emails/incidents/new-text.blade.php | 8 +- .../emails/subscribers/verify-html.blade.php | 23 +- .../views/emails/users/invite-html.blade.php | 10 +- resources/views/layout/emails.blade.php | 238 +++++++++++++++--- 15 files changed, 467 insertions(+), 178 deletions(-) create mode 100644 public/img/button-email--dark-grey.png diff --git a/app/Foundation/Providers/ComposerServiceProvider.php b/app/Foundation/Providers/ComposerServiceProvider.php index 3f42bab6..7831d008 100644 --- a/app/Foundation/Providers/ComposerServiceProvider.php +++ b/app/Foundation/Providers/ComposerServiceProvider.php @@ -34,7 +34,7 @@ class ComposerServiceProvider extends ServiceProvider $factory->composer('*', CurrentUserComposer::class); $factory->composer(['index'], MetricsComposer::class); $factory->composer(['index', 'single-incident', 'subscribe', 'signup'], StatusPageComposer::class); - $factory->composer(['index', 'single-incident', 'subscribe.*', 'signup', 'dashboard.settings.theme'], ThemeComposer::class); + $factory->composer(['index', 'single-incident', 'subscribe.*', 'signup', 'dashboard.settings.theme', 'emails.*'], ThemeComposer::class); $factory->composer('dashboard.*', DashboardComposer::class); $factory->composer(['setup', 'dashboard.settings.localization'], TimezoneLocaleComposer::class); } diff --git a/composer.json b/composer.json index 367b312a..5eefbffc 100644 --- a/composer.json +++ b/composer.json @@ -29,6 +29,7 @@ "backup-manager/laravel": "^1.1", "barryvdh/laravel-cors": "^0.8", "doctrine/dbal": "^2.5", + "fedeisas/laravel-mail-css-inliner": "^1.5", "fideloper/proxy": "^3.1", "graham-campbell/binput": "^3.4", "graham-campbell/core": "^5.1", diff --git a/composer.lock b/composer.lock index cbb76683..0e9d08e1 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "d58416fb0d16c8b7fc9b936b6f642c39", - "content-hash": "226b91629f9aa94bb32446a4e963600c", + "hash": "9d38d3ba627f866fa276370913d9bf70", + "content-hash": "b75a2ca8a01159ff0a136823a7f26e88", "packages": [ { "name": "alt-three/badger", @@ -1150,6 +1150,58 @@ ], "time": "2014-09-09 13:34:57" }, + { + "name": "fedeisas/laravel-mail-css-inliner", + "version": "1.5", + "source": { + "type": "git", + "url": "https://github.com/fedeisas/laravel-mail-css-inliner.git", + "reference": "8c3cd958634e865a90fc398900ea59c427dd35cc" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/fedeisas/laravel-mail-css-inliner/zipball/8c3cd958634e865a90fc398900ea59c427dd35cc", + "reference": "8c3cd958634e865a90fc398900ea59c427dd35cc", + "shasum": "" + }, + "require": { + "illuminate/support": "~5.0", + "php": ">=5.4.0", + "tijsverkoyen/css-to-inline-styles": "~1.2" + }, + "require-dev": { + "jakub-onderka/php-console-highlighter": "0.3.*", + "jakub-onderka/php-parallel-lint": "0.8.*", + "phpmd/phpmd": "~1.5", + "phpunit/phpunit": "~4.0", + "satooshi/php-coveralls": "~0.7@dev", + "squizlabs/php_codesniffer": "~1.5", + "swiftmailer/swiftmailer": "~5.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Fedeisas\\LaravelMailCssInliner\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fede Isas", + "email": "fedeisas@hotmail.com" + } + ], + "description": "Inline the CSS of your HTML emails using Laravel", + "keywords": [ + "css", + "laravel", + "mailer" + ], + "time": "2016-04-19 07:02:48" + }, { "name": "fideloper/proxy", "version": "3.1.0", @@ -2988,6 +3040,59 @@ "homepage": "https://symfony.com", "time": "2016-04-28 09:48:42" }, + { + "name": "symfony/css-selector", + "version": "v3.0.6", + "source": { + "type": "git", + "url": "https://github.com/symfony/css-selector.git", + "reference": "65e764f404685f2dc20c057e889b3ad04b2e2db0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/65e764f404685f2dc20c057e889b3ad04b2e2db0", + "reference": "65e764f404685f2dc20c057e889b3ad04b2e2db0", + "shasum": "" + }, + "require": { + "php": ">=5.5.9" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\CssSelector\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jean-François Simon", + "email": "jeanfrancois.simon@sensiolabs.com" + }, + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony CssSelector Component", + "homepage": "https://symfony.com", + "time": "2016-03-04 07:55:57" + }, { "name": "symfony/debug", "version": "v3.0.6", @@ -3707,6 +3812,53 @@ ], "time": "2016-04-25 11:17:47" }, + { + "name": "tijsverkoyen/css-to-inline-styles", + "version": "1.5.5", + "source": { + "type": "git", + "url": "https://github.com/tijsverkoyen/CssToInlineStyles.git", + "reference": "9753fc340726e327e4d48b7c0604f85475ae0bc3" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/9753fc340726e327e4d48b7c0604f85475ae0bc3", + "reference": "9753fc340726e327e4d48b7c0604f85475ae0bc3", + "shasum": "" + }, + "require": { + "php": ">=5.3.0", + "symfony/css-selector": "~2.1|~3.0" + }, + "require-dev": { + "phpunit/phpunit": "~4.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.5.x-dev" + } + }, + "autoload": { + "psr-4": { + "TijsVerkoyen\\CssToInlineStyles\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD" + ], + "authors": [ + { + "name": "Tijs Verkoyen", + "email": "css_to_inline_styles@verkoyen.eu", + "role": "Developer" + } + ], + "description": "CssToInlineStyles is a class that enables you to convert HTML-pages/files into HTML-pages/files with inline styles. This is very useful when you're sending emails.", + "homepage": "https://github.com/tijsverkoyen/CssToInlineStyles", + "time": "2015-12-08 16:14:14" + }, { "name": "twig/twig", "version": "v1.24.0", @@ -5066,59 +5218,6 @@ "homepage": "https://github.com/sebastianbergmann/version", "time": "2015-06-21 13:59:46" }, - { - "name": "symfony/css-selector", - "version": "v3.0.6", - "source": { - "type": "git", - "url": "https://github.com/symfony/css-selector.git", - "reference": "65e764f404685f2dc20c057e889b3ad04b2e2db0" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/65e764f404685f2dc20c057e889b3ad04b2e2db0", - "reference": "65e764f404685f2dc20c057e889b3ad04b2e2db0", - "shasum": "" - }, - "require": { - "php": ">=5.5.9" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.0-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Component\\CssSelector\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Jean-François Simon", - "email": "jeanfrancois.simon@sensiolabs.com" - }, - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony CssSelector Component", - "homepage": "https://symfony.com", - "time": "2016-03-04 07:55:57" - }, { "name": "symfony/dom-crawler", "version": "v3.0.6", diff --git a/config/app.php b/config/app.php index 8d00d1e2..3a5d4fd9 100644 --- a/config/app.php +++ b/config/app.php @@ -164,6 +164,7 @@ return [ 'AltThree\Emoji\EmojiServiceProvider', 'BackupManager\Laravel\Laravel5ServiceProvider', 'Barryvdh\Cors\ServiceProvider', + 'Fedeisas\LaravelMailCssInliner\LaravelMailCssInlinerServiceProvider', 'Fideloper\Proxy\TrustedProxyServiceProvider', 'GrahamCampbell\Binput\BinputServiceProvider', 'GrahamCampbell\Exceptions\ExceptionsServiceProvider', diff --git a/public/img/button-email--dark-grey.png b/public/img/button-email--dark-grey.png new file mode 100644 index 0000000000000000000000000000000000000000..606ed16ec13af5ebc11415e2f3546a374aaf6729 GIT binary patch literal 3814 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 c8@~wnKQRBVc|Is*ApigX07*qoM6N<$f 'Subscribe to email updates.', 'subscribed' => 'You\'ve been subscribed to email notifications, please check your email to confirm your subscription.', 'verified' => 'Your email subscription has been confirmed. Thank you!', - 'manage' => 'Manage your subscription.', + 'manage' => 'Manage your subscription', 'unsubscribe' => 'Unsubscribe from email updates.', 'unsubscribed' => 'Your email subscription has been cancelled.', 'failure' => 'Something went wrong with the subscription.', 'already-subscribed' => 'Cannot subscribe :email because they\'re already subscribed.', 'verify' => [ - 'text' => "Please confirm your email subscription to :app_name status updates.\n:link\nThank you, :app_name", - 'html-preheader' => 'Please confirm your email subscription to :app_name status updates.', - 'html' => '

Please confirm your email subscription to :app_name status updates.

:link

Thank you, :app_name

', + 'text' => "Please confirm your email subscription to :app_name status updates.\n:link", + 'html' => '

Please confirm your email subscription to :app_name status updates.

', + 'button' => 'Confirm Subscription', ], 'maintenance' => [ - 'text' => "New maintenance has been scheduled on :app_name.\nThank you, :app_name", - 'html-preheader' => 'New maintenance has been scheduled on :app_name.', - 'html' => '

New maintenance has been scheduled on :app_name.

', + 'text' => "New maintenance has been scheduled on :app_name.\nThank you, :app_name", + 'html' => '

New maintenance has been scheduled on :app_name.

', ], 'incident' => [ - 'text' => "New incident has been reported on :app_name.\nThank you, :app_name", - 'html-preheader' => 'New incident has been reported on :app_name.', - 'html' => '

New incident has been reported on :app_name.

Thank you, :app_name

', + 'text' => "New incident has been reported on :app_name.\nThank you, :app_name", + 'html' => '

New incident has been reported on :app_name.

Thank you, :app_name

', ], 'component' => [ - 'subject' => 'Component Status Update', - 'text' => 'The component :component_name has seen a status change. The component is now at :component_human_status.\nThank you, :app_name', - 'html-preheader' => 'Component Update from :app_name', - 'html' => '

The component :component_name has seen a status change. The component is now at :component_human_status.

Thank you, :app_name

', - 'tooltip-title' => 'Subscribe to notifications for :component_name.', + 'subject' => 'Component Status Update', + 'text' => 'The component :component_name has seen a status change. The component is now at :component_human_status.\nThank you, :app_name', + 'html' => '

The component :component_name has seen a status change. The component is now at :component_human_status.

Thank you, :app_name

', + 'tooltip-title' => 'Subscribe to notifications for :component_name.', ], ], ], @@ -109,7 +106,6 @@ return [ 'email' => [ 'invite' => [ 'text' => "You have been invited to the team :app_name status page, to sign up follow the next link.\n:link\nThank you, :app_name", - 'html-preheader' => 'You have been invited to the team :app_name.', 'html' => '

You have been invited to the team :app_name status page, to sign up follow the next link.

:link

Thank you, :app_name

', ], ], diff --git a/resources/views/emails/components/update-html.blade.php b/resources/views/emails/components/update-html.blade.php index abe4bdc0..d99acb78 100644 --- a/resources/views/emails/components/update-html.blade.php +++ b/resources/views/emails/components/update-html.blade.php @@ -1,16 +1,20 @@ @extends('layout.emails') -@section('preheader') -{!! trans('cachet.subscriber.email.component.html-preheader', ['app_name' => $app_name]) !!} -@stop - @section('content') {!! trans('cachet.subscriber.email.component.html', ['component_name' => $component_name, 'component_human_status' => $component_human_status, 'app_name' => $app_name]) !!} -@if($show_support) -

{!! trans('cachet.powered_by', ['app' => $app_name]) !!}

-@endif -

- {!! trans('cachet.subscriber.email.manage') !!} -

+ + + + +
+ +
@stop diff --git a/resources/views/emails/components/update-text.blade.php b/resources/views/emails/components/update-text.blade.php index f1f12454..935a8e7e 100644 --- a/resources/views/emails/components/update-text.blade.php +++ b/resources/views/emails/components/update-text.blade.php @@ -1,7 +1,7 @@ {!! trans('cachet.subscriber.email.component.text', ['component_name' => $component_name, 'component_human_status' => $component_human_status, 'app_name' => $app_name]) !!} +{!! trans('cachet.subscriber.email.manage') !!} {{ $manage_link }} + @if($show_support) {!! trans('cachet.powered_by', ['app' => $app_name]) !!} @endif - -{!! trans('cachet.subscriber.email.manage') !!} {{ $manage_link }} diff --git a/resources/views/emails/incidents/maintenance-html.blade.php b/resources/views/emails/incidents/maintenance-html.blade.php index 3a200212..532b7fbd 100644 --- a/resources/views/emails/incidents/maintenance-html.blade.php +++ b/resources/views/emails/incidents/maintenance-html.blade.php @@ -1,29 +1,34 @@ @extends('layout.emails') -@section('preheader') -{!! trans('cachet.subscriber.email.maintenance.html-preheader', ['app_name' => $app_name]) !!} -@stop - @section('content') {!! trans('cachet.subscriber.email.maintenance.html', ['app_name' => $app_name]) !!}

{{ $scheduled_at }}

-

- {!! $status !!} -

+

{!! $status !!}

-

- {!! $html_content !!} -

+

{!! $html_content !!}

-@if($show_support) -

{!! trans('cachet.powered_by', ['app' => $app_name]) !!}

-@endif -

- {!! trans('cachet.subscriber.email.manage') !!} -

-

- {!! trans('cachet.subscriber.email.unsubscribe') !!} -

+ + + + +
+ +
+ + + + + +
+

{!! trans('cachet.subscriber.email.unsubscribe') !!}

+
@stop diff --git a/resources/views/emails/incidents/maintenance-text.blade.php b/resources/views/emails/incidents/maintenance-text.blade.php index 81c33dfe..513dca8a 100644 --- a/resources/views/emails/incidents/maintenance-text.blade.php +++ b/resources/views/emails/incidents/maintenance-text.blade.php @@ -6,10 +6,10 @@ {!! $text_content !!} -@if($show_support) -{!! trans('cachet.powered_by', ['app' => $app_name]) !!} -@endif - {!! trans('cachet.subscriber.email.manage') !!} {{ $manage_link }} {!! trans('cachet.subscriber.email.unsubscribe') !!} {{ $unsubscribe_link }} + +@if($show_support) +{!! trans('cachet.powered_by', ['app' => $app_name]) !!} +@endif diff --git a/resources/views/emails/incidents/new-html.blade.php b/resources/views/emails/incidents/new-html.blade.php index ec35fefb..5d0ea79b 100644 --- a/resources/views/emails/incidents/new-html.blade.php +++ b/resources/views/emails/incidents/new-html.blade.php @@ -1,30 +1,32 @@ @extends('layout.emails') -@section('preheader') -{!! trans('cachet.subscriber.email.incident.html-preheader', ['app_name' => $app_name]) !!} -@stop - @section('content') {!! trans('cachet.subscriber.email.incident.html-preheader', ['app_name' => $app_name]) !!} -

- {!! $status !!} - @if($has_component) - ({{ $component_name }}) - @endif -

+

{!! $status !!} @if($has_component) ({{ $component_name }})@endif

-

- {!! $html_content !!} -

+

{!! $html_content !!}

-@if($show_support) -

{!! trans('cachet.powered_by', ['app' => $app_name]) !!}

-@endif -

- {!! trans('cachet.subscriber.email.manage') !!} -

-

- {!! trans('cachet.subscriber.email.unsubscribe') !!} -

+ + + + +
+ +
+ + + + + +
+

{!! trans('cachet.subscriber.email.unsubscribe') !!}

+
@stop diff --git a/resources/views/emails/incidents/new-text.blade.php b/resources/views/emails/incidents/new-text.blade.php index e5d32c84..9ec07cf8 100644 --- a/resources/views/emails/incidents/new-text.blade.php +++ b/resources/views/emails/incidents/new-text.blade.php @@ -7,10 +7,10 @@ {!! $text_content !!} -@if($show_support) -{!! trans('cachet.powered_by', ['app' => $app_name]) !!} -@endif - {!! trans('cachet.subscriber.email.manage') !!} {{ $manage_link }} {!! trans('cachet.subscriber.email.unsuscribe') !!} {{ $unsubscribe_link }} + +@if($show_support) +{!! trans('cachet.powered_by', ['app' => $app_name]) !!} +@endif diff --git a/resources/views/emails/subscribers/verify-html.blade.php b/resources/views/emails/subscribers/verify-html.blade.php index a6e854f3..edc10009 100644 --- a/resources/views/emails/subscribers/verify-html.blade.php +++ b/resources/views/emails/subscribers/verify-html.blade.php @@ -1,13 +1,20 @@ @extends('layout.emails') -@section('preheader') -{!! trans('cachet.subscriber.email.verify.html-preheader', ['app_name' => $app_name]) !!} -@stop - @section('content') -{!! trans('cachet.subscriber.email.verify.html', ['app_name' => $app_name, 'link' => $link]) !!} +{!! trans('cachet.subscriber.email.verify.html', ['app_name' => $app_name]) !!} -@if($show_support) -

{!! trans('cachet.powered_by', ['app' => $app_name]) !!}

-@endif + + + + +
+ +
@stop diff --git a/resources/views/emails/users/invite-html.blade.php b/resources/views/emails/users/invite-html.blade.php index 3c5e6e0c..8a01d8fb 100644 --- a/resources/views/emails/users/invite-html.blade.php +++ b/resources/views/emails/users/invite-html.blade.php @@ -1,13 +1,5 @@ @extends('layout.emails') -@section('preheader') -{!! trans('cachet.users.email.invite.html-preheader', ['app_name' => $app_name]) !!} -@stop - @section('content') - {!! trans('cachet.users.email.invite.html', ['app_name' => $app_name, 'link' => $link]) !!} - - @if($show_support) -

{!! trans('cachet.powered_by', ['app' => $app_name]) !!}

- @endif +{!! trans('cachet.users.email.invite.html', ['app_name' => $app_name, 'link' => $link]) !!} @stop diff --git a/resources/views/layout/emails.blade.php b/resources/views/layout/emails.blade.php index 152cb847..fe6007c2 100644 --- a/resources/views/layout/emails.blade.php +++ b/resources/views/layout/emails.blade.php @@ -1,38 +1,220 @@ - - + + - - - - -{{ $app_name }} -@include('partials.email-css') + + + + {{ $app_name }} + - - + +
-