diff --git a/assets/css/src/in-app-announcements.styl b/assets/css/src/in-app-announcements.styl index 170d7e31e0..210fdb7f31 100644 --- a/assets/css/src/in-app-announcements.styl +++ b/assets/css/src/in-app-announcements.styl @@ -26,3 +26,16 @@ 100% -moz-box-shadow: 0 0 0 0 rgba(255, 83, 1, 0) box-shadow: 0 0 0 0 rgba(255, 83, 1, 0) + +.mailpoet_in_app_announcement_free_welcome_emails + text-align: center + h2 + font-size: 28px + img + width: 640px + margin-top: -20px + +.mailpoet_in_app_announcement_free_welcome_emails_dot + position: relative + top: -3px + left: 8px diff --git a/assets/img/in_app_announcements/hello-illustration-for-welcome-emails.png b/assets/img/in_app_announcements/hello-illustration-for-welcome-emails.png new file mode 100644 index 0000000000..49f6928759 Binary files /dev/null and b/assets/img/in_app_announcements/hello-illustration-for-welcome-emails.png differ diff --git a/assets/js/src/newsletters/listings/heading.jsx b/assets/js/src/newsletters/listings/heading.jsx index 54df9f61e8..15f3727f37 100644 --- a/assets/js/src/newsletters/listings/heading.jsx +++ b/assets/js/src/newsletters/listings/heading.jsx @@ -1,6 +1,7 @@ import React from 'react'; import { Link } from 'react-router'; import MailPoet from 'mailpoet'; +import InAppAnnoucement from 'in_app_announcements/in_app_announcement.jsx'; const ListingHeading = () => (

@@ -17,6 +18,23 @@ const ListingHeading = () => ( > {MailPoet.I18n.t('new')} + +
+

{MailPoet.I18n.t('freeWelcomeEmailsHeading')}

+ {MailPoet.I18n.t('freeWelcomeEmailsHeading')} +

{MailPoet.I18n.t('freeWelcomeEmailsParagraph')}

+
+

); diff --git a/lib/Models/Setting.php b/lib/Models/Setting.php index efcc2ccfae..d962270762 100644 --- a/lib/Models/Setting.php +++ b/lib/Models/Setting.php @@ -53,7 +53,10 @@ class Setting extends Model { ), 'analytics' => array( 'enabled' => false, - ) + ), + 'in_app_announcements' => [ + 'displayed' => [] + ], ); } diff --git a/views/newsletters.html b/views/newsletters.html index 5a9eebe73b..8e85310f58 100644 --- a/views/newsletters.html +++ b/views/newsletters.html @@ -17,6 +17,8 @@ var mailpoet_tracking_enabled = <%= json_encode(tracking_enabled) %>; var mailpoet_premium_active = <%= json_encode(premium_plugin_active) %>; var mailpoet_automatic_emails = <%= json_encode(automatic_emails) %>; + var mailpoet_in_app_announcements = mailpoet_settings.in_app_announcements; + var mailpoet_free_welcome_emails_image = '<%= image_url('in_app_announcements/hello-illustration-for-welcome-emails.png') %>'; <% set newUser = (is_new_user == true) ? 'true' : 'false' %> var mailpoet_is_new_user = <%= newUser %>; @@ -297,6 +299,9 @@ 'introBack': _x('Back', 'A label on a button'), 'introSkip': _x('Skip', 'A label on a button'), 'introDone': _x('Done', 'A label on a button'), + + 'freeWelcomeEmailsHeading': __('Welcome Emails are now free for everyone'), + 'freeWelcomeEmailsParagraph': __('Say “Hello!” automatically to all your new subscribers. They’ll appreciate the extra touch.'), }) %> <% endblock %>