From 2c12d9ee2da38a1d450d4fa932422c421bb077f7 Mon Sep 17 00:00:00 2001 From: Amine Ben hammou Date: Fri, 27 Oct 2017 11:40:31 +0000 Subject: [PATCH] changes on welcome and update pages --- views/update.html | 80 +++++++++++++++++++++++++++++++++++----------- views/welcome.html | 27 +--------------- 2 files changed, 62 insertions(+), 45 deletions(-) diff --git a/views/update.html b/views/update.html index f0ceb55b6b..22a43ecf8f 100644 --- a/views/update.html +++ b/views/update.html @@ -35,27 +35,61 @@
+
+
+ <% if(not settings.analytics.enabled) %> +
+

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

+
- <% 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://beta.docs.mailpoet.com/article/130-sharing-your-data-with-us', {'target' : '_blank'}) - |raw - %> + +

+

<%= __("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://beta.docs.mailpoet.com/article/130-sharing-your-data-with-us', {'target' : '_blank'}) + |raw + %> +

+
+
+ <% endif %>
-
- <% endif %> +
+
+

<%= __("Subscribe To Our Newsletter") %>

+

<%= __("About once a month, we send out a pretty cool newsletter ourselves.") %>

+

<%= __("Sign up to get a curated selection of awesome links, tips and tricks for using MailPoet, special offers, and important plugin updates!") %>

+ +
+
+
+ +
+
+

<%= __("Learn the Ropes") %>

+

<%= __("New to MailPoet? Check out our brand new email course. Over the course of a week, we'll teach you how to create and send your first MailPoet email newsletter. Sign up below!") %>

+ +
+
+
+ +
+
+

<%= __("Leave a Review, Make Us Happy") %>

+

<%= __('We love to read reviews, either critical or positive. Take 3 minutes and make our day. [link]Write a review[/link]. :)') + |replaceLinkTags('https://wordpress.org/support/plugin/mailpoet/reviews/', {'target' : '_blank'}) + |raw + %> +

+
+
+
+

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

@@ -109,7 +143,15 @@ ); } }); - }) + }); + + var $random = $('#mailpoet_random_order'); + var divs = $random.children().toArray(); + $random.empty(); + _.shuffle(divs).forEach(function(div) { + $random.append(div) + }); + }); diff --git a/views/welcome.html b/views/welcome.html index fc0b745cc0..f483a9b732 100644 --- a/views/welcome.html +++ b/views/welcome.html @@ -5,11 +5,7 @@

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

-

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

+

<%= __('The new MailPoet. Simply better. And with regular updates.') %>

@@ -41,7 +37,6 @@
-

<%= __('Want to Make MailPoet Even Better?') %>

<%= __('Documentation Is One Click Away') %>

<%= __('Simply click on the blue circle in the bottom right corner of any of the MailPoet pages to access our documentation.') %> <%= __('Voilà!') %> @@ -61,26 +56,6 @@

-
-
-

<%= __("Subscribe To Our Newsletter") %>

-

<%= __("About once a month, we send out a pretty cool newsletter ourselves.") %>

-

<%= __("Sign up to get a curated selection of awesome links, tips and tricks for using MailPoet, special offers, and important plugin updates!") %>

-

- -

-
-
-

<%= __("Learn the Ropes") %>

-

<%= __("New to MailPoet? Check out our brand new email course. Over the course of a week, we'll teach you how to create and send your first MailPoet email newsletter. Sign up below!") %>

-

- -

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