diff --git a/assets/css/src/box.styl b/assets/css/src/box.styl index 374e80b5c0..14ef074e16 100644 --- a/assets/css/src/box.styl +++ b/assets/css/src/box.styl @@ -30,7 +30,7 @@ $box-description-font-size = $box-description-line-height margin: 0 0 $box-margin-big padding: 0 width: 30.5% - + @media screen and (max-width 1178px) width: 47% @@ -151,7 +151,6 @@ $box-description-font-size = $box-description-line-height width: 258px max-height: $box-description-height padding-bottom: 0 - overflow: hidden word-wrap: break-word overflow-wrap: break-word diff --git a/assets/css/src/listing/newsletters.styl b/assets/css/src/listing/newsletters.styl index b5c8b9c144..938ee33ef0 100644 --- a/assets/css/src/listing/newsletters.styl +++ b/assets/css/src/listing/newsletters.styl @@ -2,6 +2,7 @@ $excellent-badge-color = #2993ab $good-badge-color = #f0b849 $bad-badge-color = #d54e21 $green-badge-color = #55bd56 +$cta-badge-color = #46b450 #newsletters_container h2.nav-tab-wrapper @@ -51,3 +52,20 @@ $green-badge-color = #55bd56 &_green background: $green-badge-color + + &_cta + background: $cta-badge-color + line-height: 5em + padding: 7px 6px 7px 6px + text-decoration: none + + &:hover, &:active, &:focus + color: #FFFFFF + background: $green-badge-color + + &_grey + background: #c3c3c3 + + .dashicons + font-size: 14px; + line-height: 3.4em; diff --git a/assets/js/src/newsletters/types.jsx b/assets/js/src/newsletters/types.jsx index 84cb328afd..54a6892539 100644 --- a/assets/js/src/newsletters/types.jsx +++ b/assets/js/src/newsletters/types.jsx @@ -90,6 +90,7 @@ const NewsletterTypes = React.createClass({ slug: 'welcome', title: MailPoet.I18n.t('welcomeNewsletterTypeTitle'), description: MailPoet.I18n.t('welcomeNewsletterTypeDescription'), + videoGuide: 'https://beta.docs.mailpoet.com/article/254-video-guide-to-welcome-emails', action: (function action() { return (
@@ -104,6 +105,7 @@ const NewsletterTypes = React.createClass({ slug: 'notification', title: MailPoet.I18n.t('postNotificationNewsletterTypeTitle'), description: MailPoet.I18n.t('postNotificationNewsletterTypeDescription'), + videoGuide: 'https://beta.docs.mailpoet.com/article/210-video-guide-to-post-notifications', action: (function action() { return ( @@ -138,6 +141,12 @@ const NewsletterTypes = React.createClass({

{type.title}

{type.description}

+ { type.videoGuide && ( + + {MailPoet.I18n.t('seeVideoGuide')} + + ) + }
diff --git a/lib/Config/Menu.php b/lib/Config/Menu.php index 385f7d6d20..0eaae9fba4 100644 --- a/lib/Config/Menu.php +++ b/lib/Config/Menu.php @@ -438,6 +438,13 @@ class Menu { ) ); + $data['is_new_user'] = true; + if(!empty($data['settings']['installed_at'])) { + $installed_at = Carbon::createFromTimestamp(strtotime($data['settings']['installed_at'])); + $current_time = Carbon::createFromTimestamp(WPFunctions::currentTime('timestamp')); + $data['is_new_user'] = $current_time->diffInDays($installed_at) <= 30; + } + $data = array_merge($data, Installer::getPremiumStatus()); $this->displayPage('settings.html', $data); @@ -541,6 +548,14 @@ class Menu { $data['items_per_page'] = $this->getLimitPerPage('forms'); $data['segments'] = Segment::findArray(); + $data['is_new_user'] = true; + $installed_at = Setting::getValue('installed_at'); + if(!is_null($installed_at)) { + $installed_at = Carbon::createFromTimestamp(strtotime($installed_at)); + $current_time = Carbon::createFromTimestamp(WPFunctions::currentTime('timestamp')); + $data['is_new_user'] = $current_time->diffInDays($installed_at) <= 30; + } + $this->displayPage('forms.html', $data); } @@ -579,6 +594,13 @@ class Menu { $data['automatic_emails'] = array(); + $data['is_new_user'] = 'true'; + if(!empty($data['settings']['installed_at'])) { + $installed_at = Carbon::createFromTimestamp(strtotime($data['settings']['installed_at'])); + $current_time = Carbon::createFromTimestamp(WPFunctions::currentTime('timestamp')); + $data['is_new_user'] = $current_time->diffInDays($installed_at) <= 30 ? 'true' : 'false'; + } + wp_enqueue_script('jquery-ui'); wp_enqueue_script('jquery-ui-datepicker'); @@ -609,6 +631,15 @@ class Menu { 'month_names' => Block\Date::getMonthNames(), 'sub_menu' => 'mailpoet-subscribers' )); + + $data['is_new_user'] = true; + $installed_at = Setting::getValue('installed_at'); + if(!is_null($installed_at)) { + $installed_at = Carbon::createFromTimestamp(strtotime($installed_at)); + $current_time = Carbon::createFromTimestamp(WPFunctions::currentTime('timestamp')); + $data['is_new_user'] = $current_time->diffInDays($installed_at) <= 30; + } + $this->displayPage('subscribers/importExport/import.html', $data); } diff --git a/views/forms.html b/views/forms.html index 8e51940fa2..2bcf4a42fb 100644 --- a/views/forms.html +++ b/views/forms.html @@ -12,6 +12,10 @@

+ + <%= __('See video guide') %> + + <% endblock %> @@ -122,6 +123,7 @@ 'draftNewsletterTitle': __('Subject'), 'pickCampaignType': __('Select type of email'), + 'seeVideoGuide': __('See video guide'), 'regularNewsletterTypeTitle': __('Newsletter'), 'regularNewsletterTypeDescription': __('Send a newsletter with images, buttons, dividers, and social bookmarks. Or, just send a basic text email.'), 'create': __('Create'), diff --git a/views/settings/mta.html b/views/settings/mta.html index 712c44008b..a543a39ebb 100644 --- a/views/settings/mta.html +++ b/views/settings/mta.html @@ -145,7 +145,11 @@

- <%= __("Need help to pick? [link]Check out the comparison table of sending methods[/link].") + <%= __("Need help to pick?") %> + + <%= __('See video guide') %> + + <%= __("[link]or check out the comparison table of sending methods[/link].") |replaceLinkTags('http://beta.docs.mailpoet.com/article/181-comparison-table-of-sending-methods', {'target' : '_blank'}) |raw %> diff --git a/views/subscribers/importExport/import/step1.html b/views/subscribers/importExport/import/step1.html index 88e8646483..54b557ec9f 100644 --- a/views/subscribers/importExport/import/step1.html +++ b/views/subscribers/importExport/import/step1.html @@ -22,6 +22,10 @@ + + <%= __('See video guide') %> + +