Bump up release version to 0.0.15

Implements sending frequency

.env.sample

@@ -1,2 +1,16 @@
 WP_TEST_PATH="/var/www/wordpress"
-
+WP_TEST_ENABLE_NETWORK_TESTS="true"
+WP_TEST_IMPORT_MAILCHIMP_API=""
+WP_TEST_IMPORT_MAILCHIMP_LISTS="" // (separated with comma)
+WP_TEST_MAILER_ENABLE_SENDING="true"
+WP_TEST_MAILER_AMAZON_ACCESS=""
+WP_TEST_MAILER_AMAZON_SECRET=""
+WP_TEST_MAILER_AMAZON_REGION=""
+WP_TEST_MAILER_ELASTICEMAIL_API=""
+WP_TEST_MAILER_MAILGUN_API=""
+WP_TEST_MAILER_MAILGUN_DOMAIN=""
+WP_TEST_MAILER_MAILPOET_API=""
+WP_TEST_MAILER_SENDGRID_API=""
+WP_TEST_MAILER_SMTP_HOST=""
+WP_TEST_MAILER_SMTP_LOGIN=""
+WP_TEST_MAILER_SMTP_PASSWORD=""

.gitignore

@@ -1,7 +1,7 @@
 .DS_Store
 TODO
 composer.phar
-vendor
+/vendor
 tests/_output/*
 tests/acceptance.suite.yml
 tests/_support/_generated/*
@@ -15,4 +15,5 @@ temp
 wysija-newsletters.zip
 tests/javascript/testBundles
 assets/css/*.css
-assets/js/*.js
+assets/js/*.js
+.vagrant

README.md

@@ -8,7 +8,6 @@ MailPoet done the right way.
 ```
 php
 nodejs
-phantomjs
 wordpress
 ```
 
@@ -47,16 +46,6 @@ $ ./do compile:all
 $ ./do test:unit
 ```
 
-- Acceptance tests:
-```sh
-$ ./do test:acceptance
-```
-
-- Run all tests:
-```sh
-$ ./do test:all
-```
-
 - Debug tests:
 ```sh
 $ ./do test:debug

RoboFile.php

@@ -47,6 +47,19 @@ class RoboFile extends \Robo\Tasks {
       ->run();
   }
 
+  function watchCss() {
+    $css_files = $this->rsearch('assets/css/src/', array('styl'));
+    $this->taskWatch()
+      ->monitor($css_files, function() {
+        $this->compileCss();
+      })
+      ->run();
+  }
+
+  function watchJs() {
+    $this->_exec('./node_modules/webpack/bin/webpack.js --watch');
+  }
+
   function compileAll() {
     $this->compileJs();
     $this->compileCss();
@@ -61,7 +74,8 @@ class RoboFile extends \Robo\Tasks {
       'assets/css/src/admin.styl',
       'assets/css/src/newsletter_editor/newsletter_editor.styl',
       'assets/css/src/public.styl',
-      'assets/css/src/rtl.styl'
+      'assets/css/src/rtl.styl',
+      'assets/css/src/importExport.styl'
     );
 
     $this->_exec(join(' ', array(
@@ -94,6 +108,17 @@ class RoboFile extends \Robo\Tasks {
     $this->_exec('vendor/bin/codecept run unit -f '.(($file) ? $file : ''));
   }
 
+  function testCoverage($file = null) {
+    $this->loadEnv();
+    $this->_exec('vendor/bin/codecept build');
+    $this->_exec(join(' ', array(
+      'vendor/bin/codecept run',
+      (($file) ? $file : ''),
+      '--coverage',
+      '--coverage-html'
+    )));
+  }
+
   function testJavascript() {
     $this->compileJs();
 
@@ -120,4 +145,4 @@ class RoboFile extends \Robo\Tasks {
     $dotenv = new Dotenv\Dotenv(__DIR__);
     $dotenv->load();
   }
-}
+}

assets/css/src/admin.styl

@@ -5,12 +5,15 @@
 @require 'common'
 @require 'modal'
 @require 'notice'
-@require 'parsley'
 
 @require 'form_editor'
 @require 'listing'
 @require 'box'
 @require 'breadcrumb'
-@require 'form'
 
-@require 'settings'
+@require 'form'
+@require 'parsley'
+@require 'form_validation'
+
+@require 'settings'
+@require 'progress_bar'

assets/css/src/common.styl

@@ -19,6 +19,8 @@ a:focus
 
 // select 2
 .select2-container
+  width: 25em !important
+
 // textareas
 textarea.regular-text
   width: 25em !important
@@ -26,3 +28,25 @@ textarea.regular-text
 @media screen and (max-width: 782px)
   .select2-container
     width: 100% !important
+
+// progress bars
+progress-border-radius = 5px
+progress-background = #efefef
+progress-foreground = #69b1e9
+
+progress
+  background-color: progress-background;
+  height: 2em
+  border: 0
+  width: 100%
+
+progress::-webkit-progress-bar
+  background-color: progress-background;
+
+progress::-webkit-progress-value
+  background-color: progress-foreground
+  border-radius: progress-border-radius
+
+progress::-moz-progress-bar
+  background-color: progress-foreground
+  border-radius: progress-border-radius

assets/css/src/form_editor.styl

@@ -4,6 +4,9 @@
 icons = '../img/form_editor_icons.png'
 handle_icon = '../img/handle.png'
 
+#mailpoet_form_name
+  font-size: 23px
+
 #mailpoet_form_history
   display: none
 
@@ -99,6 +102,7 @@ handle_icon = '../img/handle.png'
 /* MailPoet Form wrapper */
 #mailpoet_form_wrapper
   position: relative
+  margin: 20px 0 0 0
 
 /* MailPoet Form container */
 #mailpoet_form_container
@@ -121,6 +125,7 @@ handle_icon = '../img/handle.png'
   float: none
 
 #mailpoet_form_toolbar
+  z-index: 999
   position: absolute
   width: 400px
 

assets/css/src/form_validation.styl

@@ -0,0 +1,6 @@
+.parsley-errors-list
+  margin-top: 8px
+
+.parsley-required
+.parsley-custom-error-message
+  color: #b94a48

assets/css/src/importExport.styl

@@ -0,0 +1,78 @@
+.mailpoet_hidden, .mailpoet_validation_error
+  display none
+
+.form-table
+  th
+    width 300px
+
+#paste_input
+  width 100%
+
+input[type="radio"]
+  margin-right 0.5em !important
+  & + span
+    margin-right 2.5em
+
+span
+  &.mailpoet_mailchimp-key-status
+    &.mailpoet_mailchimp-ok
+      &:before
+        content "\2713"
+        color #0e90d2
+        margin-left 15px
+    &.mailpoet_mailchimp-error
+      &:before
+        content "\2717"
+        color #900
+        margin-left 15px
+
+#subscribers_data
+  overflow auto
+  table
+    width auto
+  td
+    padding 0.5em
+  & > table
+    & > tbody
+      & > td
+        padding 0.5em
+      & > tr
+        &:nth-child(odd)
+          background #f9f9f9
+  .mailpoet_header
+    text-transform uppercase
+    font-weight 600
+    text-decoration underline
+
+#subscribers_data th:first-child, #subscribers_data td:first-child
+  width 10em !important
+  text-align center !important
+  padding 0 1em 0 1em !important
+  vertical-align inherit !important
+
+#subscribers_data
+  & > table
+    & > thead
+      & > tr
+        & > th
+          & > span
+            width 15em !important
+
+.mailpoet_data_match
+  color #0e90d2
+  margin-left 0.25em
+
+.mailpoet_import_error, .mailpoet_validation_error
+  color #900
+
+tr
+  &.mailpoet_segments
+    & > td
+      & > a
+        margin-left 15px
+
+span
+  &.select2-search
+    &.select2-search--dropdown
+      display none !important
+

assets/css/src/modal.styl

@@ -90,7 +90,7 @@ body.mailpoet_modal_opened
   padding: 0
   margin: 0
   width: 100%
-  transition: margin 0.3s ease-out
+  transition: margin 350ms ease-out
 
 .mailpoet_panel_wrapper
   background-color: #f1f1f1
@@ -159,23 +159,6 @@ body.mailpoet_modal_opened
   margin: 0
   text-align: right
 
-.mailpoet_button
-  padding: 3px 15px
-  border: 1px solid #444
-  font-weight: normal
-  cursor: pointer
-  background-color: #222
-  color: #cfcfcf
-  font-size: 1em
-
-.mailpoet_button:hover
-  background-color: #00aacc
-  color: #fff
-
-.mailpoet_button:active
-  background-color: #00ccff
-  color: #fff
-
 @media screen and (max-width: 782px)
   #mailpoet_modal_overlay.mailpoet_panel_overlay
     top: 46px
@@ -217,4 +200,4 @@ body.mailpoet_modal_opened
   0%
   50%
     background-color: #064E6D
-  100%
+  100%

assets/css/src/newsletter_editor/components/blockTools.styl

@@ -7,7 +7,6 @@ $tool-active-secondary-color = #ffffff
 
 $tool-width = 20px
 $master-column-tool-width = 24px
-$layer-selector-width = 30px
 
 .mailpoet_tools
   position: absolute
@@ -33,10 +32,35 @@ $layer-selector-width = 30px
         width: $master-column-tool-width
         height: $master-column-tool-width
 
+
+    .mailpoet_delete_block_activate
+      max-width: 100%
+      max-height: $master-column-tool-width
+      opacity: 1
+      display: block
+
+    .mailpoet_delete_block_confirm,
+    .mailpoet_delete_block_cancel
+      max-width: 100%
+      max-height: 0
+      opacity: 0
+      overflow: hidden
+      display: block
+
     .mailpoet_delete_block_activated
       width: auto
       height: auto
 
+      .mailpoet_delete_block_activate
+        overflow: hidden
+        max-height: 0
+        opacity: 0
+
+      .mailpoet_delete_block_confirm,
+      .mailpoet_delete_block_cancel
+        max-height: $master-column-tool-width*2
+        opacity: 1
+
 .mailpoet_tool
   display: inline-block
   width: $tool-width
@@ -76,28 +100,45 @@ $layer-selector-width = 30px
   display: inline-block
   padding: 2px
   vertical-align: top
+  animation-background-color()
 
   .mailpoet_tool
     padding: 0
 
+  .mailpoet_delete_block_activate
+    max-width: $tool-width
+    display: inline-block
+    opacity: 1
+    animation-fade-in-and-scale-horizontally()
+
   .mailpoet_delete_block_confirm,
   .mailpoet_delete_block_cancel
-    display: none
+    max-width: 0
+    opacity: 0
+    overflow: hidden
+    display: inline-block
+    animation-fade-in-and-scale-horizontally()
 
 .mailpoet_delete_block_activated
+  height: auto
   width: auto
   border-radius(3px)
   background-color: $warning-background-color
   padding: 3px 5px
   line-height: 1.2em
-  height: auto
 
   .mailpoet_delete_block_activate
-    display: none
+    overflow: hidden
+    max-width: 0
+    opacity: 0
 
   .mailpoet_delete_block_confirm,
   .mailpoet_delete_block_cancel
-    display: inline-block
+    max-width: 100%
+    opacity: 1
+
+  .mailpoet_delete_block_cancel
+    margin-left: 3px
 
 .mailpoet_delete_block_confirm
   color: $warning-text-color

assets/css/src/newsletter_editor/components/dragAndDrop.styl

@@ -52,6 +52,7 @@ $draggable-widget-z-index = 2
   padding: 0
   margin: 0
   z-index: $draggable-widget-z-index
+  animation-fade-in()
 
   .mailpoet_widget_icon
     padding: 0

assets/css/src/newsletter_editor/components/save.styl

@@ -48,7 +48,7 @@
 .mailpoet_save_as_template_container,
 .mailpoet_export_template_container
   border-radius(3px)
-  float: left
+  display: inline-block
   clear: both
 
   margin-top: 5px

assets/css/src/newsletter_editor/components/sidebar.styl

@@ -26,13 +26,9 @@ $widget-icon-width = 30px
     border-right: 0
 
     &.closed .mailpoet_region_content
-      max-height: 0px
+      display: none
-      overflow: hidden
-      margin-top: 0
 
   .mailpoet_region_content
-    max-height: 2000px
-    transition: max-height 0.2s ease
     padding: 0 20px
     margin-top: 12px
 

assets/css/src/newsletter_editor/contentBlocks/automatedLatestContent.styl

@@ -18,3 +18,6 @@
 
   & > .mailpoet_block
     width: 100%
+
+.mailpoet_automated_latest_content_display_options
+  animation-slide-open-downwards()

assets/css/src/newsletter_editor/contentBlocks/container.styl

@@ -79,3 +79,4 @@ $three-column-width = ($newsletter-width / 3) - (2 * $column-margin)
   box-shadow(inset 1px 2px 1px $primary-inactive-color)
   color: #656565
   border-radius(3px)
+  animation-background-color()

assets/css/src/newsletter_editor/contentBlocks/divider.styl

@@ -19,6 +19,10 @@ $divider-hover-border-color = $primary-active-color
   width: 100%
   border: 1px solid transparent
 
+.mailpoet_active_divider_style
+  border: 1px solid $active-divider-border-color
+  background: $active-divider-background-color
+
 .mailpoet_field_divider_style:hover
   border: 1px solid $divider-hover-border-color
 

assets/css/src/newsletter_editor/contentBlocks/image.styl

@@ -1,15 +1,19 @@
 .mailpoet_image_block
 
+  img
+    vertical-align: bottom
+    max-width: 100%
+    width: auto
+    height: auto
+
   &.mailpoet_full_image
     padding-left: 0
     padding-right: 0
     margin-bottom: 0
 
+    img
+      width: 100%
+
   .mailpoet_content a:hover
     cursor: all-scroll
 
-  img
-    vertical-align: bottom
-    max-width: $newsletter-width
-    width: 100%
-    height: auto

assets/css/src/newsletter_editor/contentBlocks/posts.styl

@@ -1,15 +1,12 @@
 .mailpoet_posts_block
-  box-shadow(none)
+  padding-left: 0
+  padding-right: 0
 
-  & > .mailpoet_content
+.mailpoet_posts_block_posts
-    font-size: 1em
+  overflow: auto
-    text-align: center
+
-    background-color: $primary-active-color
+  & > .mailpoet_block
-    margin: 20px 0
+    width: 100%
-    padding: 15px
-    box-shadow(inset 1px 2px 1px $primary-inset-shadow-color)
-    color: $white-color
-    border-radius(3px)
 
 .mailpoet_post_selection_filter_row
   margin-top: 5px
@@ -18,7 +15,11 @@
 .mailpoet_posts_categories_and_tags
   width: 100%
 
-.mailpoet_settings_posts_show_display_options
+.mailpoet_settings_posts_display_options
+.mailpoet_settings_posts_selection
+  animation-slide-open-downwards()
+
+.mailpoet_settings_posts_show_display_options,
 .mailpoet_settings_posts_show_post_selection
   display: block
   margin-top: 10px

assets/css/src/newsletter_editor/libraryOverrides.styl

@@ -1,6 +1,6 @@
 /* Fix select2 z-index to work with MailPoet.Modal */
 .select2-dropdown
-  z-index: 101000
+  z-index: 101000 !important
 
 /* Remove input field styles from select2 type input */
 .select2-container
@@ -129,3 +129,7 @@ body
 
 #mailpoet_modal_close
   display: none
+
+.wrap > .mailpoet_notice,
+.update-nag
+  margin-left: 2px + 15px !important

assets/css/src/newsletter_editor/mixins/transitions.styl

@@ -0,0 +1,31 @@
+animation-slide-open-downwards()
+  transition: all 250ms cubic-bezier(0.420, 0.000, 0.580, 1.000) /* ease-in-out */
+  max-height: 2000px
+  opacity: 1
+
+  &.mailpoet_closed
+    max-height: 0
+    opacity: 0
+    overflow-y: hidden
+
+animation-background-color()
+  transition: background 250ms cubic-bezier(0.420, 0.000, 0.580, 1.000) /* ease-in-out */
+
+animation-fade-in()
+  animation-name: fadeIn
+  animation-duration: 300ms
+  animation-fill-mode: forwards
+  animation-timing-function: ease-in
+
+animation-fade-in-and-scale-horizontally()
+  transition: all 250ms cubic-bezier(0.420, 0.000, 0.580, 1.000) /* ease-in-out */
+
+@keyframes fadeIn {
+  0% {
+    opacity: 0.3
+  }
+
+  100% {
+    opacity: 1
+  }
+}

assets/css/src/newsletter_editor/newsletter_editor.styl

@@ -6,6 +6,7 @@
 @require 'mixins/border-radius'
 @require 'mixins/box-shadow'
 @require 'mixins/filter-shadow'
+@require 'mixins/transitions'
 
 @require 'variables'
 @require 'common'

assets/css/src/progress_bar.styl

@@ -0,0 +1,29 @@
+.mailpoet_progress
+  background-color: #efefef
+  height: 25px
+  padding: 0
+  width: 100%
+  margin: 0
+  border-radius: 5px
+  position: relative
+
+.mailpoet_progress_label
+  position: absolute
+  width: 100%
+  text-align: center
+  display: inline-block
+  margin: 2px 0 0 0
+
+.mailpoet_progress_bar
+  position: absolute
+  display: inline-block
+  height: 100%
+  border-radius: 3px
+  box-shadow: 0 1px 0 rgba(255, 255, 255, .5) inset
+  background-color: #34c2e3
+  background-image: linear-gradient(top, #34c2e3, darken(#34c2e3, 20%))
+
+.mailpoet_progress_complete
+  .mailpoet_progress_bar
+    background-color: #fecf23
+    background-image: linear-gradient(top, #fecf23, #fd9215)

assets/css/src/public.styl

@@ -1,3 +1,4 @@
 @import 'nib'
 
 @require 'parsley'
+@require 'form_validation'

assets/img/preview_magnifying_glass.svg

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.0.4, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="47.002px" height="38.003px" viewBox="0 0 47.002 38.003" enable-background="new 0 0 47.002 38.003" xml:space="preserve">
+<path fill-rule="evenodd" clip-rule="evenodd" fill="#565656" d="M46.328,36.365c-1.188,1.725-3.553,2.158-5.273,0.962L25.479,26.52
+	c-1.104-0.763-1.674-2.007-1.631-3.257c-2.006,2.157-4.642,3.606-7.594,4.145c-3.626,0.663-7.288-0.13-10.311-2.227
+	c-3.024-2.098-5.054-5.253-5.714-8.887c-0.661-3.636,0.127-7.31,2.221-10.344c4.325-6.264,12.927-7.834,19.177-3.5
+	c5.672,3.938,7.486,11.412,4.537,17.443c1.152-0.486,2.519-0.392,3.627,0.377l15.58,10.808C47.09,32.274,47.52,34.641,46.328,36.365
+	z M23.235,12.09c-0.459-2.534-1.874-4.734-3.982-6.196C14.897,2.87,8.896,3.963,5.878,8.331c-3.014,4.373-1.922,10.388,2.435,13.408
+	c4.356,3.025,10.356,1.932,13.374-2.438C23.146,17.187,23.696,14.625,23.235,12.09z"/>
+</svg>

assets/js/lib/analytics.js

@@ -0,0 +1,8 @@
+(function(e,b){if(!b.__SV){var a,f,i,g;window.mixpanel=b;b._i=[];b.init=function(a,e,d){function f(b,h){var a=h.split(".");2==a.length&&(b=b[a[0]],h=a[1]);b[h]=function(){b.push([h].concat(Array.prototype.slice.call(arguments,0)))}}var c=b;"undefined"!==typeof d?c=b[d]=[]:d="mixpanel";c.people=c.people||[];c.toString=function(b){var a="mixpanel";"mixpanel"!==d&&(a+="."+d);b||(a+=" (stub)");return a};c.people.toString=function(){return c.toString(1)+".people (stub)"};i="disable time_event track track_pageview track_links track_forms register register_once alias unregister identify name_tag set_config people.set people.set_once people.increment people.append people.union people.track_charge people.clear_charges people.delete_user".split(" ");
+for(g=0;g<i.length;g++)f(c,i[g]);b._i.push([a,e,d])};b.__SV=1.2;a=e.createElement("script");a.type="text/javascript";a.async=!0;a.src="undefined"!==typeof MIXPANEL_CUSTOM_LIB_URL?MIXPANEL_CUSTOM_LIB_URL:"file:"===e.location.protocol&&"//cdn.mxpnl.com/libs/mixpanel-2-latest.min.js".match(/^\/\//)?"https://cdn.mxpnl.com/libs/mixpanel-2-latest.min.js":"//cdn.mxpnl.com/libs/mixpanel-2-latest.min.js";f=e.getElementsByTagName("script")[0];f.parentNode.insertBefore(a,f)}})(document,window.mixpanel||[]);
+
+mixpanel.init("f683d388fb25fcf331f1b2b5c4449798");
+
+if (typeof mailpoet_analytics_data === 'object') {
+  mixpanel.track('Wysija Usage', mailpoet_analytics_data || {});
+}

assets/js/src/cron.jsx

@@ -0,0 +1,106 @@
+define(
+  [
+    'react',
+    'react-dom',
+    'mailpoet'
+  ],
+  function(
+    React,
+    ReactDOM,
+    MailPoet
+  ) {
+  var CronControl = React.createClass({
+    getInitialState: function() {
+      return {
+        status: 'loading'
+      };
+    },
+    getCronData: function() {
+      MailPoet.Ajax.post({
+          endpoint: 'cron',
+          action: 'getStatus'
+        })
+        .done(function(response) {
+          jQuery('.button-primary')
+            .removeClass('disabled');
+          if(response.status !== undefined) {
+            this.setState(response);
+          } else {
+            this.replaceState();
+          }
+        }.bind(this));
+    },
+    componentDidMount: function() {
+      if(this.isMounted()) {
+        this.getCronData();
+        setInterval(this.getCronData, 5000);
+      }
+    },
+    controlCron: function(action) {
+      if(jQuery('.button-primary').hasClass('disabled')) {
+        return;
+      }
+      jQuery('.button-primary')
+        .addClass('disabled');
+      MailPoet.Ajax.post({
+        endpoint: 'cron',
+        action: action,
+      })
+      .done(function(response) {
+        if(!response.result) {
+          MailPoet.Notice.error(MailPoetI18n.daemonControlError);
+        }
+      }.bind(this));
+    },
+    render: function() {
+      if(this.state.status === 'loading') {
+        return(<div>Loading daemon status...</div>);
+      }
+      switch(this.state.status) {
+        case 'started':
+          return(
+            <div>
+              Cron daemon is running.
+              <br/>
+              <br/>
+              It was started
+              <strong> {this.state.timeSinceStart} </strong> and last executed
+              <strong> {this.state.timeSinceUpdate} </strong> for a total of
+              <strong> {this.state.counter} </strong> times (once every 30 seconds, unless it was interrupted and restarted).
+              <br />
+              <br />
+              <a href="#" className="button-primary" onClick={this.controlCron.bind(null, 'stop')}>Stop</a>
+            </div>
+          );
+        break;
+        case 'starting':
+        case 'stopping':
+          return(
+            <div>
+              Daemon is {this.state.status}
+            </div>
+          );
+        break;
+        case 'stopped':
+          return(
+            <div>
+              Daemon is {this.state.status}
+              <br />
+              <br />
+              <a href="#" className="button-primary" onClick={this.controlCron.bind(null, 'start')}>Start</a>
+            </div>
+          );
+        break;
+      }
+    }
+  });
+
+  const container = document.getElementById('cron_container');
+
+  if(container) {
+    ReactDOM.render(
+      <CronControl />,
+      container
+    );
+  }
+});

assets/js/src/form/fields/checkbox.jsx

@@ -1,31 +1,31 @@
 define([
-  'react',
+  'react'
-  'react-checkbox-group'
 ],
 function(
-  React,
+  React
-  CheckboxGroup
 ) {
-  var FormFieldCheckbox = React.createClass({
+  const FormFieldCheckbox = React.createClass({
+    onValueChange: function(e) {
+      e.target.value = this.refs.checkbox.checked ? '1' : '';
+      return this.props.onValueChange(e);
+    },
     render: function() {
-      var selected_values = this.props.item[this.props.field.name] || '';
+      const isChecked = !!(this.props.item[this.props.field.name]);
-      if(
-        selected_values !== undefined
-        && selected_values.constructor !== Array
-      ) {
-        selected_values = selected_values.split(';').map(function(value) {
-          return value.trim();
-        });
-      }
-      var count = Object.keys(this.props.field.values).length;
 
-      var options = Object.keys(this.props.field.values).map(
+      const options = Object.keys(this.props.field.values).map(
         function(value, index) {
           return (
             <p key={ 'checkbox-' + index }>
               <label>
-                <input type="checkbox" value={ value } />
+                <input
-                &nbsp;{ this.props.field.values[value] }
+                  ref="checkbox"
+                  type="checkbox"
+                  value="1"
+                  checked={ isChecked }
+                  onChange={ this.onValueChange }
+                  name={ this.props.field.name }
+                />
+                { this.props.field.values[value] }
               </label>
             </p>
           );
@@ -33,30 +33,10 @@ function(
       );
 
       return (
-        <CheckboxGroup
+        <div>
-          name={ this.props.field.name }
-          value={ selected_values }
-          ref={ this.props.field.name }
-          onChange={ this.handleValueChange }>
           { options }
-        </CheckboxGroup>
+        </div>
       );
-    },
-    handleValueChange: function() {
-      var field = this.props.field.name;
-      var group = this.refs[field];
-      var selected_values = [];
-
-      if(group !== undefined) {
-        selected_values = group.getCheckedValues();
-      }
-
-      return this.props.onValueChange({
-        target: {
-          name: field,
-          value: selected_values.join(';')
-        }
-      });
     }
   });
 

assets/js/src/form/fields/date.jsx

@@ -0,0 +1,196 @@
+define([
+  'react',
+  'moment',
+], function(
+  React,
+  Moment
+) {
+  class FormFieldDateYear extends React.Component {
+    render() {
+      const yearsRange = 100;
+      const years = [];
+      const currentYear = Moment().year();
+      for (let i = currentYear; i >= currentYear - yearsRange; i--) {
+        years.push((
+          <option
+            key={ i }
+            value={ i }
+         >{ i }</option>
+        ));
+      }
+      return (
+        <select
+          name={ this.props.name + '[year]' }
+          value={ this.props.year }
+          onChange={ this.props.onValueChange }
+        >
+          { years }
+        </select>
+      );
+    }
+  }
+
+  class FormFieldDateMonth extends React.Component {
+    render() {
+      const months = [];
+      for (let i = 1; i <= 12; i++) {
+        months.push((
+          <option
+            key={ i }
+            value={ i }
+         >{ this.props.monthNames[i - 1] }</option>
+        ));
+      }
+      return (
+        <select
+          name={ this.props.name + '[month]' }
+          value={ this.props.month }
+          onChange={ this.props.onValueChange }
+        >
+          { months }
+        </select>
+      );
+    }
+  }
+
+  class FormFieldDateDay extends React.Component {
+    render() {
+      const days = [];
+      for (let i = 1; i <= 31; i++) {
+        days.push((
+          <option
+            key={ i }
+            value={ i }
+          >{ i }</option>
+        ));
+      }
+
+      return (
+        <select
+          name={ this.props.name + '[day]' }
+          value={ this.props.day }
+          onChange={ this.props.onValueChange }
+        >
+          { days }
+        </select>
+      );
+    }
+  }
+
+  class FormFieldDate extends React.Component {
+    constructor(props) {
+      super(props);
+      this.state = {
+        year: Moment().year(),
+        month: 1,
+        day: 1
+      }
+    }
+    componentDidMount() {
+    }
+    componentDidUpdate(prevProps, prevState) {
+      if (
+        (this.props.item !== undefined && prevProps.item !== undefined)
+        && (this.props.item.id !== prevProps.item.id)
+      ) {
+        this.extractTimeStamp();
+      }
+    }
+    extractTimeStamp() {
+      const timeStamp = parseInt(this.props.item[this.props.field.name], 10);
+
+      this.setState({
+        year: Moment.unix(timeStamp).year(),
+        // Moment returns the month as [0..11]
+        // We increment it to match PHP's mktime() which expects [1..12]
+        month: Moment.unix(timeStamp).month() + 1,
+        day: Moment.unix(timeStamp).date()
+      });
+    }
+    updateTimeStamp(field) {
+      let newTimeStamp = Moment(
+        `${this.state.month}/${this.state.day}/${this.state.year}`,
+        'M/D/YYYY'
+      ).valueOf();
+      if (!isNaN(newTimeStamp) && parseInt(newTimeStamp, 10) > 0) {
+        // convert milliseconds to seconds
+        newTimeStamp /= 1000;
+        return this.props.onValueChange({
+          target: {
+            name: field,
+            value: newTimeStamp
+          }
+        });
+      }
+    }
+    onValueChange(e) {
+      // extract property from name
+      const matches = e.target.name.match(/(.*?)\[(.*?)\]/);
+      let field = null;
+      let property = null;
+
+      if (matches !== null && matches.length === 3) {
+        field = matches[1];
+        property = matches[2];
+
+        let value = parseInt(e.target.value, 10);
+
+        this.setState({
+          [`${property}`]: value
+        }, () => {
+          this.updateTimeStamp(field);
+        });
+      }
+    }
+    render() {
+      const monthNames = window.mailpoet_month_names || [];
+
+      const dateType = this.props.field.params.date_type;
+
+      const dateSelects = dateType.split('_');
+
+      const fields = dateSelects.map(type => {
+        switch(type) {
+          case 'year':
+            return (<FormFieldDateYear
+              onValueChange={ this.onValueChange.bind(this) }
+              ref={ 'year' }
+              key={ 'year' }
+              name={ this.props.field.name }
+              year={ this.state.year }
+            />);
+          break;
+
+          case 'month':
+            return (<FormFieldDateMonth
+              onValueChange={ this.onValueChange.bind(this) }
+              ref={ 'month' }
+              key={ 'month' }
+              name={ this.props.field.name }
+              month={ this.state.month }
+              monthNames={ monthNames }
+            />);
+          break;
+
+          case 'day':
+            return (<FormFieldDateDay
+              onValueChange={ this.onValueChange.bind(this) }
+              ref={ 'day' }
+              key={ 'day' }
+              name={ this.props.field.name }
+              day={ this.state.day }
+            />);
+          break;
+        }
+       });
+
+      return (
+        <div>
+          {fields}
+        </div>
+      );
+    }
+  };
+
+  return FormFieldDate;
+});

assets/js/src/form/fields/field.jsx

@@ -5,7 +5,8 @@ define([
   'form/fields/select.jsx',
   'form/fields/radio.jsx',
   'form/fields/checkbox.jsx',
-  'form/fields/selection.jsx'
+  'form/fields/selection.jsx',
+  'form/fields/date.jsx',
 ],
 function(
   React,
@@ -14,7 +15,8 @@ function(
   FormFieldSelect,
   FormFieldRadio,
   FormFieldCheckbox,
-  FormFieldSelection
+  FormFieldSelection,
+  FormFieldDate
 ) {
   var FormField = React.createClass({
     renderField: function(data, inline = false) {
@@ -55,6 +57,10 @@ function(
         case 'selection':
           field = (<FormFieldSelection {...data} />);
         break;
+
+        case 'date':
+          field = (<FormFieldDate {...data} />);
+        break;
       }
 
       if(inline === true) {
@@ -66,10 +72,10 @@ function(
         );
       } else {
         return (
-          <p key={ 'field-' + (data.index || 0) }>
+          <div key={ 'field-' + (data.index || 0) }>
             { field }
             { description }
-          </p>
+          </div>
         );
       }
     },

assets/js/src/form/fields/radio.jsx

@@ -7,7 +7,6 @@ function(
   var FormFieldRadio = React.createClass({
     render: function() {
       var selected_value = this.props.item[this.props.field.name];
-      var count = Object.keys(this.props.field.values).length;
 
       var options = Object.keys(this.props.field.values).map(
         function(value, index) {
@@ -20,7 +19,7 @@ function(
                   value={ value }
                   onChange={ this.props.onValueChange }
                   name={ this.props.field.name } />
-                 { this.props.field.values[value] }
+                { this.props.field.values[value] }
               </label>
             </p>
           );

assets/js/src/form/fields/select.jsx

@@ -23,7 +23,9 @@ function(
           name={ this.props.field.name }
           id={ 'field_'+this.props.field.name }
           value={ this.props.item[this.props.field.name] }
-          onChange={ this.props.onValueChange }>
+          onChange={ this.props.onValueChange }
+          {...this.props.field.validation}
+        >
           {options}
         </select>
       );

assets/js/src/form/fields/selection.jsx

@@ -20,8 +20,15 @@ function(
       this.loadCachedItems();
       this.setupSelect2();
     },
-    componentDidUpdate: function() {
+    componentDidUpdate: function(prevProps, prevState) {
-      this.setupSelect2();
+      if(
+        (this.props.item !== undefined && prevProps.item !== undefined)
+        && (this.props.item.id !== prevProps.item.id)
+      ) {
+        jQuery('#'+this.refs.select.id)
+          .val(this.props.item[this.props.field.name])
+          .trigger('change');
+      }
     },
     setupSelect2: function() {
       if(
@@ -43,7 +50,19 @@ function(
         }
       });
 
+      var hasRemoved = false;
+      select2.on('select2:unselecting', function(e) {
+        hasRemoved = true;
+      });
+      select2.on('select2:opening', function(e) {
+        if(hasRemoved === true) {
+          hasRemoved = false;
+          e.preventDefault();
+        }
+      });
+
       select2.on('change', this.handleChange);
+
       select2.select2(
         'val',
         this.props.item[this.props.field.name]
@@ -54,6 +73,11 @@ function(
     loadCachedItems: function() {
       if(typeof(window['mailpoet_'+this.props.field.endpoint]) !== 'undefined') {
         var items = window['mailpoet_'+this.props.field.endpoint];
+
+        if(this.props.field['filter'] !== undefined) {
+          items = items.filter(this.props.field.filter);
+        }
+
         this.setState({
           items: items
         });
@@ -62,7 +86,7 @@ function(
     handleChange: function(e) {
       if(this.props.onValueChange !== undefined) {
         if(this.props.field.multiple) {
-          value = jQuery('#'+this.refs.select.id).select2('val');
+          value = jQuery('#'+this.refs.select.id).val();
         } else {
           value = e.target.value;
         }
@@ -73,40 +97,35 @@ function(
           }
         });
       }
-      return true;
     },
     render: function() {
-      if(this.state.items.length === 0) {
+      var options = this.state.items.map(function(item, index) {
-        return false;
-      } else {
-        var options = this.state.items.map(function(item, index) {
-          return (
-            <option
-              key={ item.id }
-              value={ item.id }
-            >
-              { item.name }
-            </option>
-          );
-        });
-
-        var default_value = (
-          (this.props.item !== undefined && this.props.field.name !== undefined)
-          ? this.props.item[this.props.field.name]
-          : null
-        );
-
         return (
-          <select
+          <option
-            id={ this.props.field.id || this.props.field.name }
+            key={ item.id }
-            ref="select"
+            value={ item.id }
-            placeholder={ this.props.field.placeholder }
+          >
-            multiple={ this.props.field.multiple }
+            { item.name }
-            onChange={ this.handleChange }
+          </option>
-            defaultValue={ default_value }
-          >{ options }</select>
         );
-      }
+      });
+
+      var default_value = (
+        (this.props.item !== undefined && this.props.field.name !== undefined)
+        ? this.props.item[this.props.field.name]
+        : null
+      );
+
+      return (
+        <select
+          id={ this.props.field.id || this.props.field.name }
+          ref="select"
+          data-placeholder={ this.props.field.placeholder }
+          multiple={ this.props.field.multiple }
+          defaultValue={ default_value }
+          {...this.props.field.validation}
+        >{ options }</select>
+      );
     }
   });
 

assets/js/src/form/fields/text.jsx

@@ -6,6 +6,8 @@ function(
 ) {
   var FormFieldText = React.createClass({
     render: function() {
+      var value = this.props.item[this.props.field.name];
+      if(!value) { value = null; }
       return (
         <input
           type="text"
@@ -17,10 +19,12 @@ function(
           }
           name={ this.props.field.name }
           id={ 'field_'+this.props.field.name }
-          value={ this.props.item[this.props.field.name] }
+          value={ value }
           placeholder={ this.props.field.placeholder }
           defaultValue={ this.props.field.defaultValue }
-          onChange={ this.props.onValueChange } />
+          onChange={ this.props.onValueChange }
+          {...this.props.field.validation}
+        />
       );
     }
   });

assets/js/src/form/fields/textarea.jsx

@@ -15,7 +15,9 @@ function(
           value={ this.props.item[this.props.field.name] }
           placeholder={ this.props.field.placeholder }
           defaultValue={ this.props.field.defaultValue }
-          onChange={ this.props.onValueChange } />
+          onChange={ this.props.onValueChange }
+          {...this.props.field.validation}
+        />
       );
     }
   });

assets/js/src/form/form.jsx

@@ -48,7 +48,7 @@ define(
         MailPoet.Ajax.post({
           endpoint: this.props.endpoint,
           action: 'get',
-          data: { id: id }
+          data: id
         }).done(function(response) {
           if(response === false) {
             this.setState({
@@ -68,12 +68,25 @@ define(
       handleSubmit: function(e) {
         e.preventDefault();
 
+        // handle validation
+        if(this.props.isValid !== undefined) {
+          if(this.props.isValid() === false) {
+            return;
+          }
+        }
+
         this.setState({ loading: true });
 
         // only get values from displayed fields
-        item = {};
+        var item = {};
         this.props.fields.map(function(field) {
-          item[field.name] = this.state.item[field.name];
+          if(field['fields'] !== undefined) {
+            field.fields.map(function(subfield) {
+              item[subfield.name] = this.state.item[subfield.name];
+            }.bind(this));
+          } else {
+            item[field.name] = this.state.item[field.name];
+          }
         }.bind(this));
 
         // set id if specified
@@ -88,23 +101,23 @@ define(
         }).done(function(response) {
           this.setState({ loading: false });
 
-          if(response === true) {
+          if(response.result === true) {
             if(this.props.onSuccess !== undefined) {
-              this.props.onSuccess()
+              this.props.onSuccess();
             } else {
               this.history.pushState(null, '/')
             }
 
             if(this.props.params.id !== undefined) {
-              this.props.messages['updated']();
+              this.props.messages.onUpdate();
             } else {
-              this.props.messages['created']();
+              this.props.messages.onCreate();
             }
           } else {
-            if(response === false) {
+            if(response.result === false) {
-              // unknown error occurred
+              if(response.errors.length > 0) {
-            } else {
+                this.setState({ errors: response.errors });
-              this.setState({ errors: response });
+              }
             }
           }
         }.bind(this));
@@ -121,13 +134,15 @@ define(
         return true;
       },
       render: function() {
-        var errors = this.state.errors.map(function(error, index) {
+        if(this.state.errors !== undefined) {
-          return (
+          var errors = this.state.errors.map(function(error, index) {
-            <p key={ 'error-'+index } className="mailpoet_error">
+            return (
-              { error }
+              <p key={ 'error-'+index } className="mailpoet_error">
-            </p>
+                { error }
-          );
+              </p>
-        });
+            );
+          });
+        }
 
         var formClasses = classNames(
           'mailpoet_form',

assets/js/src/form_editor/form_editor.js

@@ -231,7 +231,7 @@ var WysijaHistory = {
 
 /* MailPoet Form */
 var WysijaForm = {
-  version: '0.6',
+  version: '0.7',
   options: {
     container: 'mailpoet_form_container',
     editor: 'mailpoet_form_editor',
@@ -317,6 +317,7 @@ var WysijaForm = {
   save: function() {
     var position = 1,
       data = {
+        'name': $F('mailpoet_form_name'),
         'settings': $('mailpoet_form_settings').serialize(true),
         'body': [],
         'styles': (MailPoet.CodeEditor !== undefined) ? MailPoet.CodeEditor.getValue() : null
@@ -616,6 +617,28 @@ var WysijaForm = {
       // this is a url, so do not encode the protocol
       return encodeURI(str).replace(/[!'()*]/g, escape);
     }
+  },
+  updateBlock: function(field) {
+    var hasUpdated = false;
+    WysijaForm.getBlocks().each(function(b) {
+      if(b.block.getData().id === field.id) {
+        hasUpdated = true;
+        b.block.redraw(field);
+      }
+    });
+
+    return hasUpdated;
+  },
+  removeBlock: function(field, callback) {
+    var hasRemoved = false;
+    WysijaForm.getBlocks().each(function(b) {
+      if(b.block.getData().id === field.id) {
+        hasRemoved = true;
+        b.block.removeBlock(callback);
+      }
+    });
+
+    return hasRemoved;
   }
 };
 
@@ -824,10 +847,6 @@ WysijaForm.Block = Class.create({
     Effect.Fade(this.element.identify(), {
       duration: 0.2,
       afterFinish: function(effect) {
-        if(effect.element.next('.mailpoet_form_block') !== undefined && callback !== false) {
-          // show controls of next block to allow mass delete
-          WysijaForm.get(effect.element.next('.mailpoet_form_block')).block.showControls();
-        }
         // remove placeholder
         if(effect.element.previous('.block_placeholder') !== undefined) {
           effect.element.previous('.block_placeholder').remove();

assets/js/src/forms/form.jsx

@@ -1,57 +0,0 @@
-import React from 'react'
-import ReactDOM from 'react-dom'
-import { Router, History } from 'react-router'
-import MailPoet from 'mailpoet'
-import Form from 'form/form.jsx'
-
-const fields = [
-  {
-    name: 'name',
-    label: 'Name',
-    type: 'text'
-  },
-  {
-    name: 'segments',
-    label: 'Lists',
-    type: 'selection',
-    endpoint: 'segments',
-    multiple: true
-  }
-]
-
-const messages = {
-  updated: function() {
-    MailPoet.Notice.success('Form successfully updated!');
-  },
-  created: function() {
-    MailPoet.Notice.success('Form successfully added!');
-  }
-}
-
-const FormForm = React.createClass({
-  mixins: [
-    History
-  ],
-  render() {
-    return (
-      <div>
-        <h2 className="title">
-          Form <a
-            href="javascript:;"
-            className="add-new-h2"
-            onClick={ this.history.goBack }
-          >Back to list</a>
-        </h2>
-
-        <Form
-          endpoint="forms"
-          fields={ fields }
-          params={ this.props.params }
-          messages={ messages }
-          onSuccess={ this.history.goBack } />
-      </div>
-    );
-  }
-});
-
-module.exports = FormForm

assets/js/src/forms/forms.jsx

@@ -2,7 +2,6 @@ import React from 'react'
 import ReactDOM from 'react-dom'
 import { Router, Route, IndexRoute } from 'react-router'
 import FormList from 'forms/list.jsx'
-import FormForm from 'forms/form.jsx'
 import createHashHistory from 'history/lib/createHashHistory'
 
 let history = createHashHistory({ queryKey: false })
@@ -20,8 +19,6 @@ if(container) {
     <Router history={ history }>
       <Route path="/" component={ App }>
         <IndexRoute component={ FormList } />
-        <Route path="new" component={ FormForm } />
-        <Route path="edit/:id" component={ FormForm } />
         <Route path="*" component={ FormList } />
       </Route>
     </Router>

assets/js/src/forms/list.jsx

@@ -25,58 +25,49 @@ const columns = [
 
 const messages = {
   onTrash: function(response) {
-    if(response) {
+    var count = ~~response;
-      let message = null;
+    var message = null;
-      if(~~response === 1) {
-        message = (
-          '1 form was moved to the trash.'
-        );
-      } else if(~~response > 1) {
-        message = (
-          '%$1d forms were moved to the trash.'
-        ).replace('%$1d', ~~response);
-      }
 
-      if(message !== null) {
+    if(count === 1) {
-        MailPoet.Notice.success(message);
+      message = (
-      }
+        '1 form was moved to the trash.'
+      );
+    } else {
+      message = (
+        '%$1d forms were moved to the trash.'
+      ).replace('%$1d', count);
     }
+    MailPoet.Notice.success(message);
   },
   onDelete: function(response) {
-    if(response) {
+    var count = ~~response;
-      let message = null;
+    var message = null;
-      if(~~response === 1) {
-        message = (
-          '1 form was permanently deleted.'
-        );
-      } else if(~~response > 1) {
-        message = (
-          '%$1d forms were permanently deleted.'
-        ).replace('%$1d', ~~response);
-      }
 
-      if(message !== null) {
+    if(count === 1) {
-        MailPoet.Notice.success(message);
+      message = (
-      }
+        '1 form was permanently deleted.'
+      );
+    } else {
+      message = (
+        '%$1d forms were permanently deleted.'
+      ).replace('%$1d', count);
     }
+    MailPoet.Notice.success(message);
   },
   onRestore: function(response) {
-    if(response) {
+    var count = ~~response;
-      let message = null;
+    var message = null;
-      if(~~response === 1) {
-        message = (
-          '1 form has been restored from the trash.'
-        );
-      } else if(~~response > 1) {
-        message = (
-          '%$1d forms have been restored from the trash.'
-        ).replace('%$1d', ~~response);
-      }
 
-      if(message !== null) {
+    if(count === 1) {
-        MailPoet.Notice.success(message);
+      message = (
-      }
+        '1 form has been restored from the trash.'
+      );
+    } else {
+      message = (
+        '%$1d forms have been restored from the trash.'
+      ).replace('%$1d', count);
     }
+    MailPoet.Notice.success(message);
   }
 };
 
@@ -105,6 +96,9 @@ const item_actions = [
         refresh();
       });
     }
+  },
+  {
+    name: 'trash'
   }
 ];
 
@@ -122,8 +116,8 @@ const FormList = React.createClass({
       endpoint: 'forms',
       action: 'create'
     }).done(function(response) {
-      if(response !== false) {
+      if(response.result && response.form_id) {
-        window.location = response;
+        window.location = mailpoet_form_edit_url + response.form_id;
       }
     });
   },

assets/js/src/helpscout.js

@@ -0,0 +1,3 @@
+define([], function() {
+  !function(e,o,n){window.HSCW=o,window.HS=n,n.beacon=n.beacon||{};var t=n.beacon;t.userConfig={},t.readyQueue=[],t.config=function(e){this.userConfig=e},t.ready=function(e){this.readyQueue.push(e)},o.config={docs:{enabled:!1,baseUrl:""},contact:{enabled:!0,formId:"e5c408c7-895e-11e5-9e75-0a7d6919297d"}};var r=e.getElementsByTagName("script")[0],c=e.createElement("script");c.type="text/javascript",c.async=!0,c.src="https://djtflbt20bdde.cloudfront.net/",r.parentNode.insertBefore(c,r)}(document,window.HSCW||{},window.HS||{});
+});

assets/js/src/listing/bulk_actions.jsx

@@ -15,16 +15,16 @@ function(
       this.setState({
         action: e.target.value,
         extra: false
-      });
+      }, function() {
+        var action = this.getSelectedAction();
 
-      var action = this.getSelectedAction();
+        // action on select callback
-
+        if(action !== null && action['onSelect'] !== undefined) {
-      // action on select callback
+          this.setState({
-      if(action !== null && action['onSelect'] !== undefined) {
+            extra: action.onSelect(e)
-        this.setState({
+          });
-          extra: action.onSelect(e)
+        }
-        });
+      }.bind(this));
-      }
     },
     handleApplyAction: function(e) {
       e.preventDefault();
@@ -85,7 +85,12 @@ function(
             Select bulk action
           </label>
 
-          <select ref="action" value={ this.state.action } onChange={this.handleChangeAction}>
+          <select
+            name="bulk_actions"
+            ref="action"
+            value={ this.state.action }
+            onChange={this.handleChangeAction}
+          >
             <option value="">Bulk Actions</option>
             { this.props.bulk_actions.map(function(action, index) {
               return (

assets/js/src/listing/filters.jsx

@@ -14,6 +14,9 @@ function(
       })
       return this.props.onSelectFilter(filters);
     },
+    handleEmptyTrash: function() {
+      return this.props.onEmptyTrash();
+    },
     getAvailableFilters: function() {
       let filters = this.props.filters;
 
@@ -34,7 +37,7 @@ function(
       const available_filters = this.getAvailableFilters()
         .map(function(filter, i) {
           let default_value = false;
-          if(selected_filters[filter] !== undefined && selected_filters[filter]) {
+          if (selected_filters[filter] !== undefined && selected_filters[filter]) {
             default_value = selected_filters[filter]
           } else {
             jQuery(`select[name="${filter}"]`).val('');
@@ -60,9 +63,10 @@ function(
 
       let button = false;
 
-      if(available_filters.length > 0) {
+      if (available_filters.length > 0) {
         button = (
           <input
+            id="post-query-submit"
             onClick={ this.handleFilterAction }
             type="submit"
             defaultValue="Filter"
@@ -70,10 +74,23 @@ function(
         );
       }
 
+      let empty_trash = false;
+      if (this.props.group === 'trash') {
+        empty_trash = (
+          <input
+            onClick={ this.handleEmptyTrash }
+            type="submit"
+            value="Empty Trash"
+            className="button"
+          />
+        );
+      }
+
       return (
         <div className="alignleft actions actions">
           { available_filters }
           { button }
+          { empty_trash }
         </div>
       );
     }

assets/js/src/listing/header.jsx

@@ -11,7 +11,7 @@ define(['react', 'classnames'], function(React, classNames) {
         column.is_primary = (index === 0);
         column.sorted = (this.props.sort_by === column.name)
           ? this.props.sort_order
-          : 'asc';
+          : 'desc';
         return (
           <ListingColumn
             onSort={this.props.onSort}
@@ -32,6 +32,7 @@ define(['react', 'classnames'], function(React, classNames) {
             </label>
             <input
               type="checkbox"
+              name="select_all"
               ref="toggle"
               checked={ this.props.selection }
               onChange={ this.handleSelectItems } />

assets/js/src/listing/listing.jsx

@@ -79,27 +79,48 @@ define(
 
         if(custom_actions.length > 0) {
           item_actions = custom_actions.map(function(action, index) {
-            if(action.refresh) {
+            if(action.display !== undefined) {
+              if(action.display(this.props.item) === false) {
+                return;
+              }
+            }
+
+            if(action.name === 'trash') {
+              return (
+                <span key={ 'action-'+index } className="trash">
+                  {(index > 0) ? ' | ' : ''}
+                  <a
+                    href="javascript:;"
+                    onClick={ this.handleTrashItem.bind(
+                      null,
+                      this.props.item.id
+                    ) }>
+                    Trash
+                  </a>
+                </span>
+              );
+            } else if(action.refresh) {
               return (
                 <span
                   onClick={ this.props.onRefreshItems }
                   key={ 'action-'+index } className={ action.name }>
+                  {(index > 0) ? ' | ' : ''}
                   { action.link(this.props.item) }
-                  {(index < (custom_actions.length - 1)) ? ' | ' : ''}
                 </span>
               );
             } else if(action.link) {
               return (
                 <span
                   key={ 'action-'+index } className={ action.name }>
+                  {(index > 0) ? ' | ' : ''}
                   { action.link(this.props.item) }
-                  {(index < (custom_actions.length - 1)) ? ' | ' : ''}
                 </span>
               );
             } else {
               return (
                 <span
                   key={ 'action-'+index } className={ action.name }>
+                  {(index > 0) ? ' | ' : ''}
                   <a href="javascript:;" onClick={
                     (action.onClick !== undefined)
                     ? action.onClick.bind(null,
@@ -108,7 +129,6 @@ define(
                       )
                     : false
                   }>{ action.label }</a>
-                  {(index < (custom_actions.length - 1)) ? ' | ' : ''}
                 </span>
               );
             }
@@ -158,17 +178,6 @@ define(
             <div>
               <div className="row-actions">
                 { item_actions }
-                { ' | ' }
-                <span className="trash">
-                  <a
-                    href="javascript:;"
-                    onClick={ this.handleTrashItem.bind(
-                      null,
-                      this.props.item.id
-                    ) }>
-                    Trash
-                  </a>
-                </span>
               </div>
               <button
                 onClick={ this.handleToggleItem.bind(null, this.props.item.id) }
@@ -388,6 +397,12 @@ define(
         if(this.isMounted()) {
           const params = this.props.params || {}
           this.initWithParams(params)
+
+          if(this.props.auto_refresh) {
+            jQuery(document).on('heartbeat-tick.mailpoet', function(e, data) {
+              this.getItems();
+            }.bind(this));
+          }
         }
       },
       componentWillReceiveProps: function(nextProps) {
@@ -419,7 +434,13 @@ define(
               groups: response.groups || [],
               count: response.count || 0,
               loading: false
-            });
+            }, function() {
+              if(this.props['onGetItems'] !== undefined) {
+                  this.props.onGetItems(
+                    ~~(this.state.groups[0]['count'])
+                  );
+              }
+            }.bind(this));
           }.bind(this));
         }
       },
@@ -483,10 +504,21 @@ define(
           this.getItems();
         }.bind(this));
       },
+      handleEmptyTrash: function() {
+        this.handleBulkAction('all', {
+          action: 'delete',
+          group: 'trash'
+        }, function(response) {
+          MailPoet.Notice.success(
+            MailPoetI18n.permanentlyDeleted.replace('%d', response)
+          );
+        });
+      },
       handleBulkAction: function(selected_ids, params, callback) {
         if(
           this.state.selection === false
           && this.state.selected_ids.length === 0
+          && selected_ids !== 'all'
         ) {
           return;
         }
@@ -499,8 +531,10 @@ define(
           limit: 0,
           filter: this.state.filter,
           group: this.state.group,
-          search: this.state.search,
+          search: this.state.search
-          selection: selected_ids
+        }
+        if(selected_ids !== 'all') {
+          data.listing.selection = selected_ids;
         }
 
         MailPoet.Ajax.post({
@@ -631,7 +665,7 @@ define(
         // bulk actions
         var bulk_actions = this.props.bulk_actions || [];
 
-        if(this.state.group === 'trash') {
+        if(this.state.group === 'trash' && bulk_actions.length > 0) {
           bulk_actions = [
             {
               name: 'restore',
@@ -694,7 +728,10 @@ define(
               <ListingFilters
                 filters={ this.state.filters }
                 filter={ this.state.filter }
-                onSelectFilter={ this.handleFilter } />
+                group={ this.state.group }
+                onSelectFilter={ this.handleFilter }
+                onEmptyTrash={ this.handleEmptyTrash }
+              />
               <ListingPages
                 count={ this.state.count }
                 page={ this.state.page }

assets/js/src/listing/pages.jsx

@@ -7,7 +7,11 @@ define(['react', 'classnames'], function(React, classNames) {
       }
     },
     setPage: function(page) {
-      this.props.onSetPage(page);
+      this.setState({
+        page: null
+      }, function () {
+        this.props.onSetPage(this.constrainPage(page));
+      }.bind(this));
     },
     setFirstPage: function() {
       this.setPage(1);
@@ -16,10 +20,14 @@ define(['react', 'classnames'], function(React, classNames) {
       this.setPage(this.getLastPage());
     },
     setPreviousPage: function() {
-      this.setPage(this.constrainPage(this.props.page - 1));
+      this.setPage(this.constrainPage(
+        parseInt(this.props.page, 10) - 1)
+      );
     },
     setNextPage: function() {
-      this.setPage(this.constrainPage(this.props.page + 1));
+      this.setPage(this.constrainPage(
+        parseInt(this.props.page, 10) + 1)
+      );
     },
     constrainPage: function(page) {
       return Math.min(Math.max(1, Math.abs(~~page)), this.getLastPage());
@@ -27,14 +35,16 @@ define(['react', 'classnames'], function(React, classNames) {
     handleSetManualPage: function(e) {
       if(e.which === 13) {
         this.setPage(this.state.page);
-        this.setState({ page: null });
       }
     },
     handleChangeManualPage: function(e) {
       this.setState({
-        page: this.constrainPage(e.target.value)
+        page: e.target.value
       });
     },
+    handleBlurManualPage: function(e) {
+      this.setPage(e.target.value);
+    },
     getLastPage: function() {
       return Math.ceil(this.props.count / this.props.limit);
     },
@@ -101,6 +111,11 @@ define(['react', 'classnames'], function(React, classNames) {
             );
           }
 
+          let pageValue =  this.props.page;
+          if(this.state.page !== null) {
+            pageValue = this.state.page;
+          }
+
           pagination = (
             <span className="pagination-links">
               {firstPage}
@@ -115,10 +130,11 @@ define(['react', 'classnames'], function(React, classNames) {
                   type="text"
                   onChange={ this.handleChangeManualPage }
                   onKeyUp={ this.handleSetManualPage }
+                  onBlur={ this.handleBlurManualPage }
                   aria-describedby="table-paging"
                   size="1"
                   ref="page"
-                  value={ this.state.page || this.props.page }
+                  value={ pageValue }
                   name="paged"
                   id="current-page-selector"
                   className="current-page" />

assets/js/src/newsletter_editor/behaviors/DraggableBehavior.js

@@ -47,7 +47,6 @@ define([
         autoScroll: true,
 
         onstart: function(event) {
-          console.log('Drag start', event, this);
 
           if (that.options.cloneOriginal === true) {
             // Use substitution instead of a clone

assets/js/src/newsletter_editor/blocks/automatedLatestContent.js

@@ -11,10 +11,10 @@ define([
     'newsletter_editor/blocks/base',
     'newsletter_editor/blocks/button',
     'newsletter_editor/blocks/divider',
-    'newsletter_editor/components/wordpress',
+    'newsletter_editor/components/communication',
     'underscore',
     'jquery'
-  ], function(App, BaseBlock, ButtonBlock, DividerBlock, WordpressComponent, _, jQuery) {
+  ], function(App, BaseBlock, ButtonBlock, DividerBlock, CommunicationComponent, _, jQuery) {
 
   "use strict";
 
@@ -35,7 +35,7 @@ define([
         titlePosition: 'inTextBlock', // 'inTextBlock'|'aboveBlock',
         titleAlignment: 'left', // 'left'|'center'|'right'
         titleIsLink: false, // false|true
-        imagePadded: true, // true|false
+        imageFullWidth: false, // true|false
         //imageAlignment: 'centerPadded', // 'centerFull'|'centerPadded'|'left'|'right'|'alternate'|'none'
         showAuthor: 'no', // 'no'|'aboveText'|'belowText'
         authorPrecededBy: 'Author:',
@@ -63,15 +63,15 @@ define([
     initialize: function() {
       base.BlockView.prototype.initialize.apply(this, arguments);
       this.fetchPosts();
-      this.on('change:amount change:contentType change:terms change:inclusionType change:displayType change:titleFormat change:titlePosition change:titleAlignment change:titleIsLink change:imagePadded change:showAuthor change:authorPrecededBy change:showCategories change:categoriesPrecededBy change:readMoreType change:readMoreText change:sortBy change:showDivider', this._scheduleFetchPosts, this);
+      this.on('change:amount change:contentType change:terms change:inclusionType change:displayType change:titleFormat change:titlePosition change:titleAlignment change:titleIsLink change:imageFullWidth change:showAuthor change:authorPrecededBy change:showCategories change:categoriesPrecededBy change:readMoreType change:readMoreText change:sortBy change:showDivider', this._scheduleFetchPosts, this);
       this.listenTo(this.get('readMoreButton'), 'change', this._scheduleFetchPosts);
       this.listenTo(this.get('divider'), 'change', this._scheduleFetchPosts);
     },
     fetchPosts: function() {
       var that = this;
-      WordpressComponent.getTransformedPosts(this.toJSON()).done(function(content) {
+      CommunicationComponent.getTransformedPosts(this.toJSON()).done(function(content) {
-        console.log('ALC fetched', arguments);
         that.get('_container').get('blocks').reset(content, {parse: true});
+        that.trigger('postsChanged');
       }).fail(function(error) {
         console.log('ALC fetchPosts error', arguments);
       });
@@ -100,6 +100,11 @@ define([
       toolsRegion: '.mailpoet_tools',
       postsRegion: '.mailpoet_automated_latest_content_block_posts',
     },
+    modelEvents: _.extend(
+      _.omit(base.BlockView.prototype.modelEvents, 'change'),
+      {
+        'postsChanged': 'render',
+      }),
     events: _.extend(base.BlockView.prototype.events, {
       'click .mailpoet_automated_latest_content_block_overlay': 'showSettings',
     }),
@@ -139,7 +144,7 @@ define([
         "change .mailpoet_automated_latest_content_include_or_exclude": _.partial(this.changeField, "inclusionType"),
         "change .mailpoet_automated_latest_content_title_position": _.partial(this.changeField, "titlePosition"),
         "change .mailpoet_automated_latest_content_title_alignment": _.partial(this.changeField, "titleAlignment"),
-        "change .mailpoet_automated_latest_content_image_padded": _.partial(this.changeBoolField, "imagePadded"),
+        "change .mailpoet_automated_latest_content_image_full_width": _.partial(this.changeBoolField, "imageFullWidth"),
         "change .mailpoet_automated_latest_content_show_author": _.partial(this.changeField, "showAuthor"),
         "keyup .mailpoet_automated_latest_content_author_preceded_by": _.partial(this.changeField, "authorPrecededBy"),
         "change .mailpoet_automated_latest_content_show_categories": _.partial(this.changeField, "showCategories"),
@@ -161,7 +166,7 @@ define([
       var that = this;
 
       // Dynamically update available post types
-      WordpressComponent.getPostTypes().done(_.bind(this._updateContentTypes, this));
+      CommunicationComponent.getPostTypes().done(_.bind(this._updateContentTypes, this));
 
       this.$('.mailpoet_automated_latest_content_categories_and_tags').select2({
         multiple: true,
@@ -174,10 +179,10 @@ define([
           },
           transport: function(options, success, failure) {
             var taxonomies,
-                promise = WordpressComponent.getTaxonomies(that.model.get('contentType')).then(function(tax) {
+                promise = CommunicationComponent.getTaxonomies(that.model.get('contentType')).then(function(tax) {
               taxonomies = tax;
               // Fetch available terms based on the list of taxonomies already fetched
-              var promise = WordpressComponent.getTerms({
+              var promise = CommunicationComponent.getTerms({
                 search: options.data.term,
                 taxonomies: _.keys(taxonomies)
               }).then(function(terms) {
@@ -226,11 +231,11 @@ define([
     toggleDisplayOptions: function(event) {
       var el = this.$('.mailpoet_automated_latest_content_display_options'),
         showControl = this.$('.mailpoet_automated_latest_content_show_display_options');
-      if (el.hasClass('mailpoet_hidden')) {
+      if (el.hasClass('mailpoet_closed')) {
-        el.removeClass('mailpoet_hidden');
+        el.removeClass('mailpoet_closed');
         showControl.addClass('mailpoet_hidden');
       } else {
-        el.addClass('mailpoet_hidden');
+        el.addClass('mailpoet_closed');
         showControl.removeClass('mailpoet_hidden');
       }
     },
@@ -306,7 +311,7 @@ define([
       _.each(postTypes, function(type) {
         select.append(jQuery('<option>', {
           value: type.name,
-          text: type.labels.singular_name,
+          text: type.label,
         }));
       });
       select.val(selectedValue);

assets/js/src/newsletter_editor/blocks/base.js

@@ -48,6 +48,7 @@ define([
     },
     modelEvents: {
       'change': 'render',
+      'delete': 'deleteBlock',
     },
     events: {
       "mouseenter": "showTools",
@@ -88,7 +89,9 @@ define([
       this.$el.addClass('mailpoet_editor_view_' + this.cid);
     },
     initialize: function() {
-      this.on('showSettings', this.showSettings);
+      this.on('showSettings', this.showSettings, this);
+      this.on('dom:refresh', this.showBlock, this);
+      this._isFirstRender = true;
     },
     showTools: function(_event) {
       if (!this.showingToolsDisabled) {
@@ -114,12 +117,49 @@ define([
      * Defines drop behavior of BlockView instance
      */
     getDropFunc: function() {
-      var that = this;
       return function() {
-        var newModel = that.model.clone();
+        return this.model.clone();
-        //that.model.destroy();
+      }.bind(this);
-        return newModel;
+    },
-      };
+    showBlock: function() {
+      if (this._isFirstRender) {
+        this.transitionIn();
+        this._isFirstRender = false;
+      }
+    },
+    deleteBlock: function() {
+      this.transitionOut().then(function() {
+        this.model.destroy();
+      }.bind(this));
+    },
+    transitionIn: function() {
+      return this._transition('slideDown', 'fadeIn', 'easeOut');
+    },
+    transitionOut: function() {
+      return this._transition('slideUp', 'fadeOut', 'easeIn');
+    },
+    _transition: function(slideDirection, fadeDirection, easing) {
+      var promise = jQuery.Deferred();
+
+      this.$el.velocity(
+        slideDirection,
+        {
+          duration: 250,
+          easing: easing,
+          complete: function() {
+            promise.resolve();
+          }.bind(this),
+        }
+      ).velocity(
+        fadeDirection,
+        {
+          duration: 250,
+          easing: easing,
+          queue: false, // Do not enqueue, trigger animation in parallel
+        }
+      );
+
+      return promise;
     },
   });
 
@@ -168,24 +208,22 @@ define([
     },
     deleteBlock: function(event) {
       event.preventDefault();
-      this.model.destroy();
+      this.model.trigger('delete');
       return false;
-    }
+    },
   });
 
   Module.BlockSettingsView = Marionette.LayoutView.extend({
     className: 'mailpoet_editor_settings',
     initialize: function() {
-      var that = this;
-
       MailPoet.Modal.panel({
         element: this.$el,
         template: '',
         position: 'right',
         width: App.getConfig().get('sidepanelWidth'),
         onCancel: function() {
-          that.destroy();
+          this.destroy();
-        },
+        }.bind(this),
       });
     },
     close: function(event) {
@@ -203,6 +241,9 @@ define([
     changeBoolField: function(field, event) {
       this.model.set(field, (jQuery(event.target).val() === 'true') ? true : false);
     },
+    changeBoolCheckboxField: function(field, event) {
+      this.model.set(field, (!!jQuery(event.target).prop('checked')));
+    },
     changeColorField: function(field, event) {
       var value = jQuery(event.target).val();
       if (value === '') {

assets/js/src/newsletter_editor/blocks/button.js

@@ -42,16 +42,12 @@ define([
   Module.ButtonBlockView = base.BlockView.extend({
     className: "mailpoet_block mailpoet_button_block mailpoet_droppable_block",
     getTemplate: function() { return templates.buttonBlock; },
-    modelEvents: {
-      'change': 'render',
-    },
     onDragSubstituteBy: function() { return Module.ButtonWidgetView; },
     initialize: function() {
       base.BlockView.prototype.initialize.apply(this, arguments);
-      var that = this;
 
       // Listen for attempts to change all dividers in one go
-      this._replaceButtonStylesHandler = function(data) { that.model.set(data); };
+      this._replaceButtonStylesHandler = function(data) { this.model.set(data); }.bind(this);
       App.getChannel().on('replaceAllButtonStyles', this._replaceButtonStylesHandler);
     },
     onRender: function() {

assets/js/src/newsletter_editor/blocks/container.js

@@ -75,7 +75,8 @@ define([
     getEmptyView: function() { return Module.ContainerBlockEmptyView; },
     emptyViewOptions: function() { return { renderOptions: this.renderOptions }; },
     modelEvents: {
-      'change': 'render'
+      'change': 'render',
+      'delete': 'deleteBlock',
     },
     events: {
       "mouseenter": "showTools",
@@ -136,6 +137,8 @@ define([
     },
     initialize: function(options) {
       this.renderOptions = _.defaults(options.renderOptions || {}, {});
+      this.on('dom:refresh', this.showBlock, this);
+      this._isFirstRender = true;
     },
     // Determines which view type should be used for a child
     getChildView: function(model) {
@@ -162,10 +165,10 @@ define([
       this.toolsView = new Module.ContainerBlockToolsView({
         model: this.model,
         tools: {
-          settings: this.renderOptions.depth > 1,
+          settings: this.renderOptions.depth === 1,
           delete: this.renderOptions.depth === 1,
           move: this.renderOptions.depth === 1,
-          layerSelector: this.renderOptions.depth === 1,
+          layerSelector: false,
         },
       });
       this.toolsRegion.show(this.toolsView);
@@ -229,12 +232,49 @@ define([
       _.extend(this, this._buildRegions(this.regions));
     },
     getDropFunc: function() {
-      var that = this;
       return function() {
-        var newModel = that.model.clone();
+        return this.model.clone();
-        that.model.destroy();
+      }.bind(this);
-        return newModel;
+    },
-      };
+    showBlock: function() {
+      if (this._isFirstRender) {
+        this.transitionIn();
+        this._isFirstRender = false;
+      }
+    },
+    deleteBlock: function() {
+      this.transitionOut().done(function() {
+        this.model.destroy();
+      }.bind(this));
+    },
+    transitionIn: function() {
+      return this._transition('slideDown', 'fadeIn', 'easeIn');
+    },
+    transitionOut: function() {
+      return this._transition('slideUp', 'fadeOut', 'easeOut');
+    },
+    _transition: function(slideDirection, fadeDirection, easing) {
+      var promise = jQuery.Deferred();
+
+      this.$el.velocity(
+        slideDirection,
+        {
+          duration: 250,
+          easing: easing,
+          complete: function() {
+            promise.resolve();
+          }.bind(this),
+        }
+      ).velocity(
+        fadeDirection,
+        {
+          duration: 250,
+          easing: easing,
+          queue: false, // Do not enqueue, trigger animation in parallel
+        }
+      );
+
+      return promise;
     },
   });
 
@@ -265,6 +305,41 @@ define([
     behaviors: {
       ColorPickerBehavior: {},
     },
+    regions: {
+      columnsSettingsRegion: '.mailpoet_container_columns_settings',
+    },
+    initialize: function() {
+      base.BlockSettingsView.prototype.initialize.apply(this, arguments);
+
+      this._columnsSettingsView = new (Module.ContainerBlockColumnsSettingsView)({
+        collection: this.model.get('blocks'),
+      });
+    },
+    onRender: function() {
+      this.columnsSettingsRegion.show(this._columnsSettingsView);
+    },
+  });
+
+  Module.ContainerBlockColumnsSettingsView = Marionette.CollectionView.extend({
+    getChildView: function() { return Module.ContainerBlockColumnSettingsView; },
+    childViewOptions: function(model, index) {
+      return {
+        columnIndex: index,
+      };
+    },
+  });
+
+  Module.ContainerBlockColumnSettingsView = Marionette.ItemView.extend({
+    getTemplate: function() { return templates.containerBlockColumnSettings; },
+    initialize: function(options) {
+      this.columnNumber = (options.columnIndex || 0) + 1;
+    },
+    templateHelpers: function() {
+      return {
+        model: this.model.toJSON(),
+        columnNumber: this.columnNumber,
+      };
+    },
   });
 
   Module.OneColumnContainerWidgetView = base.WidgetView.extend({

assets/js/src/newsletter_editor/blocks/divider.js

@@ -57,11 +57,9 @@ define([
       this.listenTo(this.model, 'change:styles.block.padding', this.changePadding);
     },
     templateHelpers: function() {
-      return {
+      return _.extend({
-        model: this.model.toJSON(),
-        viewCid: this.cid,
         totalHeight: parseInt(this.model.get('styles.block.padding'), 10)*2 + parseInt(this.model.get('styles.block.borderWidth')) + 'px',
-      };
+      }, base.BlockView.prototype.templateHelpers.apply(this));
     },
     onRender: function() {
       this.toolsView = new Module.DividerBlockToolsView({ model: this.model });

assets/js/src/newsletter_editor/blocks/footer.js

@@ -39,9 +39,9 @@ define([
   Module.FooterBlockView = base.BlockView.extend({
     className: "mailpoet_block mailpoet_footer_block mailpoet_droppable_block",
     getTemplate: function() { return templates.footerBlock; },
-    modelEvents: {
+    modelEvents: _.extend({
       'change:styles.block.backgroundColor change:styles.text.fontColor change:styles.text.fontFamily change:styles.text.fontSize change:styles.text.textAlign change:styles.link.fontColor change:styles.link.textDecoration': 'render',
-    },
+    }, base.BlockView.prototype.modelEvents),
     onDragSubstituteBy: function() { return Module.FooterWidgetView; },
     onRender: function() {
       this.toolsView = new Module.FooterBlockToolsView({ model: this.model });

assets/js/src/newsletter_editor/blocks/header.js

@@ -39,9 +39,9 @@ define([
   Module.HeaderBlockView = base.BlockView.extend({
     className: "mailpoet_block mailpoet_header_block mailpoet_droppable_block",
     getTemplate: function() { return templates.headerBlock; },
-    modelEvents: {
+    modelEvents: _.extend({
       'change:styles.block.backgroundColor change:styles.text.fontColor change:styles.text.fontFamily change:styles.text.fontSize change:styles.text.textAlign change:styles.link.fontColor change:styles.link.textDecoration': 'render',
-    },
+    }, base.BlockView.prototype.modelEvents),
     onDragSubstituteBy: function() { return Module.HeaderWidgetView; },
     onRender: function() {
       this.toolsView = new Module.HeaderBlockToolsView({ model: this.model });

assets/js/src/newsletter_editor/blocks/image.js

@@ -20,7 +20,7 @@ define([
         link: 'http://example.org',
         src: 'no-image.png',
         alt: 'An image of...',
-        padded: true, // true | false - Padded or full width
+        fullWidth: true, // true | false
         width: '64px',
         height: '64px',
         styles: {
@@ -37,20 +37,18 @@ define([
     getTemplate: function() { return templates.imageBlock; },
     onDragSubstituteBy: function() { return Module.ImageWidgetView; },
     templateHelpers: function() {
-      return {
+      return _.extend({
-        model: this.model.toJSON(),
-        viewCid: this.cid,
         imageMissingSrc: App.getConfig().get('urls.imageMissing'),
-      };
+      }, base.BlockView.prototype.templateHelpers.apply(this));
     },
     onRender: function() {
       this.toolsView = new Module.ImageBlockToolsView({ model: this.model });
       this.toolsRegion.show(this.toolsView);
 
-      if (this.model.get('padded')) {
+      if (this.model.get('fullWidth')) {
-        this.$el.removeClass('mailpoet_full_image');
-      } else {
         this.$el.addClass('mailpoet_full_image');
+      } else {
+        this.$el.removeClass('mailpoet_full_image');
       }
     },
   });
@@ -66,7 +64,7 @@ define([
         "keyup .mailpoet_field_image_link": _.partial(this.changeField, "link"),
         "keyup .mailpoet_field_image_address": _.partial(this.changeField, "src"),
         "keyup .mailpoet_field_image_alt_text": _.partial(this.changeField, "alt"),
-        "change .mailpoet_field_image_padded": _.partial(this.changeBoolField, "padded"),
+        "change .mailpoet_field_image_full_width": _.partial(this.changeBoolCheckboxField, "fullWidth"),
         "change .mailpoet_field_image_alignment": _.partial(this.changeField, "styles.block.textAlign"),
         "click .mailpoet_field_image_select_another_image": "showMediaManager",
         "click .mailpoet_done_editing": "close",

assets/js/src/newsletter_editor/blocks/posts.js

@@ -18,12 +18,12 @@ define([
     'jquery',
     'mailpoet',
     'newsletter_editor/App',
-    'newsletter_editor/components/wordpress',
+    'newsletter_editor/components/communication',
     'newsletter_editor/blocks/base',
     'newsletter_editor/blocks/button',
     'newsletter_editor/blocks/divider',
     'select2'
-  ], function(Backbone, Marionette, Radio, _, jQuery, MailPoet, App, WordpressComponent, BaseBlock, ButtonBlock, DividerBlock) {
+  ], function(Backbone, Marionette, Radio, _, jQuery, MailPoet, App, CommunicationComponent, BaseBlock, ButtonBlock, DividerBlock) {
 
   "use strict";
 
@@ -31,7 +31,7 @@ define([
       base = BaseBlock;
 
   Module.PostsBlockModel = base.BlockModel.extend({
-    stale: ['_selectedPosts', '_availablePosts'],
+    stale: ['_selectedPosts', '_availablePosts', '_transformedPosts'],
     defaults: function() {
       return this._getDefaults({
         type: 'posts',
@@ -46,7 +46,7 @@ define([
         titlePosition: 'inTextBlock', // 'inTextBlock'|'aboveBlock',
         titleAlignment: 'left', // 'left'|'center'|'right'
         titleIsLink: false, // false|true
-        imagePadded: true, // true|false
+        imageFullWidth: false, // true|false
         //imageAlignment: 'centerPadded', // 'centerFull'|'centerPadded'|'left'|'right'|'alternate'|'none'
         showAuthor: 'no', // 'no'|'aboveText'|'belowText'
         authorPrecededBy: 'Author:',
@@ -63,6 +63,7 @@ define([
         divider: {},
         _selectedPosts: [],
         _availablePosts: [],
+        _transformedPosts: new (App.getBlockTypeModel('container'))(),
       }, App.getConfig().get('blockDefaults.posts'));
     },
     relations: function() {
@@ -71,21 +72,31 @@ define([
         divider: App.getBlockTypeModel('divider'),
         _selectedPosts: Backbone.Collection,
         _availablePosts: Backbone.Collection,
+        _transformedPosts: App.getBlockTypeModel('container'),
       };
     },
     initialize: function() {
-      var that = this;
+      var that = this,
+        POST_REFRESH_DELAY_MS = 500,
+        refreshAvailablePosts = _.debounce(this.fetchAvailablePosts.bind(this), POST_REFRESH_DELAY_MS),
+        refreshTransformedPosts = _.debounce(this._refreshTransformedPosts.bind(this), POST_REFRESH_DELAY_MS);
+
       // Attach Radio.Requests API primarily for highlighting
       _.extend(this, Radio.Requests);
 
       this.fetchAvailablePosts();
-      this.on('change:amount change:contentType change:terms change:inclusionType change:postStatus change:search change:sortBy', this._scheduleFetchAvailablePosts, this);
+      this.on('change:amount change:contentType change:terms change:inclusionType change:postStatus change:search change:sortBy', refreshAvailablePosts);
+
+      this.listenTo(this.get('_selectedPosts'), 'add remove reset', refreshTransformedPosts);
+      this.on('change:displayType change:titleFormat change:titlePosition change:titleAlignment change:titleIsLink change:imageFullWidth change:showAuthor change:authorPrecededBy change:showCategories change:categoriesPrecededBy change:readMoreType change:readMoreText change:showDivider', refreshTransformedPosts);
+      this.listenTo(this.get('readMoreButton'), 'change', refreshTransformedPosts);
+      this.listenTo(this.get('divider'), 'change', refreshTransformedPosts);
+
       this.on('insertSelectedPosts', this._insertSelectedPosts, this);
     },
     fetchAvailablePosts: function() {
       var that = this;
-      WordpressComponent.getPosts(this.toJSON()).done(function(posts) {
+      CommunicationComponent.getPosts(this.toJSON()).done(function(posts) {
-        console.log('Posts fetched', arguments);
         that.get('_availablePosts').reset(posts);
         that.get('_selectedPosts').reset(); // Empty out the collection
         that.trigger('change:_availablePosts');
@@ -93,20 +104,22 @@ define([
         console.log('Posts fetchPosts error', arguments);
       });
     },
-    /**
+    _refreshTransformedPosts: function() {
-     * Batch more changes during a specific time, instead of fetching
+      var that = this,
-     * ALC posts on each model change
+        data = this.toJSON();
-     */
+
-    _scheduleFetchAvailablePosts: function() {
+      data.posts = this.get('_selectedPosts').pluck('ID');
-      var timeout = 500,
+
-        that = this;
+      if (data.posts.length === 0) {
-      if (this._fetchPostsTimer !== undefined) {
+        this.get('_transformedPosts.blocks').reset();
-        clearTimeout(this._fetchPostsTimer);
+        return;
       }
-      this._fetchPostsTimer = setTimeout(function() {
+
-        that.fetchAvailablePosts();
+      CommunicationComponent.getTransformedPosts(data).done(function(posts) {
-        that._fetchPostsTimer = undefined;
+        that.get('_transformedPosts').get('blocks').reset(posts, {parse: true});
-      }, timeout);
+      }).fail(function() {
+        console.log('Posts _refreshTransformedPosts error', arguments);
+      });
     },
     _insertSelectedPosts: function() {
       var that = this,
@@ -118,8 +131,7 @@ define([
 
       if (data.posts.length === 0) return;
 
-      WordpressComponent.getTransformedPosts(data).done(function(posts) {
+      CommunicationComponent.getTransformedPosts(data).done(function(posts) {
-        console.log('Available posts fetched', arguments);
         collection.add(posts, { at: index });
       }).fail(function() {
         console.log('Posts fetchPosts error', arguments);
@@ -130,10 +142,14 @@ define([
   Module.PostsBlockView = base.BlockView.extend({
     className: "mailpoet_block mailpoet_posts_block mailpoet_droppable_block",
     getTemplate: function() { return templates.postsBlock; },
-    modelEvents: {},
+    modelEvents: {}, // Forcefully disable all events
+    regions: _.extend({
+      postsRegion: '.mailpoet_posts_block_posts',
+    }, base.BlockView.prototype.regions),
     onDragSubstituteBy: function() { return Module.PostsWidgetView; },
     initialize: function() {
       base.BlockView.prototype.initialize.apply(this, arguments);
+
       this.toolsView = new Module.PostsBlockToolsView({ model: this.model });
       this.model.reply('blockView', this.notifyAboutSelf, this);
     },
@@ -142,6 +158,13 @@ define([
         this.toolsRegion.show(this.toolsView);
       }
       this.trigger('showSettings');
+
+      var ContainerView = App.getBlockTypeView('container'),
+        renderOptions = {
+          disableTextEditor: true,
+          disableDragAndDrop: true,
+        };
+      this.postsRegion.show(new ContainerView({ model: this.model.get('_transformedPosts'), renderOptions: renderOptions }));
     },
     notifyAboutSelf: function() {
       return this;
@@ -197,8 +220,8 @@ define([
     },
     switchToDisplayOptions: function() {
       // Switch content view
-      this.$('.mailpoet_settings_posts_selection').addClass('mailpoet_hidden');
+      this.$('.mailpoet_settings_posts_selection').addClass('mailpoet_closed');
-      this.$('.mailpoet_settings_posts_display_options').removeClass('mailpoet_hidden');
+      this.$('.mailpoet_settings_posts_display_options').removeClass('mailpoet_closed');
 
       // Switch controls
       this.$('.mailpoet_settings_posts_show_display_options').addClass('mailpoet_hidden');
@@ -206,8 +229,8 @@ define([
     },
     switchToPostSelection: function() {
       // Switch content view
-      this.$('.mailpoet_settings_posts_display_options').addClass('mailpoet_hidden');
+      this.$('.mailpoet_settings_posts_display_options').addClass('mailpoet_closed');
-      this.$('.mailpoet_settings_posts_selection').removeClass('mailpoet_hidden');
+      this.$('.mailpoet_settings_posts_selection').removeClass('mailpoet_closed');
 
       // Switch controls
       this.$('.mailpoet_settings_posts_show_post_selection').addClass('mailpoet_hidden');
@@ -216,6 +239,7 @@ define([
     insertPosts: function() {
       this.model.trigger('insertSelectedPosts');
       this.model.destroy();
+      this.close();
     },
   });
 
@@ -245,7 +269,7 @@ define([
       var that = this;
 
       // Dynamically update available post types
-      WordpressComponent.getPostTypes().done(_.bind(this._updateContentTypes, this));
+      CommunicationComponent.getPostTypes().done(_.bind(this._updateContentTypes, this));
 
       this.$('.mailpoet_posts_categories_and_tags').select2({
         multiple: true,
@@ -258,10 +282,10 @@ define([
           },
           transport: function(options, success, failure) {
             var taxonomies,
-                promise = WordpressComponent.getTaxonomies(that.model.get('contentType')).then(function(tax) {
+                promise = CommunicationComponent.getTaxonomies(that.model.get('contentType')).then(function(tax) {
               taxonomies = tax;
               // Fetch available terms based on the list of taxonomies already fetched
-              var promise = WordpressComponent.getTerms({
+              var promise = CommunicationComponent.getTerms({
                 search: options.data.term,
                 taxonomies: _.keys(taxonomies)
               }).then(function(terms) {
@@ -307,11 +331,6 @@ define([
         },
       }).trigger( 'change' );
     },
-    onBeforeDestroy: function() {
-      base.BlockSettingsView.prototype.onBeforeDestroy.apply(this, arguments);
-      // Force close select2 if it hasn't closed yet
-      this.$('.mailpoet_posts_categories_and_tags').select2('close');
-    },
     changeField: function(field, event) {
       this.model.set(field, jQuery(event.target).val());
     },
@@ -323,7 +342,7 @@ define([
       _.each(postTypes, function(type) {
         select.append(jQuery('<option>', {
           value: type.name,
-          text: type.labels.singular_name,
+          text: type.label,
         }));
       });
       select.val(selectedValue);
@@ -377,7 +396,7 @@ define([
         "change .mailpoet_posts_include_or_exclude": _.partial(this.changeField, "inclusionType"),
         "change .mailpoet_posts_title_position": _.partial(this.changeField, "titlePosition"),
         "change .mailpoet_posts_title_alignment": _.partial(this.changeField, "titleAlignment"),
-        "change .mailpoet_posts_image_padded": _.partial(this.changeBoolField, "imagePadded"),
+        "change .mailpoet_posts_image_full_width": _.partial(this.changeBoolField, "imageFullWidth"),
         "change .mailpoet_posts_show_author": _.partial(this.changeField, "showAuthor"),
         "keyup .mailpoet_posts_author_preceded_by": _.partial(this.changeField, "authorPrecededBy"),
         "change .mailpoet_posts_show_categories": _.partial(this.changeField, "showCategories"),

assets/js/src/newsletter_editor/blocks/social.js

@@ -103,7 +103,8 @@ define([
     getTemplate: function() { return templates.socialBlock; },
     childViewContainer: '.mailpoet_social',
     modelEvents: {
-      'change': 'render'
+      'change': 'render',
+      'delete': 'deleteBlock',
     },
     events: {
       "mouseover": "showTools",
@@ -145,6 +146,10 @@ define([
       arguments[0].collection = arguments[0].model.get('icons');
       Marionette.CompositeView.apply(this, arguments);
     },
+    initialize: function() {
+      this.on('dom:refresh', this.showBlock, this);
+      this._isFirstRender = true;
+    },
     // Determines which view type should be used for a child
     childView: SocialIconView,
     templateHelpers: function() {
@@ -170,12 +175,9 @@ define([
       _event.stopPropagation();
     },
     getDropFunc: function() {
-      var that = this;
       return function() {
-        var newModel = that.model.clone();
+        return this.model.clone();
-        //that.model.destroy();
+      }.bind(this);
-        return newModel;
-      };
     },
     _buildRegions: function(regions) {
       var that = this;
@@ -194,6 +196,46 @@ define([
       this.regionManager.destroy();
       _.extend(this, this._buildRegions(this.regions));
     },
+    showBlock: function() {
+      if (this._isFirstRender) {
+        this.transitionIn();
+        this._isFirstRender = false;
+      }
+    },
+    deleteBlock: function() {
+      this.transitionOut().done(function() {
+        this.model.destroy();
+      }.bind(this));
+    },
+    transitionIn: function() {
+      return this._transition('slideDown', 'fadeIn', 'easeIn');
+    },
+    transitionOut: function() {
+      return this._transition('slideUp', 'fadeOut', 'easeOut');
+    },
+    _transition: function(slideDirection, fadeDirection, easing) {
+      var promise = jQuery.Deferred();
+
+      this.$el.velocity(
+        slideDirection,
+        {
+          duration: 250,
+          easing: easing,
+          complete: function() {
+            promise.resolve();
+          }.bind(this),
+        }
+      ).velocity(
+        fadeDirection,
+        {
+          duration: 250,
+          easing: easing,
+          queue: false, // Do not enqueue, trigger animation in parallel
+        }
+      );
+
+      return promise;
+    },
   });
 
   Module.SocialBlockToolsView = base.BlockToolsView.extend({

assets/js/src/newsletter_editor/blocks/text.js

@@ -26,6 +26,8 @@ define([
     getTemplate: function() { return templates.textBlock; },
     modelEvents: _.omit(base.BlockView.prototype.modelEvents, 'change'), // Prevent rerendering on model change due to text editor redrawing
     initialize: function(options) {
+      base.BlockView.prototype.initialize.apply(this, arguments);
+
       this.renderOptions = _.defaults(options.renderOptions || {}, {
         disableTextEditor: false,
       });

assets/js/src/newsletter_editor/components/communication.js

@@ -9,7 +9,7 @@ define([
 
   Module._query = function(args) {
     return MailPoet.Ajax.post({
-      endpoint: 'wordpress',
+      endpoint: 'automatedLatestContent',
       action: args.action,
       data: args.options || {},
     });
@@ -63,16 +63,18 @@ define([
   };
 
   Module.saveNewsletter = function(options) {
-    return Module._query({
+    return MailPoet.Ajax.post({
+      endpoint: 'newsletters',
       action: 'save',
-      options: options,
+      data: options || {},
     });
   };
 
   Module.previewNewsletter = function(options) {
-    return Module._query({
+    return MailPoet.Ajax.post({
-      action: 'preview',
+      endpoint: 'newsletters',
-      options: options,
+      action: 'sendPreview',
+      data: options || {},
     });
   };
 

assets/js/src/newsletter_editor/components/content.js

@@ -11,7 +11,7 @@ define([
   // Does not hold newsletter content nor newsletter styles, those are
   // handled by other components.
   Module.NewsletterModel = SuperModel.extend({
-    stale: ['body'],
+    stale: ['body', 'created_at', 'deleted_at', 'updated_at'],
     initialize: function(options) {
       this.on('change', function() {
           App.getChannel().trigger('autoSave');
@@ -44,10 +44,10 @@ define([
   };
 
   Module.getBody = function() {
-    return JSON.stringify({
+    return {
       content: App._contentContainer.toJSON(),
       globalStyles: App.getGlobalStyles().toJSON(),
-    });
+    };
   };
 
   Module.toJSON = function() {
@@ -73,8 +73,7 @@ define([
   });
 
   App.on('start', function(options) {
-    // TODO: Other newsletter information will be needed as well.
+    var body = options.newsletter.body;
-    var body = JSON.parse(options.newsletter.body);
     App._contentContainer = new (App.getBlockTypeModel('container'))(body.content, {parse: true});
     App._contentContainerView = new (App.getBlockTypeView('container'))({
       model: App._contentContainer,

assets/js/src/newsletter_editor/components/save.js

@@ -1,13 +1,26 @@
 define([
     'newsletter_editor/App',
+    'newsletter_editor/components/communication',
     'mailpoet',
     'notice',
     'backbone',
     'backbone.marionette',
     'jquery',
     'blob',
-    'filesaver'
+    'filesaver',
-  ], function(App, MailPoet, Notice, Backbone, Marionette, jQuery, Blob, FileSaver) {
+    'html2canvas'
+  ], function(
+    App,
+    CommunicationComponent,
+    MailPoet,
+    Notice,
+    Backbone,
+    Marionette,
+    jQuery,
+    Blob,
+    FileSaver,
+    html2canvas
+  ) {
 
   "use strict";
 
@@ -16,26 +29,33 @@ define([
 
   // Save editor contents to server
   Module.save = function() {
-    App.getChannel().trigger('beforeEditorSave');
 
     var json = App.toJSON();
 
+    // Stringify to enable transmission of primitive non-string value types
+    if (!_.isUndefined(json.body)) {
+      json.body = JSON.stringify(json.body);
+    }
+
+    App.getChannel().trigger('beforeEditorSave', json);
+
     // save newsletter
-    MailPoet.Ajax.post({
+    CommunicationComponent.saveNewsletter(json).done(function(response) {
-      endpoint: 'newsletters',
-      action: 'save',
-      data: json,
-    }).done(function(response) {
       if(response.success !== undefined && response.success === true) {
         // TODO: Handle translations
         //MailPoet.Notice.success("<?php _e('Newsletter has been saved.'); ?>");
       } else if(response.error !== undefined) {
         if(response.error.length === 0) {
           // TODO: Handle translations
-          MailPoet.Notice.error("<?php _e('An unknown error occurred, please check your settings.'); ?>");
+          MailPoet.Notice.error(
+            "An unknown error occurred, please check your settings.",
+            {
+              scroll: true,
+            }
+          );
         } else {
           $(response.error).each(function(i, error) {
-            MailPoet.Notice.error(error);
+            MailPoet.Notice.error(error, { scroll: true });
           });
         }
       }
@@ -46,26 +66,52 @@ define([
     });
   };
 
+  Module.getThumbnail = function(element, options) {
+    return html2canvas(element, options || {});
+  };
+
   Module.saveTemplate = function(options) {
-    return MailPoet.Ajax.post({
+    var that = this,
-      endpoint: 'newsletterTemplates',
+        promise = jQuery.Deferred();
-      action: 'save',
+
-      data: _.extend(options || {}, {
+    promise.then(function(thumbnail) {
-        body: App.getBody(),
+      var data = _.extend(options || {}, {
-      }),
+        thumbnail: thumbnail.toDataURL('image/jpeg'),
+        body: JSON.stringify(App.getBody()),
+      });
+
+      return MailPoet.Ajax.post({
+        endpoint: 'newsletterTemplates',
+        action: 'save',
+        data: data,
+      });
     });
+
+    Module.getThumbnail(
+      jQuery('#mailpoet_editor_content > .mailpoet_block').get(0)
+    ).then(function(thumbnail) {
+      promise.resolve(thumbnail);
+    });
+
+    return promise;
   };
 
   Module.exportTemplate = function(options) {
-    var data = _.extend(options || {}, {
+    var that = this;
-      body: App.getBody(),
+    return Module.getThumbnail(
-    });
+      jQuery('#mailpoet_editor_content > .mailpoet_block').get(0)
-    var blob = new Blob(
+    ).then(function(thumbnail) {
-      [JSON.stringify(data)],
+      var data = _.extend(options || {}, {
-      { type: 'application/json;charset=utf-8' }
+        thumbnail: thumbnail.toDataURL('image/jpeg'),
-    );
+        body: App.getBody(),
+      });
+      var blob = new Blob(
+        [JSON.stringify(data)],
+        { type: 'application/json;charset=utf-8' }
+      );
 
-    FileSaver.saveAs(blob, 'template.json');
+      FileSaver.saveAs(blob, 'template.json');
+    });
   };
 
   Module.SaveView = Marionette.LayoutView.extend({
@@ -119,20 +165,52 @@ define([
     },
     saveAsTemplate: function() {
       var templateName = this.$('.mailpoet_save_as_template_name').val(),
-          templateDescription = this.$('.mailpoet_save_as_template_description').val();
+          templateDescription = this.$('.mailpoet_save_as_template_description').val(),
+          that = this;
 
-      console.log('Saving template with ', templateName, templateDescription);
+      if (templateName === '') {
-      Module.saveTemplate({
+        MailPoet.Notice.error(
-        name: templateName,
+          App.getConfig().get('translations.templateNameMissing'),
-        description: templateDescription,
+          {
-      }).done(function() {
+            positionAfter: that.$el,
-        console.log('Template saved', arguments);
+            scroll: true,
-      }).fail(function() {
+          }
-        // TODO: Handle error messages
+        );
-        console.log('Template save failed', arguments);
+      } else if (templateDescription === '') {
-      });
+        MailPoet.Notice.error(
+          App.getConfig().get('translations.templateDescriptionMissing'),
+          {
+            positionAfter: that.$el,
+            scroll: true,
+          }
+        );
+      } else {
+        console.log('Saving template with ', templateName, templateDescription);
+        Module.saveTemplate({
+          name: templateName,
+          description: templateDescription,
+        }).done(function() {
+          console.log('Template saved', arguments);
+          MailPoet.Notice.success(
+            App.getConfig().get('translations.templateSaved'),
+            {
+              positionAfter: that.$el,
+              scroll: true,
+            }
+          );
+        }).fail(function() {
+          console.log('Template save failed', arguments);
+          MailPoet.Notice.error(
+            App.getConfig().get('translations.templateSaveFailed'),
+            {
+              positionAfter: that.$el,
+              scroll: true,
+            }
+          );
+        });
+        this.hideOptionContents();
+      }
 
-      this.hideOptionContents();
     },
     toggleExportTemplate: function() {
       this.$('.mailpoet_export_template_container').toggleClass('mailpoet_hidden');
@@ -143,12 +221,25 @@ define([
     },
     exportTemplate: function() {
       var templateName = this.$('.mailpoet_export_template_name').val(),
-          templateDescription = this.$('.mailpoet_export_template_description').val();
+          templateDescription = this.$('.mailpoet_export_template_description').val(),
+          that = this;
 
       if (templateName === '') {
-        MailPoet.Notice.error(App.getConfig().get('translations.templateNameMissing'));
+        MailPoet.Notice.error(
+          App.getConfig().get('translations.templateNameMissing'),
+          {
+            positionAfter: that.$el,
+            scroll: true,
+          }
+        );
       } else if (templateDescription === '') {
-        MailPoet.Notice.error(App.getConfig().get('translations.templateDescriptionMissing'));
+        MailPoet.Notice.error(
+          App.getConfig().get('translations.templateDescriptionMissing'),
+          {
+            positionAfter: that.$el,
+            scroll: true,
+          }
+        );
       } else {
         console.log('Exporting template with ', templateName, templateDescription);
         Module.exportTemplate({

assets/js/src/newsletter_editor/components/sidebar.js

@@ -1,12 +1,13 @@
 define([
     'newsletter_editor/App',
+    'newsletter_editor/components/communication',
     'backbone',
     'backbone.marionette',
     'backbone.supermodel',
     'underscore',
     'jquery',
     'sticky-kit'
-  ], function(App, Backbone, Marionette, SuperModel, _, jQuery, StickyKit) {
+  ], function(App, CommunicationComponent, Backbone, Marionette, SuperModel, _, jQuery, StickyKit) {
 
   "use strict";
 
@@ -50,8 +51,33 @@ define([
     },
     events: {
       'click .mailpoet_sidebar_region h3, .mailpoet_sidebar_region .handlediv': function(event) {
-        this.$el.find('.mailpoet_sidebar_region').addClass('closed');
+        var $openRegion = this.$el.find('.mailpoet_sidebar_region:not(.closed)'),
-        this.$el.find(event.target).parent().parent().removeClass('closed');
+          $targetRegion = this.$el.find(event.target).closest('.mailpoet_sidebar_region');
+
+        if ($openRegion.get(0) === $targetRegion.get(0)) {
+          return;
+        }
+
+        $openRegion.find('.mailpoet_region_content').velocity(
+          'slideUp',
+          {
+            duration: 250,
+            easing: "easeOut",
+            complete: function() {
+              $openRegion.addClass('closed');
+            }.bind(this)
+          }
+        );
+        $targetRegion.find('.mailpoet_region_content').velocity(
+          'slideDown',
+          {
+            duration: 250,
+            easing: "easeIn",
+            complete: function() {
+              $targetRegion.removeClass('closed');
+            },
+          }
+        );
       },
     },
     initialize: function(options) {
@@ -90,7 +116,6 @@ define([
       });
     },
     onDomRefresh: function() {
-      var that = this;
       this.$el.parent().stick_in_parent({
         offset_top: 32,
       });
@@ -169,10 +194,8 @@ define([
     },
     initialize: function(options) {
       this.availableStyles = options.availableStyles;
-      var that = this;
     },
     onRender: function() {
-      var that = this;
       this.$('.mailpoet_color').spectrum({
         clickoutFiresChange: true,
         showInput: true,
@@ -202,6 +225,11 @@ define([
     showPreview: function() {
       var json = App.toJSON();
 
+      // Stringify to enable transmission of primitive non-string value types
+      if (!_.isUndefined(json.body)) {
+        json.body = JSON.stringify(json.body);
+      }
+
       MailPoet.Ajax.post({
         endpoint: 'newsletters',
         action: 'render',
@@ -219,26 +247,29 @@ define([
       console.log('trying to send a preview');
       // get form data
       var data = {
-        from_name: this.$('#mailpoet_preview_from_name').val(),
+        subscriber: this.$('#mailpoet_preview_to_email').val(),
-        from_email: this.$('#mailpoet_preview_from_email').val(),
+        id: App.getNewsletter().get('id'),
-        to_email: this.$('#mailpoet_preview_to_email').val(),
-        newsletter: App.newsletterId,
       };
 
       // send test email
       MailPoet.Modal.loading(true);
 
-      // TODO: Migrate logic to new AJAX format
+      CommunicationComponent.previewNewsletter(data).done(function(response) {
-      Wordpress.previewNewsletter(data).done(function(response) {
+        if(response.result !== undefined && response.result === true) {
-        if(response.success !== undefined && response.success === true) {
+          MailPoet.Notice.success(App.getConfig().get('translations.newsletterPreviewSent'), { scroll: true });
-          MailPoet.Notice.success(App.getConfig().get('translations.testEmailSent'));
+        } else {
-        } else if(response.error !== undefined) {
+          if (_.isArray(response.errors)) {
-          if(response.error.length === 0) {
+            response.errors.map(function(error) {
-            MailPoet.Notice.error(App.getConfig().get('translations.unknownErrorOccurred'));
+              MailPoet.Notice.error(error, { scroll: true });
-          } else {
-            $(response.error).each(function(i, error) {
-              MailPoet.Notice.error(error);
             });
+          } else {
+            MailPoet.Notice.error(
+              App.getConfig().get('translations.newsletterPreviewFailedToSend'),
+              {
+                scroll: true,
+                static: true,
+              }
+            );
           }
         }
         MailPoet.Modal.loading(false);

assets/js/src/newsletter_editor/components/styles.js

@@ -17,7 +17,7 @@ define([
       },
       h1: {
         fontColor: '#111111',
-        fontFamily: 'Arial Black',
+        fontFamily: 'Arial',
         fontSize: '40px'
       },
       h2: {
@@ -72,7 +72,7 @@ define([
 
     App.getAvailableStyles = Module.getAvailableStyles;
 
-    var body = JSON.parse(options.newsletter.body);
+    var body = options.newsletter.body;
     this.setGlobalStyles(body.globalStyles);
   });
 

assets/js/src/newsletters/list.jsx

@@ -21,6 +21,10 @@ define(
         label: 'Subject',
         sortable: true
       },
+      {
+        name: 'status',
+        label: 'Status'
+      },
       {
         name: 'segments',
         label: 'Lists'
@@ -39,58 +43,49 @@ define(
 
     var messages = {
       onTrash: function(response) {
-        var count = ~~response.newsletters;
+        var count = ~~response;
         var message = null;
 
-        if(count === 1 || response === true) {
+        if(count === 1) {
           message = (
             '1 newsletter was moved to the trash.'
           );
-        } else if(count > 1) {
+        } else {
           message = (
             '%$1d newsletters were moved to the trash.'
           ).replace('%$1d', count);
         }
-
+        MailPoet.Notice.success(message);
-        if(message !== null) {
-          MailPoet.Notice.success(message);
-        }
       },
       onDelete: function(response) {
-        var count = ~~response.newsletters;
+        var count = ~~response;
         var message = null;
 
-        if(count === 1 || response === true) {
+        if(count === 1) {
           message = (
             '1 newsletter was permanently deleted.'
           );
-        } else if(count > 1) {
+        } else {
           message = (
             '%$1d newsletters were permanently deleted.'
           ).replace('%$1d', count);
         }
-
+        MailPoet.Notice.success(message);
-        if(message !== null) {
-          MailPoet.Notice.success(message);
-        }
       },
       onRestore: function(response) {
-        var count = ~~response.newsletters;
+        var count = ~~response;
         var message = null;
 
-        if(count === 1 || response === true) {
+        if(count === 1) {
           message = (
             '1 newsletter has been restored from the trash.'
           );
-        } else if(count > 1) {
+        } else {
           message = (
             '%$1d newsletters have been restored from the trash.'
           ).replace('%$1d', count);
         }
-
+        MailPoet.Notice.success(message);
-        if(message !== null) {
-          MailPoet.Notice.success(message);
-        }
       }
     };
 
@@ -112,12 +107,101 @@ define(
             </a>
           );
         }
+      },
+      {
+        name: 'trash'
       }
     ];
 
     var NewsletterList = React.createClass({
-      renderItem: function(newsletter, actions) {
+      pauseSending: function(item) {
+        MailPoet.Ajax.post({
+          endpoint: 'sendingQueue',
+          action: 'pause',
+          data: item.id
+        }).done(function() {
+          jQuery('#resume_'+item.id).show();
+          jQuery('#pause_'+item.id).hide();
+        });
+      },
+      resumeSending: function(item) {
+        MailPoet.Ajax.post({
+          endpoint: 'sendingQueue',
+          action: 'resume',
+          data: item.id
+        }).done(function() {
+          jQuery('#pause_'+item.id).show();
+          jQuery('#resume_'+item.id).hide();
+        });
+      },
+      renderStatus: function(item) {
+        if(item.queue === null) {
+          return (
+            <span>Not sent yet.</span>
+          );
+        } else {
+          var progressClasses = classNames(
+            'mailpoet_progress',
+            { 'mailpoet_progress_complete': item.queue.status === 'completed'}
+          );
 
+          // calculate percentage done
+          var percentage = Math.round(
+            (item.queue.count_processed * 100) / (item.queue.count_total)
+          );
+
+          var label = false;
+
+          if(item.queue.status === 'completed') {
+            label = (
+              <span>
+                Sent to {
+                  item.queue.count_processed - item.queue.count_failed
+                } out of { item.queue.count_total }.
+              </span>
+            );
+          } else {
+            label = (
+              <span>
+                { item.queue.count_processed } / { item.queue.count_total }
+                &nbsp;&nbsp;
+                <a
+                  id={ 'resume_'+item.id }
+                  className="button"
+                  style={{ display: (item.queue.status === 'paused') ? 'inline-block': 'none' }}
+                  href="javascript:;"
+                  onClick={ this.resumeSending.bind(null, item) }
+                >Resume</a>
+                <a
+                  id={ 'pause_'+item.id }
+                  className="button mailpoet_pause"
+                  style={{ display: (item.queue.status === null) ? 'inline-block': 'none' }}
+                  href="javascript:;"
+                  onClick={ this.pauseSending.bind(null, item) }
+                >Pause</a>
+              </span>
+            );
+          }
+
+          return (
+            <div>
+              <div className={ progressClasses }>
+                  <span
+                    className="mailpoet_progress_bar"
+                    style={ { width: percentage + "%"} }
+                  ></span>
+                  <span className="mailpoet_progress_label">
+                    { percentage + "%" }
+                  </span>
+              </div>
+              <p style={{ textAlign:'center' }}>
+                { label }
+              </p>
+            </div>
+          );
+        }
+      },
+      renderItem: function(newsletter, actions) {
         var rowClasses = classNames(
           'manage-column',
           'column-primary',
@@ -138,6 +222,9 @@ define(
               </strong>
               { actions }
             </td>
+            <td className="column" data-colname="Lists">
+              { this.renderStatus(newsletter) }
+            </td>
             <td className="column" data-colname="Lists">
               { segments }
             </td>
@@ -164,7 +251,8 @@ define(
               columns={columns}
               bulk_actions={ bulk_actions }
               item_actions={ item_actions }
-              messages={ messages } />
+              messages={ messages }
+              auto_refresh={ true } />
           </div>
         );
       }

assets/js/src/newsletters/send.jsx

@@ -16,7 +16,7 @@ define(
     Breadcrumb
   ) {
 
-    var settings = window.mailpoet_settings || {};
+    var settings = window.mailpoet_settings || {};
 
     var fields = [
       {
@@ -24,17 +24,26 @@ define(
         label: 'Subject line',
         tip: "Be creative! It's the first thing your subscribers see."+
              "Tempt them to open your email.",
-        type: 'text'
+        type: 'text',
+        validation: {
+          'data-parsley-required': true
+        }
       },
       {
         name: 'segments',
-        label: 'Lists',
+        label: 'Segments',
-        tip: "The subscriber list that will be used for this campaign.",
+        tip: "The subscriber segment that will be used for this campaign.",
         type: 'selection',
-        placeholder: "Select a list",
+        placeholder: "Select a segment",
         id: "mailpoet_segments",
         endpoint: "segments",
-        multiple: true
+        multiple: true,
+        filter: function(segment) {
+          return !!(!segment.deleted_at);
+        },
+        validation: {
+          'data-parsley-required': true
+        }
       },
       {
         name: 'sender',
@@ -42,17 +51,24 @@ define(
         tip: "Name & email of yourself or your company.",
         fields: [
           {
-            name: 'from_name',
+            name: 'sender_name',
             type: 'text',
             placeholder: 'John Doe',
-            defaultValue: settings.from_name
+            defaultValue: (settings.sender !== undefined) ? settings.sender.name : '',
+            validation: {
+              'data-parsley-required': true
+            }
           },
           {
-            name: 'from_email',
+            name: 'sender_address',
             type: 'text',
             placeholder: 'john.doe@email.com',
-            defaultValue: settings.from_address
+            defaultValue: (settings.sender !== undefined) ? settings.sender.address : '',
-          },
+            validation: {
+              'data-parsley-required': true,
+              'data-parsley-type': 'email'
+            }
+          }
         ]
       },
       {
@@ -65,20 +81,25 @@ define(
           {
             name: 'reply_to_name',
             type: 'text',
-            placeholder: 'John Doe'
+            placeholder: 'John Doe',
+            defaultValue: (settings.reply_to !== undefined) ? settings.reply_to.name : '',
           },
           {
-            name: 'reply_to_email',
+            name: 'reply_to_address',
             type: 'text',
-            placeholder: 'john.doe@email.com'
+            placeholder: 'john.doe@email.com',
+            defaultValue: (settings.reply_to !== undefined) ? settings.reply_to.address : ''
           },
         ]
       }
     ];
 
     var messages = {
-      updated: function() {
+      onUpdate: function() {
-        MailPoet.Notice.success('The newsletter has been updated!');
+        MailPoet.Notice.success('Newsletter successfully updated!');
+      },
+      onCreate: function() {
+        MailPoet.Notice.success('Newsletter successfully added!');
       }
     };
 
@@ -87,34 +108,42 @@ define(
         Router.History
       ],
       handleSend: function() {
-        MailPoet.Ajax.post({
+        if(jQuery('#mailpoet_newsletter').parsley().validate() === true) {
-          endpoint: 'newsletters',
+          MailPoet.Ajax.post({
-          action: 'send',
+            endpoint: 'sendingQueue',
-          data: {
+            action: 'add',
-            id: this.props.params.id,
+            data: {
-            newsletter: jQuery('#mailpoet_newsletter').serializeObject(),
+              newsletter_id: this.props.params.id,
-            segments: jQuery('#mailpoet_segments').val()
+              segments: jQuery('#mailpoet_segments').val(),
-          }
+              sender: {
-        }).done(function(response) {
+                'name': jQuery('#mailpoet_newsletter [name="sender_name"]').val(),
-          if(response === true) {
+                'address': jQuery('#mailpoet_newsletter [name="sender_address"]').val()
-            this.history.pushState(null, '/');
+              },
-
+              reply_to: {
-            MailPoet.Notice.success(
+                'name': jQuery('#mailpoet_newsletter [name="reply_to_name"]').val(),
-              'The newsletter has been sent!'
+                'address': jQuery('#mailpoet_newsletter [name="reply_to_address"]').val()
-            );
+              }
-          } else {
+            }
-            if(response.errors) {
+          }).done(function(response) {
-              MailPoet.Notice.error(
+            if(response.result === true) {
-                response.errors.join("<br />")
+              this.history.pushState(null, '/');
+              MailPoet.Notice.success(
+                'The newsletter is being sent...'
               );
             } else {
-              MailPoet.Notice.error(
+              if(response.errors) {
-                'An error occurred while trying to send. '+
+                MailPoet.Notice.error(
-                '<a href="?page=mailpoet-settings">Check your settings.</a>'
+                  response.errors.join("<br />")
-              );
+                );
+              } else {
+                MailPoet.Notice.error(
+                  'An error occurred while trying to send. '+
+                  '<a href="?page=mailpoet-settings">Check your settings.</a>'
+                );
+              }
             }
-          }
+          }.bind(this));
-        }.bind(this));
+        }
       },
       render: function() {
         return (
@@ -128,8 +157,8 @@ define(
               endpoint="newsletters"
               fields={ fields }
               params={ this.props.params }
-              messages={ messages }>
+              messages={ messages }
-
+            >
               <p className="submit">
                 <input
                   className="button button-primary"

assets/js/src/newsletters/templates.jsx

@@ -18,12 +18,18 @@ define(
 
     var ImportTemplate = React.createClass({
       saveTemplate: function(template) {
+
+        // Stringify to enable transmission of primitive non-string value types
+        if (!_.isUndefined(template.body)) {
+          template.body = JSON.stringify(template.body);
+        }
+
         MailPoet.Ajax.post({
           endpoint: 'newsletterTemplates',
           action: 'save',
           data: template
         }).done(function(response) {
-          if(response === true) {
+          if(response.result === true) {
             this.props.onImport(template);
           } else {
             response.map(function(error) {
@@ -99,7 +105,7 @@ define(
                     "MailPoet's Guide",
                   description:
                     "This is the standard template that comes with MailPoet.",
-                  readonly: true
+                  readonly: "1"
                 }
               ]
             }
@@ -111,19 +117,26 @@ define(
         }.bind(this));
       },
       handleSelectTemplate: function(template) {
+        var body = template.body;
+
+        // Stringify to enable transmission of primitive non-string value types
+        if (!_.isUndefined(body)) {
+          body = JSON.stringify(body);
+        }
+
         MailPoet.Ajax.post({
           endpoint: 'newsletters',
           action: 'save',
           data: {
             id: this.props.params.id,
-            body: template.body
+            body: body
           }
         }).done(function(response) {
-          if(response === true) {
+          if(response.result === true) {
             // TODO: Move this URL elsewhere
             window.location = 'admin.php?page=mailpoet-newsletter-editor&id=' + this.props.params.id;
           } else {
-            response.map(function(error) {
+            response.errors.map(function(error) {
               MailPoet.Notice.error(error);
             });
           }
@@ -150,6 +163,13 @@ define(
            this.setState({ loading: false });
         }
       },
+      handleShowTemplate: function(template) {
+        MailPoet.Modal.popup({
+          title: template.name,
+          template: '<div class="mailpoet_boxes_preview" style="background-color: {{ body.globalStyles.body.backgroundColor }}"><img src="{{ thumbnail }}" /></div>',
+          data: template,
+        });
+      },
       handleTemplateImport: function() {
         this.getTemplates();
       },
@@ -164,11 +184,22 @@ define(
                 Delete
               </a>
             </div>
-          );
+          ), thumbnail = '';
+
+          if (typeof template.thumbnail === 'string'
+              && template.thumbnail.length > 0) {
+            thumbnail = (
+              <a href="javascript:;" onClick={this.handleShowTemplate.bind(null, template)}>
+                <img src={ template.thumbnail } />
+                <div className="mailpoet_overlay"></div>
+              </a>
+            );
+          }
 
           return (
             <li key={ 'template-'+index }>
               <div className="mailpoet_thumbnail">
+                { thumbnail }
               </div>
 
               <div className="mailpoet_description">
@@ -192,7 +223,7 @@ define(
                     Preview
                   </a>
               </div>
-              { (template.readonly) ? false : deleteLink }
+              { (template.readonly === "1") ? false : deleteLink }
             </li>
           );
         }.bind(this));

assets/js/src/newsletters/types.jsx

@@ -26,14 +26,17 @@ define(
           action: 'create',
           data: {
             type: type,
+            subject: 'Draft newsletter',
           }
         }).done(function(response) {
-          if(response.id !== undefined) {
+          if(response.result && response.newsletter.id) {
-            this.history.pushState(null, `/template/${response.id}`);
+            this.history.pushState(null, `/template/${response.newsletter.id}`);
           } else {
-            response.map(function(error) {
+            if(response.errors.length > 0) {
-              MailPoet.Notice.error(error);
+              response.errors.map(function(error) {
-            });
+                MailPoet.Notice.error(error);
+              });
+            }
           }
         }.bind(this));
       },

assets/js/src/newsletters/types/notification.jsx

@@ -138,12 +138,14 @@ define(
             options: this.state,
           },
         }).done(function(response) {
-          if(response.id !== undefined) {
+          if(response.result && response.newsletter.id) {
-            this.showTemplateSelection(response.id);
+            this.showTemplateSelection(response.newsletter.id);
           } else {
-            response.map(function(error) {
+            if(response.errors.length > 0) {
-              MailPoet.Notice.error(error);
+              response.errors.map(function(error) {
-            });
+                MailPoet.Notice.error(error);
+              });
+            }
           }
         }.bind(this));
       },

assets/js/src/newsletters/types/standard.jsx

@@ -32,12 +32,15 @@ define(
             type: 'standard',
           }
         }).done(function(response) {
-          if(response.id !== undefined) {
+          console.log(response);
-            this.showTemplateSelection(response.id);
+          if(response.result && response.newsletter.id) {
+            this.showTemplateSelection(response.newsletter.id);
           } else {
-            response.map(function(error) {
+            if(response.errors.length > 0) {
-              MailPoet.Notice.error(error);
+              response.errors.map(function(error) {
-            });
+                MailPoet.Notice.error(error);
+              });
+            }
           }
         }.bind(this));
       },

assets/js/src/newsletters/types/welcome.jsx

@@ -111,12 +111,14 @@ define(
             options: this.state,
           },
         }).done(function(response) {
-          if(response.id !== undefined) {
+          if(response.result && response.newsletter.id) {
-            this.showTemplateSelection(response.id);
+            this.showTemplateSelection(response.newsletter.id);
           } else {
-            response.map(function(error) {
+            if(response.errors.length > 0) {
-              MailPoet.Notice.error(error);
+              response.errors.map(function(error) {
-            });
+                MailPoet.Notice.error(error);
+              });
+            }
           }
         }.bind(this));
       },

assets/js/src/notice.js

@@ -1,191 +1,219 @@
-define('notice', ['mailpoet', 'jquery'], function(MailPoet, jQuery) {
+define('notice', ['mailpoet', 'jquery'], function(MailPoet, jQuery) {
-  "use strict";
+  "use strict";
-  /*==================================================================================================
+  /*==================================================================================================
-
+
-      MailPoet Notice:
+      MailPoet Notice:
-
+
-          description: Handles notices
+          description: Handles notices
-          version: 0.2
+          version: 0.2
-          author: Jonathan Labreuille
+          author: Jonathan Labreuille
-          company: Wysija
+          company: Wysija
-          dependencies: jQuery
+          dependencies: jQuery
-
+
-      Usage:
+      Usage:
-
+
-      // success message (static: false)
+      // success message (static: false)
-          MailPoet.Notice.success('Yatta!');
+          MailPoet.Notice.success('Yatta!');
-
+
-          // error message (static: false)
+          // error message (static: false)
-          MailPoet.Notice.error('Boo!');
+          MailPoet.Notice.error('Boo!');
-
+
-          // system message (static: true)
+          // system message (static: true)
-          MailPoet.Notice.system('You need to updated ASAP!');
+          MailPoet.Notice.system('You need to updated ASAP!');
-
+
-      Examples:
+      Examples:
-
+
-          MailPoet.Notice.success('-  success #1 -');
+          MailPoet.Notice.success('-  success #1 -');
-          setTimeout(function() {
+          setTimeout(function() {
-              MailPoet.Notice.success('-  success #2 -');
+              MailPoet.Notice.success('-  success #2 -');
-              setTimeout(function() {
+              setTimeout(function() {
-                  MailPoet.Notice.error('-  error -');
+                  MailPoet.Notice.error('-  error -');
-                  setTimeout(function() {
+                  setTimeout(function() {
-                      MailPoet.Notice.system('- system -');
+                      MailPoet.Notice.system('- system -');
-
+
-                      setTimeout(function() {
+                      setTimeout(function() {
-                          MailPoet.Notice.hide();
+                          MailPoet.Notice.hide();
-                      }, 2500);
+                      }, 2500);
-                  }, 300);
+                  }, 300);
-              }, 400);
+              }, 400);
-          }, 500);
+          }, 500);
-
+
-  ==================================================================================================*/
+  ==================================================================================================*/
-
+
-  MailPoet.Notice = {
+  MailPoet.Notice = {
-      version: 0.2,
+      version: 0.2,
-      // default options
+      // default options
-      defaults: {
+      defaults: {
-          type: 'success',
+          type: 'success',
-          message: '',
+          message: '',
-          static: false,
+          static: false,
-          scroll: false,
+          hideClose: false,
-          timeout: 2000,
+          id: null,
-          onOpen: null,
+          positionAfter: false,
-          onClose: null
+          scroll: false,
-      },
+          timeout: 2000,
-      options: {},
+          onOpen: null,
-      init: function(options) {
+          onClose: null
-          // set options
+      },
-          this.options = jQuery.extend({}, this.defaults, options);
+      options: {},
-
+      init: function(options) {
-          // clone element
+          // set options
-          this.element = jQuery('#mailpoet_notice_'+this.options.type).clone();
+          this.options = jQuery.extend({}, this.defaults, options);
-
+
-          // remove id from clone
+          // clone element
-          this.element.removeAttr('id');
+          this.element = jQuery('#mailpoet_notice_'+this.options.type).clone();
-
+
-          // insert notice after its parent
+          // add data-id to the element
-          jQuery('#mailpoet_notice_'+this.options.type).after(this.element);
+          if (this.options.id) this.element.attr('data-id', 'notice_' + this.options.id);
-
+
-          // setup onClose callback
+          // remove id from clone
-          var onClose = null;
+          this.element.removeAttr('id');
-          if(this.options.onClose !== null) {
+
-              onClose = this.options.onClose;
+          // insert notice after its parent
-          }
+          var positionAfter;
-
+          if (typeof this.options.positionAfter === 'object') {
-          // listen to remove event
+            positionAfter = this.options.positionAfter;
-          var element = this.element;
+          } else if (typeof this.options.positionAfter === 'string') {
-          jQuery(this.element).on('close', function() {
+            positionAfter = jQuery(this.options.positionAfter);
-              jQuery(this).fadeOut(200, function() {
+          } else {
-                  // on close callback
+            positionAfter = jQuery('#mailpoet_notice_'+this.options.type);
-                  if(onClose !== null) {
+          }
-                      onClose();
+          positionAfter.after(this.element);
-                  }
+
-                  // remove notice
+          // setup onClose callback
-                  jQuery(this).remove();
+          var onClose = null;
-              });
+          if(this.options.onClose !== null) {
-          }.bind(this.element));
+              onClose = this.options.onClose;
-
+          }
-          // listen to message event
+
-          jQuery(this.element).on('message', function(e, message) {
+          // listen to remove event
-              MailPoet.Notice.setMessage(message);
+          jQuery(this.element).on('close', function() {
-          }.bind(this.element));
+              jQuery(this).fadeOut(200, function() {
-
+                  // on close callback
-          return this;
+                  if(onClose !== null) {
-      },
+                      onClose();
-      isHTML: function(str) {
+                  }
-          var a = document.createElement('div');
+                  // remove notice
-          a.innerHTML = str;
+                  jQuery(this).remove();
-          for(var c = a.childNodes, i = c.length; i--;) {
+              });
-              if(c[i].nodeType == 1) return true;
+          }.bind(this.element));
-          }
+
-          return false;
+          // listen to message event
-      },
+          jQuery(this.element).on('message', function(e, message) {
-      setMessage: function(message) {
+              MailPoet.Notice.setMessage(message);
-          // if it's not an html message, let's sugar coat the message with a fancy <p>
+          }.bind(this.element));
-          if(this.isHTML(message) === false) {
+
-              message = '<p>'+message+'</p>';
+          return this;
-          }
+      },
-          // set message
+      isHTML: function(str) {
-          return this.element.html(message);
+          var a = document.createElement('div');
-      },
+          a.innerHTML = str;
-      show: function(options) {
+          for(var c = a.childNodes, i = c.length; i--;) {
-        // initialize
+              if(c[i].nodeType == 1) return true;
-        this.init(options);
+          }
-
+          return false;
-          // show notice
+      },
-          this.showNotice();
+      setMessage: function(message) {
-
+          // if it's not an html message, let's sugar coat the message with a fancy <p>
-          // return this;
+          if(this.isHTML(message) === false) {
-      },
+              message = '<p>'+message+'</p>';
-      showNotice: function() {
+          }
-          // set message
+          // set message
-          this.setMessage(this.options.message);
+          return this.element.html(message);
-
+      },
-          // position notice
+      show: function(options) {
-          this.element.insertAfter(jQuery('h2.title'));
+        // initialize
-
+        this.init(options);
-          // set class name
+
-          switch(this.options.type) {
+          // show notice
-            case 'success':
+          this.showNotice();
-              this.element.addClass('updated');
+
-            break;
+          // return this;
-            case 'system':
+      },
-              this.element.addClass('update-nag');
+      showNotice: function() {
-            break;
+          // set message
-            case 'error':
+          this.setMessage(this.options.message);
-              this.element.addClass('error');
+
-            break;
+          // position notice
-          }
+          this.element.insertAfter(jQuery('h2.title'));
-
+
-          // make the notice appear
+          // set class name
-          this.element.fadeIn(200);
+          switch(this.options.type) {
-
+            case 'success':
-          // if scroll option is enabled, scroll to the notice
+              this.element.addClass('updated');
-          if(this.options.scroll === true) {
+            break;
-              this.element.get(0).scrollIntoView(false);
+            case 'system':
-          }
+              this.element.addClass('update-nag');
-
+            break;
-          // if the notice is not static, it has to disappear after a timeout
+            case 'error':
-          if(this.options.static === false) {
+              this.element.addClass('error');
-              this.element.delay(this.options.timeout).trigger('close');
+            break;
-          } else {
+          }
-              this.element.append('<a href="javascript:;" class="mailpoet_notice_close"><span class="dashicons dashicons-dismiss"></span></a>');
+
-              this.element.find('.mailpoet_notice_close').on('click', function() {
+          // make the notice appear
-                  jQuery(this).trigger('close');
+          this.element.fadeIn(200);
-              });
+
-          }
+          // if scroll option is enabled, scroll to the notice
-
+          if(this.options.scroll === true) {
-          // call onOpen callback
+              this.element.get(0).scrollIntoView(false);
-          if(this.options.onOpen !== null) {
+          }
-              this.options.onOpen(this.element);
+
-          }
+          // if the notice is not static, it has to disappear after a timeout
-      },
+          if(this.options.static === false) {
-      hide: function(all) {
+              this.element.delay(this.options.timeout).trigger('close');
-          if(all !== undefined && all === true) {
+          } else if (this.options.hideClose === false) {
-              jQuery('.mailpoet_notice:not([id])').trigger('close');
+              this.element.append('<a href="javascript:;" class="mailpoet_notice_close"><span class="dashicons dashicons-dismiss"></span></a>');
-          } else {
+              this.element.find('.mailpoet_notice_close').on('click', function() {
-              jQuery('.mailpoet_notice.updated:not([id]), .mailpoet_notice.error:not([id])')
+                  jQuery(this).trigger('close');
-              .trigger('close');
+              });
-          }
+          }
-      },
+
-      error: function(message, options) {
+          // call onOpen callback
-        this.show(jQuery.extend({}, {
+          if(this.options.onOpen !== null) {
-              type: 'error',
+              this.options.onOpen(this.element);
-              message: '<p>'+message+'</p>'
+          }
-          }, options));
+      },
-      },
+      hide: function(all) {
-      success: function(message, options) {
+          if(all !== undefined && all === true) {
-          this.show(jQuery.extend({}, {
+              jQuery('.mailpoet_notice:not([id])').trigger('close');
-              type: 'success',
+          } else if (all !== undefined && jQuery.isArray(all)) {
-              message: '<p>'+message+'</p>'
+              for (var id in all) {
-          }, options));
+                  jQuery('[data-id="notice_' + all[id] + '"]')
-      },
+                   .trigger('close');
-      system: function(message, options) {
+              }
-          this.show(jQuery.extend({}, {
+          } if (all !== undefined) {
-              type: 'system',
+              jQuery('[data-id="notice_' + all + '"]')
-              static: true,
+               .trigger('close');
-              message: message
+          } else {
-          }, options));
+              jQuery('.mailpoet_notice.updated:not([id]), .mailpoet_notice.error:not([id])')
-      }
+              .trigger('close');
-  };
+          }
-});
+      },
+      error: function(message, options) {
+        this.show(jQuery.extend({}, {
+              type: 'error',
+              message: '<p>'+this.formatMessage(message)+'</p>'
+          }, options));
+      },
+      success: function(message, options) {
+          this.show(jQuery.extend({}, {
+              type: 'success',
+              message: '<p>'+this.formatMessage(message)+'</p>'
+          }, options));
+      },
+      system: function(message, options) {
+          this.show(jQuery.extend({}, {
+              type: 'system',
+              static: true,
+              message: '<p>'+this.formatMessage(message)+'</p>'
+          }, options));
+      },
+      formatMessage: function(message) {
+        if(Array.isArray(message)) {
+          return message.join('<br />');
+        } else {
+          return message;
+        }
+      }
+  };
+});

assets/js/src/segments/form.jsx

@@ -26,10 +26,10 @@ define(
     ];
 
     var messages = {
-      updated: function() {
+      onUpdate: function() {
         MailPoet.Notice.success('Segment successfully updated!');
       },
-      created: function() {
+      onCreate: function() {
         MailPoet.Notice.success('Segment successfully added!');
       }
     };
@@ -42,11 +42,7 @@ define(
         return (
           <div>
             <h2 className="title">
-              Segment <a
+              Segment
-                href="javascript:;"
-                className="add-new-h2"
-                onClick={ this.history.goBack }
-              >Back to list</a>
             </h2>
 
             <Form
@@ -54,7 +50,7 @@ define(
               fields={ fields }
               params={ this.props.params }
               messages={ messages }
-              onSuccess={ this.history.goBack } />
+            />
           </div>
         );
       }

assets/js/src/segments/list.jsx

@@ -42,58 +42,49 @@ var columns = [
 
 const messages = {
   onTrash: function(response) {
-    if(response) {
+    var count = ~~response;
-      let message = null;
+    var message = null;
-      if(~~response === 1) {
-        message = (
-          '1 segment was moved to the trash.'
-        );
-      } else if(~~response > 1) {
-        message = (
-          '%$1d segments were moved to the trash.'
-        ).replace('%$1d', ~~response);
-      }
 
-      if(message !== null) {
+    if(count === 1) {
-        MailPoet.Notice.success(message);
+      message = (
-      }
+        '1 segment was moved to the trash.'
+      );
+    } else {
+      message = (
+        '%$1d segments were moved to the trash.'
+      ).replace('%$1d', count);
     }
+    MailPoet.Notice.success(message);
   },
   onDelete: function(response) {
-    if(response) {
+    var count = ~~response;
-      let message = null;
+    var message = null;
-      if(~~response === 1) {
-        message = (
-          '1 segment was permanently deleted.'
-        );
-      } else if(~~response > 1) {
-        message = (
-          '%$1d segments were permanently deleted.'
-        ).replace('%$1d', ~~response);
-      }
 
-      if(message !== null) {
+    if(count === 1) {
-        MailPoet.Notice.success(message);
+      message = (
-      }
+        '1 segment was permanently deleted.'
+      );
+    } else {
+      message = (
+        '%$1d segments were permanently deleted.'
+      ).replace('%$1d', count);
     }
+    MailPoet.Notice.success(message);
   },
   onRestore: function(response) {
-    if(response) {
+    var count = ~~response;
-      let message = null;
+    var message = null;
-      if(~~response === 1) {
-        message = (
-          '1 segment has been restored from the trash.'
-        );
-      } else if(~~response > 1) {
-        message = (
-          '%$1d segments have been restored from the trash.'
-        ).replace('%$1d', ~~response);
-      }
 
-      if(message !== null) {
+    if(count === 1) {
-        MailPoet.Notice.success(message);
+      message = (
-      }
+        '1 segment has been restored from the trash.'
+      );
+    } else {
+      message = (
+        '%$1d segments have been restored from the trash.'
+      ).replace('%$1d', count);
     }
+    MailPoet.Notice.success(message);
   }
 };
 
@@ -121,6 +112,32 @@ const item_actions = [
         );
         refresh();
       });
+    },
+    display: function(segment) {
+      return (segment.type !== 'wp_users');
+    }
+  },
+  {
+    name: 'synchronize_segment',
+    label: 'Update',
+    className: 'update',
+    onClick: function(item, refresh) {
+      MailPoet.Modal.loading(true);
+      MailPoet.Ajax.post({
+        endpoint: 'segments',
+        action: 'synchronize'
+      }).done(function(response) {
+        MailPoet.Modal.loading(false);
+        if(response === true) {
+          MailPoet.Notice.success(
+            ('List "%$1s" has been synchronized.').replace('%$1s', item.name)
+          );
+          refresh();
+        }
+      });
+    },
+    display: function(segment) {
+      return (segment.type === 'wp_users');
     }
   },
   {
@@ -130,15 +147,16 @@ const item_actions = [
         <a href={ item.subscribers_url }>View subscribers</a>
       );
     }
+  },
+  {
+    name: 'trash',
+    display: function(segment) {
+      return (segment.type !== 'wp_users');
+    }
   }
 ];
 
 const bulk_actions = [
-  {
-    name: 'trash',
-    label: 'Trash',
-    onSuccess: messages.onTrash
-  }
 ];
 
 const SegmentList = React.createClass({
@@ -148,7 +166,6 @@ const SegmentList = React.createClass({
       'column-primary',
       'has-row-actions'
     );
-
     return (
       <div>
         <td className={ rowClasses }>

assets/js/src/settings/tabs.js

@@ -15,10 +15,10 @@ define(
 
     MailPoet.Router = new (Backbone.Router.extend({
       routes: {
-        'mta(/:method)': 'sendingMethod',
+        'mta(/:group)': 'sendingMethodGroup',
         '(:tab)': 'tabs',
       },
-      sendingMethod: function(method) {
+      sendingMethodGroup: function(group) {
         // display mta tab
         this.tabs('mta');
 
@@ -30,13 +30,13 @@ define(
         // hide "save settings" button
         jQuery('.mailpoet_settings_submit').hide();
 
-        if(method === null) {
+        if(group === null) {
           // show sending methods
           jQuery('.mailpoet_sending_methods').fadeIn();
         } else {
           // hide DKIM option when using MailPoet's API
           jQuery('#mailpoet_mta_dkim')[
-            (method === 'mailpoet')
+            (group === 'mailpoet')
             ? 'hide'
             : 'show'
           ]();
@@ -45,7 +45,7 @@ define(
           jQuery('.mailpoet_sending_methods').hide();
 
           // display selected sending method's settings
-          jQuery('.mailpoet_sending_method[data-method="'+ method +'"]').show();
+          jQuery('.mailpoet_sending_method[data-group="'+ group +'"]').show();
           jQuery('#mailpoet_sending_method_setup').fadeIn();
         }
       },
@@ -73,7 +73,7 @@ define(
     }));
 
     jQuery(document).ready(function() {
-      Backbone.history.start();
+      if (!Backbone.History.started) Backbone.history.start();
     });
   }
 );

assets/js/src/subscribers/form.jsx

@@ -37,14 +37,43 @@ define(
           'subscribed': 'Subscribed',
           'unsubscribed': 'Unsubscribed'
         }
+      },
+      {
+        name: 'segments',
+        label: 'Lists',
+        type: 'selection',
+        placeholder: "Select a list",
+        endpoint: "segments",
+        multiple: true,
+        filter: function(segment) {
+          return !!(!segment.deleted_at);
+        }
       }
     ];
 
+    var custom_fields = window.mailpoet_custom_fields || [];
+    custom_fields.map(custom_field => {
+      let field = {
+        name: 'cf_' + custom_field.id,
+        label: custom_field.name,
+        type: custom_field.type
+      };
+      if(custom_field.params) {
+        field.params = custom_field.params;
+      }
+
+      if(custom_field.params.values) {
+        field.values = custom_field.params.values;
+      }
+
+      fields.push(field);
+    });
+
     var messages = {
-      updated: function() {
+      onUpdate: function() {
         MailPoet.Notice.success('Subscriber successfully updated!');
       },
-      created: function() {
+      onCreate: function() {
         MailPoet.Notice.success('Subscriber successfully added!');
       }
     };
@@ -59,11 +88,7 @@ define(
         return (
           <div>
             <h2 className="title">
-              Subscriber <a
+              Subscriber
-                href="javascript:;"
-                className="add-new-h2"
-                onClick={ this.history.goBack }
-              >Back to list</a>
             </h2>
 
             <Form
@@ -71,7 +96,7 @@ define(
               fields={ fields }
               params={ this.props.params }
               messages={ messages }
-              onSuccess={ this.history.goBack } />
+            />
           </div>
         );
       }

assets/js/src/subscribers/importExport/export.js

@@ -0,0 +1,170 @@
+define(
+ [
+   'underscore',
+   'jquery',
+   'mailpoet',
+   'handlebars',
+   'select2'
+ ],
+ function (
+  _,
+  jQuery,
+  MailPoet,
+  Handlebars
+ ) {
+   if (!jQuery("#mailpoet_subscribers_export").length) {
+     return;
+   }
+   jQuery(document).ready(function () {
+     if (!exportData.segments) {
+       return;
+     }
+     var subscribers_export_template =
+      Handlebars.compile(jQuery('#mailpoet_subscribers_export_template').html());
+
+     //render template
+     jQuery('#mailpoet_subscribers_export > div.inside').html(subscribers_export_template(exportData));
+
+     // define reusable variables
+     var segmentsContainerElement = jQuery("#export_lists"),
+      subscriberFieldsContainerElement = jQuery("#export_columns"),
+      exportConfirmedOptionElement = jQuery(':radio[name="option_confirmed"]'),
+      groupBySegmentOptionElement = jQuery(':checkbox[name="option_group_by_list"]'),
+      nextStepButton = jQuery("a.mailpoet_export_process"),
+      renderSegmentsAndFields = function (container, data) {
+        if (container.data('select2')) {
+          container
+           .html('')
+           .select2('destroy');
+        }
+        container
+         .select2({
+           data: data,
+           width: '20em',
+           templateResult: function (item) {
+             return (item.subscriberCount > 0)
+              ? item.name + ' (' + item.subscriberCount + ')'
+              : item.name;
+           },
+           templateSelection: function (item) {
+             return (item.subscriberCount > 0)
+              ? item.name + ' (' + item.subscriberCount + ')'
+              : item.name;
+           }
+         })
+         .on('select2:selecting', function (selectEvent) {
+           var selectElement = this,
+            selectedOptionId = selectEvent.params.args.data.id,
+            fieldsToExclude = [
+              'select',
+              'deselect'
+            ];
+           if (_.contains(fieldsToExclude, selectedOptionId)) {
+             selectEvent.preventDefault();
+             if (selectedOptionId === 'deselect') {
+               jQuery(selectElement).val('').trigger('change');
+             } else {
+               var allOptions = [];
+               _.each(container.find('option'), function (field) {
+                 if (!_.contains(fieldsToExclude, field.value)) {
+                   allOptions.push(field.value);
+                 }
+               });
+               jQuery(selectElement).val(allOptions).trigger('change');
+             }
+             jQuery(selectElement).select2('close');
+           }
+         })
+         .on('change', function () {
+           if ((exportData.segments && segmentsContainerElement.select2('data').length && subscriberFieldsContainerElement.select2('data').length)
+            ||
+            (!exportData.segments && subscriberFieldsContainerElement.select2('data').length)
+           ) {
+             toggleNextStepButton('on');
+           }
+           else {
+             toggleNextStepButton('off');
+           }
+
+           if (segmentsContainerElement.select2('data').length > 1 && exportData.groupBySegmentOption) {
+             jQuery('.mailpoet_group_by_list').show();
+           }
+           else if (exportData.groupBySegmentOption) {
+             jQuery('.mailpoet_group_by_list').hide();
+           }
+         });
+      };
+
+     renderSegmentsAndFields(subscriberFieldsContainerElement, subscriberFieldsSelect2);
+     renderSegmentsAndFields(segmentsContainerElement, segments);
+
+     subscriberFieldsContainerElement.select2('val', [
+       'status',
+       'email',
+       'first_name',
+       'last_name'
+     ]);
+
+     exportConfirmedOptionElement.change(function () {
+       var selectedSegments = segmentsContainerElement.val();
+       if (this.value == 1) {
+         exportData.exportConfirmedOption = true;
+         renderSegmentsAndFields(segmentsContainerElement, segmentsWithConfirmedSubscribers);
+       }
+       else {
+         exportData.exportConfirmedOption = false;
+         renderSegmentsAndFields(segmentsContainerElement, segments);
+       }
+       segmentsContainerElement.select2('val', selectedSegments);
+     });
+
+     function toggleNextStepButton(condition) {
+       var disabled = 'button-disabled';
+       if (condition === 'on') {
+         nextStepButton.removeClass(disabled);
+       }
+       else {
+         nextStepButton.addClass(disabled);
+       }
+     }
+
+     nextStepButton.click(function () {
+       if (jQuery(this).hasClass('button-disabled')) {
+         return;
+       }
+       MailPoet.Modal.loading(true);
+       MailPoet.Ajax
+        .post({
+          endpoint: 'ImportExport',
+          action: 'processExport',
+          data: JSON.stringify({
+            'export_confirmed_option': exportData.exportConfirmedOption,
+            'export_format_option': jQuery(':radio[name="option_format"]:checked').val(),
+            'group_by_segment_option': (groupBySegmentOptionElement.is(":visible")) ? groupBySegmentOptionElement.prop('checked') : false,
+            'segments': (exportData.segments) ? segmentsContainerElement.val() : false,
+            'subscriber_fields': subscriberFieldsContainerElement.val()
+          })
+        })
+        .done(function (response) {
+          MailPoet.Modal.loading(false);
+          if (response.result === false) {
+            MailPoet.Notice.error(response.error);
+          } else {
+            resultMessage = MailPoetI18n.exportMessage
+             .replace('%1$s', '<strong>' + response.data.totalExported + '</strong>')
+             .replace('[link]', '<a href="' + response.data.exportFileURL + '" target="_blank" >')
+             .replace('[/link]', '</a>');
+            jQuery('#export_result_notice > ul > li').html(resultMessage);
+            jQuery('#export_result_notice').show();
+            window.location.href = response.data.exportFileURL;
+          }
+        })
+        .error(function (error) {
+          MailPoet.Modal.loading(false);
+          MailPoet.Notice.error(
+           MailPoetI18n.serverError + error.statusText.toLowerCase() + '.'
+          );
+        });
+     });
+   });
+ });

assets/js/src/subscribers/list.jsx

@@ -101,7 +101,12 @@ const bulk_actions = [
     onSelect: function() {
       let field = {
         id: 'move_to_segment',
-        endpoint: 'segments'
+        endpoint: 'segments',
+        filter: function(segment) {
+          return !!(
+            !segment.deleted_at && segment.type === 'default'
+          );
+        }
       };
 
       return (
@@ -127,7 +132,12 @@ const bulk_actions = [
     onSelect: function() {
       let field = {
         id: 'add_to_segment',
-        endpoint: 'segments'
+        endpoint: 'segments',
+        filter: function(segment) {
+          return !!(
+            !segment.deleted_at && segment.type === 'default'
+          );
+        }
       };
 
       return (
@@ -153,7 +163,12 @@ const bulk_actions = [
     onSelect: function() {
       let field = {
         id: 'remove_from_segment',
-        endpoint: 'segments'
+        endpoint: 'segments',
+        filter: function(segment) {
+          return !!(
+            segment.type === 'default'
+          );
+        }
       };
 
       return (
@@ -200,6 +215,21 @@ const bulk_actions = [
   }
 ];
 
+const item_actions = [
+  {
+    name: 'edit',
+    label: 'Edit',
+    link: function(item) {
+      return (
+        <Link to={ `/edit/${item.id}` }>Edit</Link>
+      );
+    }
+  },
+  {
+    name: 'trash'
+  }
+];
+
 const SubscriberList = React.createClass({
   renderItem: function(subscriber, actions) {
     let row_classes = classNames(
@@ -270,11 +300,16 @@ const SubscriberList = React.createClass({
       </div>
     );
   },
+  onGetItems: function(count) {
+    jQuery('#mailpoet_export_button')[(count > 0) ? 'show' : 'hide']();
+  },
   render: function() {
     return (
       <div>
         <h2 className="title">
           Subscribers <Link className="add-new-h2" to="/new">New</Link>
+          <a className="add-new-h2" href="?page=mailpoet-import#step1">Import</a>
+          <a id="mailpoet_export_button" className="add-new-h2" href="?page=mailpoet-export">Export</a>
         </h2>
 
         <Listing
@@ -284,7 +319,9 @@ const SubscriberList = React.createClass({
           onRenderItem={ this.renderItem }
           columns={ columns }
           bulk_actions={ bulk_actions }
+          item_actions={ item_actions }
           messages={ messages }
+          onGetItems={ this.onGetItems }
         />
       </div>
     )

assets/js/src/vendor/jquery.sticky-kit.js

@@ -0,0 +1,264 @@
+// Generated by CoffeeScript 1.9.2
+
+/**
+@license Sticky-kit v1.1.2 | WTFPL | Leaf Corcoran 2015 | http://leafo.net
+ */
+
+(function() {
+  var $, win;
+
+  $ = this.jQuery || window.jQuery;
+
+  win = $(window);
+
+  $.fn.stick_in_parent = function(opts) {
+    var doc, elm, enable_bottoming, fn, i, inner_scrolling, len, manual_spacer, offset_top, outer_width, parent_selector, recalc_every, sticky_class;
+    if (opts == null) {
+      opts = {};
+    }
+    sticky_class = opts.sticky_class, inner_scrolling = opts.inner_scrolling, recalc_every = opts.recalc_every, parent_selector = opts.parent, offset_top = opts.offset_top, manual_spacer = opts.spacer, enable_bottoming = opts.bottoming;
+    if (offset_top == null) {
+      offset_top = 0;
+    }
+    if (parent_selector == null) {
+      parent_selector = void 0;
+    }
+    if (inner_scrolling == null) {
+      inner_scrolling = true;
+    }
+    if (sticky_class == null) {
+      sticky_class = "is_stuck";
+    }
+    doc = $(document);
+    if (enable_bottoming == null) {
+      enable_bottoming = true;
+    }
+    outer_width = function(el) {
+      var _el, computed, w;
+      if (window.getComputedStyle) {
+        _el = el[0];
+        computed = window.getComputedStyle(el[0]);
+        w = parseFloat(computed.getPropertyValue("width")) + parseFloat(computed.getPropertyValue("margin-left")) + parseFloat(computed.getPropertyValue("margin-right"));
+        if (computed.getPropertyValue("box-sizing") !== "border-box") {
+          w += parseFloat(computed.getPropertyValue("border-left-width")) + parseFloat(computed.getPropertyValue("border-right-width")) + parseFloat(computed.getPropertyValue("padding-left")) + parseFloat(computed.getPropertyValue("padding-right"));
+        }
+        return w;
+      } else {
+        return el.outerWidth(true);
+      }
+    };
+    fn = function(elm, padding_bottom, parent_top, parent_height, top, height, el_float, detached) {
+      var bottomed, detach, fixed, last_pos, last_scroll_height, offset, parent, recalc, recalc_and_tick, recalc_counter, spacer, tick;
+      if (elm.data("sticky_kit")) {
+        return;
+      }
+      elm.data("sticky_kit", true);
+      last_scroll_height = doc.height();
+      parent = elm.parent();
+      if (parent_selector != null) {
+        parent = parent.closest(parent_selector);
+      }
+      if (!parent.length) {
+        throw "failed to find stick parent";
+      }
+      fixed = false;
+      bottomed = false;
+      spacer = manual_spacer != null ? manual_spacer && elm.closest(manual_spacer) : $("<div />");
+      if (spacer) {
+        spacer.css('position', elm.css('position'));
+      }
+      recalc = function() {
+        var border_top, padding_top, restore;
+        if (detached) {
+          return;
+        }
+        last_scroll_height = doc.height();
+        border_top = parseInt(parent.css("border-top-width"), 10);
+        padding_top = parseInt(parent.css("padding-top"), 10);
+        padding_bottom = parseInt(parent.css("padding-bottom"), 10);
+        parent_top = parent.offset().top + border_top + padding_top;
+        parent_height = parent.height();
+        if (fixed) {
+          fixed = false;
+          bottomed = false;
+          if (manual_spacer == null) {
+            elm.insertAfter(spacer);
+            spacer.detach();
+          }
+          elm.css({
+            position: "",
+            top: "",
+            width: "",
+            bottom: ""
+          }).removeClass(sticky_class);
+          restore = true;
+        }
+        top = elm.offset().top - (parseInt(elm.css("margin-top"), 10) || 0) - offset_top;
+        height = elm.outerHeight(true);
+        el_float = elm.css("float");
+        if (spacer) {
+          spacer.css({
+            width: outer_width(elm),
+            height: height,
+            display: elm.css("display"),
+            "vertical-align": elm.css("vertical-align"),
+            "float": el_float
+          });
+        }
+        if (restore) {
+          return tick();
+        }
+      };
+      recalc();
+
+      last_pos = void 0;
+      offset = offset_top;
+      recalc_counter = recalc_every;
+      tick = function() {
+        var css, delta, recalced, scroll, will_bottom, win_height;
+        if (detached) {
+          return;
+        }
+        recalced = false;
+        if (recalc_counter != null) {
+          recalc_counter -= 1;
+          if (recalc_counter <= 0) {
+            recalc_counter = recalc_every;
+            recalc();
+            recalced = true;
+          }
+        }
+        if (!recalced && doc.height() !== last_scroll_height) {
+          recalc();
+          recalced = true;
+        }
+        scroll = win.scrollTop();
+        if (last_pos != null) {
+          delta = scroll - last_pos;
+        }
+        last_pos = scroll;
+        if (fixed) {
+          if (enable_bottoming) {
+            will_bottom = scroll + height + offset > parent_height + parent_top;
+            if (bottomed && !will_bottom) {
+              bottomed = false;
+              elm.css({
+                position: "fixed",
+                bottom: "",
+                top: offset
+              }).trigger("sticky_kit:unbottom");
+            }
+          }
+          if (scroll < top) {
+            fixed = false;
+            offset = offset_top;
+            if (manual_spacer == null) {
+              if (el_float === "left" || el_float === "right") {
+                elm.insertAfter(spacer);
+              }
+              spacer.detach();
+            }
+            css = {
+              position: "",
+              width: "",
+              top: ""
+            };
+            elm.css(css).removeClass(sticky_class).trigger("sticky_kit:unstick");
+          }
+          if (inner_scrolling) {
+            win_height = win.height();
+            if (height + offset_top > win_height) {
+              if (!bottomed) {
+                offset -= delta;
+                offset = Math.max(win_height - height, offset);
+                offset = Math.min(offset_top, offset);
+                if (fixed) {
+                  elm.css({
+                    top: offset + "px"
+                  });
+                }
+              }
+            }
+          }
+        } else {
+          if (scroll > top) {
+            fixed = true;
+            css = {
+              position: "fixed",
+              top: offset
+            };
+            css.width = elm.css("box-sizing") === "border-box" ? elm.outerWidth() + "px" : elm.width() + "px";
+            elm.css(css).addClass(sticky_class);
+            if (manual_spacer == null) {
+              elm.after(spacer);
+              if (el_float === "left" || el_float === "right") {
+                spacer.append(elm);
+              }
+            }
+            elm.trigger("sticky_kit:stick");
+          }
+        }
+        if (fixed && enable_bottoming) {
+          if (will_bottom == null) {
+            will_bottom = scroll + height + offset > parent_height + parent_top;
+          }
+          if (!bottomed && will_bottom) {
+            bottomed = true;
+            if (parent.css("position") === "static") {
+              parent.css({
+                position: "relative"
+              });
+            }
+            return elm.css({
+              position: "absolute",
+              bottom: padding_bottom,
+              top: "auto"
+            }).trigger("sticky_kit:bottom");
+          }
+        }
+      };
+      recalc_and_tick = function() {
+        recalc();
+        return tick();
+      };
+      detach = function() {
+        detached = true;
+        win.off("touchmove", tick);
+        win.off("scroll", tick);
+        win.off("resize", recalc_and_tick);
+        $(document.body).off("sticky_kit:recalc", recalc_and_tick);
+        elm.off("sticky_kit:detach", detach);
+        elm.removeData("sticky_kit");
+        elm.css({
+          position: "",
+          bottom: "",
+          top: "",
+          width: ""
+        });
+        parent.position("position", "");
+        if (fixed) {
+          if (manual_spacer == null) {
+            if (el_float === "left" || el_float === "right") {
+              elm.insertAfter(spacer);
+            }
+            spacer.remove();
+          }
+          return elm.removeClass(sticky_class);
+        }
+      };
+      win.on("touchmove", tick);
+      win.on("scroll", tick);
+      win.on("resize", recalc_and_tick);
+      $(document.body).on("sticky_kit:recalc", recalc_and_tick);
+      elm.on("sticky_kit:detach", detach);
+      return setTimeout(tick, 0);
+    };
+    for (i = 0, len = this.length; i < len; i++) {
+      elm = this[i];
+      fn($(elm));
+    }
+    return this;
+  };
+
+}).call(this);
+

build

@@ -1,42 +0,0 @@
-#!/bin/sh
-
-# Remove previous build.
-rm wysija-newsletters.zip;
-
-# Create temp dir.
-mkdir wysija-newsletters;
-
-# Production assets.
-./do compile:all;
-
-# Production libraries.
-rm -rf vendor;
-rm composer.lock;
-./composer.phar install --no-dev;
-
-# Copy release folders.
-cp -rf lang wysija-newsletters;
-cp -rfL assets wysija-newsletters;
-cp -rf lib wysija-newsletters;
-cp -rf vendor wysija-newsletters;
-cp -rf views wysija-newsletters;
-rm -rf wysija-newsletters/assets/css/src;
-rm -rf wysija-newsletters/assets/js/src;
-
-# Copy release files.
-cp LICENSE wysija-newsletters;
-cp index.php wysija-newsletters;
-cp mailpoet.php wysija-newsletters;
-cp readme.txt wysija-newsletters;
-cp uninstall.php wysija-newsletters;
-
-# Zip final release.
-zip -r wysija-newsletters.zip wysija-newsletters;
-
-# Remove temp dir.
-rm -rf wysija-newsletters;
-
-# Reinstall dev dependencies.
-rm composer.lock;
-./composer.phar install;
-./do install;

build.sh

@@ -0,0 +1,42 @@
+#!/bin/sh
+
+plugin_name='mailpoet'
+
+# Remove previous build.
+rm $plugin_name.zip
+
+# Create temp dir.
+mkdir $plugin_name
+
+# Production assets.
+rm -rf node_modules
+npm install
+./do compile:all
+
+# Production libraries.
+./composer.phar install --no-dev
+
+# Copy release folders.
+cp -Rf lang $plugin_name
+cp -RfL assets $plugin_name
+cp -Rf lib $plugin_name
+cp -Rf vendor $plugin_name
+cp -Rf views $plugin_name
+rm -Rf $plugin_name/assets/css/src
+rm -Rf $plugin_name/assets/js/src
+
+# Copy release files.
+cp LICENSE $plugin_name
+cp index.php $plugin_name
+cp $plugin_name.php $plugin_name
+cp readme.txt $plugin_name
+cp uninstall.php $plugin_name
+
+# Zip final release.
+zip -r $plugin_name.zip $plugin_name
+
+# Remove temp dir.
+rm -rf $plugin_name
+
+# Reinstall dev dependencies.
+./composer.phar install

codeception.yml

@@ -19,3 +19,12 @@ modules:
             user: ''
             password: ''
             dump: tests/_data/dump.sql
+coverage:
+    enabled: true
+    whitelist:
+        include:
+            - lib/*
+        exclude:
+    blacklist:
+        include:
+        exclude:

composer.json

@@ -8,7 +8,10 @@
     "tburry/pquery": "*",
     "j4mie/paris": "1.5.4",
     "swiftmailer/swiftmailer": "^5.4",
-    "phpseclib/phpseclib": "*"
+    "phpseclib/phpseclib": "*",
+    "mtdowling/cron-expression": "^1.0",
+    "nesbot/carbon": "^1.21",
+    "soundasleep/html2text": "^0.3.0"
   },
   "require-dev": {
     "codeception/codeception": "*",

lib/Analytics/Reporter.php

@@ -0,0 +1,25 @@
+<?php
+namespace MailPoet\Analytics;
+
+class Reporter {
+
+  private $fields = array(
+    'Plugin Version' => 'pluginVersion',
+  );
+
+  function __construct() {}
+
+  function getData() {
+    $_this = $this;
+
+    $analytics_data = array_map(function($func) use ($_this) {
+      return $_this->$func();
+    }, $this->fields);
+
+    return $analytics_data;
+  }
+
+  private function pluginVersion() {
+    return MAILPOET_VERSION;
+  }
+}

lib/Config/Activator.php

@@ -9,13 +9,6 @@ class Activator {
   function __construct() {
   }
 
-  function init() {
-    register_activation_hook(
-      Env::$file,
-      array($this, 'activate')
-    );
-  }
-
   function activate() {
     $migrator = new Migrator();
     $migrator->up();
@@ -23,4 +16,9 @@ class Activator {
     $populator = new Populator();
     $populator->up();
   }
+
+  function deactivate() {
+    $migrator = new Migrator();
+    $migrator->down();
+  }
 }

lib/Config/Analytics.php

@@ -0,0 +1,33 @@
+<?php
+namespace MailPoet\Config;
+use \MailPoet\Analytics\Reporter;
+use \MailPoet\Models\Setting;
+
+if(!defined('ABSPATH')) exit;
+
+class Analytics {
+  function __construct() {
+  }
+
+  function init() {
+    // review: this creates a fatal error when mailpoet tables are dropped.
+    //add_action('admin_enqueue_scripts', array($this, 'setupAdminDependencies'));
+  }
+
+  function setupAdminDependencies() {
+    if(Setting::getValue('send_analytics_now', false)) {
+      $analytics = new Reporter();
+      wp_enqueue_script(
+        'analytics',
+        Env::$assets_url . '/js/lib/analytics.js',
+        array(),
+        Env::$version
+      );
+      wp_localize_script(
+        'analytics',
+        'mailpoet_analytics_data',
+        $analytics->getData()
+      );
+    }
+  }
+}

lib/Config/Changelog.php

@@ -0,0 +1,61 @@
+<?php
+namespace MailPoet\Config;
+use \MailPoet\Models\Setting;
+
+class Changelog {
+  function init() {
+    $doing_ajax = (bool)(defined('DOING_AJAX') && DOING_AJAX);
+
+    // don't run any check when it's an ajax request
+    if($doing_ajax) {
+      return;
+    }
+
+    // don't run any check when we're not on our pages
+    if(
+      !(isset($_GET['page']))
+      or
+      (isset($_GET['page']) && strpos($_GET['page'], 'mailpoet') !== 0)
+    ) {
+      return;
+    }
+
+    add_action(
+      'admin_init',
+      array($this, 'check')
+    );
+  }
+
+  function check() {
+    $version = Setting::getValue('version', null);
+    $redirect_url = null;
+
+    if($version === null) {
+      // new install
+      $redirect_url = admin_url('admin.php?page=mailpoet-welcome');
+    } else if($version !== Env::$version) {
+      // update
+      $redirect_url = admin_url('admin.php?page=mailpoet-update');
+    }
+
+    if($redirect_url !== null) {
+      // save version number
+      Setting::setValue('version', Env::$version);
+
+      global $wp;
+      $current_url = home_url(add_query_arg($wp->query_string, $wp->request));
+
+      if($redirect_url !== $current_url) {
+        wp_safe_redirect(
+          add_query_arg(
+            array(
+              'mailpoet_redirect' => urlencode($current_url)
+            ),
+            $redirect_url
+          )
+        );
+        exit;
+      }
+    }
+  }
+}

lib/Config/Env.php

@@ -4,53 +4,73 @@ namespace MailPoet\Config;
 if(!defined('ABSPATH')) exit;
 
 class Env {
-  public static $version;
+  static $version;
-  public static $plugin_name;
+  static $plugin_name;
-  public static $file;
+  static $plugin_path;
-  public static $path;
+  static $file;
-  public static $views_path;
+  static $path;
-  public static $assets_path;
+  static $views_path;
-  public static $assets_url;
+  static $assets_path;
-  public static $languages_path;
+  static $assets_url;
-  public static $lib_path;
+  static $temp_path;
-  public static $plugin_prefix;
+  static $temp_URL;
-  public static $db_prefix;
+  static $languages_path;
-  public static $db_source_name;
+  static $lib_path;
-  public static $db_host;
+  static $plugin_prefix;
-  public static $db_name;
+  static $db_prefix;
-  public static $db_username;
+  static $db_source_name;
-  public static $db_password;
+  static $db_host;
-  public static $db_charset;
+  static $db_socket;
+  static $db_port;
+  static $db_name;
+  static $db_username;
+  static $db_password;
+  static $db_charset;
 
-  public static function init($file, $version) {
+  static function init($file, $version) {
     global $wpdb;
     self::$version = $version;
-    self::$plugin_name = 'mailpoet';
     self::$file = $file;
     self::$path = dirname(self::$file);
+    self::$plugin_name = 'mailpoet';
     self::$views_path = self::$path . '/views';
     self::$assets_path = self::$path . '/assets';
     self::$assets_url = plugins_url('/assets', $file);
+    $wp_upload_dir = wp_upload_dir();
+    self::$temp_path = $wp_upload_dir['path'];
+    self::$temp_URL = $wp_upload_dir['url'];
     self::$languages_path = self::$path . '/lang';
     self::$lib_path = self::$path . '/lib';
     self::$plugin_prefix = 'mailpoet_';
     self::$db_prefix = $wpdb->prefix . self::$plugin_prefix;
-    self::$db_source_name = self::dbSourceName();
     self::$db_host = DB_HOST;
+    self::$db_port = 3306;
+    self::$db_socket = false;
+    if(preg_match('/(?=:\d+$)/', DB_HOST)) {
+      list(self::$db_host, self::$db_port) = explode(':', DB_HOST);
+    } else {
+      if(preg_match('/:/', DB_HOST)) {
+        self::$db_socket = true;
+      }
+    }
     self::$db_name = DB_NAME;
     self::$db_username = DB_USER;
     self::$db_password = DB_PASSWORD;
     self::$db_charset = $wpdb->get_charset_collate();
+    self::$db_source_name = self::dbSourceName(self::$db_host, self::$db_socket, self::$db_port);
   }
 
-  private static function dbSourceName() {
+  private static function dbSourceName($host, $socket, $port) {
     $source_name = array(
-      'mysql:host=',
+      (!$socket) ? 'mysql:host=' : 'mysql:unix_socket=',
-      DB_HOST,
+      $host,
+      ';',
+      'port=',
+      $port,
       ';',
       'dbname=',
       DB_NAME
     );
     return implode('', $source_name);
   }
-}
+}

lib/Config/Hooks.php

@@ -0,0 +1,113 @@
+<?php
+namespace MailPoet\Config;
+use \MailPoet\Models\Setting;
+
+class Hooks {
+  function __construct() {
+  }
+
+  function init() {
+    // Subscribe in comments
+    if((bool)Setting::getValue('subscribe.on_comment.enabled')) {
+      if(is_user_logged_in()) {
+        add_action(
+          'comment_form_field_comment',
+          '\MailPoet\Subscription\Comment::extendLoggedInForm'
+        );
+      } else {
+        add_action(
+          'comment_form_after_fields',
+          '\MailPoet\Subscription\Comment::extendLoggedOutForm'
+        );
+      }
+
+      add_action(
+        'comment_post',
+        '\MailPoet\Subscription\Comment::onSubmit',
+        60,
+        2
+      );
+
+      add_action(
+        'wp_set_comment_status',
+        '\MailPoet\Subscription\Comment::onStatusUpdate',
+        60,
+        2
+      );
+    }
+
+    // Subscribe in registration form
+    if((bool)Setting::getValue('subscribe.on_register.enabled')) {
+      if(is_multisite()) {
+        add_action(
+          'signup_extra_fields',
+          '\MailPoet\Subscription\Registration::extendForm'
+        );
+        add_action(
+          'wpmu_validate_user_signup',
+          '\MailPoet\Subscription\Registration::onMultiSiteRegister',
+          60,
+          1
+        );
+      } else {
+        add_action(
+          'register_form',
+          '\MailPoet\Subscription\Registration::extendForm'
+        );
+        add_action(
+          'register_post',
+          '\MailPoet\Subscription\Registration::onRegister',
+          60,
+          3
+        );
+      }
+    }
+
+    // WP Users synchronization
+    add_action(
+      'user_register',
+      '\MailPoet\Segments\WP::synchronizeUser',
+      1
+    );
+    add_action(
+      'added_existing_user',
+      '\MailPoet\Segments\WP::synchronizeUser',
+      1
+    );
+    add_action(
+      'profile_update',
+      '\MailPoet\Segments\WP::synchronizeUser',
+      1
+    );
+    add_action(
+      'delete_user',
+      '\MailPoet\Segments\WP::synchronizeUser',
+      1
+    );
+    // multisite
+    add_action(
+      'deleted_user',
+      '\MailPoet\Segments\WP::synchronizeUser',
+      1
+    );
+    add_action(
+      'remove_user_from_blog',
+      '\MailPoet\Segments\WP::synchronizeUser',
+      1
+    );
+
+    add_filter(
+      'image_size_names_choose',
+      array(
+        $this,
+        'appendImageSizes'
+      )
+    );
+  }
+
+  function appendImageSizes($sizes) {
+    return array_merge($sizes, array(
+      'mailpoet_newsletter_max' => __('MailPoet Newsletter'),
+    ));
+  }
+}

lib/Config/Initializer.php

@@ -2,10 +2,15 @@
 namespace MailPoet\Config;
 
 use MailPoet\Models;
+use MailPoet\Cron\Supervisor;
 use MailPoet\Router;
+use MailPoet\Models\Setting;
+use MailPoet\Settings\Pages;
 
 if(!defined('ABSPATH')) exit;
 
+require_once(ABSPATH . 'wp-admin/includes/plugin.php');
+
 class Initializer {
   function __construct($params = array(
     'file' => '',
@@ -16,13 +21,34 @@ class Initializer {
 
   function init() {
     $this->setupDB();
-    $this->setupActivator();
+
-    $this->setupRenderer();
+    register_activation_hook(Env::$file, array($this, 'runMigrator'));
-    $this->setupLocalizer();
+    register_activation_hook(Env::$file, array($this, 'runPopulator'));
-    $this->setupMenu();
+
-    $this->setupRouter();
+    add_action('plugins_loaded', array($this, 'setup'));
-    $this->setupWidget();
+    add_action('widgets_init', array($this, 'setupWidget'));
-    $this->setupPermissions();
+  }
+
+  function setup() {
+    try {
+      $this->setupRenderer();
+      $this->setupLocalizer();
+      $this->setupMenu();
+      $this->setupRouter();
+      $this->setupPermissions();
+      $this->setupPublicAPI();
+      $this->setupAnalytics();
+      $this->setupChangelog();
+      $this->runQueueSupervisor();
+      $this->setupShortcodes();
+      $this->setupHooks();
+      $this->setupPages();
+      $this->setupImages();
+    } catch(\Exception $e) {
+      // if anything goes wrong during init
+      // automatically deactivate the plugin
+      deactivate_plugins(Env::$file);
+    }
   }
 
   function setupDB() {
@@ -31,7 +57,8 @@ class Initializer {
     \ORM::configure('password', Env::$db_password);
     \ORM::configure('logging', WP_DEBUG);
     \ORM::configure('driver_options', array(
-      \PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8'
+      \PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8',
+      \PDO::MYSQL_ATTR_INIT_COMMAND => 'SET TIME_ZONE = "+00:00"'
     ));
 
     $subscribers = Env::$db_prefix . 'subscribers';
@@ -46,6 +73,8 @@ class Initializer {
     $subscriber_custom_field = Env::$db_prefix . 'subscriber_custom_field';
     $newsletter_option_fields = Env::$db_prefix . 'newsletter_option_fields';
     $newsletter_option = Env::$db_prefix . 'newsletter_option';
+    $sending_queues = Env::$db_prefix . 'sending_queues';
+    $newsletter_statistics = Env::$db_prefix . 'newsletter_statistics';
 
     define('MP_SUBSCRIBERS_TABLE', $subscribers);
     define('MP_SETTINGS_TABLE', $settings);
@@ -59,11 +88,18 @@ class Initializer {
     define('MP_SUBSCRIBER_CUSTOM_FIELD_TABLE', $subscriber_custom_field);
     define('MP_NEWSLETTER_OPTION_FIELDS_TABLE', $newsletter_option_fields);
     define('MP_NEWSLETTER_OPTION_TABLE', $newsletter_option);
+    define('MP_SENDING_QUEUES_TABLE', $sending_queues);
+    define('MP_NEWSLETTER_STATISTICS_TABLE', $newsletter_statistics);
   }
 
-  function setupActivator() {
+  function runMigrator() {
-    $activator = new Activator();
+    $migrator = new Migrator();
-    $activator->init();
+    $migrator->up();
+  }
+
+  function runPopulator() {
+    $populator = new Populator();
+    $populator->up();
   }
 
   function setupRenderer() {
@@ -77,10 +113,7 @@ class Initializer {
   }
 
   function setupMenu() {
-    $menu = new Menu(
+    $menu = new Menu($this->renderer, Env::$assets_url);
-      $this->renderer,
-      Env::$assets_url
-    );
     $menu->init();
   }
 
@@ -94,8 +127,51 @@ class Initializer {
     $widget->init();
   }
 
+  function setupAnalytics() {
+    $widget = new Analytics();
+    $widget->init();
+  }
+
   function setupPermissions() {
     $permissions = new Permissions();
     $permissions->init();
   }
-}
+
+  function setupChangelog() {
+    $changelog = new Changelog();
+    $changelog->init();
+  }
+
+  function setupPages() {
+    $pages = new Pages();
+    $pages->init();
+  }
+
+  function setupShortcodes() {
+    $shortcodes = new Shortcodes();
+    $shortcodes->init();
+  }
+
+  function setupHooks() {
+    $hooks = new Hooks();
+    $hooks->init();
+  }
+
+  function setupPublicAPI() {
+    $publicAPI = new PublicAPI();
+    $publicAPI->init();
+  }
+
+  function runQueueSupervisor() {
+    if(php_sapi_name() === 'cli') return;
+    try {
+      $supervisor = new Supervisor();
+      $supervisor->checkDaemon();
+    } catch(\Exception $e) {
+    }
+  }
+
+  function setupImages() {
+    add_image_size('mailpoet_newsletter_max', 1320);
+  }
+}