From f359ba1499b76a488d164b80987dae7ee2aa82b3 Mon Sep 17 00:00:00 2001 From: Vlad Date: Wed, 27 Jun 2018 12:38:09 -0400 Subject: [PATCH 01/18] Removes copy text --- views/settings/mta.html | 1 - 1 file changed, 1 deletion(-) diff --git a/views/settings/mta.html b/views/settings/mta.html index c4067ab2b3..b98057de7d 100644 --- a/views/settings/mta.html +++ b/views/settings/mta.html @@ -85,7 +85,6 @@
  • <%= __('All emails are signed with SPF & DKIM.') %>
  • <%= __('Automatically remove invalid and bounced addresses (bounce handling) to keep your lists clean.') %>
  • <%= __('Configuration is dead-simple: simply enter a key to activate the sending service.') %> -
  • <%= __('Plus:')%> <%= __('get the Premium features for free.') %>
    • Date: Wed, 27 Jun 2018 12:39:36 -0400 Subject: [PATCH 02/18] Removes monthly plans info button --- views/settings/mta.html | 5 ----- 1 file changed, 5 deletions(-) diff --git a/views/settings/mta.html b/views/settings/mta.html index b98057de7d..2caba0f7cd 100644 --- a/views/settings/mta.html +++ b/views/settings/mta.html @@ -87,11 +87,6 @@
  • <%= __('Configuration is dead-simple: simply enter a key to activate the sending service.') %>
    • -     <%= __('Find out more about our monthly plans') %> <%= __('new!') %> <%= __('Try it for free (for up to 2,000 subscribers)') %> From ce17adf693953218030c136ff87d00e4d2762531 Mon Sep 17 00:00:00 2001 From: Vlad Date: Wed, 27 Jun 2018 12:45:22 -0400 Subject: [PATCH 03/18] Removes "try for free" button / fixes HTML markup --- views/settings/mta.html | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/views/settings/mta.html b/views/settings/mta.html index 2caba0f7cd..383c2b5e7a 100644 --- a/views/settings/mta.html +++ b/views/settings/mta.html @@ -80,17 +80,13 @@ <%= __("Solve all of your sending problems!") %>
      -
    • <%= __('Reach the inbox, not the spam box.') %> -
    • <%= __('Super fast: send up to 50,000 emails per hour.') %> -
    • <%= __('All emails are signed with SPF & DKIM.') %> -
    • <%= __('Automatically remove invalid and bounced addresses (bounce handling) to keep your lists clean.') %> -
    • <%= __('Configuration is dead-simple: simply enter a key to activate the sending service.') %> -
      • +
    • <%= __('Reach the inbox, not the spam box.') %>
      • +
    • <%= __('Super fast: send up to 50,000 emails per hour.') %>
      • +
    • <%= __('All emails are signed with SPF & DKIM.') %>
      • +
    • <%= __('Automatically remove invalid and bounced addresses (bounce handling) to keep your lists clean.') %>
      • +
    • <%= __('Configuration is dead-simple: simply enter a key to activate the sending service.') %>
    -     - <%= __('new!') %> <%= __('Try it for free (for up to 2,000 subscribers)') %> -
    @@ -115,15 +111,16 @@
    <%= __('Send emails via your host (not recommended!) or via a third-party sender.') %>
      -
    • <%= __("Unless you're a pro, you’ll probably end up in spam.") %> -
    • <%= __("Sending speed is limited by your host and/or your third-party (with a 2,000 per hour maximum).") %> -
    • <%= __("Manual configuration of SPF and DKIM required.") %> +
    • <%= __("Unless you're a pro, you’ll probably end up in spam.") %>
      • +
    • <%= __("Sending speed is limited by your host and/or your third-party (with a 2,000 per hour maximum).") %>
      • +
    • <%= __("Manual configuration of SPF and DKIM required.") %>
    • <%= __("Bounce handling is available, but only with an extra [link]add-on[/link].") |replaceLinkTags('https://wordpress.org/plugins/bounce-handler-mailpoet/', {'target' : '_blank'}) |raw %> -
    • <%= __("You’ll need a separate plugin to send your WordPress site emails (optional).") %> +
      • +
    • <%= __("You’ll need a separate plugin to send your WordPress site emails (optional).") %>
    From ce2484589651190877de2d6a2b61ba47fc8e04da Mon Sep 17 00:00:00 2001 From: Vlad Date: Wed, 27 Jun 2018 12:50:09 -0400 Subject: [PATCH 04/18] Moves video badge under MSS box --- views/settings/mta.html | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/views/settings/mta.html b/views/settings/mta.html index 383c2b5e7a..28a3d09c3f 100644 --- a/views/settings/mta.html +++ b/views/settings/mta.html @@ -87,6 +87,14 @@
  • <%= __('Configuration is dead-simple: simply enter a key to activate the sending service.') %>
    • +

    + <% set badgeClassName = (is_new_user == true) ? 'mailpoet_badge mailpoet_badge_video' : 'mailpoet_badge mailpoet_badge_video mailpoet_badge_video_grey' %> + <%= __('[link]%s See video guide[/link]') + |format('') + |replaceLinkTags('https://beta.docs.mailpoet.com/article/235-video-guide-sending-options', {'class' : badgeClassName, 'target' : '_blank'}, 'link') + |raw + %> +

    @@ -135,16 +143,6 @@ -

    - <% set badgeClassName = (is_new_user == true) ? 'mailpoet_badge mailpoet_badge_video' : 'mailpoet_badge mailpoet_badge_video mailpoet_badge_video_grey' %> - <%= __('Need help to pick? [link1]%s See video guide[/link1] [link2]or check out the comparison table of sending methods[/link2].') - |format('') - |replaceLinkTags('https://beta.docs.mailpoet.com/article/235-video-guide-sending-options', {'class' : badgeClassName, 'target' : '_blank'}, 'link1') - |replaceLinkTags('http://beta.docs.mailpoet.com/article/181-comparison-table-of-sending-methods', {'target' : '_blank'}, 'link2') - |raw - %> -

    -
    From 0b973274afcfb678469cda1407a0e53f6919b9c1 Mon Sep 17 00:00:00 2001 From: Vlad Date: Wed, 27 Jun 2018 12:51:41 -0400 Subject: [PATCH 05/18] Removes copy text --- views/settings/mta.html | 1 - 1 file changed, 1 deletion(-) diff --git a/views/settings/mta.html b/views/settings/mta.html index 28a3d09c3f..0d5b0d7da3 100644 --- a/views/settings/mta.html +++ b/views/settings/mta.html @@ -128,7 +128,6 @@ |raw %> -
  • <%= __("You’ll need a separate plugin to send your WordPress site emails (optional).") %>
    • From ab696a133b5948d44fcc1a1ea7ff93810064527c Mon Sep 17 00:00:00 2001 From: Vlad Date: Wed, 27 Jun 2018 12:53:17 -0400 Subject: [PATCH 06/18] Updates copy text --- views/settings/mta.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/settings/mta.html b/views/settings/mta.html index 0d5b0d7da3..90222a9eeb 100644 --- a/views/settings/mta.html +++ b/views/settings/mta.html @@ -81,10 +81,10 @@
    • <%= __('Reach the inbox, not the spam box.') %>
      • +
    • <%= __('Easy configuration: enter a key to activate the sending service.') %>
    • <%= __('Super fast: send up to 50,000 emails per hour.') %>
    • <%= __('All emails are signed with SPF & DKIM.') %>
    • <%= __('Automatically remove invalid and bounced addresses (bounce handling) to keep your lists clean.') %>
      • -
    • <%= __('Configuration is dead-simple: simply enter a key to activate the sending service.') %>

    From 01af61a93f8535d6d0e3f551b42531f1b9f3b151 Mon Sep 17 00:00:00 2001 From: Vlad Date: Wed, 27 Jun 2018 12:55:11 -0400 Subject: [PATCH 07/18] Removes copy text that's displayed when MSS is activated --- views/settings/mta.html | 2 -- 1 file changed, 2 deletions(-) diff --git a/views/settings/mta.html b/views/settings/mta.html index 90222a9eeb..0e484cefd6 100644 --- a/views/settings/mta.html +++ b/views/settings/mta.html @@ -69,8 +69,6 @@ id="mailpoet_sending_method_active_text" > <%= __("You're now sending with MailPoet!") %> -
    - <%= __("Great, you're all set up. Your emails will now be sent quickly and reliably!") %>

    Date: Wed, 27 Jun 2018 13:42:16 -0400 Subject: [PATCH 08/18] Adds border around activated sending method box --- assets/css/src/settings.styl | 1 + 1 file changed, 1 insertion(+) diff --git a/assets/css/src/settings.styl b/assets/css/src/settings.styl index b5d0b101ee..453b27d855 100644 --- a/assets/css/src/settings.styl +++ b/assets/css/src/settings.styl @@ -47,6 +47,7 @@ visibility hidden font-weight bold .mailpoet_active + border 2px solid #088b00 .mailpoet_status background-color #088b00 span From e4c151165380d1d9b77fb707d9a653c7edd7d9fd Mon Sep 17 00:00:00 2001 From: Vlad Date: Wed, 27 Jun 2018 14:04:26 -0400 Subject: [PATCH 09/18] Changes status background color/adds border around deactivated box --- assets/css/src/settings.styl | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/assets/css/src/settings.styl b/assets/css/src/settings.styl index 453b27d855..f12b6c6c5e 100644 --- a/assets/css/src/settings.styl +++ b/assets/css/src/settings.styl @@ -19,13 +19,15 @@ flex-direction column flex-basis 0 margin 0 25px 25px 0 - border 1px solid #dedede background-color #fff + border 2px solid #dcdcdc max-width 500px .mailpoet_sending_method_description padding: 25px flex-grow 1 flex-shrink 0 + &:hover:not(.mailpoet_active) + border-color #c5c5c5 > li:last-child margin-right 0 h3 @@ -39,7 +41,7 @@ flex-direction row justify-content space-between align-items center - background-color #2f2f2f + background-color #dcdcdc color #fff text-overflow ellipsis padding 15px From 7962a005b18a34efa5e57b0520077dc3f7d907cb Mon Sep 17 00:00:00 2001 From: Vlad Date: Thu, 28 Jun 2018 11:34:43 -0400 Subject: [PATCH 10/18] Modifies activation behavior/presentation --- assets/css/src/settings.styl | 9 ++++-- views/settings/mta.html | 56 +++++++++++++++++++++++------------- 2 files changed, 43 insertions(+), 22 deletions(-) diff --git a/assets/css/src/settings.styl b/assets/css/src/settings.styl index f12b6c6c5e..3c8cb1aa65 100644 --- a/assets/css/src/settings.styl +++ b/assets/css/src/settings.styl @@ -39,15 +39,18 @@ .mailpoet_status display flex flex-direction row - justify-content space-between + justify-content flex-end align-items center background-color #dcdcdc color #fff text-overflow ellipsis - padding 15px + min-height 2em + padding 1em span visibility hidden font-weight bold + div + margin-left 1em .mailpoet_active border 2px solid #088b00 .mailpoet_status @@ -56,6 +59,8 @@ visibility visible #mailpoet_mta_activate visibility hidden + .mailpoet_actions + color initial .tooltip.dashicons.dashicons-editor-help line-height: 1.4 diff --git a/views/settings/mta.html b/views/settings/mta.html index 0e484cefd6..6e972269fc 100644 --- a/views/settings/mta.html +++ b/views/settings/mta.html @@ -1,4 +1,5 @@ <% set intervals = [1, 2, 5, 10, 15, 30] %> +<% set mss_key_valid = settings.mta.mailpoet_api_key_state.state != "valid" %> <% set default_frequency = { 'website': { 'emails': 25, @@ -96,21 +97,27 @@
    - <%= __('Activated') %> - -
    - +
    + <%= __('Activated') %> +
    +
    +
    + + or + <%= + __("[link]enter your key[/link]") + |replaceLinkTags('#premium') + |raw + %> +
    +
    + +
    -
    -
  • class="mailpoet_active"<% endif %> + <% if(settings.mta_group != 'mailpoet') %>class="mailpoet_active"<% endif %> >

    <%= __('Other') %>

    @@ -132,9 +139,12 @@
    <%= __('Activated') %>
    - <%= __('Configure') %> + <% if(settings.mta_group == 'mailpoet') %> + <%= __('Activate') %> + <% else %> + <%= __('Configure') %> + <% endif %> +
    • @@ -1066,7 +1076,6 @@ // format daily emails number according to locale options.daily_emails = options.daily_emails.toLocaleString(); - $(options.output).html( sending_frequency_template(options) ); @@ -1114,11 +1123,18 @@ function updateMSSActivationUI() { var $ = jQuery; var group = $('.mailpoet_sending_methods .mailpoet_active').data('group'); - var key_valid = !$('.mailpoet_mss_key_valid').hasClass('mailpoet_hidden'); - var activation_possible = group !== 'mailpoet' && key_valid; - $('.mailpoet_sending_service_activate').prop('disabled', !activation_possible); - $('.mailpoet_mss_activate_notice').toggle(activation_possible); - } + var key_valid = $('.mailpoet_mss_key_valid').hasClass('mailpoet_hidden'); + + if (group !== 'mailpoet') { + $('.mailpoet_actions .mailpoet_invalid_key').toggleClass('mailpoet_hidden', !key_valid); + $('.mailpoet_actions .mailpoet_valid_key').toggleClass('mailpoet_hidden', key_valid); + $('.mailpoet_other_sending_method_action').removeClass('button-primary').addClass('button-secondary').text('<%= __('Configure') %>'); + } else { + $('.mailpoet_actions .mailpoet_valid_key').addClass('mailpoet_hidden'); + $('.mailpoet_activated').removeClass('mailpoet_hidden'); + $('.mailpoet_other_sending_method_action').removeClass('button-secondary').addClass('button-primary').text('<%= __('Activate') %>'); + } + }; <%= partial( From 4bb06a949a031c36f742287f86e0296caab57713 Mon Sep 17 00:00:00 2001 From: Vlad Date: Thu, 28 Jun 2018 11:36:33 -0400 Subject: [PATCH 11/18] Changes order of the Send With tab --- views/settings.html | 2 +- views/settings/mta.html | 124 ++++++++++++++++++++-------------------- 2 files changed, 63 insertions(+), 63 deletions(-) diff --git a/views/settings.html b/views/settings.html index 5bf90ddc4c..be2105f7fa 100644 --- a/views/settings.html +++ b/views/settings.html @@ -15,9 +15,9 @@ > diff --git a/views/settings/mta.html b/views/settings/mta.html index 6e972269fc..81cdba56c1 100644 --- a/views/settings/mta.html +++ b/views/settings/mta.html @@ -601,69 +601,69 @@ + + + + + + + + + + + + + + + + + + + +
    + +

    + <%= __("This improves your delivery rate by verifying that you're allowed to send emails from your domain.") %> +

    +     		+

    + <%= __("SPF is set up in your DNS. Read your host's support documentation for more information.") %> +

    +
    + + +

    + + <%= __('Send a test email') %> + + +

    +
    +

    + <%= __('Activate') %> +   + <%= __('or Cancel') %> +

    +
    - - - - - - - - - - - - - - - - - - - -
    - -

    - <%= __("This improves your delivery rate by verifying that you're allowed to send emails from your domain.") %> -

    -     		-

    - <%= __("SPF is set up in your DNS. Read your host's support documentation for more information.") %> -

    -
    - - -

    - - <%= __('Send a test email') %> - - -

    -
    -

    - <%= __('Activate') %> -   - <%= __('or Cancel') %> -

    -