diff --git a/assets/css/src/pages.styl b/assets/css/src/pages.styl index 5573d2d813..5917c6da46 100644 --- a/assets/css/src/pages.styl +++ b/assets/css/src/pages.styl @@ -117,6 +117,21 @@ About page styles that may differ across WP versions. h3 margin-top: 0 + .feature-section + &.one-col + width: 700px + margin: 0 auto + text-align: center + & > a.button + margin-top: 2em + &.one-col-left + width: 700px + margin: 0 auto + h2.mailpoet-feature-top + margin: 50px auto + .lead-description ~ p + margin-top: 3em + .feature-section h4 margin: 1.4em 0 0.6em 0 diff --git a/lib/Config/Menu.php b/lib/Config/Menu.php index 2abb4bb8b9..2edcc1d5b1 100644 --- a/lib/Config/Menu.php +++ b/lib/Config/Menu.php @@ -340,7 +340,7 @@ class Menu { $readme_file = Env::$path . '/readme.txt'; if(is_readable($readme_file)) { - $changelog = Readme::parseChangelog(file_get_contents($readme_file), 2); + $changelog = Readme::parseChangelog(file_get_contents($readme_file), 1); if($changelog) { $data['changelog'] = $changelog; } diff --git a/views/update.html b/views/update.html index e373fff267..fda26a8de7 100644 --- a/views/update.html +++ b/views/update.html @@ -10,9 +10,12 @@
-

<%= __('Welcome to MailPoet') %> <%= settings.version %>

+

<%= __('Greetings, humans.') %>

-

<%= __("Thank you for helping us test and improve this new version of MailPoet. You're one of our extra-special beta testers. We really appreciate your help!") %> +

<%= __('Thanks for using MailPoet! We really appreciate all of your love, affection, [link]and (good) plugin reviews.[/link]') + |replaceLinkTags('https://wordpress.org/support/plugin/wysija-newsletters/reviews/', {'target' : '_blank'}) + |raw + %>

@@ -21,8 +24,8 @@ <%= __("What's New") %> -
-

<%= __("List of Changes") %>

+
+

<%= __('List of Changes') %>

<% if changelog %> <% for item in changelog %>

<%= item.version %>

@@ -31,23 +34,51 @@
  • <%= change %>
  • <% endfor %> -
    <% endfor %> <% else %> -

    <%= __("See readme.txt for a changelog.") %>

    +

    <%= __('See readme.txt for a changelog.') %>

    <% endif %> + <%= __('View all changes') %> →

    -
    -
    -

    <%= __("Awesome! Now, take me to MailPoet") %> → <%= __("View all changes") %> →

    + <% if(not settings.analytics.enabled) %> +
    +

    <%= __('Do Your Part to Make MailPoet Better') %>

    +
    + + +
    +

    <%= __("By sharing your data with us, you can help us understand what our users like (and don't like).") %> + <%= __('We use it to prioritize and develop new plugin features.') %>
    + <%= __('Share your data to help shape the future of MailPoet! [link]Read more.[/link]') + |replaceLinkTags('http://docs.mailpoet.com/article/36-share-your-data', {'target' : '_blank'}) + |raw + %> +

    + +
    + <% endif %> + +
    +

    <%= __('Care to Give Your Opinion?') %>

    + + + +
    + +
    + +
    - <% endblock %> - diff --git a/views/welcome.html b/views/welcome.html index cb80c8a807..8a002b09c1 100644 --- a/views/welcome.html +++ b/views/welcome.html @@ -19,9 +19,12 @@
    -

    <%= __('Welcome to MailPoet') %> <%= settings.version %>

    +

    <%= __('Greetings, humans.') %>

    -

    <%= __("Thank you for helping us test and improve this new version of MailPoet. You're one of our extra-special beta testers. We really appreciate your help!") %> +

    <%= __('Thanks for using MailPoet! We really appreciate all of your love, affection, [link]and (good) plugin reviews.[/link]') + |replaceLinkTags('https://wordpress.org/support/plugin/wysija-newsletters/reviews/', {'target' : '_blank'}) + |raw + %>