Bump up release version to 0.0.32

Fix PHP unit tests

.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(
@@ -75,14 +89,14 @@ class RoboFile extends \Robo\Tasks {
   }
 
   function makepot() {
-    $this->_exec('grunt makepot'.
+    $this->_exec('./node_modules/.bin/grunt makepot'.
       ' --gruntfile '.__DIR__.'/tasks/makepot/makepot.js'.
       ' --base_path '.__DIR__
     );
   }
 
   function pushpot() {
-    $this->_exec('grunt pushpot'.
+    $this->_exec('./node_modules/.bin/grunt pushpot'.
       ' --gruntfile '.__DIR__.'/tasks/makepot/makepot.js'.
       ' --base_path '.__DIR__
     );
@@ -91,14 +105,25 @@ class RoboFile extends \Robo\Tasks {
   function testUnit($file = null) {
     $this->loadEnv();
     $this->_exec('vendor/bin/codecept build');
-    $this->_exec('vendor/bin/codecept run unit '.(($file) ? $file : ''));
+    $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();
 
     $this->_exec(join(' ', array(
-      './node_modules/mocha/bin/mocha',
+      './node_modules/.bin/mocha',
       '-r tests/javascript/mochaTestHelper.js',
       'tests/javascript/testBundles/**/*.js'
     )));
@@ -113,7 +138,6 @@ class RoboFile extends \Robo\Tasks {
   function testFailed() {
     $this->loadEnv();
     $this->_exec('vendor/bin/codecept build');
-    $this->startPhantomJS();
     $this->_exec('vendor/bin/codecept run -g failed');
   }
 
@@ -121,4 +145,4 @@ class RoboFile extends \Robo\Tasks {
     $dotenv = new Dotenv\Dotenv(__DIR__);
     $dotenv->load();
   }
-}
+}

assets/css/src/admin.styl

@@ -1,16 +1,22 @@
 @import 'nib'
 
 @require 'select2/dist/css/select2.css'
+@require 'datepicker/datepicker'
 
 @require 'common'
 @require 'modal'
 @require 'notice'
-@require 'validation_engine'
 
 @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'
+
+@require 'subscribers'

assets/css/src/common.styl

@@ -21,6 +21,32 @@ a:focus
 .select2-container
   width: 25em !important
 
+// textareas
+textarea.regular-text
+  width: 25em !important
+
 @media screen and (max-width: 782px)
   .select2-container
-    width: 100% !important
+    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/datepicker/datepicker.styl

@@ -0,0 +1,2 @@
+@require 'jquery-ui-1.10.1.css'
+@require 'melon.datepicker.css'

assets/css/src/datepicker/jquery-ui-1.10.1.css

@@ -0,0 +1,649 @@
+/*! jQuery UI - v1.10.1 - 2013-03-10
+* http://jqueryui.com
+* Includes: jquery.ui.core.css, jquery.ui.datepicker.css
+* To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Trebuchet%20MS%2CTahoma%2CVerdana%2CArial%2Csans-serif&fwDefault=bold&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=f6a828&bgTextureHeader=gloss_wave&bgImgOpacityHeader=35&borderColorHeader=e78f08&fcHeader=ffffff&iconColorHeader=ffffff&bgColorContent=eeeeee&bgTextureContent=highlight_soft&bgImgOpacityContent=100&borderColorContent=dddddd&fcContent=333333&iconColorContent=222222&bgColorDefault=f6f6f6&bgTextureDefault=glass&bgImgOpacityDefault=100&borderColorDefault=cccccc&fcDefault=1c94c4&iconColorDefault=ef8c08&bgColorHover=fdf5ce&bgTextureHover=glass&bgImgOpacityHover=100&borderColorHover=fbcb09&fcHover=c77405&iconColorHover=ef8c08&bgColorActive=ffffff&bgTextureActive=glass&bgImgOpacityActive=65&borderColorActive=fbd850&fcActive=eb8f00&iconColorActive=ef8c08&bgColorHighlight=ffe45c&bgTextureHighlight=highlight_soft&bgImgOpacityHighlight=75&borderColorHighlight=fed22f&fcHighlight=363636&iconColorHighlight=228ef1&bgColorError=b81900&bgTextureError=diagonals_thick&bgImgOpacityError=18&borderColorError=cd0a0a&fcError=ffffff&iconColorError=ffd27a&bgColorOverlay=666666&bgTextureOverlay=diagonals_thick&bgImgOpacityOverlay=20&opacityOverlay=50&bgColorShadow=000000&bgTextureShadow=flat&bgImgOpacityShadow=10&opacityShadow=20&thicknessShadow=5px&offsetTopShadow=-5px&offsetLeftShadow=-5px&cornerRadiusShadow=5px
+* Copyright (c) 2013 jQuery Foundation and other contributors Licensed MIT */
+
+/* Layout helpers
+----------------------------------*/
+.ui-helper-hidden {
+	display: none;
+}
+.ui-helper-hidden-accessible {
+	border: 0;
+	clip: rect(0 0 0 0);
+	height: 1px;
+	margin: -1px;
+	overflow: hidden;
+	padding: 0;
+	position: absolute;
+	width: 1px;
+}
+.ui-helper-reset {
+	margin: 0;
+	padding: 0;
+	border: 0;
+	outline: 0;
+	line-height: 1.3;
+	text-decoration: none;
+	font-size: 100%;
+	list-style: none;
+}
+.ui-helper-clearfix:before,
+.ui-helper-clearfix:after {
+	content: "";
+	display: table;
+	border-collapse: collapse;
+}
+.ui-helper-clearfix:after {
+	clear: both;
+}
+.ui-helper-clearfix {
+	min-height: 0; /* support: IE7 */
+}
+.ui-helper-zfix {
+	width: 100%;
+	height: 100%;
+	top: 0;
+	left: 0;
+	position: absolute;
+	opacity: 0;
+	filter:Alpha(Opacity=0);
+}
+
+.ui-front {
+	z-index: 100;
+}
+
+
+/* Interaction Cues
+----------------------------------*/
+.ui-state-disabled {
+	cursor: default !important;
+}
+
+
+/* Icons
+----------------------------------*/
+
+/* states and images */
+.ui-icon {
+	display: block;
+	text-indent: -99999px;
+	overflow: hidden;
+	background-repeat: no-repeat;
+}
+
+
+/* Misc visuals
+----------------------------------*/
+
+/* Overlays */
+.ui-widget-overlay {
+	position: fixed;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+}
+.ui-datepicker {
+	width: 17em;
+	padding: .2em .2em 0;
+	display: none;
+}
+.ui-datepicker .ui-datepicker-header {
+	position: relative;
+	padding: .2em 0;
+}
+.ui-datepicker .ui-datepicker-prev,
+.ui-datepicker .ui-datepicker-next {
+	position: absolute;
+	top: 2px;
+	width: 1.8em;
+	height: 1.8em;
+}
+.ui-datepicker .ui-datepicker-prev-hover,
+.ui-datepicker .ui-datepicker-next-hover {
+	top: 1px;
+}
+.ui-datepicker .ui-datepicker-prev {
+	left: 2px;
+}
+.ui-datepicker .ui-datepicker-next {
+	right: 2px;
+}
+.ui-datepicker .ui-datepicker-prev-hover {
+	left: 1px;
+}
+.ui-datepicker .ui-datepicker-next-hover {
+	right: 1px;
+}
+.ui-datepicker .ui-datepicker-prev span,
+.ui-datepicker .ui-datepicker-next span {
+	display: block;
+	position: absolute;
+	left: 50%;
+	margin-left: -8px;
+	top: 50%;
+	margin-top: -8px;
+}
+.ui-datepicker .ui-datepicker-title {
+	margin: 0 2.3em;
+	line-height: 1.8em;
+	text-align: center;
+}
+.ui-datepicker .ui-datepicker-title select {
+	font-size: 1em;
+	margin: 1px 0;
+}
+.ui-datepicker select.ui-datepicker-month-year {
+	width: 100%;
+}
+.ui-datepicker select.ui-datepicker-month,
+.ui-datepicker select.ui-datepicker-year {
+	width: 49%;
+}
+.ui-datepicker table {
+	width: 100%;
+	font-size: .9em;
+	border-collapse: collapse;
+	margin: 0 0 .4em;
+}
+.ui-datepicker th {
+	padding: .7em .3em;
+	text-align: center;
+	font-weight: bold;
+	border: 0;
+}
+.ui-datepicker td {
+	border: 0;
+	padding: 1px;
+}
+.ui-datepicker td span,
+.ui-datepicker td a {
+	display: block;
+	padding: .2em;
+	text-align: right;
+	text-decoration: none;
+}
+.ui-datepicker .ui-datepicker-buttonpane {
+	background-image: none;
+	margin: .7em 0 0 0;
+	padding: 0 .2em;
+	border-left: 0;
+	border-right: 0;
+	border-bottom: 0;
+}
+.ui-datepicker .ui-datepicker-buttonpane button {
+	float: right;
+	margin: .5em .2em .4em;
+	cursor: pointer;
+	padding: .2em .6em .3em .6em;
+	width: auto;
+	overflow: visible;
+}
+.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current {
+	float: left;
+}
+
+/* with multiple calendars */
+.ui-datepicker.ui-datepicker-multi {
+	width: auto;
+}
+.ui-datepicker-multi .ui-datepicker-group {
+	float: left;
+}
+.ui-datepicker-multi .ui-datepicker-group table {
+	width: 95%;
+	margin: 0 auto .4em;
+}
+.ui-datepicker-multi-2 .ui-datepicker-group {
+	width: 50%;
+}
+.ui-datepicker-multi-3 .ui-datepicker-group {
+	width: 33.3%;
+}
+.ui-datepicker-multi-4 .ui-datepicker-group {
+	width: 25%;
+}
+.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header,
+.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header {
+	border-left-width: 0;
+}
+.ui-datepicker-multi .ui-datepicker-buttonpane {
+	clear: left;
+}
+.ui-datepicker-row-break {
+	clear: both;
+	width: 100%;
+	font-size: 0;
+}
+
+/* RTL support */
+.ui-datepicker-rtl {
+	direction: rtl;
+}
+.ui-datepicker-rtl .ui-datepicker-prev {
+	right: 2px;
+	left: auto;
+}
+.ui-datepicker-rtl .ui-datepicker-next {
+	left: 2px;
+	right: auto;
+}
+.ui-datepicker-rtl .ui-datepicker-prev:hover {
+	right: 1px;
+	left: auto;
+}
+.ui-datepicker-rtl .ui-datepicker-next:hover {
+	left: 1px;
+	right: auto;
+}
+.ui-datepicker-rtl .ui-datepicker-buttonpane {
+	clear: right;
+}
+.ui-datepicker-rtl .ui-datepicker-buttonpane button {
+	float: left;
+}
+.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current,
+.ui-datepicker-rtl .ui-datepicker-group {
+	float: right;
+}
+.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header,
+.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header {
+	border-right-width: 0;
+	border-left-width: 1px;
+}
+
+/* Component containers
+----------------------------------*/
+.ui-widget {
+	font-family: Trebuchet MS,Tahoma,Verdana,Arial,sans-serif;
+	font-size: 1.1em;
+}
+.ui-widget .ui-widget {
+	font-size: 1em;
+}
+.ui-widget input,
+.ui-widget select,
+.ui-widget textarea,
+.ui-widget button {
+	font-family: Trebuchet MS,Tahoma,Verdana,Arial,sans-serif;
+	font-size: 1em;
+}
+.ui-widget-content {
+	border: 1px solid #dddddd;
+	background: #eeeeee url(../img/datepicker/ui-bg_highlight-soft_100_eeeeee_1x100.png) 50% top repeat-x;
+	color: #333333;
+}
+.ui-widget-content a {
+	color: #333333;
+}
+.ui-widget-header {
+	border: 1px solid #e78f08;
+	background: #f6a828 url(../img/datepicker/ui-bg_gloss-wave_35_f6a828_500x100.png) 50% 50% repeat-x;
+	color: #ffffff;
+	font-weight: bold;
+}
+.ui-widget-header a {
+	color: #ffffff;
+}
+
+/* Interaction states
+----------------------------------*/
+.ui-state-default,
+.ui-widget-content .ui-state-default,
+.ui-widget-header .ui-state-default {
+	border: 1px solid #cccccc;
+	background: #f6f6f6 url(../img/datepicker/ui-bg_glass_100_f6f6f6_1x400.png) 50% 50% repeat-x;
+	font-weight: bold;
+	color: #1c94c4;
+}
+.ui-state-default a,
+.ui-state-default a:link,
+.ui-state-default a:visited {
+	color: #1c94c4;
+	text-decoration: none;
+}
+.ui-state-hover,
+.ui-widget-content .ui-state-hover,
+.ui-widget-header .ui-state-hover,
+.ui-state-focus,
+.ui-widget-content .ui-state-focus,
+.ui-widget-header .ui-state-focus {
+	border: 1px solid #fbcb09;
+	background: #fdf5ce url(../img/datepicker/ui-bg_glass_100_fdf5ce_1x400.png) 50% 50% repeat-x;
+	font-weight: bold;
+	color: #c77405;
+}
+.ui-state-hover a,
+.ui-state-hover a:hover,
+.ui-state-hover a:link,
+.ui-state-hover a:visited {
+	color: #c77405;
+	text-decoration: none;
+}
+.ui-state-active,
+.ui-widget-content .ui-state-active,
+.ui-widget-header .ui-state-active {
+	border: 1px solid #fbd850;
+	background: #ffffff url(../img/datepicker/ui-bg_glass_65_ffffff_1x400.png) 50% 50% repeat-x;
+	font-weight: bold;
+	color: #eb8f00;
+}
+.ui-state-active a,
+.ui-state-active a:link,
+.ui-state-active a:visited {
+	color: #eb8f00;
+	text-decoration: none;
+}
+
+/* Interaction Cues
+----------------------------------*/
+.ui-state-highlight,
+.ui-widget-content .ui-state-highlight,
+.ui-widget-header .ui-state-highlight {
+	border: 1px solid #fed22f;
+	background: #ffe45c url(../img/datepicker/ui-bg_highlight-soft_75_ffe45c_1x100.png) 50% top repeat-x;
+	color: #363636;
+}
+.ui-state-highlight a,
+.ui-widget-content .ui-state-highlight a,
+.ui-widget-header .ui-state-highlight a {
+	color: #363636;
+}
+.ui-state-error,
+.ui-widget-content .ui-state-error,
+.ui-widget-header .ui-state-error {
+	border: 1px solid #cd0a0a;
+	background: #b81900 url(../img/datepicker/ui-bg_diagonals-thick_18_b81900_40x40.png) 50% 50% repeat;
+	color: #ffffff;
+}
+.ui-state-error a,
+.ui-widget-content .ui-state-error a,
+.ui-widget-header .ui-state-error a {
+	color: #ffffff;
+}
+.ui-state-error-text,
+.ui-widget-content .ui-state-error-text,
+.ui-widget-header .ui-state-error-text {
+	color: #ffffff;
+}
+.ui-priority-primary,
+.ui-widget-content .ui-priority-primary,
+.ui-widget-header .ui-priority-primary {
+	font-weight: bold;
+}
+.ui-priority-secondary,
+.ui-widget-content .ui-priority-secondary,
+.ui-widget-header .ui-priority-secondary {
+	opacity: .7;
+	filter:Alpha(Opacity=70);
+	font-weight: normal;
+}
+.ui-state-disabled,
+.ui-widget-content .ui-state-disabled,
+.ui-widget-header .ui-state-disabled {
+	opacity: .35;
+	filter:Alpha(Opacity=35);
+	background-image: none;
+}
+.ui-state-disabled .ui-icon {
+	filter:Alpha(Opacity=35); /* For IE8 - See #6059 */
+}
+
+/* Icons
+----------------------------------*/
+
+/* states and images */
+.ui-icon {
+	width: 16px;
+	height: 16px;
+	background-position: 16px 16px;
+}
+.ui-icon,
+.ui-widget-content .ui-icon {
+	background-image: url(../img/datepicker/ui-icons_222222_256x240.png);
+}
+.ui-widget-header .ui-icon {
+	background-image: url(../img/datepicker/ui-icons_ffffff_256x240.png);
+}
+.ui-state-default .ui-icon {
+	background-image: url(../img/datepicker/ui-icons_ef8c08_256x240.png);
+}
+.ui-state-hover .ui-icon,
+.ui-state-focus .ui-icon {
+	background-image: url(../img/datepicker/ui-icons_ef8c08_256x240.png);
+}
+.ui-state-active .ui-icon {
+	background-image: url(../img/datepicker/ui-icons_ef8c08_256x240.png);
+}
+.ui-state-highlight .ui-icon {
+	background-image: url(../img/datepicker/ui-icons_228ef1_256x240.png);
+}
+.ui-state-error .ui-icon,
+.ui-state-error-text .ui-icon {
+	background-image: url(../img/datepicker/ui-icons_ffd27a_256x240.png);
+}
+
+/* positioning */
+.ui-icon-carat-1-n { background-position: 0 0; }
+.ui-icon-carat-1-ne { background-position: -16px 0; }
+.ui-icon-carat-1-e { background-position: -32px 0; }
+.ui-icon-carat-1-se { background-position: -48px 0; }
+.ui-icon-carat-1-s { background-position: -64px 0; }
+.ui-icon-carat-1-sw { background-position: -80px 0; }
+.ui-icon-carat-1-w { background-position: -96px 0; }
+.ui-icon-carat-1-nw { background-position: -112px 0; }
+.ui-icon-carat-2-n-s { background-position: -128px 0; }
+.ui-icon-carat-2-e-w { background-position: -144px 0; }
+.ui-icon-triangle-1-n { background-position: 0 -16px; }
+.ui-icon-triangle-1-ne { background-position: -16px -16px; }
+.ui-icon-triangle-1-e { background-position: -32px -16px; }
+.ui-icon-triangle-1-se { background-position: -48px -16px; }
+.ui-icon-triangle-1-s { background-position: -64px -16px; }
+.ui-icon-triangle-1-sw { background-position: -80px -16px; }
+.ui-icon-triangle-1-w { background-position: -96px -16px; }
+.ui-icon-triangle-1-nw { background-position: -112px -16px; }
+.ui-icon-triangle-2-n-s { background-position: -128px -16px; }
+.ui-icon-triangle-2-e-w { background-position: -144px -16px; }
+.ui-icon-arrow-1-n { background-position: 0 -32px; }
+.ui-icon-arrow-1-ne { background-position: -16px -32px; }
+.ui-icon-arrow-1-e { background-position: -32px -32px; }
+.ui-icon-arrow-1-se { background-position: -48px -32px; }
+.ui-icon-arrow-1-s { background-position: -64px -32px; }
+.ui-icon-arrow-1-sw { background-position: -80px -32px; }
+.ui-icon-arrow-1-w { background-position: -96px -32px; }
+.ui-icon-arrow-1-nw { background-position: -112px -32px; }
+.ui-icon-arrow-2-n-s { background-position: -128px -32px; }
+.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; }
+.ui-icon-arrow-2-e-w { background-position: -160px -32px; }
+.ui-icon-arrow-2-se-nw { background-position: -176px -32px; }
+.ui-icon-arrowstop-1-n { background-position: -192px -32px; }
+.ui-icon-arrowstop-1-e { background-position: -208px -32px; }
+.ui-icon-arrowstop-1-s { background-position: -224px -32px; }
+.ui-icon-arrowstop-1-w { background-position: -240px -32px; }
+.ui-icon-arrowthick-1-n { background-position: 0 -48px; }
+.ui-icon-arrowthick-1-ne { background-position: -16px -48px; }
+.ui-icon-arrowthick-1-e { background-position: -32px -48px; }
+.ui-icon-arrowthick-1-se { background-position: -48px -48px; }
+.ui-icon-arrowthick-1-s { background-position: -64px -48px; }
+.ui-icon-arrowthick-1-sw { background-position: -80px -48px; }
+.ui-icon-arrowthick-1-w { background-position: -96px -48px; }
+.ui-icon-arrowthick-1-nw { background-position: -112px -48px; }
+.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; }
+.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; }
+.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; }
+.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; }
+.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; }
+.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; }
+.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; }
+.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; }
+.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; }
+.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; }
+.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; }
+.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; }
+.ui-icon-arrowreturn-1-w { background-position: -64px -64px; }
+.ui-icon-arrowreturn-1-n { background-position: -80px -64px; }
+.ui-icon-arrowreturn-1-e { background-position: -96px -64px; }
+.ui-icon-arrowreturn-1-s { background-position: -112px -64px; }
+.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; }
+.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; }
+.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; }
+.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; }
+.ui-icon-arrow-4 { background-position: 0 -80px; }
+.ui-icon-arrow-4-diag { background-position: -16px -80px; }
+.ui-icon-extlink { background-position: -32px -80px; }
+.ui-icon-newwin { background-position: -48px -80px; }
+.ui-icon-refresh { background-position: -64px -80px; }
+.ui-icon-shuffle { background-position: -80px -80px; }
+.ui-icon-transfer-e-w { background-position: -96px -80px; }
+.ui-icon-transferthick-e-w { background-position: -112px -80px; }
+.ui-icon-folder-collapsed { background-position: 0 -96px; }
+.ui-icon-folder-open { background-position: -16px -96px; }
+.ui-icon-document { background-position: -32px -96px; }
+.ui-icon-document-b { background-position: -48px -96px; }
+.ui-icon-note { background-position: -64px -96px; }
+.ui-icon-mail-closed { background-position: -80px -96px; }
+.ui-icon-mail-open { background-position: -96px -96px; }
+.ui-icon-suitcase { background-position: -112px -96px; }
+.ui-icon-comment { background-position: -128px -96px; }
+.ui-icon-person { background-position: -144px -96px; }
+.ui-icon-print { background-position: -160px -96px; }
+.ui-icon-trash { background-position: -176px -96px; }
+.ui-icon-locked { background-position: -192px -96px; }
+.ui-icon-unlocked { background-position: -208px -96px; }
+.ui-icon-bookmark { background-position: -224px -96px; }
+.ui-icon-tag { background-position: -240px -96px; }
+.ui-icon-home { background-position: 0 -112px; }
+.ui-icon-flag { background-position: -16px -112px; }
+.ui-icon-calendar { background-position: -32px -112px; }
+.ui-icon-cart { background-position: -48px -112px; }
+.ui-icon-pencil { background-position: -64px -112px; }
+.ui-icon-clock { background-position: -80px -112px; }
+.ui-icon-disk { background-position: -96px -112px; }
+.ui-icon-calculator { background-position: -112px -112px; }
+.ui-icon-zoomin { background-position: -128px -112px; }
+.ui-icon-zoomout { background-position: -144px -112px; }
+.ui-icon-search { background-position: -160px -112px; }
+.ui-icon-wrench { background-position: -176px -112px; }
+.ui-icon-gear { background-position: -192px -112px; }
+.ui-icon-heart { background-position: -208px -112px; }
+.ui-icon-star { background-position: -224px -112px; }
+.ui-icon-link { background-position: -240px -112px; }
+.ui-icon-cancel { background-position: 0 -128px; }
+.ui-icon-plus { background-position: -16px -128px; }
+.ui-icon-plusthick { background-position: -32px -128px; }
+.ui-icon-minus { background-position: -48px -128px; }
+.ui-icon-minusthick { background-position: -64px -128px; }
+.ui-icon-close { background-position: -80px -128px; }
+.ui-icon-closethick { background-position: -96px -128px; }
+.ui-icon-key { background-position: -112px -128px; }
+.ui-icon-lightbulb { background-position: -128px -128px; }
+.ui-icon-scissors { background-position: -144px -128px; }
+.ui-icon-clipboard { background-position: -160px -128px; }
+.ui-icon-copy { background-position: -176px -128px; }
+.ui-icon-contact { background-position: -192px -128px; }
+.ui-icon-image { background-position: -208px -128px; }
+.ui-icon-video { background-position: -224px -128px; }
+.ui-icon-script { background-position: -240px -128px; }
+.ui-icon-alert { background-position: 0 -144px; }
+.ui-icon-info { background-position: -16px -144px; }
+.ui-icon-notice { background-position: -32px -144px; }
+.ui-icon-help { background-position: -48px -144px; }
+.ui-icon-check { background-position: -64px -144px; }
+.ui-icon-bullet { background-position: -80px -144px; }
+.ui-icon-radio-on { background-position: -96px -144px; }
+.ui-icon-radio-off { background-position: -112px -144px; }
+.ui-icon-pin-w { background-position: -128px -144px; }
+.ui-icon-pin-s { background-position: -144px -144px; }
+.ui-icon-play { background-position: 0 -160px; }
+.ui-icon-pause { background-position: -16px -160px; }
+.ui-icon-seek-next { background-position: -32px -160px; }
+.ui-icon-seek-prev { background-position: -48px -160px; }
+.ui-icon-seek-end { background-position: -64px -160px; }
+.ui-icon-seek-start { background-position: -80px -160px; }
+/* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */
+.ui-icon-seek-first { background-position: -80px -160px; }
+.ui-icon-stop { background-position: -96px -160px; }
+.ui-icon-eject { background-position: -112px -160px; }
+.ui-icon-volume-off { background-position: -128px -160px; }
+.ui-icon-volume-on { background-position: -144px -160px; }
+.ui-icon-power { background-position: 0 -176px; }
+.ui-icon-signal-diag { background-position: -16px -176px; }
+.ui-icon-signal { background-position: -32px -176px; }
+.ui-icon-battery-0 { background-position: -48px -176px; }
+.ui-icon-battery-1 { background-position: -64px -176px; }
+.ui-icon-battery-2 { background-position: -80px -176px; }
+.ui-icon-battery-3 { background-position: -96px -176px; }
+.ui-icon-circle-plus { background-position: 0 -192px; }
+.ui-icon-circle-minus { background-position: -16px -192px; }
+.ui-icon-circle-close { background-position: -32px -192px; }
+.ui-icon-circle-triangle-e { background-position: -48px -192px; }
+.ui-icon-circle-triangle-s { background-position: -64px -192px; }
+.ui-icon-circle-triangle-w { background-position: -80px -192px; }
+.ui-icon-circle-triangle-n { background-position: -96px -192px; }
+.ui-icon-circle-arrow-e { background-position: -112px -192px; }
+.ui-icon-circle-arrow-s { background-position: -128px -192px; }
+.ui-icon-circle-arrow-w { background-position: -144px -192px; }
+.ui-icon-circle-arrow-n { background-position: -160px -192px; }
+.ui-icon-circle-zoomin { background-position: -176px -192px; }
+.ui-icon-circle-zoomout { background-position: -192px -192px; }
+.ui-icon-circle-check { background-position: -208px -192px; }
+.ui-icon-circlesmall-plus { background-position: 0 -208px; }
+.ui-icon-circlesmall-minus { background-position: -16px -208px; }
+.ui-icon-circlesmall-close { background-position: -32px -208px; }
+.ui-icon-squaresmall-plus { background-position: -48px -208px; }
+.ui-icon-squaresmall-minus { background-position: -64px -208px; }
+.ui-icon-squaresmall-close { background-position: -80px -208px; }
+.ui-icon-grip-dotted-vertical { background-position: 0 -224px; }
+.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; }
+.ui-icon-grip-solid-vertical { background-position: -32px -224px; }
+.ui-icon-grip-solid-horizontal { background-position: -48px -224px; }
+.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; }
+.ui-icon-grip-diagonal-se { background-position: -80px -224px; }
+
+
+/* Misc visuals
+----------------------------------*/
+
+/* Corner radius */
+.ui-corner-all,
+.ui-corner-top,
+.ui-corner-left,
+.ui-corner-tl {
+	border-top-left-radius: 4px;
+}
+.ui-corner-all,
+.ui-corner-top,
+.ui-corner-right,
+.ui-corner-tr {
+	border-top-right-radius: 4px;
+}
+.ui-corner-all,
+.ui-corner-bottom,
+.ui-corner-left,
+.ui-corner-bl {
+	border-bottom-left-radius: 4px;
+}
+.ui-corner-all,
+.ui-corner-bottom,
+.ui-corner-right,
+.ui-corner-br {
+	border-bottom-right-radius: 4px;
+}
+
+/* Overlays */
+.ui-widget-overlay {
+	background: #666666 url(../img/datepicker/ui-bg_diagonals-thick_20_666666_40x40.png) 50% 50% repeat;
+	opacity: .5;
+	filter: Alpha(Opacity=50);
+}
+.ui-widget-shadow {
+	margin: -5px 0 0 -5px;
+	padding: 5px;
+	background: #000000 url(../img/datepicker/ui-bg_flat_10_000000_40x100.png) 50% 50% repeat-x;
+	opacity: .2;
+	filter: Alpha(Opacity=20);
+	border-radius: 5px;
+}

assets/css/src/datepicker/melon.datepicker.css

@@ -0,0 +1,115 @@
+/**
+ * Melon skin from: https://github.com/rtsinani/jquery-datepicker-skins
+ */
+
+.wp-admin {
+	font-size: 90%;
+}
+
+.wp-admin .ui-widget {
+	font-family: "Lucida Grande", "Lucida Sans Unicode", Helvetica, Arial, Verdana, sans-serif;
+	background: #2e3641;
+	border: none;
+	border-radius: 0;
+	-webkit-border-radius: 0;
+	-moz-border-radius: 0;
+}
+
+.wp-admin .ui-datepicker {
+	padding: 0;
+}
+
+.wp-admin .ui-datepicker-header {
+	border: none;
+	background: transparent;
+	font-weight: normal;
+	font-size: 15px;
+}
+
+.wp-admin .ui-datepicker-header .ui-state-hover {
+	background: transparent;
+	border-color: transparent;
+	cursor: pointer;
+	border-radius: 0;
+	-webkit-border-radius: 0;
+	-moz-border-radius: 0;
+}
+
+.wp-admin .ui-datepicker .ui-datepicker-title {
+	margin-top: .4em;
+	margin-bottom: .3em;
+	color: #e9f0f4;
+}
+
+.wp-admin .ui-datepicker .ui-datepicker-prev-hover,
+.wp-admin .ui-datepicker .ui-datepicker-next-hover,
+.wp-admin .ui-datepicker .ui-datepicker-next,
+.wp-admin .ui-datepicker .ui-datepicker-prev {
+	top: .9em;
+	border:none;
+}
+
+.wp-admin .ui-datepicker .ui-datepicker-prev-hover {
+	left: 2px;
+}
+
+.wp-admin .ui-datepicker .ui-datepicker-next-hover {
+	right: 2px;
+}
+
+.wp-admin .ui-datepicker .ui-datepicker-next span,
+.wp-admin .ui-datepicker .ui-datepicker-prev span {
+	background-image: url(../img/datepicker/ui-icons_ffffff_256x240.png);
+	background-position: -32px 0;
+	margin-top: 0;
+	top: 0;
+	font-weight: normal;
+}
+
+.wp-admin .ui-datepicker .ui-datepicker-prev span {
+	background-position: -96px 0;
+}
+
+.wp-admin .ui-datepicker table {
+	margin: 0;
+}
+
+.wp-admin .ui-datepicker th {
+	padding: 1em 0;
+	color: #ccc;
+	font-size: 13px;
+	font-weight: normal;
+	border: none;
+	border-top: 1px solid #3a414d;
+}
+
+.wp-admin .ui-datepicker td {
+	background: #f97e76;
+	border: none;
+	padding: 0;
+}
+
+.wp-admin td .ui-state-default {
+	background: transparent;
+	border: none;
+	text-align: center;
+	padding: .5em;
+	margin: 0;
+	font-weight: normal;
+	color: #efefef;
+	font-size: 16px;
+}
+
+.wp-admin .ui-state-disabled  {
+	opacity: 1;
+}
+
+.wp-admin .ui-state-disabled .ui-state-default {
+	color: #fba49e;
+}
+
+.wp-admin td .ui-state-active,
+.wp-admin td .ui-state-hover {
+	background: #2e3641;
+}
+

assets/css/src/form.styl

@@ -1,2 +1,5 @@
+.mailpoet_form
+  margin: 0 0 20px 0
+
 .mailpoet_form td
-  vertical-align: top !important
+  vertical-align: top !important

assets/css/src/form_editor.styl

@@ -1,6 +1,12 @@
+@require 'codemirror/lib/codemirror.css'
+@require 'codemirror/theme/neo.css'
+
 icons = '../img/form_editor_icons.png'
 handle_icon = '../img/handle.png'
 
+#mailpoet_form_name
+  font-size: 23px
+
 #mailpoet_form_history
   display: none
 
@@ -96,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
@@ -118,6 +125,7 @@ handle_icon = '../img/handle.png'
   float: none
 
 #mailpoet_form_toolbar
+  z-index: 999
   position: absolute
   width: 400px
 
@@ -555,3 +563,6 @@ handle_icon = '../img/handle.png'
 .CodeMirror
   border: 1px solid #eee
 
+/* Settings */
+#mailpoet_form_segments.parsley-error + span .select2-selection
+  border: 1px solid #b94a48

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/listing.styl

@@ -1,4 +1,4 @@
-.mailpoet_listing_loading tbody tr,
+.mailpoet_listing_loading tbody tr
 .mailpoet_form_loading tbody tr
   opacity: 0.2
 
@@ -8,6 +8,20 @@
 .mailpoet_select_all td
   text-align: center
 
-table.widefat thead .check-column,
-table.widefat tfoot .check-column
-  padding: 10px 0 0 3px
+.mailpoet_listing_table
+  th span
+    white-space: nowrap
+
+  thead .check-column
+  tfoot .check-column
+    padding: 10px 0 0 3px
+
+  thead th.column-primary
+  tfoot th.column-primary
+    width: 25em
+
+  // responsive
+  @media screen and (max-width: 782px)
+    thead th.column-primary
+    tfoot th.column-primary
+      width: 100%

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/forms.styl

@@ -37,3 +37,6 @@
 
   input[type=text]
     vertical-align: middle
+
+.mailpoet_form_field_block
+  display: block

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

@@ -38,16 +38,15 @@
       content: '\f142'
 
 .mailpoet_save_show_options_icon
-  width: auto
-  height: auto
-  line-height: auto
+  vertical-align: middle
 
   &::before
     content: '\f140'
 
-.mailpoet_save_as_template_container
+.mailpoet_save_as_template_container,
+.mailpoet_export_template_container
   border-radius(3px)
-  float: left
+  display: inline-block
   clear: both
 
   margin-top: 5px
@@ -55,7 +54,8 @@
   background-color: $white-color
   border: 1px solid $structure-border-color
 
-.mailpoet_save_as_template_title
+.mailpoet_save_as_template_title,
+.mailpoet_export_template_title
   font-size: 1.1em
 
 .mailpoet_editor_last_saved

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
-      overflow: hidden
-      margin-top: 0
+      display: none
 
   .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,12 @@
 
   & > .mailpoet_block
     width: 100%
+
+.mailpoet_automated_latest_content_display_options
+  animation-slide-open-downwards()
+
+.mailpoet_automated_latest_content_show_amount
+  width: 25px
+
+.mailpoet_automated_latest_content_content_type
+  width: 180px

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

@@ -1,4 +1,5 @@
 $block-hover-highlight-color = $primary-active-color
+$block-text-line-height = $text-line-height
 
 .mailpoet_block
   box-sizing: border-box
@@ -22,6 +23,7 @@ $block-hover-highlight-color = $primary-active-color
     border: 1px solid $transparent-color
 
   &:hover > .mailpoet_block_highlight
+  &.mailpoet_highlight > .mailpoet_block_highlight
     border: 1px dashed $block-hover-highlight-color
 
 
@@ -30,3 +32,34 @@ $block-hover-highlight-color = $primary-active-color
 
 .mailpoet_content
   position: relative
+  line-height: $block-text-line-height
+
+  p, h1, h2, h3, h4, h5, h6
+    line-height: $block-text-line-height
+    padding: 0
+    margin: 0
+    font-style: normal
+    font-weight: normal
+
+  h1, h2, h3, h4, h5, h6
+    margin-bottom: 0.3em
+
+  p
+    margin-top: 0
+    margin-bottom: 0
+    font-weight: normal
+
+  ul
+    padding: 0
+    margin-top: 10px
+    margin-bottom: 10px
+
+  li
+    margin-top: 0
+    font-weight: normal
+    margin-bottom: 10px
+
+  blockquote
+    margin: 0 0 $block-text-line-height
+    padding-left: 10px
+    border-left: 2px #565656 solid

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

@@ -1,9 +1,4 @@
-$button-vertical-padding = 13px
-
 .mailpoet_button_block
-  padding-top: $button-vertical-padding
-  padding-bottom: $button-vertical-padding
-
   overflow: hidden
 
   .mailpoet_editor_button

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

@@ -1,3 +1,8 @@
+$column-margin = 20px
+$one-column-width = $newsletter-width - (2 * $column-margin)
+$two-column-width = ($newsletter-width / 2) - (2 * $column-margin)
+$three-column-width = ($newsletter-width / 3) - (2 * $column-margin)
+
 .mailpoet_container
   width: 100%
   min-height: 15px
@@ -12,7 +17,7 @@
   padding-left: 0
   padding-right: 0
 
-  &:hover
+  &:hover > .mailpoet_block_highlight
     border: 0
 
 .mailpoet_container_vertical > *
@@ -44,7 +49,7 @@
 
   .mailpoet_container_horizontal > .mailpoet_container_block
     margin-bottom: 0
-    width: 20px + 560px + 20px
+    width: $column-margin + $one-column-width + $column-margin
 
   // More than one column
   & > .mailpoet_container_block > .mailpoet_container > .mailpoet_container_block > .mailpoet_container_horizontal
@@ -57,14 +62,14 @@
     & > .mailpoet_block:first-child:nth-last-child(2) ~ .mailpoet_block
       //padding-left: 20px
       //padding-right: 20px
-      width: 260px + 20px + 20px
+      width: $column-margin + $two-column-width + $column-margin
 
     // Three columns
     & > .mailpoet_block:first-child:nth-last-child(3)
     & > .mailpoet_block:first-child:nth-last-child(3) ~ .mailpoet_block
       //padding-left: 20px
       //padding-right: 20px
-      width: 160px + 20px + 20px
+      width: $column-margin + $three-column-width + $column-margin
 
 .mailpoet_container_empty
   text-align: center
@@ -74,3 +79,4 @@
   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/footer.styl

@@ -1,6 +1,10 @@
 .mailpoet_footer_block
   padding-left: 0
   padding-right: 0
+  margin-bottom: 0
 
   .mailpoet_content
-    padding: 5px 20px
+    padding: 10px 20px
+
+    & > *:last-child
+      margin-bottom: 0

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

@@ -1,6 +1,10 @@
 .mailpoet_header_block
   padding-left: 0
   padding-right: 0
+  margin-bottom: 0
 
   .mailpoet_content
-    padding: 5px 20px
+    padding: 10px 20px
+
+    & > *:last-child
+      margin-bottom: 0

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

@@ -1,5 +1,11 @@
 .mailpoet_image_block
 
+  img
+    vertical-align: bottom
+    max-width: 100%
+    width: auto
+    height: auto
+
   &.mailpoet_full_image
     padding-left: 0
     padding-right: 0
@@ -8,8 +14,3 @@
   .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
-    font-size: 1em
-    text-align: center
-    background-color: $primary-active-color
-    margin: 20px 0
-    padding: 15px
-    box-shadow(inset 1px 2px 1px $primary-inset-shadow-color)
-    color: $white-color
-    border-radius(3px)
+.mailpoet_posts_block_posts
+  overflow: auto
+
+  & > .mailpoet_block
+    width: 100%
 
 .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/contentBlocks/social.styl

@@ -1,4 +1,4 @@
-$social-block-vertical-padding = 11px
+$social-block-vertical-padding = 0px
 
 $social-icon-width = 32px
 $active-social-icon-set-border-color = #adadad

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

@@ -1,17 +1,13 @@
-$text-vertical-padding = 3px
-
 .mailpoet_text_block
   padding-left: 0
   padding-right: 0
 
   & > .mailpoet_content
     overflow: hidden
-    padding-top: 13px
-    padding-bottom: 13px
+    padding-top: 0
+    padding-bottom: 0px
     padding-left: 20px
     padding-right: 20px
 
-blockquote
-  margin: 1em
-  padding-left: 1em
-  border-left: 2px #565656 solid
+    & > *:last-child
+      margin-bottom: 0

assets/css/src/newsletter_editor/libraryOverrides.styl

@@ -1,12 +1,25 @@
 /* Fix select2 z-index to work with MailPoet.Modal */
-.select2-drop
-  z-index: 101000
+.select2-dropdown
+  z-index: 101000 !important
 
 /* Remove input field styles from select2 type input */
 .select2-container
   border: none
   padding: 0
 
+/* Fix select2 input glow and margins that wordpress may insert */
+.select2 input,
+.select2 input:focus
+  border-color: none
+  box-shadow: none
+
+  margin: 0
+  padding: 0
+
+/* Fix width overrides for select2 */
+.mailpoet_editor_settings .select2-container
+  width: 100% !important
+
 /* Fix inline TinyMCE toolbar to have minimal width instead of being close to 100% of the screen */
 div.mce-toolbar-grp.mce-container
   position: absolute
@@ -18,7 +31,7 @@ div.mce-toolbar-grp.mce-container
   box-shadow(0px 0px 3px 1px rgba(0, 0, 0, 0.05))
 
 .mce-window
-  /* Fix TinyMCE mailpoet_custom_fields window lack of hiding overflow */
+  /* Fix TinyMCE mailpoet_shortcodes window lack of hiding overflow */
   div.mce-container-body.mce-abs-layout
     overflow: hidden
 
@@ -27,8 +40,8 @@ div.mce-toolbar-grp.mce-container
     width: -webkit-calc( 100% - 36px )
     width: calc( 100% - 36px )
 
-/* TinyMCE mailpoet_custom_fields toolbar icon */
-.mce-i-mailpoet_custom_fields:before
+/* TinyMCE mailpoet_shortcodes toolbar icon */
+.mce-i-mailpoet_shortcodes:before
   font: 400 20px/1 dashicons!important
   content: "\f307"
 
@@ -116,3 +129,21 @@ body
 
 #mailpoet_modal_close
   display: none
+
+.wrap > .mailpoet_notice,
+.update-nag
+  margin-left: 2px + 15px !important
+
+/* Make a button group */
+.mailpoet_button_group
+
+  .button:first-child
+    border-right: 0
+    border-top-right-radius: 0
+    border-bottom-right-radius: 0
+
+  .button:last-child
+    border-left: 0
+    border-top-left-radius: 0
+    border-bottom-left-radius: 0
+

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/newsletter_editor/variables.styl

@@ -23,4 +23,6 @@ $warning-alternate-text-color = #f4c6c8
 $error-text-color = #d54e21
 
 // Dimensions
-$newsletter-width = 600px
+$newsletter-width = 660px
+
+$text-line-height = 1.6em

assets/css/src/parsley.styl

@@ -0,0 +1,27 @@
+input.parsley-success,
+select.parsley-success,
+textarea.parsley-success
+  color #468847
+  background-color #DFF0D8
+  border 1px solid #D6E9C6
+
+input.parsley-error,
+select.parsley-error,
+textarea.parsley-error
+  color #B94A48
+  background-color #F2DEDE
+  border 1px solid #EED3D7
+
+.parsley-errors-list
+  margin 2px 0 3px
+  padding 0
+  list-style-type none
+  font-size 0.9em
+  line-height 0.9em
+  opacity 0
+  transition all .3s ease-in
+  -o-transition all .3s ease-in
+  -moz-transition all .3s ease-in
+  -webkit-transition all .3s ease-in
+  &.filled
+    opacity 1

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

@@ -0,0 +1,14 @@
+@import 'nib'
+
+@require 'parsley'
+@require 'form_validation'
+
+/* labels */
+.mailpoet_text_label
+.mailpoet_textarea_label
+.mailpoet_select_label
+.mailpoet_radio_label
+.mailpoet_checkbox_label
+.mailpoet_list_label
+.mailpoet_date_label
+  display:block

assets/css/src/subscribers.styl

@@ -0,0 +1,3 @@
+#subscribers_container
+  .mailpoet_segments_unsubscribed
+    color: lighten(#555, 33)

assets/css/src/validation_engine.styl

@@ -1,141 +0,0 @@
-lesscss-percentage(n)
-  (n * 100)%
-popupBg = rgb(0, 87, 154, 1)
-popupTextColor = rgb(255, 255, 255, 1)
-borderColor = rgb(255, 255, 255, 1)
-borderWidth = 1px
-popupFontSize = 12px
-popupRadius = 0
-popupShadowWidth = 2px
-popupShadowColor = rgb(51, 51, 51, 1)
-/* Z-INDEX */
-.formError
-  z-index 990
-.formError .formErrorContent
-  z-index 991
-.formError .formErrorArrow
-  z-index 996
-.ui-dialog .formError
-  z-index 5000
-.ui-dialog .formError .formErrorContent
-  z-index 5001
-.ui-dialog .formError .formErrorArrow
-  z-index 5006
-.inputContainer
-  position relative
-  float left
-.formError
-  position absolute
-  top 300px
-  left 300px
-  display block
-  cursor pointer
-  text-align left
-.formError.inline
-  position relative
-  top 0
-  left 0
-  display inline-block
-.ajaxSubmit
-  padding 20px
-  background #55ea55
-  border 1px solid #999
-  display none
-.formError .formErrorContent
-  width 100%
-  background popupBg
-  position relative
-  color popupTextColor
-  min-width 120px
-  font-size popupFontSize
-  border borderWidth solid borderColor
-  box-shadow 0 0 popupShadowWidth popupShadowColor
-  -moz-box-shadow 0 0 popupShadowWidth popupShadowColor
-  -webkit-box-shadow 0 0 popupShadowWidth popupShadowColor
-  -o-box-shadow 0 0 popupShadowWidth popupShadowColor
-  padding 4px 10px 4px 10px
-  border-radius popupRadius
-  -moz-border-radius popupRadius
-  -webkit-border-radius popupRadius
-  -o-border-radius popupRadius
-.formError.inline .formErrorContent
-  box-shadow none
-  -moz-box-shadow none
-  -webkit-box-shadow none
-  -o-box-shadow none
-  border none
-  border-radius 0
-  -moz-border-radius 0
-  -webkit-border-radius 0
-  -o-border-radius 0
-.greenPopup .formErrorContent
-  background #33be40
-.blackPopup .formErrorContent
-  background #393939
-  color #FFF
-.formError .formErrorArrow
-  width 15px
-  margin -2px 0 0 13px
-  position relative
-body[dir='rtl'] .formError .formErrorArrow, body.rtl .formError .formErrorArrow
-  margin -2px 13px 0 0
-.formError .formErrorArrowBottom
-  box-shadow none
-  -moz-box-shadow none
-  -webkit-box-shadow none
-  -o-box-shadow none
-  margin 0px 0 0 12px
-  top 2px
-.formError .formErrorArrow div
-  border-left borderWidth solid borderColor
-  border-right borderWidth solid borderColor
-  box-shadow 0 ceil((popupShadowWidth / 3)) ceil((popupShadowWidth / 2)) lighten(popupShadowColor, 10%)
-  -moz-box-shadow 0 ceil((popupShadowWidth / 3)) ceil((popupShadowWidth / 2)) lighten(popupShadowColor, 10%)
-  -webkit-box-shadow 0 ceil((popupShadowWidth / 3)) ceil((popupShadowWidth / 2)) lighten(popupShadowColor, 10%)
-  -o-box-shadow 0 ceil((popupShadowWidth / 3)) ceil((popupShadowWidth / 2)) lighten(popupShadowColor, 10%)
-  font-size 0px
-  height 1px
-  background popupBg
-  margin 0 auto
-  line-height 0
-  font-size 0
-  display block
-.formError .formErrorArrowBottom div
-  box-shadow none
-  -moz-box-shadow none
-  -webkit-box-shadow none
-  -o-box-shadow none
-.greenPopup .formErrorArrow div
-  background #33be40
-.blackPopup .formErrorArrow div
-  background #393939
-  color #FFF
-.formError .formErrorArrow .line10
-  width 13px
-  border none
-.formError .formErrorArrow .line9
-  width 11px
-  border none
-.formError .formErrorArrow .line8
-  width 11px
-.formError .formErrorArrow .line7
-  width 9px
-.formError .formErrorArrow .line6
-  width 7px
-.formError .formErrorArrow .line5
-  width 5px
-.formError .formErrorArrow .line4
-  width 3px
-.formError .formErrorArrow .line3
-  width ceil((borderWidth / 2))
-  border-left borderWidth solid borderColor
-  border-right borderWidth solid borderColor
-  border-bottom 0 solid borderColor
-.formError .formErrorArrow .line2
-  width 3px
-  border none
-  background borderColor
-.formError .formErrorArrow .line1
-  width 1px
-  border none
-  background borderColor

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/lib/mailpoet_custom_fields

@@ -1 +0,0 @@
-../src/newsletter_editor/tinymce/mailpoet_custom_fields

assets/js/lib/mailpoet_shortcodes

@@ -0,0 +1 @@
+../src/newsletter_editor/tinymce/mailpoet_shortcodes

assets/js/src/cron.jsx

@@ -0,0 +1,100 @@
+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(MailPoet.I18n.t('daemonControlError'));
+        }
+      }.bind(this));
+    },
+    render: function() {
+      if(this.state.status === 'loading') {
+        return(<div>{MailPoet.I18n.t('loadingDaemonStatus')}</div>);
+      }
+      switch(this.state.status) {
+        case 'started':
+          return(
+            <div>
+              {MailPoet.I18n.t('cronDaemonIsRunning')}
+              <br/>
+              <br/>
+              <a href="#" className="button-primary" onClick={this.controlCron.bind(null, 'stop')}>{MailPoet.I18n.t('stop')}</a>
+            </div>
+          );
+        break;
+        case 'starting':
+        case 'stopping':
+          return(
+            <div>
+              {MailPoet.I18n.t('cronDaemonState').replace('%$1s', this.state.status)}
+            </div>
+          );
+        break;
+        case 'stopped':
+          return(
+            <div>
+              {MailPoet.I18n.t('cronDaemonState').replace('%$1s', this.state.status)}
+              <br />
+              <br />
+              <a href="#" className="button-primary" onClick={this.controlCron.bind(null, 'start')}>{MailPoet.I18n.t('start')}</a>
+            </div>
+          );
+        break;
+      }
+    }
+  });
+
+  const container = document.getElementById('cron_container');
+
+  if(container) {
+    ReactDOM.render(
+      <CronControl />,
+      container
+    );
+  }
+});

assets/js/src/date.js

@@ -0,0 +1,145 @@
+define('date',
+  [
+    'mailpoet',
+    'jquery',
+    'moment'
+  ], function(
+    MailPoet,
+    jQuery,
+    Moment
+) {
+  'use strict';
+
+  MailPoet.Date = {
+    version: 0.1,
+    options: {},
+    defaults: {
+      offset: 0,
+      format: 'F, d Y H:i:s'
+    },
+    init: function(options) {
+      options = options || {};
+
+      // set UTC offset
+      if (
+        options.offset === undefined
+        && window.mailpoet_date_offset !== undefined
+      ) {
+        options.offset = window.mailpoet_date_offset;
+      }
+      // set date format
+      if (
+        options.format === undefined
+        && window.mailpoet_date_format !== undefined
+      ) {
+        options.format = window.mailpoet_date_format;
+      }
+      // merge options
+      this.options = jQuery.extend({}, this.defaults, options);
+
+      return this;
+    },
+    format: function(date, options) {
+      options = options || {};
+      this.init(options);
+
+      return Moment(date, this.convertFormat(options.parseFormat))
+        .format(this.convertFormat(this.options.format));
+    },
+    toDate: function(date, options) {
+      options = options || {};
+      this.init(options);
+
+      return Moment(date, this.convertFormat(options.parseFormat)).toDate();
+    },
+    short: function(date) {
+      return this.format(date, {
+        format: 'F, j Y'
+      });
+    },
+    full: function(date) {
+      return this.format(date, {
+        format: 'F, j Y H:i:s'
+      });
+    },
+    time: function(date) {
+      return this.format(date, {
+        format: 'H:i:s'
+      });
+    },
+    convertFormat: function(format) {
+      const format_mappings = {
+        date: {
+          D: 'ddd',
+          l: 'dddd',
+          d: 'DD',
+          j: 'D',
+          z: 'DDDD',
+          N: 'E',
+          S: '',
+          M: 'MMM',
+          F: 'MMMM',
+          m: 'MM',
+          n: '',
+          t: '',
+          y: 'YY',
+          Y: 'YYYY',
+          H: 'HH',
+          h: 'hh',
+          g: 'h',
+          A: 'A',
+          i: 'mm',
+          s: 'ss',
+          T: 'z',
+          O: 'ZZ',
+          w: 'd',
+          W: 'WW'
+        },
+        strftime: {
+          a: 'ddd',
+          A: 'dddd',
+          b: 'MMM',
+          B: 'MMMM',
+          d: 'DD',
+          e: 'D',
+          F: 'YYYY-MM-DD',
+          H: 'HH',
+          I: 'hh',
+          j: 'DDDD',
+          k: 'H',
+          l: 'h',
+          m: 'MM',
+          M: 'mm',
+          p: 'A',
+          S: 'ss',
+          u: 'E',
+          w: 'd',
+          W: 'WW',
+          y: 'YY',
+          Y: 'YYYY',
+          z: 'ZZ',
+          Z: 'z'
+        }
+      };
+
+      if (!format || format.length <= 0) return format;
+
+      const replacements = format_mappings['date'];
+
+      let outputFormat = '';
+
+      Object.keys(replacements).forEach(function(key) {
+        if (format.indexOf(key) !== -1) {
+          format = format.replace(key, '%'+key);
+        }
+      });
+      outputFormat = format;
+      Object.keys(replacements).forEach(function(key) {
+        if (outputFormat.indexOf('%'+key) !== -1) {
+          outputFormat = outputFormat.replace('%'+key, replacements[key]);
+        }
+      });
+      return outputFormat;
+    }
+  };
+});

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

@@ -1,62 +1,45 @@
 define([
-  'react',
-  'react-checkbox-group'
+  'react'
 ],
 function(
-  React,
-  CheckboxGroup
+  React
 ) {
-  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] || '';
-      if(
-        selected_values !== undefined
-        && selected_values.constructor !== Array
-      ) {
-        selected_values = selected_values.split(';').map(function(value) {
-          return value.trim();
-        });
+      if (this.props.field.values === undefined) {
+        return false;
       }
-      var count = Object.keys(this.props.field.values).length;
 
-      var options = Object.keys(this.props.field.values).map(
-        function(value, index) {
+      const isChecked = !!(this.props.item[this.props.field.name]);
+      const options = Object.keys(this.props.field.values).map(
+        (value, index) => {
           return (
             <p key={ 'checkbox-' + index }>
               <label>
-                <input type="checkbox" value={ value } />
-                &nbsp;{ this.props.field.values[value] }
+                <input
+                  ref="checkbox"
+                  type="checkbox"
+                  value="1"
+                  checked={ isChecked }
+                  onChange={ this.onValueChange }
+                  name={ this.props.field.name }
+                />
+                { this.props.field.values[value] }
               </label>
             </p>
           );
-        }.bind(this)
+        }
       );
 
       return (
-        <CheckboxGroup
-          name={ this.props.field.name }
-          value={ selected_values }
-          ref={ this.props.field.name }
-          onChange={ this.handleValueChange }>
+        <div>
           { 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,219 @@
+define([
+  'react',
+  'moment',
+], function(
+  React,
+  Moment
+) {
+  class FormFieldDateYear extends React.Component {
+    render() {
+      const yearsRange = 100;
+      const years = [];
+
+      if (this.props.placeholder !== undefined) {
+        years.push((
+          <option value="" key={ 0 }>{ this.props.placeholder }</option>
+        ));
+      }
+
+      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 = [];
+
+      if (this.props.placeholder !== undefined) {
+        months.push((
+          <option value="" key={ 0 }>{ this.props.placeholder }</option>
+        ));
+      }
+
+      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 = [];
+
+      if (this.props.placeholder !== undefined) {
+        days.push((
+          <option value="" key={ 0 }>{ this.props.placeholder }</option>
+        ));
+      }
+
+      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: undefined,
+        month: undefined,
+        day: undefined
+      }
+    }
+    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 (~~(newTimeStamp) > 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 }
+              placeholder={ this.props.field.year_placeholder }
+            />);
+          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 }
+              placeholder={ this.props.field.month_placeholder }
+            />);
+          break;
+
+          case 'day':
+            return (<FormFieldDateDay
+              onValueChange={ this.onValueChange.bind(this) }
+              ref={ 'day' }
+              key={ 'day' }
+              name={ this.props.field.name }
+              day={ this.state.day }
+              placeholder={ this.props.field.day_placeholder }
+            />);
+          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,14 @@ function(
         case 'selection':
           field = (<FormFieldSelection {...data} />);
         break;
+
+        case 'date':
+          field = (<FormFieldDate {...data} />);
+        break;
+
+        case 'reactComponent':
+          field = (<data.field.component {...data} />);
+        break;
       }
 
       if(inline === true) {
@@ -66,10 +76,10 @@ function(
         );
       } else {
         return (
-          <p key={ 'field-' + (data.index || 0) }>
+          <div key={ 'field-' + (data.index || 0) }>
             { field }
             { description }
-          </p>
+          </div>
         );
       }
     },
@@ -115,4 +125,4 @@ function(
   });
 
   return FormField;
-});
+});

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

@@ -4,13 +4,15 @@ define([
 function(
   React
 ) {
-  var FormFieldRadio = React.createClass({
+  const FormFieldRadio = React.createClass({
     render: function() {
-      var selected_value = this.props.item[this.props.field.name];
-      var count = Object.keys(this.props.field.values).length;
+      if (this.props.field.values === undefined) {
+        return false;
+      }
 
-      var options = Object.keys(this.props.field.values).map(
-        function(value, index) {
+      const selected_value = this.props.item[this.props.field.name];
+      const options = Object.keys(this.props.field.values).map(
+        (value, index) => {
           return (
             <p key={ 'radio-' + index }>
               <label>
@@ -20,11 +22,11 @@ function(
                   value={ value }
                   onChange={ this.props.onValueChange }
                   name={ this.props.field.name } />
-                &nbsp;{ this.props.field.values[value] }
+                { this.props.field.values[value] }
               </label>
             </p>
           );
-        }.bind(this)
+        }
       );
 
       return (

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

@@ -1,34 +1,54 @@
-define([
-  'react'
-],
-function(
-  React
-) {
-  var FormFieldSelect = React.createClass({
-    render: function() {
-      var options =
-        Object.keys(this.props.field.values).map(function(value, index) {
-          return (
-            <option
-              key={ 'option-' + index }
-              value={ value }>
-              { this.props.field.values[value] }
-            </option>
-          );
-        }.bind(this)
-      );
+import React from 'react'
 
-      return (
-        <select
-          name={ this.props.field.name }
-          id={ 'field_'+this.props.field.name }
-          value={ this.props.item[this.props.field.name] }
-          onChange={ this.props.onValueChange }>
-          {options}
-        </select>
+const FormFieldSelect = React.createClass({
+  render() {
+    if (this.props.field.values === undefined) {
+      return false;
+    }
+
+    let filter = false;
+    let placeholder = false;
+
+    if (this.props.field.placeholder !== undefined) {
+      placeholder = (
+        <option value="">{ this.props.field.placeholder }</option>
       );
     }
-  });
 
-  return FormFieldSelect;
-});
+    if (this.props.field['filter'] !== undefined) {
+      filter = this.props.field.filter;
+    }
+
+    const options = Object.keys(this.props.field.values).map(
+      (value, index) => {
+
+        if (filter !== false && filter(this.props.item, value) === false) {
+          return;
+        }
+
+        return (
+          <option
+            key={ 'option-' + index }
+            value={ value }>
+            { this.props.field.values[value] }
+          </option>
+        );
+      }
+    );
+
+    return (
+      <select
+        name={ this.props.field.name }
+        id={ 'field_'+this.props.field.name }
+        value={ this.props.item[this.props.field.name] }
+        onChange={ this.props.onValueChange }
+        {...this.props.field.validation}
+      >
+        {placeholder}
+        {options}
+      </select>
+    );
+  }
+});
+
+module.exports = FormFieldSelect;

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

@@ -1,104 +1,175 @@
 define([
   'react',
+  'react-dom',
   'jquery',
   'select2'
 ],
 function(
   React,
+  ReactDOM,
   jQuery
 ) {
   var Selection = React.createClass({
     getInitialState: function() {
       return {
         items: [],
-        initialized: false
-      }
+        select2: false
+      };
     },
-    componentDidMount: function() {
+    componentWillMount: function() {
       this.loadCachedItems();
     },
-    componentDidUpdate: function() {
-      this.setupSelect2();
+    allowMultipleValues: function() {
+      return (this.props.field.multiple === true);
+    },
+    isSelect2Initialized: function() {
+      return (this.state.select2 === true);
+    },
+    componentDidMount: function() {
+      if(this.allowMultipleValues()) {
+        this.setupSelect2();
+      }
+    },
+    componentDidUpdate: function(prevProps, prevState) {
+      if(
+        (this.props.item !== undefined && prevProps.item !== undefined)
+        && (this.props.item.id !== prevProps.item.id)
+      ) {
+        jQuery('#'+this.refs.select.id)
+          .val(this.getSelectedValues())
+          .trigger('change');
+      }
+    },
+    componentWillUnmount: function() {
+      if(this.allowMultipleValues()) {
+        this.destroySelect2();
+      }
+    },
+    destroySelect2: function() {
+      if(this.isSelect2Initialized()) {
+        jQuery('#'+this.refs.select.id).select2('destroy');
+      }
     },
     setupSelect2: function() {
-      if(this.state.initialized === true) {
+      if(this.isSelect2Initialized()) {
         return;
       }
 
-      if(this.props.field.select2 && Object.keys(this.props.item).length > 0) {
-        var select2 = jQuery('#'+this.props.field.id).select2({
-          width: (this.props.width || ''),
-          templateResult: function(item) {
-            if (item.element && item.element.selected) {
-              return null;
+      var select2 = jQuery('#'+this.refs.select.id).select2({
+        width: (this.props.width || ''),
+        templateResult: function(item) {
+          if(item.element && item.element.selected) {
+            return null;
+          } else {
+            if(item.title) {
+              return item.title;
             } else {
               return item.text;
             }
           }
-        });
+        }
+      });
 
-        select2.on('change', this.handleChange)
+      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.select2(
-          'val',
-          this.props.item[this.props.field.name]
-        );
+      select2.on('change', this.handleChange);
 
-        this.setState({ initialized: true });
+      this.setState({ select2: true });
+    },
+    getSelectedValues: function() {
+      if(this.props.field['selected'] !== undefined) {
+        return this.props.field['selected'](this.props.item);
+      } else if(this.props.item !== undefined && this.props.field.name !== undefined) {
+        return this.props.item[this.props.field.name];
+      } else {
+        return null;
       }
     },
     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
         });
       }
     },
-    handleChange: function() {
+    handleChange: function(e) {
       if(this.props.onValueChange !== undefined) {
+        if(this.props.field.multiple) {
+          value = jQuery('#'+this.refs.select.id).val();
+        } else {
+          value = e.target.value;
+        }
         this.props.onValueChange({
          target: {
-            value: jQuery('#'+this.props.field.id).select2('val'),
+            value: value,
             name: this.props.field.name
           }
         });
       }
-      return true;
+    },
+    getLabel: function(item) {
+      if(this.props.field['getLabel'] !== undefined) {
+        return this.props.field.getLabel(item, this.props.item);
+      }
+      return item.name;
+    },
+    getSearchLabel: function(item) {
+      if(this.props.field['getSearchLabel'] !== undefined) {
+        return this.props.field.getSearchLabel(item, this.props.item);
+      }
+      return null;
+    },
+    getValue: function(item) {
+      if(this.props.field['getValue'] !== undefined) {
+        return this.props.field.getValue(item, this.props.item);
+      }
+      return item.id;
     },
     render: function() {
-      if(this.state.items.length === 0) {
-        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
-        );
+      const options = this.state.items.map((item, index) => {
+        let label = this.getLabel(item);
+        let searchLabel = this.getSearchLabel(item);
+        let value = this.getValue(item);
 
         return (
-          <select
-            id={ this.props.field.id }
-            placeholder={ this.props.field.placeholder }
-            multiple={ this.props.field.multiple }
-            onChange={ this.handleChange }
-            defaultValue={ default_value }
-          >{ options }</select>
+          <option
+            key={ 'option-'+index }
+            value={ value }
+            title={ searchLabel }
+          >
+            { label }
+          </option>
         );
-      }
+      });
+
+      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={ this.getSelectedValues() }
+          {...this.props.field.validation}
+        >{ options }</select>
+      );
     }
   });
 
   return Selection;
-});
+});

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

@@ -1,29 +1,35 @@
-define([
-  'react'
-],
-function(
-  React
-) {
-  var FormFieldText = React.createClass({
-    render: function() {
-      return (
-        <input
-          type="text"
-          className={ (this.props.field.size) ? '' : 'regular-text' }
-          size={
-            (this.props.field.size !== 'auto' && this.props.field.size > 0)
-            ? this.props.field.size
-            : false
-          }
-          name={ this.props.field.name }
-          id={ 'field_'+this.props.field.name }
-          value={ this.props.item[this.props.field.name] }
-          placeholder={ this.props.field.placeholder }
-          defaultValue={ this.props.field.defaultValue }
-          onChange={ this.props.onValueChange } />
-      );
-    }
-  });
+import React from 'react'
 
-  return FormFieldText;
-});
+const FormFieldText = React.createClass({
+  render() {
+    let value = this.props.item[this.props.field.name];
+    if (value === undefined) {
+      value = this.props.field.defaultValue || '';
+    }
+
+    return (
+      <input
+        type="text"
+        disabled={
+          (this.props.field['disabled'] !== undefined)
+          ? this.props.field.disabled(this.props.item)
+          : false
+        }
+        className={ (this.props.field.size) ? '' : 'regular-text' }
+        size={
+          (this.props.field.size !== 'auto' && this.props.field.size > 0)
+          ? this.props.field.size
+          : false
+        }
+        name={ this.props.field.name }
+        id={ 'field_'+this.props.field.name }
+        value={ value }
+        placeholder={ this.props.field.placeholder }
+        onChange={ this.props.onValueChange }
+        {...this.props.field.validation}
+      />
+    );
+  }
+});
+
+module.exports = FormFieldText;

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

@@ -13,10 +13,16 @@ define(
     Router,
     FormField
   ) {
+
     var Form = React.createClass({
-      mixins: [
-        Router.History
-      ],
+      contextTypes: {
+        router: React.PropTypes.object.isRequired
+      },
+      getDefaultProps: function() {
+        return {
+          params: {},
+        };
+      },
       getInitialState: function() {
         return {
           loading: false,
@@ -24,10 +30,20 @@ define(
           item: {}
         };
       },
+      getValues: function() {
+        return this.props.item ? this.props.item : this.state.item;
+      },
+      getErrors: function() {
+        return this.props.errors ? this.props.errors : this.state.errors;
+      },
       componentDidMount: function() {
-        if(this.props.params.id !== undefined) {
-          if(this.isMounted()) {
+        if(this.isMounted()) {
+          if(this.props.params.id !== undefined) {
             this.loadItem(this.props.params.id);
+          } else {
+            this.setState({
+              item: jQuery('.mailpoet_form').serializeObject()
+            });
           }
         }
       },
@@ -37,7 +53,9 @@ define(
             loading: false,
             item: {}
           });
-          this.refs.form.reset();
+          if (props.item === undefined) {
+            this.refs.form.reset();
+          }
         } else {
           this.loadItem(props.params.id);
         }
@@ -48,14 +66,14 @@ define(
         MailPoet.Ajax.post({
           endpoint: this.props.endpoint,
           action: 'get',
-          data: { id: id }
+          data: id
         }).done(function(response) {
           if(response === false) {
             this.setState({
               loading: false,
               item: {}
             }, function() {
-              this.history.pushState(null, '/new');
+              this.context.router.push('/new');
             }.bind(this));
           } else {
             this.setState({
@@ -68,61 +86,106 @@ 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
+        var item = {};
+        this.props.fields.map(function(field) {
+          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
+        if(this.props.params.id !== undefined) {
+          item.id = this.props.params.id;
+        }
+
         MailPoet.Ajax.post({
           endpoint: this.props.endpoint,
           action: 'save',
-          data: this.state.item
+          data: item
         }).done(function(response) {
           this.setState({ loading: false });
 
-          if(response === true) {
-            this.history.pushState(null, '/');
-            if(this.props.params.id !== undefined) {
-              this.props.messages['updated']();
+          if(response.result === true) {
+            if(this.props.onSuccess !== undefined) {
+              this.props.onSuccess();
             } else {
-              this.props.messages['created']();
+              this.context.router.push('/');
+            }
+
+            if(this.props.params.id !== undefined) {
+              this.props.messages.onUpdate();
+            } else {
+              this.props.messages.onCreate();
             }
           } else {
-            if(response === false) {
-              // unknown error occurred
-            } else {
-              this.setState({ errors: response });
+            if(response.result === false) {
+              if(response.errors.length > 0) {
+                this.setState({ errors: response.errors });
+              }
             }
           }
         }.bind(this));
       },
       handleValueChange: function(e) {
-        var item = this.state.item,
-          field = e.target.name;
+        if (this.props.onChange) {
+          return this.props.onChange(e);
+        } else {
+          var item = this.state.item,
+            field = e.target.name;
 
-        item[field] = e.target.value;
+          item[field] = e.target.value;
 
-        this.setState({
-          item: item
-        });
-        return true;
+          this.setState({
+            item: item
+          });
+          return true;
+        }
       },
       render: function() {
-        var errors = this.state.errors.map(function(error, index) {
-          return (
-            <p key={ 'error-'+index } className="mailpoet_error">
-              { error }
-            </p>
-          );
-        });
+        if(this.getErrors() !== undefined) {
+          var errors = this.getErrors().map(function(error, index) {
+            return (
+              <p key={ 'error-'+index } className="mailpoet_error">
+                { error }
+              </p>
+            );
+          });
+        }
 
         var formClasses = classNames(
           'mailpoet_form',
-          { 'mailpoet_form_loading': this.state.loading }
+          { 'mailpoet_form_loading': this.state.loading || this.props.loading }
         );
 
+        var beforeFormContent = false;
+        var afterFormContent = false;
+
+        if (this.props.beforeFormContent !== undefined) {
+          beforeFormContent = this.props.beforeFormContent(this.getValues());
+        }
+
+        if (this.props.afterFormContent !== undefined) {
+          afterFormContent = this.props.afterFormContent(this.getValues());
+        }
+
         var fields = this.props.fields.map(function(field, i) {
           return (
             <FormField
               field={ field }
-              item={ this.state.item }
+              item={ this.getValues() }
               onValueChange={ this.handleValueChange }
               key={ 'field-'+i } />
           );
@@ -136,36 +199,40 @@ define(
             <input
               className="button button-primary"
               type="submit"
-              value="Save"
+              value={MailPoet.I18n.t('save')}
               disabled={this.state.loading} />
           );
         }
 
         return (
-          <form
-            id={ this.props.id }
-            ref="form"
-            className={ formClasses }
-            onSubmit={
-              (this.props.onSubmit !== undefined)
-              ? this.props.onSubmit
-              : this.handleSubmit
-            }
-          >
-            { errors }
+          <div>
+            { beforeFormContent }
+            <form
+              id={ this.props.id }
+              ref="form"
+              className={ formClasses }
+              onSubmit={
+                (this.props.onSubmit !== undefined)
+                ? this.props.onSubmit
+                : this.handleSubmit
+              }
+            >
+              { errors }
 
-            <table className="form-table">
-              <tbody>
-                {fields}
-              </tbody>
-            </table>
+              <table className="form-table">
+                <tbody>
+                  {fields}
+                </tbody>
+              </table>
 
-            { actions }
-          </form>
+              { actions }
+            </form>
+            { afterFormContent }
+          </div>
         );
       }
     });
 
     return Form;
   }
-);
+);

assets/js/src/form_editor.js

@@ -1,993 +0,0 @@
-/*
- * name: MailPoet Form Editor
- * author: Jonathan Labreuille
- * company: Wysija
- * framework: prototype 1.7.2
-*/
-
-'use strict';
-
-Event.cacheDelegated = {};
-Object.extend(document, (function () {
-    var cache = Event.cacheDelegated;
-
-    function getCacheForSelector(selector) {
-        return cache[selector] = cache[selector] || {};
-    }
-
-    function getWrappersForSelector(selector, eventName) {
-        var c = getCacheForSelector(selector);
-        return c[eventName] = c[eventName] || [];
-    }
-
-    function findWrapper(selector, eventName, handler) {
-        var c = getWrappersForSelector(selector, eventName);
-        return c.find(function (wrapper) {
-            return wrapper.handler === handler
-        });
-    }
-
-    function destroyWrapper(selector, eventName, handler) {
-        var c = getCacheForSelector(selector);
-        if (!c[eventName]) return false;
-        var wrapper = findWrapper(selector, eventName, handler)
-        c[eventName] = c[eventName].without(wrapper);
-        return wrapper;
-    }
-
-    function createWrapper(selector, eventName, handler, context) {
-        var wrapper, c = getWrappersForSelector(selector, eventName);
-        if (c.pluck('handler').include(handler)) return false;
-        wrapper = function (event) {
-            var element = event.findElement(selector);
-            if (element) handler.call(context || element, event, element);
-        };
-        wrapper.handler = handler;
-        c.push(wrapper);
-        return wrapper;
-    }
-    return {
-        delegate: function (selector, eventName, handler, context) {
-            var wrapper = createWrapper.apply(null, arguments);
-            if (wrapper) document.observe(eventName, wrapper);
-            return document;
-        },
-        stopDelegating: function (selector, eventName, handler) {
-            var length = arguments.length;
-            switch (length) {
-                case 2:
-                getWrappersForSelector(selector, eventName).each(function (wrapper) {
-                    document.stopDelegating(selector, eventName, wrapper.handler);
-                });
-                break;
-                case 1:
-                Object.keys(getCacheForSelector(selector)).each(function (eventName) {
-                    document.stopDelegating(selector, eventName);
-                });
-                break;
-                case 0:
-                Object.keys(cache).each(function (selector) {
-                    document.stopDelegating(selector);
-                });
-                break;
-                default:
-                var wrapper = destroyWrapper.apply(null, arguments);
-                if (wrapper) document.stopObserving(eventName, wrapper);
-            }
-            return document;
-        }
-    }
-})());
-
-var Observable = (function () {
-    function getEventName(name, namespace) {
-        name = name.substring(2);
-        if (namespace) name = namespace + ':' + name;
-        return name.underscore().split('_').join(':');
-    }
-
-    function getHandlers(klass) {
-        var proto = klass.prototype,
-        namespace = proto.namespace;
-        return Object.keys(proto).grep(/^on/).inject($H(), function (handlers, name) {
-            if (name === 'onDomLoaded') return handlers;
-            handlers.set(getEventName(name, namespace), getWrapper(proto[name], klass));
-            return handlers;
-        });
-    }
-
-    function getWrapper(handler, klass) {
-        return function (event) {
-            return handler.call(new klass(this), event, event.memo);
-        }
-    }
-
-    function onDomLoad(selector, klass) {
-        $$(selector).each(function (element) {
-            new klass(element).onDomLoaded();
-        });
-    }
-    return {
-        observe: function (selector) {
-            if (!this.handlers) this.handlers = {};
-            if (this.handlers[selector]) return;
-            var klass = this;
-            if (this.prototype.onDomLoaded) document.loaded ? onDomLoad(selector, klass) : document.observe('dom:loaded', onDomLoad.curry(selector, klass));
-            this.handlers[selector] = getHandlers(klass).each(function (handler) {
-                document.delegate(selector, handler.key, handler.value);
-            });
-        },
-        stopObserving: function (selector) {
-            if (!this.handlers || !this.handlers[selector]) return;
-            this.handlers[selector].each(function (handler) {
-                document.stopDelegating(selector, handler.key, handler.value);
-            });
-            delete this.handlers[selector];
-        }
-    }
-})();
-
-// override droppables
-Object.extend(Droppables, {
-    deactivate: Droppables.deactivate.wrap(function (proceed, drop, draggable) {
-        if (drop.onLeave) drop.onLeave(draggable, drop.element);
-        return proceed(drop);
-    }),
-    activate: Droppables.activate.wrap(function (proceed, drop, draggable) {
-        if (drop.onEnter) drop.onEnter(draggable, drop.element);
-        return proceed(drop);
-    }),
-    show: function (point, element) {
-        if (!this.drops.length) return;
-        var drop, affected = [];
-        this.drops.each(function (drop) {
-            if (Droppables.isAffected(point, element, drop)) affected.push(drop);
-        });
-        if (affected.length > 0) drop = Droppables.findDeepestChild(affected);
-        if (this.last_active && this.last_active !== drop) this.deactivate(this.last_active, element);
-        if (drop) {
-            Position.within(drop.element, point[0], point[1]);
-            if (drop.onHover) drop.onHover(element, drop.element, Position.overlap(drop.overlap, drop.element));
-            if (drop !== this.last_active) Droppables.activate(drop, element);
-        }
-    },
-    displayArea: function(draggable) {
-        if(!this.drops.length) return;
-
-        // hide controls when displaying drop areas.
-        WysijaForm.hideBlockControls();
-
-        this.drops.each(function (drop, iterator) {
-            if(drop.element.hasClassName('block_placeholder')) {
-                drop.element.addClassName('active');
-            }
-        });
-    },
-    hideArea: function() {
-        if (!this.drops.length) return;
-        this.drops.each(function (drop, iterator) {
-            if(drop.element.hasClassName('block_placeholder')) {
-                drop.element.removeClassName('active');
-            } else if(drop.element.hasClassName('image_placeholder')) {
-                drop.element.removeClassName('active');
-                drop.element.up().removeClassName('active');
-            } else if(drop.element.hasClassName('text_placeholder')) {
-                drop.element.removeClassName('active');
-            }
-        });
-    },
-    reset: function (draggable) {
-        if (this.last_active) this.deactivate(this.last_active, draggable);
-    }
-});
-
-/*
-    Wysija History handling
-    POTENTIAL FEATURES:
-        - set a maximum number of items to be stored
-
-*/
-var WysijaHistory = {
-    container: 'mailpoet_form_history',
-    size: 30,
-    enqueue: function(element) {
-        // create deep clone (includes child elements) of passed element
-        var clone = element.clone(true);
-
-        // check if the field is unique
-        if(parseInt(clone.readAttribute('wysija_unique'), 10) === 1) {
-            // check if the field is already in the queue
-            $(WysijaHistory.container).select('[wysija_field="'+clone.readAttribute('wysija_field')+'"]').invoke('remove');
-        }
-
-        // check history size
-        if($(WysijaHistory.container).select('> div').length >= WysijaHistory.size) {
-            // remove oldest element (last in the list)
-            $(WysijaHistory.container).select('> div').last().remove();
-        }
-
-        // store block in history
-        $(WysijaHistory.container).insert({ top: clone });
-    },
-    dequeue: function() {
-        // pop last block off the history
-        var block = $(WysijaHistory.container).select('div').first();
-
-        if(block !== undefined) {
-            // insert block back into the editor
-            $(WysijaForm.options.body).insert({top: block});
-        }
-    },
-    clear: function() {
-        $(WysijaHistory.container).innerHTML = '';
-    },
-    remove: function(field) {
-        $(WysijaHistory.container).select('[wysija_field="'+field+'"]').invoke('remove');
-    }
-};
-
-/* MailPoet Form */
-var WysijaForm = {
-    version: '0.6',
-    options: {
-        container: 'mailpoet_form_container',
-        editor: 'mailpoet_form_editor',
-        body: 'mailpoet_form_body',
-        toolbar: 'mailpoet_form_toolbar',
-        templates: 'wysija_widget_templates',
-        debug: false
-    },
-    toolbar: {
-        effect: null,
-        x: null,
-        y: null,
-        top: null,
-        left: null
-    },
-    scroll: {
-        top: 0,
-        left: 0
-    },
-    flags: {
-        doSave: false
-    },
-    locks: {
-        dragging: false,
-        selectingColor: false,
-        showingTools: false
-    },
-    encodeHtmlValue: function(str) {
-        return str.replace(/&/g, '&amp;').replace(/>/g, '&gt;').replace(/</g, '&lt;').replace(/"/g, '&quot;');
-        // ": fix for FileMerge because the previous line fucks up its syntax coloring
-    },
-    decodeHtmlValue: function(str) {
-        return str.replace(/&amp;/g, '&').replace(/&gt;/g, '>').replace(/&lt;/g, '<').replace(/&quot;/g, '"');
-        // ": fix for FileMerge because the previous line fucks up its syntax coloring
-    },
-    loading: function(is_loading) {
-        if(is_loading) {
-            $(WysijaForm.options.editor).addClassName('loading');
-            $(WysijaForm.options.toolbar).addClassName('loading');
-        } else {
-            $(WysijaForm.options.editor).removeClassName('loading');
-            $(WysijaForm.options.toolbar).removeClassName('loading');
-        }
-    },
-    loadStatic: function(blocks) {
-        $A(blocks).each(function(block) {
-            // create block
-            WysijaForm.Block.create(block, $('block_placeholder'));
-        });
-    },
-    load: function(form) {
-        if(form.data === undefined) return;
-
-        // load body
-        if(form.data.body !== undefined) {
-            $A(form.data.body).each(function(block) {
-                // create block
-                WysijaForm.Block.create(block, $('block_placeholder'));
-            });
-
-            // load settings
-            var settings_elements = $('mailpoet_form_settings').getElements();
-            settings_elements.each(function(setting) {
-                // skip lists
-                if(setting.name === 'lists') {
-                    return true;
-                } else if(setting.name === 'on_success') {
-                    // if the input value is equal to the one stored in the settings
-                    if(setting.value === form.data.settings[setting.name]) {
-                        // check selected value
-                        $(setting).checked = true;
-                    }
-                } else if(form.data.settings[setting.name] !== undefined) {
-                    if(typeof form.data.settings[setting.name] === 'string') {
-                        setting.setValue(WysijaForm.decodeHtmlValue(form.data.settings[setting.name]));
-                    } else {
-                        setting.setValue(form.data.settings[setting.name]);
-                    }
-                }
-            });
-        }
-    },
-    save: function() {
-        var position = 1,
-            data = {
-            'version': WysijaForm.version,
-            'settings': $('mailpoet_form_settings').serialize(true),
-            'body': [],
-            'styles': (MailPoet.CodeEditor !== undefined) ? MailPoet.CodeEditor.getValue() : null
-        };
-        // body
-        WysijaForm.getBlocks().each(function(b) {
-            var block_data = (typeof(b.block['save']) === 'function') ? b.block.save() : null;
-
-            if(block_data !== null) {
-                // set block position
-                block_data['position'] = position;
-
-                // increment position
-                position++;
-
-                // add block data to body
-                data['body'].push(block_data);
-            }
-        });
-
-        return data;
-    },
-    init: function() {
-        // set document scroll
-        info('init -> set scroll offsets');
-        WysijaForm.setScrollOffsets();
-
-        // position toolbar
-        info('init -> set toolbar position');
-        WysijaForm.setToolbarPosition();
-
-        // enable droppable targets
-        info('init -> make droppable');
-        WysijaForm.makeDroppable();
-
-        // enable sortable
-        info('init -> make sortable');
-        WysijaForm.makeSortable();
-
-        // hide controls
-        info('init -> hide controls');
-        WysijaForm.hideControls();
-
-        // hide settings
-        info('init -> hide settings');
-        WysijaForm.hideSettings();
-
-        // set settings buttons position
-        info('init -> init settings');
-        WysijaForm.setSettingsPosition();
-
-        // toggle widgets
-        info('init -> toggle widgets');
-        WysijaForm.toggleWidgets();
-    },
-    getFieldData: function(element) {
-        // get basic field data
-        var data = {
-            type: element.readAttribute('wysija_type'),
-            field: element.readAttribute('wysija_field'),
-            name: element.readAttribute('wysija_name'),
-            unique: parseInt(element.readAttribute('wysija_unique') || 0, 10),
-            static: parseInt(element.readAttribute('wysija_static') || 0, 10),
-            element: element,
-            params: ''
-        };
-
-        // get params (may be empty)
-        if(element.readAttribute('wysija_params') !== null && element.readAttribute('wysija_params').length > 0) {
-            data.params = JSON.parse(element.readAttribute('wysija_params'));
-        }
-        return data;
-    },
-    toggleWidgets: function() {
-        $$('a[wysija_unique="1"]').invoke('removeClassName', 'disabled');
-
-        // loop through each unique field already inserted in the editor and disable its toolbar equivalent
-        $$('#'+WysijaForm.options.editor+' [wysija_unique="1"]').each(function(element) {
-            var field = $$('#'+WysijaForm.options.toolbar+' [wysija_field="'+element.readAttribute('wysija_field')+'"]').first();
-            if(field !== undefined) {
-                field.addClassName('disabled');
-            }
-        });
-
-        // hide list selection if a list widget has been dragged into the editor
-        $('mailpoet_settings_list_selection')[(($$('#'+WysijaForm.options.editor+' [wysija_field="list"]').length > 0) === true) ? 'hide': 'show']();
-    },
-    setBlockPositions: function(event, target) {
-        // release dragging lock
-        WysijaForm.locks.dragging = false;
-
-        var index = 1;
-        WysijaForm.getBlocks().each(function (container) {
-            container.setPosition(index++);
-            // remove z-index value to avoid issues when resizing images
-            if(container['block'] !== undefined) {
-                container.block.element.setStyle({zIndex: ''});
-            }
-        });
-
-        if(target !== undefined) {
-            // get placeholders (previous placeholder matches the placeholder linked to the next block)
-            var block_placeholder = $(target.element.readAttribute('wysija_placeholder')),
-                previous_placeholder = target.element.previous('.block_placeholder');
-
-            if(block_placeholder !== null) {
-                // put block placeholder before the current block
-                target.element.insert({before: block_placeholder});
-
-                // if the next block is a wysija_block, insert previous placeholder
-                if(target.element.next() !== undefined && target.element.next().hasClassName('mailpoet_form_block') && previous_placeholder !== undefined) {
-                    target.element.insert({after: previous_placeholder});
-                }
-            }
-        }
-    },
-    setScrollOffsets: function() {
-        WysijaForm.scroll = document.viewport.getScrollOffsets();
-    },
-    hideSettings: function() {
-        $(WysijaForm.options.container).select('.wysija_settings').invoke('hide');
-    },
-    setSettingsPosition: function() {
-        // get viewport offsets and dimensions
-        var viewportHeight = document.viewport.getHeight(),
-            blockPadding = 5;
-
-        $(WysijaForm.options.container).select('.wysija_settings').each(function(element) {
-            // get parent dimensions and position
-            var parentDim = element.up('.mailpoet_form_block').getDimensions(),
-                parentPos = element.up('.mailpoet_form_block').cumulativeOffset(),
-                is_visible = (parentPos.top <= (WysijaForm.scroll.top + viewportHeight)) ? true : false,
-                buttonMargin = 5,
-                relativeTop = buttonMargin;
-
-            if(is_visible) {
-                // desired position is set to center of viewport
-                var absoluteTop = parseInt(WysijaForm.scroll.top + ((viewportHeight / 2) - (element.getHeight() / 2)), 10),
-                    parentTop = parseInt(parentPos.top - blockPadding, 10),
-                    parentBottom = parseInt(parentPos.top + parentDim.height - blockPadding, 10);
-
-                // always center
-                relativeTop = parseInt((parentDim.height / 2)  - (element.getHeight() / 2), 10);
-            }
-            // set position for button
-            $(element).setStyle({
-                left: parseInt((parentDim.width / 2) - (element.getWidth() / 2)) + 'px',
-                top: relativeTop + 'px'
-            });
-        });
-    },
-    initToolbarPosition: function() {
-        if(WysijaForm.toolbar.top === null) WysijaForm.toolbar.top = parseInt($(WysijaForm.options.container).positionedOffset().top);
-        if(WysijaForm.toolbar.y === null) WysijaForm.toolbar.y = parseInt(WysijaForm.toolbar.top);
-
-        if(isRtl) {
-            if(WysijaForm.toolbar.left === null) WysijaForm.toolbar.left = 0;
-        } else {
-            if(WysijaForm.toolbar.left === null) WysijaForm.toolbar.left = parseInt($(WysijaForm.options.container).positionedOffset().left);
-        }
-        if(WysijaForm.toolbar.x === null) WysijaForm.toolbar.x = parseInt(WysijaForm.toolbar.left + $(WysijaForm.options.container).getDimensions().width + 15);
-
-    },
-    setToolbarPosition: function() {
-        WysijaForm.initToolbarPosition();
-
-        var position = { top: WysijaForm.toolbar.y + 'px', visibility: 'visible' };
-
-        if(isRtl) {
-            position.right = WysijaForm.toolbar.x + 'px';
-        } else {
-            position.left = WysijaForm.toolbar.x + 'px';
-        }
-
-        $(WysijaForm.options.toolbar).setStyle(position);
-    },
-    updateToolbarPosition: function() {
-        // init toolbar position (updates scroll and toolbar y)
-        WysijaForm.initToolbarPosition();
-
-        // cancel previous effect
-        if(WysijaForm.toolbar.effect !== null) WysijaForm.toolbar.effect.cancel();
-
-        if(WysijaForm.scroll.top >= (WysijaForm.toolbar.top - 20)) {
-            WysijaForm.toolbar.y = parseInt(20 + WysijaForm.scroll.top);
-            // start effect
-            WysijaForm.toolbar.effect = new Effect.Move(WysijaForm.options.toolbar, {
-                x: WysijaForm.toolbar.x,
-                y: WysijaForm.toolbar.y,
-                mode: 'absolute',
-                duration: 0.2
-            });
-        } else {
-            $(WysijaForm.options.toolbar).setStyle({
-                left: WysijaForm.toolbar.x + 'px',
-                top: WysijaForm.toolbar.top + 'px'
-            });
-        }
-    },
-    blockDropOptions: {
-        accept: $w('mailpoet_form_field'), // acceptable items (classes array)
-        onEnter: function (draggable, droppable) {
-            $(droppable).addClassName('hover');
-        },
-        onLeave: function (draggable, droppable) {
-            $(droppable).removeClassName('hover');
-        },
-        onDrop: function (draggable, droppable) {
-            // custom data for images
-            droppable.fire('wjfe:item:drop', WysijaForm.getFieldData(draggable));
-            $(droppable).removeClassName('hover');
-        }
-    },
-    hideControls: function() {
-        try {
-            return WysijaForm.getBlocks().invoke('hideControls');
-        } catch(e) { return; }
-    },
-    hideTools: function() {
-        $$('.wysija_tools').invoke('hide');
-        WysijaForm.locks.showingTools = false;
-    },
-    instances: {},
-    get: function (element, type) {
-        if(type === undefined) type = 'block';
-        // identify element
-        var id = element.identify();
-        var instance = WysijaForm.instances[id] || new WysijaForm[type.capitalize().camelize()](id);
-
-        WysijaForm.instances[id] = instance;
-        return instance;
-    },
-    makeDroppable: function() {
-        Droppables.add('block_placeholder', WysijaForm.blockDropOptions);
-    },
-    makeSortable: function () {
-        var body = $(WysijaForm.options.body);
-        Sortable.create(body, {
-            tag: 'div',
-            only: 'mailpoet_form_block',
-            scroll: window,
-            handle: 'handle',
-            constraint: 'vertical'
-
-        });
-        Draggables.removeObserver(body);
-        Draggables.addObserver({
-            element: body,
-            onStart: WysijaForm.startBlockPositions,
-            onEnd: WysijaForm.setBlockPositions
-        });
-    },
-    hideBlockControls: function() {
-        $$('.wysija_controls').invoke('hide');
-        this.getBlockElements().invoke('removeClassName', 'hover');
-    },
-    getBlocks: function () {
-        return WysijaForm.getBlockElements().map(function (element) {
-            return WysijaForm.get(element);
-        });
-    },
-    getBlockElements: function () {
-        return $(WysijaForm.options.container).select('.mailpoet_form_block');
-    },
-    startBlockPositions: function(event, target) {
-        if(target.element.hasClassName('mailpoet_form_block')) {
-            // store block placeholder id for the block that is being repositionned
-            if(target.element.previous('.block_placeholder') !== undefined) {
-                target.element.writeAttribute('wysija_placeholder', target.element.previous('.block_placeholder').identify());
-            }
-        }
-        WysijaForm.locks.dragging = true;
-    },
-    encodeURIComponent: function(str) {
-        // check if it's a url and if so, prevent encoding of protocol
-        var regexp = new RegExp(/^http[s]?:\/\//),
-            protocol = regexp.exec(str);
-
-        if(protocol === null) {
-            // this is not a url so encode the whole thing
-            return encodeURIComponent(str).replace(/[!'()*]/g, escape);
-        } else if(protocol.length === 1) {
-            // this is a url, so do not encode the protocol
-            return encodeURI(str).replace(/[!'()*]/g, escape);
-        }
-    }
-};
-
-WysijaForm.DraggableItem = Class.create({
-    initialize: function (element) {
-        this.elementType = $(element).readAttribute('wysija_type');
-        this.element = $(element).down() || $(element);
-        this.clone = this.cloneElement();
-        this.insert();
-    },
-    STYLES: new Template('position: absolute; top: #{top}px; left: #{left}px;'),
-    cloneElement: function () {
-        var clone = this.element.clone(),
-        offset = this.element.cumulativeOffset(),
-        list = this.getList(),
-        styles = this.STYLES.evaluate({
-            top: offset.top - list.scrollTop,
-            left: offset.left - list.scrollLeft
-        });
-        clone.setStyle(styles);
-
-        clone.addClassName('mailpoet_form_widget');
-        clone.addClassName(this.elementType);
-        clone.innerHTML = this.element.innerHTML;
-        return clone;
-    },
-    getOffset: function () {
-        return this.element.offsetTop - this.getList().scrollTop;
-    },
-    getList: function () {
-        return this.element.up('ul');
-    },
-    insert: function () {
-        $$("body")[0].insert(this.clone);
-    },
-    onMousedown: function (event) {
-        var draggable = new Draggable(this.clone, {
-            scroll: window,
-            onStart: function () {
-                Droppables.displayArea(draggable);
-            },
-            onEnd: function (drag) {
-                drag.destroy();
-                drag.element.remove();
-                Droppables.hideArea();
-            },
-            starteffect: function (element) {
-                new Effect.Opacity(element, {
-                    duration: 0.2,
-                    from: element.getOpacity(),
-                    to: 0.7
-                });
-            },
-            endeffect: Prototype.emptyFunction
-        });
-        draggable.initDrag(event);
-        draggable.startDrag(event);
-        return draggable;
-    }
-});
-Object.extend(WysijaForm.DraggableItem, Observable).observe('a[class="mailpoet_form_field"]');
-
-
-WysijaForm.Block = Class.create({
-    /* Invoked on load */
-    initialize: function(element) {
-        info('block -> init');
-
-        this.element = $(element);
-        this.block = new WysijaForm.Widget(this.element);
-
-        // enable block placeholder
-        this.block.makeBlockDroppable();
-
-        // setup events
-        if(this.block['setup'] !== undefined) {
-            this.block.setup();
-        }
-        return this;
-    },
-    setPosition: function(position) {
-        this.element.writeAttribute('wysija_position', position);
-    },
-    hideControls: function() {
-        if(this['getControls']) {
-            this.element.removeClassName('hover');
-            this.getControls().hide();
-        }
-    },
-    showControls: function() {
-        if(this['getControls']) {
-            this.element.addClassName('hover');
-            try {
-                this.getControls().show();
-            } catch(e) {
-                ;
-            }
-        }
-    },
-    makeBlockDroppable: function() {
-        if(this.isBlockDroppableEnabled() === false) {
-            var block_placeholder = this.getBlockDroppable();
-            Droppables.add(block_placeholder.identify(), WysijaForm.blockDropOptions);
-            block_placeholder.addClassName('enabled');
-        }
-    },
-    removeBlockDroppable: function() {
-        if(this.isBlockDroppableEnabled()) {
-            var block_placeholder = this.getBlockDroppable();
-            Droppables.remove(block_placeholder.identify());
-            block_placeholder.removeClassName('enabled');
-        }
-    },
-    isBlockDroppableEnabled: function() {
-        // if the block_placeholder does not exist, create it
-        var block_placeholder = this.getBlockDroppable();
-        if(block_placeholder === null) {
-            return this.createBlockDroppable().hasClassName('enabled');
-        } else {
-            return block_placeholder.hasClassName('enabled');
-        }
-    },
-    createBlockDroppable: function() {
-        info('block -> createBlockDroppable');
-        this.element.insert({before: '<div class=\"block_placeholder\">'+$('block_placeholder').innerHTML+'</div>'});
-        return this.element.previous('.block_placeholder');
-    },
-    getBlockDroppable: function() {
-        if(this.element.previous() === undefined || this.element.previous().hasClassName('block_placeholder') === false) {
-            return null;
-        } else {
-            return this.element.previous();
-        }
-    },
-    getControls: function() {
-        return this.element.down('.wysija_controls');
-    },
-    setupControls: function() {
-        // enable controls
-        this.controls = this.getControls();
-
-        if(this.controls) {
-            // setup events for block controls
-            this.element.observe('mouseover', function() {
-                // special cases where controls shouldn't be displayed
-                if(WysijaForm.locks.dragging === true || WysijaForm.locks.selectingColor === true || WysijaForm.locks.showingTools === true) return;
-
-                // set block flag
-                this.element.addClassName('hover');
-
-                // show controls
-                this.showControls();
-
-                // show settings if present
-                if(this.element.down('.wysija_settings') !== undefined) {
-                    this.element.down('.wysija_settings').show();
-                }
-            }.bind(this));
-
-            this.element.observe('mouseout', function() {
-                // special cases where controls shouldn't hide
-                if(WysijaForm.locks.dragging === true || WysijaForm.locks.selectingColor === true) return;
-
-                // hide controls
-                this.hideControls();
-
-                // hide settings if present
-                if(this.element.down('.wysija_settings') !== undefined) {
-                    this.element.down('.wysija_settings').hide();
-                }
-            }.bind(this));
-
-
-            // setup click event for remove button
-            this.removeButton = this.controls.down('.remove') || null;
-            if(this.removeButton !== null) {
-                this.removeButton.observe('click', function() {
-                    this.removeBlock();
-                    this.removeButton.stopObserving('click');
-                }.bind(this));
-            }
-
-            // setup click event for settings button
-            this.settingsButton = this.element.down('.settings') || null;
-
-            if(this.settingsButton !== null) {
-                this.settingsButton.observe('click', function(event) {
-                    // TODO: refactor
-                    var block = $(event.target).up('.mailpoet_form_block') || null;
-                    if(block !== null) {
-                        var field = WysijaForm.getFieldData(block);
-                        this.editSettings();
-                    }
-                }.bind(this));
-            }
-        }
-        return this;
-    },
-    removeBlock: function(callback) {
-        info('block -> removeBlock');
-
-        // save block in history
-        WysijaHistory.enqueue(this.element);
-
-        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();
-                }
-
-                // remove element from the DOM
-                this.element.remove();
-
-                // reset block positions
-                WysijaForm.setBlockPositions();
-
-                // toggle widgets
-                WysijaForm.toggleWidgets();
-
-                // optional callback execution after completely removing block
-                if(callback !== undefined && typeof(callback) === 'function') {
-                    callback();
-                }
-
-                // remove block instance
-                delete WysijaForm.instances[this.element.identify()];
-            }.bind(this)
-        });
-    }
-});
-
-/* Invoked on item dropped */
-WysijaForm.Block.create = function(block, target) {
-    if($('form_template_'+block.type) === null) {
-        return false;
-    }
-
-    var body = $(WysijaForm.options.body),
-        block_template = Handlebars.compile($('form_template_block').innerHTML),
-        template = Handlebars.compile($('form_template_'+block.type).innerHTML),
-        output = '';
-
-    // set block template (depending on the block type)
-    block.template = template(block);
-    output = block_template(block);
-
-    // check if the new block is unique and if there's already an instance
-    // of it in the history. If so, remove its former instance from the history
-    if(block.unique === 1) {
-        WysijaHistory.remove(block.field);
-    }
-
-    // if the drop target was the bottom placeholder
-    if(target.identify() === 'block_placeholder') {
-        // insert block at the bottom
-        body.insert(output);
-        //block = body.childElements().last();
-    } else {
-        // insert block before the drop target
-        target.insert({before: output });
-        //block = target.previous('.mailpoet_form_block');
-    }
-    // refresh sortable items
-    WysijaForm.makeSortable();
-
-    // refresh block positions
-    WysijaForm.setBlockPositions();
-
-    // position settings
-    WysijaForm.setSettingsPosition();
-};
-
-document.observe('wjfe:item:drop', function(event) {
-    info('create block');
-    WysijaForm.Block.create(event.memo, event.target);
-
-    // hide block controls
-    info('hide controls');
-    WysijaForm.hideBlockControls();
-
-    // toggle widgets
-    setTimeout(function() {
-        WysijaForm.toggleWidgets();
-    }, 1);
-});
-
-/* Form Widget */
-WysijaForm.Widget = Class.create(WysijaForm.Block, {
-   initialize: function(element) {
-       info('widget -> init');
-       this.element = $(element);
-       return this;
-   },
-   setup: function() {
-        info('widget -> setup');
-        this.setupControls();
-    },
-    save: function() {
-        info('widget -> save');
-        var data = this.getData();
-
-        if(data.element !== undefined) {
-            delete data.element;
-        }
-
-        return data;
-    },
-    setData: function(data) {
-        var current_data = this.getData(),
-            params = $H(current_data.params).merge(data.params).toObject();
-
-        // update type if it changed
-        if(data.type !== undefined && data.type !== current_data.type) {
-            this.element.writeAttribute('wysija_type', data.type);
-        }
-
-        // update params
-        this.element.writeAttribute('wysija_params', JSON.stringify(params));
-    },
-    getData: function() {
-        var data = WysijaForm.getFieldData(this.element);
-
-        // decode params
-        if(data.params.length > 0) {
-            data.params = JSON.parse(data.params);
-        }
-
-        return data;
-    },
-    getControls: function() {
-        return this.element.down('.wysija_controls');
-    },
-    remove: function() {
-        this.removeBlock();
-    },
-    redraw: function(data) {
-        // set parameters
-        this.setData(data);
-        var options = this.getData();
-        // redraw block
-        var block_template = Handlebars.compile($('form_template_block').innerHTML),
-            template = Handlebars.compile($('form_template_'+options.type).innerHTML),
-            data = $H(options).merge({ template: template(options) }).toObject();
-        this.element.replace(block_template(data));
-
-        WysijaForm.init();
-    },
-    editSettings: function() {
-        MailPoet.Modal.popup({
-            title: 'Edit field settings', // TODO: translate!
-            template: jQuery('#form_template_field_settings').html(),
-            data: this.getData(),
-            onSuccess: function() {
-                var data = jQuery('#form_field_settings').serializeObject();
-                this.redraw(data);
-            }.bind(this)
-        });
-    },
-    getSettings: function() {
-        return this.element.down('.wysija_settings');
-    }
-});
-
-/* When dom is loaded, initialize WysijaForm */
-document.observe('dom:loaded', WysijaForm.init);
-
-/* LOGGING */
-function info(value) {
-    if(WysijaForm.options.debug === false) return;
-
-    if(!(window.console && console.log)) {
-        (function() {
-            var noop = function() {};
-            var methods = ['assert', 'clear', 'count', 'debug', 'dir', 'dirxml', 'error', 'exception', 'group', 'groupCollapsed', 'groupEnd', 'info', 'log', 'markTimeline', 'profile', 'profileEnd', 'markTimeline', 'table', 'time', 'timeEnd', 'timeStamp', 'trace', 'warn'];
-            var length = methods.length;
-            var console = window.console = {};
-            while(length--) {
-                console[methods[length]] = noop;
-            }
-        }());
-    }
-    try {
-        console.log('[DEBUG] '+value);
-    } catch(e) {}
-}

assets/js/src/forms/forms.jsx

@@ -0,0 +1,26 @@
+import React from 'react'
+import ReactDOM from 'react-dom'
+import { Router, Route, IndexRoute, Link, useRouterHistory } from 'react-router'
+import { createHashHistory } from 'history'
+import FormList from 'forms/list.jsx'
+
+const history = useRouterHistory(createHashHistory)({ queryKey: false });
+
+const App = React.createClass({
+  render() {
+    return this.props.children
+  }
+});
+
+const container = document.getElementById('forms_container');
+
+if(container) {
+  ReactDOM.render((
+    <Router history={ history }>
+      <Route path="/" component={ App }>
+        <IndexRoute component={ FormList } />
+        <Route path="*" component={ FormList } />
+      </Route>
+    </Router>
+  ), container);
+}

assets/js/src/forms/list.jsx

@@ -0,0 +1,185 @@
+import React from 'react'
+import ReactDOM from 'react-dom'
+import { Router, Link } from 'react-router'
+import Listing from 'listing/listing.jsx'
+import classNames from 'classnames'
+import MailPoet from 'mailpoet'
+
+const columns = [
+  {
+    name: 'name',
+    label: MailPoet.I18n.t('formName'),
+    sortable: true
+  },
+  {
+    name: 'segments',
+    label: MailPoet.I18n.t('segments'),
+    sortable: false
+  },
+  {
+    name: 'created_at',
+    label: MailPoet.I18n.t('createdOn'),
+    sortable: true
+  }
+];
+
+const messages = {
+  onTrash: function(response) {
+    var count = ~~response;
+    var message = null;
+
+    if(count === 1) {
+      message = (
+        MailPoet.I18n.t('oneFormTrashed')
+      );
+    } else {
+      message = (
+        MailPoet.I18n.t('multipleFormsTrashed')
+      ).replace('%$1d', count);
+    }
+    MailPoet.Notice.success(message);
+  },
+  onDelete: function(response) {
+    var count = ~~response;
+    var message = null;
+
+    if(count === 1) {
+      message = (
+        MailPoet.I18n.t('oneFormDeleted')
+      );
+    } else {
+      message = (
+        MailPoet.I18n.t('multipleFormsDeleted')
+      ).replace('%$1d', count);
+    }
+    MailPoet.Notice.success(message);
+  },
+  onRestore: function(response) {
+    var count = ~~response;
+    var message = null;
+
+    if(count === 1) {
+      message = (
+        MailPoet.I18n.t('oneFormRestored')
+      );
+    } else {
+      message = (
+        MailPoet.I18n.t('multipleFormsRestored')
+      ).replace('%$1d', count);
+    }
+    MailPoet.Notice.success(message);
+  }
+};
+
+const bulk_actions = [
+  {
+    name: 'trash',
+    label: MailPoet.I18n.t('trash'),
+    onSuccess: messages.onTrash
+  }
+];
+
+const item_actions = [
+  {
+    name: 'edit',
+    label: MailPoet.I18n.t('edit'),
+    link: function(item) {
+      return (
+        <a href={ `admin.php?page=mailpoet-form-editor&id=${item.id}` }>{MailPoet.I18n.t('edit')}</a>
+      );
+    }
+  },
+  {
+    name: 'duplicate_form',
+    label: MailPoet.I18n.t('duplicate'),
+    onClick: function(item, refresh) {
+      return MailPoet.Ajax.post({
+        endpoint: 'forms',
+        action: 'duplicate',
+        data: item.id
+      }).done(function(response) {
+        MailPoet.Notice.success(
+          (MailPoet.I18n.t('formDuplicated')).replace('%$1s', response.name)
+        );
+        refresh();
+      });
+    }
+  },
+  {
+    name: 'trash'
+  }
+];
+
+const FormList = React.createClass({
+  createForm() {
+    MailPoet.Ajax.post({
+      endpoint: 'forms',
+      action: 'create'
+    }).done(function(response) {
+      if(response.result && response.form_id) {
+        window.location = mailpoet_form_edit_url + response.form_id;
+      }
+    });
+  },
+  renderItem(form, actions) {
+    let row_classes = classNames(
+      'manage-column',
+      'column-primary',
+      'has-row-actions'
+    );
+
+    let segments = mailpoet_segments.filter(function(segment) {
+      return (jQuery.inArray(segment.id, form.segments) !== -1);
+    }).map(function(segment) {
+      return segment.name;
+    }).join(', ');
+
+    return (
+      <div>
+        <td className={ row_classes }>
+          <strong>
+            <a
+              className="row-title"
+              href={ `admin.php?page=mailpoet-form-editor&id=${form.id}` }
+            >{ form.name }</a>
+          </strong>
+          { actions }
+        </td>
+        <td className="column-format" data-colname={MailPoet.I18n.t('segments')}>
+          { segments }
+        </td>
+        <td className="column-date" data-colname={MailPoet.I18n.t('createdOn')}>
+          <abbr>{ MailPoet.Date.format(form.created_at) }</abbr>
+        </td>
+      </div>
+    );
+  },
+  render() {
+    return (
+      <div>
+        <h1 className="title">
+          {MailPoet.I18n.t('pageTitle')} <a
+            className="page-title-action"
+            href="javascript:;"
+            onClick={ this.createForm }
+          >{MailPoet.I18n.t('new')}</a>
+        </h1>
+
+        <Listing
+          limit={ mailpoet_listing_per_page }
+          location={ this.props.location }
+          params={ this.props.params }
+          messages={ messages }
+          search={ false }
+          endpoint="forms"
+          onRenderItem={ this.renderItem }
+          columns={ columns }
+          bulk_actions={ bulk_actions }
+          item_actions={ item_actions }
+        />
+      </div>
+    );
+  }
+});
+
+module.exports = FormList;

assets/js/src/handlebars_helpers.js

@@ -140,5 +140,20 @@ define('handlebars_helpers', ['handlebars'], function(Handlebars) {
       return parseInt(string, 10);
   });
 
+  Handlebars.registerHelper('fontWithFallback', function(font) {
+    switch(font) {
+      case 'Arial': return new Handlebars.SafeString("Arial, 'Helvetica Neue', Helvetica, sans-serif");
+      case 'Comic Sans MS': return new Handlebars.SafeString("'Comic Sans MS', 'Marker Felt-Thin', Arial, sans-serif");
+      case 'Courier New': return new Handlebars.SafeString("'Courier New', Courier, 'Lucida Sans Typewriter', 'Lucida Typewriter', monospace");
+      case 'Georgia': return new Handlebars.SafeString("Georgia, Times, 'Times New Roman', serif");
+      case 'Lucida': return new Handlebars.SafeString("'Lucida Sans Unicode', 'Lucida Grande', sans-serif");
+      case 'Tahoma': return new Handlebars.SafeString("Tahoma, Verdana, Segoe, sans-serif");
+      case 'Times New Roman': return new Handlebars.SafeString("'Times New Roman', Times, Baskerville, Georgia, serif");
+      case 'Trebuchet MS': return new Handlebars.SafeString("'Trebuchet MS', 'Lucida Grande', 'Lucida Sans Unicode', 'Lucida Sans', Tahoma, sans-serif");
+      case 'Verdana': return new Handlebars.SafeString("Verdana, Geneva, sans-serif");
+      default: return font;
+    }
+  });
+
   window.Handlebars = Handlebars;
 });

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/i18n.js

@@ -0,0 +1,25 @@
+define('i18n',
+  [
+    'mailpoet',
+    'underscore',
+  ], function(
+    MailPoet,
+    _
+) {
+  'use strict';
+
+  var translations = {};
+
+  MailPoet.I18n = {
+    add: function(key, value) {
+      translations[key] = value;
+    },
+    t: function(key) {
+      return translations[key] || 'TRANSLATION "%$1s" NOT FOUND'.replace("%$1s", key);
+    },
+    all: function() {
+      return translations;
+    }
+  };
+
+});

assets/js/src/iframe.js

@@ -0,0 +1,23 @@
+define('iframe', ['mailpoet', 'jquery'], function(MailPoet, jQuery) {
+  'use strict';
+  MailPoet.Iframe = {
+    marginY: 20,
+    autoSize: function(iframe) {
+      if(!iframe) return;
+
+      this.setSize(
+        iframe,
+        iframe.contentWindow.document.body.scrollHeight
+      );
+    },
+    setSize: function(iframe, i) {
+      if(!iframe) return;
+
+      iframe.style.height = (
+        parseInt(i) + this.marginY
+      ) + "px";
+    }
+  };
+
+  return MailPoet;
+});

assets/js/src/listing/bulk_actions.jsx

@@ -1,8 +1,10 @@
 define([
-  'react'
+  'react',
+  'mailpoet'
 ],
 function(
-  React
+  React,
+  MailPoet
 ) {
   var ListingBulkActions = React.createClass({
     getInitialState: function() {
@@ -15,16 +17,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) {
-        this.setState({
-          extra: action.onSelect(e)
-        });
-      }
+        // action on select callback
+        if(action !== null && action['onSelect'] !== undefined) {
+          this.setState({
+            extra: action.onSelect(e)
+          });
+        }
+      }.bind(this));
     },
     handleApplyAction: function(e) {
       e.preventDefault();
@@ -45,12 +47,13 @@ function(
 
       data.action = this.state.action;
 
+      var callback = function() {};
       if(action['onSuccess'] !== undefined) {
-        data.onSuccess = action.onSuccess;
+        callback = action.onSuccess;
       }
 
       if(data.action) {
-        this.props.onBulkAction(selected_ids, data);
+        this.props.onBulkAction(selected_ids, data, callback);
       }
 
       this.setState({
@@ -81,11 +84,16 @@ function(
           <label
             className="screen-reader-text"
             htmlFor="bulk-action-selector-top">
-            Select bulk action
+            {MailPoet.I18n.t('selectBulkAction')}
           </label>
 
-          <select ref="action" value={ this.state.action } onChange={this.handleChangeAction}>
-            <option value="">Bulk Actions</option>
+          <select
+            name="bulk_actions"
+            ref="action"
+            value={ this.state.action }
+            onChange={this.handleChangeAction}
+          >
+            <option value="">{MailPoet.I18n.t('bulkActions')}</option>
             { this.props.bulk_actions.map(function(action, index) {
               return (
                 <option
@@ -98,7 +106,7 @@ function(
           <input
             onClick={ this.handleApplyAction }
             type="submit"
-            defaultValue="Apply"
+            defaultValue={MailPoet.I18n.t('apply')}
             className="button action" />
 
             { this.state.extra }
@@ -108,4 +116,4 @@ function(
   });
 
   return ListingBulkActions;
-});
+});

assets/js/src/listing/filters.jsx

@@ -1,70 +1,98 @@
 define([
-  'react'
+  'react',
+  'jquery',
+  'mailpoet'
 ],
 function(
-  React
+  React,
+  jQuery,
+  MailPoet
 ) {
   var ListingFilters = React.createClass({
     handleFilterAction: function() {
-      var filters = this.props.filters.map(function(filter, index) {
-        var value = this.refs['filter-'+index].value;
-        if(value) {
-          return {
-            'name': filter.name,
-            'value': value
-          };
-        }
-      }.bind(this));
+      let filters = {}
+      this.getAvailableFilters().map((filter, i) => {
+        filters[this.refs['filter-'+i].name] = this.refs['filter-'+i].value
+      })
       return this.props.onSelectFilter(filters);
     },
-    handleChangeAction: function() {
-      return true;
+    handleEmptyTrash: function() {
+      return this.props.onEmptyTrash();
+    },
+    getAvailableFilters: function() {
+      let filters = this.props.filters;
+
+      return Object.keys(filters).filter(function(filter) {
+        return !(
+          filters[filter].length === 0
+          || (
+            filters[filter].length === 1
+            && !filters[filter][0].value
+          )
+        );
+      })
     },
     render: function() {
-      var filters = this.props.filters
-        .filter(function(filter) {
-          return !(
-            filter.options.length === 0
-            || (
-              filter.options.length === 1
-              && !filter.options[0].value
-            )
-          );
-        })
+      const filters = this.props.filters;
+      const selected_filters = this.props.filter;
+
+      const available_filters = this.getAvailableFilters()
         .map(function(filter, i) {
+          let default_value = false;
+          if (selected_filters[filter] !== undefined && selected_filters[filter]) {
+            default_value = selected_filters[filter]
+          } else {
+            jQuery(`select[name="${filter}"]`).val('');
+          }
           return (
             <select
-              ref={ 'filter-'+i }
-              key={ 'filter-'+i }
-              onChange={ this.handleChangeAction }>
-              { filter.options.map(function(option, j) {
-                return (
-                  <option
-                    value={ option.value }
-                    key={ 'filter-option-' + j }
-                  >{ option.label }</option>
-                );
-              }.bind(this)) }
+              ref={ `filter-${i}` }
+              key={ `filter-${i}` }
+              name={ filter }
+              defaultValue={ default_value }
+            >
+            { filters[filter].map(function(option, j) {
+              return (
+                <option
+                  value={ option.value }
+                  key={ 'filter-option-' + j }
+                >{ option.label }</option>
+              );
+            }.bind(this)) }
             </select>
           );
       }.bind(this));
 
-      var button = false;
+      let button = false;
 
-      if(filters.length > 0) {
+      if (available_filters.length > 0) {
         button = (
           <input
+            id="post-query-submit"
             onClick={ this.handleFilterAction }
             type="submit"
-            defaultValue="Filter"
+            defaultValue={MailPoet.I18n.t('filter')}
             className="button" />
         );
       }
 
+      let empty_trash = false;
+      if (this.props.group === 'trash') {
+        empty_trash = (
+          <input
+            onClick={ this.handleEmptyTrash }
+            type="submit"
+            value={MailPoet.I18n.t('emptyTrash')}
+            className="button"
+          />
+        );
+      }
+
       return (
         <div className="alignleft actions actions">
-          { filters }
+          { available_filters }
           { button }
+          { empty_trash }
         </div>
       );
     }

assets/js/src/listing/groups.jsx

@@ -21,7 +21,7 @@ define(['react', 'classnames'], function(React, classNames) {
                 href="javascript:;"
                 className={classes}
                 onClick={this.handleSelect.bind(this, group.name)} >
-                {group.label} <span className="count">({ group.count })</span>
+                {group.label} <span className="count">({ group.count.toLocaleString() })</span>
               </a>
             </li>
           );

assets/js/src/listing/header.jsx

@@ -1,4 +1,12 @@
-define(['react', 'classnames'], function(React, classNames) {
+define([
+    'react',
+    'classnames',
+    'mailpoet'
+  ], function(
+    React,
+    classNames,
+    MailPoet
+  ) {
 
   var ListingHeader = React.createClass({
     handleSelectItems: function() {
@@ -9,6 +17,9 @@ define(['react', 'classnames'], function(React, classNames) {
     render: function() {
       var columns = this.props.columns.map(function(column, index) {
         column.is_primary = (index === 0);
+        column.sorted = (this.props.sort_by === column.name)
+          ? this.props.sort_order
+          : 'desc';
         return (
           <ListingColumn
             onSort={this.props.onSort}
@@ -25,10 +36,11 @@ define(['react', 'classnames'], function(React, classNames) {
           <th
             className="manage-column column-cb check-column">
             <label className="screen-reader-text">
-              { 'Select All' }
+              {MailPoet.I18n.t('selectAll')}
             </label>
             <input
               type="checkbox"
+              name="select_all"
               ref="toggle"
               checked={ this.props.selection }
               onChange={ this.handleSelectItems } />
@@ -83,4 +95,4 @@ define(['react', 'classnames'], function(React, classNames) {
   });
 
   return ListingHeader;
-});
+});

assets/js/src/listing/listing.jsx

@@ -34,11 +34,9 @@ define(
         };
       },
       handleSelectItem: function(e) {
-        var is_checked = jQuery(e.target).is(':checked');
-
         this.props.onSelectItem(
           parseInt(e.target.value, 10),
-          is_checked
+          e.target.checked
         );
 
         return !e.target.checked;
@@ -46,8 +44,11 @@ define(
       handleRestoreItem: function(id) {
         this.props.onRestoreItem(id);
       },
-      handleDeleteItem: function(id, confirm = false) {
-        this.props.onDeleteItem(id, confirm);
+      handleTrashItem: function(id) {
+        this.props.onTrashItem(id);
+      },
+      handleDeleteItem: function(id) {
+        this.props.onDeleteItem(id);
       },
       handleToggleItem: function(id) {
         this.setState({ toggled: !this.state.toggled });
@@ -58,11 +59,12 @@ define(
         if(this.props.is_selectable === true) {
           checkbox = (
             <th className="check-column" scope="row">
-              <label className="screen-reader-text">
-                { 'Select ' + this.props.item.email }</label>
+              <label className="screen-reader-text">{
+                'Select ' + this.props.item[this.props.columns[0].name]
+              }</label>
               <input
                 type="checkbox"
-                defaultValue={ this.props.item.id }
+                value={ this.props.item.id }
                 checked={
                   this.props.item.selected || this.props.selection === 'all'
                 }
@@ -72,22 +74,78 @@ define(
           );
         }
 
-        var custom_actions = this.props.item_actions;
-        var item_actions = false;
+        const custom_actions = this.props.item_actions;
+        let item_actions = false;
 
         if(custom_actions.length > 0) {
+          let is_first = true;
           item_actions = custom_actions.map(function(action, index) {
-            return (
-              <span key={ 'action-'+index } className={ action.name }>
-                { action.link(this.props.item.id) }
-                {(index < (custom_actions.length - 1)) ? ' | ' : ''}
-              </span>
-            );
+            if(action.display !== undefined) {
+              if(action.display(this.props.item) === false) {
+                return;
+              }
+            }
+
+            let custom_action = null;
+
+            if(action.name === 'trash') {
+              custom_action = (
+                <span key={ 'action-'+index } className="trash">
+                  {(!is_first) ? ' | ' : ''}
+                  <a
+                    href="javascript:;"
+                    onClick={ this.handleTrashItem.bind(
+                      null,
+                      this.props.item.id
+                    ) }>
+                    {MailPoet.I18n.t('trash')}
+                  </a>
+                </span>
+              );
+            } else if(action.refresh) {
+              custom_action = (
+                <span
+                  onClick={ this.props.onRefreshItems }
+                  key={ 'action-'+index } className={ action.name }>
+                  {(!is_first) ? ' | ' : ''}
+                  { action.link(this.props.item) }
+                </span>
+              );
+            } else if(action.link) {
+              custom_action = (
+                <span
+                  key={ 'action-'+index } className={ action.name }>
+                  {(!is_first) ? ' | ' : ''}
+                  { action.link(this.props.item) }
+                </span>
+              );
+            } else {
+              custom_action = (
+                <span
+                  key={ 'action-'+index } className={ action.name }>
+                  {(!is_first) ? ' | ' : ''}
+                  <a href="javascript:;" onClick={
+                    (action.onClick !== undefined)
+                    ? action.onClick.bind(null,
+                        this.props.item,
+                        this.props.onRefreshItems
+                      )
+                    : false
+                  }>{ action.label }</a>
+                </span>
+              );
+            }
+
+            if(custom_action !== null && is_first === true) {
+              is_first = false;
+            }
+
+            return custom_action;
           }.bind(this));
         } else {
           item_actions = (
             <span className="edit">
-              <Link to={ `/edit/${ this.props.item.id }` }>Edit</Link>
+              <Link to={ `/edit/${ this.props.item.id }` }>{MailPoet.I18n.t('edit')}</Link>
             </span>
           );
         }
@@ -103,7 +161,7 @@ define(
                       null,
                       this.props.item.id
                     )}
-                  >Restore</a>
+                  >{MailPoet.I18n.t('restore')}</a>
                 </span>
                 { ' | ' }
                 <span className="delete">
@@ -112,16 +170,15 @@ define(
                     href="javascript:;"
                     onClick={ this.handleDeleteItem.bind(
                       null,
-                      this.props.item.id,
-                      true
+                      this.props.item.id
                     )}
-                  >Delete permanently</a>
+                  >{MailPoet.I18n.t('deletePermanently')}</a>
                 </span>
               </div>
               <button
                 onClick={ this.handleToggleItem.bind(null, this.props.item.id) }
                 className="toggle-row" type="button">
-                <span className="screen-reader-text">Show more details</span>
+                <span className="screen-reader-text">{MailPoet.I18n.t('showMoreDetails')}</span>
               </button>
             </div>
           );
@@ -130,23 +187,11 @@ define(
             <div>
               <div className="row-actions">
                 { item_actions }
-                { ' | ' }
-                <span className="trash">
-                  <a
-                    href="javascript:;"
-                    onClick={ this.handleDeleteItem.bind(
-                      null,
-                      this.props.item.id,
-                      false
-                    ) }>
-                    Trash
-                  </a>
-                </span>
               </div>
               <button
                 onClick={ this.handleToggleItem.bind(null, this.props.item.id) }
                 className="toggle-row" type="button">
-                <span className="screen-reader-text">Show more details</span>
+                <span className="screen-reader-text">{MailPoet.I18n.t('showMoreDetails')}</span>
               </button>
             </div>
           );
@@ -178,8 +223,8 @@ define(
                   className="colspanchange">
                   {
                     (this.props.loading === true)
-                    ? MailPoetI18n.loadingItems
-                    : MailPoetI18n.noItemsFound
+                    ? MailPoet.I18n.t('loadingItems')
+                    : MailPoet.I18n.t('noItemsFound')
                   }
                 </td>
               </tr>
@@ -205,8 +250,8 @@ define(
                   }>
                   {
                     (this.props.selection !== 'all')
-                    ? MailPoetI18n.selectAllLabel
-                    : MailPoetI18n.selectedAllLabel.replace(
+                    ? MailPoet.I18n.t('selectAllLabel')
+                    : MailPoet.I18n.t('selectedAllLabel').replace(
                       '%d',
                       this.props.count
                     )
@@ -216,13 +261,13 @@ define(
                     onClick={ this.props.onSelectAll }
                     href="javascript:;">{
                       (this.props.selection !== 'all')
-                      ? MailPoetI18n.selectAllLink
-                      : MailPoetI18n.clearSelection
+                      ? MailPoet.I18n.t('selectAllLink')
+                      : MailPoet.I18n.t('clearSelection')
                     }</a>
                 </td>
               </tr>
 
-              {this.props.items.map(function(item) {
+              {this.props.items.map(function(item, index) {
                 item.id = parseInt(item.id, 10);
                 item.selected = (this.props.selected_ids.indexOf(item.id) !== -1);
 
@@ -233,11 +278,13 @@ define(
                     onRenderItem={ this.props.onRenderItem }
                     onDeleteItem={ this.props.onDeleteItem }
                     onRestoreItem={ this.props.onRestoreItem }
+                    onTrashItem={ this.props.onTrashItem }
+                    onRefreshItems={ this.props.onRefreshItems }
                     selection={ this.props.selection }
                     is_selectable={ this.props.is_selectable }
                     item_actions={ this.props.item_actions }
                     group={ this.props.group }
-                    key={ 'item-' + item.id }
+                    key={ `item-${item.id}-${index}` }
                     item={ item } />
                 );
               }.bind(this))}
@@ -248,6 +295,9 @@ define(
     });
 
     var Listing = React.createClass({
+      contextTypes: {
+        router: React.PropTypes.object.isRequired
+      },
       getInitialState: function() {
         return {
           loading: false,
@@ -260,43 +310,151 @@ define(
           items: [],
           groups: [],
           group: 'all',
-          filters: [],
-          filter: [],
+          filters: {},
+          filter: {},
           selected_ids: [],
           selection: false
         };
       },
+      componentDidUpdate: function(prevProps, prevState) {
+        // reset group to "all" if trash gets emptied
+        if(
+          // we were viewing the trash
+          (prevState.group === 'trash' && prevState.count > 0)
+          &&
+          // we are still viewing the trash but there are no items left
+          (this.state.group === 'trash' && this.state.count === 0)
+          &&
+          // only do this when no filter is set
+          (Object.keys(this.state.filter).length === 0)
+        ) {
+          this.handleGroup('all');
+        }
+      },
+      getParam: function(param) {
+        var regex = /(.*)\[(.*)\]/
+        var matches = regex.exec(param)
+        return [matches[1], matches[2]]
+      },
+      initWithParams: function(params) {
+        let state = this.state || {}
+        let original_state = state
+         // check for url params
+        if(params.splat !== undefined) {
+          params.splat.split('/').map(param => {
+            let [key, value] = this.getParam(param);
+            switch(key) {
+              case 'filter':
+                let filters = {}
+                value.split('&').map(function(pair) {
+                    let [k, v] = pair.split('=')
+                    filters[k] = v
+                  }
+                )
+
+                state.filter = filters
+              break;
+              default:
+                state[key] = value
+            }
+          })
+        }
+
+        // default overrides
+        if(this.props.limit !== undefined) {
+          state.limit = Math.abs(~~this.props.limit);
+        }
+
+        this.setState(state, function() {
+          this.getItems();
+        }.bind(this));
+      },
+      setParams: function() {
+        var params = Object.keys(this.state)
+          .filter(key => {
+            return (
+              [
+                'group',
+                'filter',
+                'search',
+                'page',
+                'sort_by',
+                'sort_order'
+              ].indexOf(key) !== -1
+            )
+          })
+          .map(key => {
+            let value = this.state[key]
+            if(value === Object(value)) {
+              value = jQuery.param(value)
+            } else if(value === Boolean(value)) {
+              value = value.toString()
+            }
+
+            if(value !== '') {
+              return `${key}[${value}]`
+            }
+          })
+          .filter(key => { return (key !== undefined) })
+          .join('/');
+        params = '/'+params
+
+        if(this.props.location) {
+          if(this.props.location.pathname !== params) {
+            this.context.router.push(`${params}`);
+          }
+        }
+      },
       componentDidMount: function() {
-        this.getItems();
+        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) {
+        const params = nextProps.params || {}
+        this.initWithParams(params)
       },
       getItems: function() {
-        this.setState({ loading: true });
+        if(this.isMounted()) {
+          this.setState({ loading: true });
 
-        this.clearSelection();
+          this.clearSelection();
 
-        MailPoet.Ajax.post({
-          endpoint: this.props.endpoint,
-          action: 'listing',
-          data: {
-            offset: (this.state.page - 1) * this.state.limit,
-            limit: this.state.limit,
-            group: this.state.group,
-            filter: this.state.filter,
-            search: this.state.search,
-            sort_by: this.state.sort_by,
-            sort_order: this.state.sort_order
-          }
-        }).done(function(response) {
-          if(this.isMounted()) {
+          MailPoet.Ajax.post({
+            endpoint: this.props.endpoint,
+            action: 'listing',
+            data: {
+              offset: (this.state.page - 1) * this.state.limit,
+              limit: this.state.limit,
+              group: this.state.group,
+              filter: this.state.filter,
+              search: this.state.search,
+              sort_by: this.state.sort_by,
+              sort_order: this.state.sort_order
+            }
+          }).done(function(response) {
             this.setState({
               items: response.items || [],
-              filters: response.filters || [],
+              filters: response.filters || {},
               groups: response.groups || [],
               count: response.count || 0,
               loading: false
-            });
-          }
-        }.bind(this));
+            }, function() {
+              if(this.props['onGetItems'] !== undefined) {
+                  this.props.onGetItems(
+                    ~~(this.state.groups[0]['count'])
+                  );
+              }
+            }.bind(this));
+          }.bind(this));
+        }
       },
       handleRestoreItem: function(id) {
         this.setState({
@@ -318,7 +476,27 @@ define(
           this.getItems();
         }.bind(this));
       },
-      handleDeleteItem: function(id, confirm = false) {
+      handleTrashItem: function(id) {
+        this.setState({
+          loading: true,
+          page: 1
+        });
+
+        MailPoet.Ajax.post({
+          endpoint: this.props.endpoint,
+          action: 'trash',
+          data: id
+        }).done(function(response) {
+          if(
+            this.props.messages !== undefined
+            && this.props.messages['onTrash'] !== undefined
+          ) {
+            this.props.messages.onTrash(response);
+          }
+          this.getItems();
+        }.bind(this));
+      },
+      handleDeleteItem: function(id) {
         this.setState({
           loading: true,
           page: 1
@@ -327,34 +505,32 @@ define(
         MailPoet.Ajax.post({
           endpoint: this.props.endpoint,
           action: 'delete',
-          data: {
-            id: id,
-            confirm: confirm
-          }
+          data: id
         }).done(function(response) {
-          if(confirm === true) {
-            if(
-              this.props.messages !== undefined
-              && this.props.messages['onConfirmDelete'] !== undefined
-            ) {
-              this.props.messages.onConfirmDelete(response);
-            }
-          } else {
-            if(
-              this.props.messages !== undefined
-              && this.props.messages['onDelete'] !== undefined
-            ) {
-              this.props.messages.onDelete(response);
-            }
+          if(
+            this.props.messages !== undefined
+            && this.props.messages['onDelete'] !== undefined
+          ) {
+            this.props.messages.onDelete(response);
           }
-
           this.getItems();
         }.bind(this));
       },
-      handleBulkAction: function(selected_ids, params) {
+      handleEmptyTrash: function() {
+        this.handleBulkAction('all', {
+          action: 'delete',
+          group: 'trash'
+        }, function(response) {
+          MailPoet.Notice.success(
+            MailPoet.I18n.t('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;
         }
@@ -362,24 +538,20 @@ define(
         this.setState({ loading: true });
 
         var data = params || {};
-        var callback = ((data['onSuccess'] !== undefined)
-          ? data['onSuccess']
-          : function() {}
-        );
-        delete data.onSuccess;
-
         data.listing = {
           offset: 0,
           limit: 0,
           filter: this.state.filter,
           group: this.state.group,
-          search: this.state.search,
-          selection: selected_ids
+          search: this.state.search
+        }
+        if(selected_ids !== 'all') {
+          data.listing.selection = selected_ids;
         }
 
         MailPoet.Ajax.post({
           endpoint: this.props.endpoint,
-          action: 'bulk_action',
+          action: 'bulkAction',
           data: data
         }).done(function(response) {
           this.getItems();
@@ -393,6 +565,7 @@ define(
           selection: false,
           selected_ids: []
         }, function() {
+          this.setParams();
           this.getItems();
         }.bind(this));
       },
@@ -401,6 +574,7 @@ define(
           sort_by: sort_by,
           sort_order: sort_order,
         }, function() {
+          this.setParams();
           this.getItems();
         }.bind(this));
       },
@@ -460,6 +634,7 @@ define(
           filter: filters,
           page: 1
         }, function() {
+          this.setParams();
           this.getItems();
         }.bind(this));
       },
@@ -469,10 +644,11 @@ define(
 
         this.setState({
           group: group,
-          filter: [],
+          filter: {},
           search: '',
           page: 1
         }, function() {
+          this.setParams();
           this.getItems();
         }.bind(this));
       },
@@ -482,6 +658,7 @@ define(
           selection: false,
           selected_ids: []
         }, function() {
+          this.setParams();
           this.getItems();
         }.bind(this));
       },
@@ -489,34 +666,28 @@ define(
         var render = this.props.onRenderItem(item, actions);
         return render.props.children;
       },
+      handleRefreshItems: function() {
+        this.getItems();
+      },
       render: function() {
         var items = this.state.items,
             sort_by =  this.state.sort_by,
             sort_order =  this.state.sort_order;
 
-        // set sortable columns
-        columns = this.props.columns.map(function(column) {
-          column.sorted = (column.name === sort_by) ? sort_order : false;
-          return column;
-        });
-
         // 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',
-              label: 'Restore',
+              label: MailPoet.I18n.t('restore'),
               onSuccess: this.props.messages.onRestore
             },
             {
-              name: 'trash',
-              label: 'Delete permanently',
-              onSuccess: this.props.messages.onConfirmDelete,
-              getData: function() {
-                return { confirm: true };
-              }
+              name: 'delete',
+              label: MailPoet.I18n.t('deletePermanently'),
+              onSuccess: this.props.messages.onDelete
             }
           ];
         }
@@ -524,46 +695,70 @@ define(
         // item actions
         var item_actions = this.props.item_actions || [];
 
-        var tableClasses = classNames(
+        var table_classes = classNames(
+          'mailpoet_listing_table',
           'wp-list-table',
           'widefat',
           'fixed',
           'striped',
           { 'mailpoet_listing_loading': this.state.loading }
         );
+
+        // search
+        var search = (
+          <ListingSearch
+            onSearch={ this.handleSearch }
+            search={ this.state.search }
+          />
+        );
+        if(this.props.search === false) {
+          search = false;
+        }
+
+        // groups
+        var groups = (
+          <ListingGroups
+            groups={ this.state.groups }
+            group={ this.state.group }
+            onSelectGroup={ this.handleGroup }
+          />
+        );
+        if(this.props.groups === false) {
+          groups = false;
+        }
+
         return (
           <div>
-            <ListingGroups
-              groups={ this.state.groups }
-              group={ this.state.group }
-              onSelectGroup={ this.handleGroup } />
-            <ListingSearch
-              onSearch={ this.handleSearch }
-              search={ this.state.search } />
+            { groups }
+            { search }
             <div className="tablenav top clearfix">
               <ListingBulkActions
+                count={ this.state.count }
                 bulk_actions={ bulk_actions }
                 selection={ this.state.selection }
                 selected_ids={ this.state.selected_ids }
                 onBulkAction={ this.handleBulkAction } />
               <ListingFilters
                 filters={ this.state.filters }
-                filter={ this.state.filter }
-                onSelectFilter={ this.handleFilter } />
+                filter={ this.state.filter }
+                group={ this.state.group }
+                onSelectFilter={ this.handleFilter }
+                onEmptyTrash={ this.handleEmptyTrash }
+              />
               <ListingPages
                 count={ this.state.count }
                 page={ this.state.page }
                 limit={ this.state.limit }
                 onSetPage={ this.handleSetPage } />
             </div>
-            <table className={ tableClasses }>
+            <table className={ table_classes }>
               <thead>
                 <ListingHeader
                   onSort={ this.handleSort }
                   onSelectItems={ this.handleSelectItems }
                   selection={ this.state.selection }
-                  sort_by={ this.state.sort_by }
-                  sort_order={ this.state.sort_order }
+                  sort_by={ sort_by }
+                  sort_order={ sort_order }
                   columns={ this.props.columns }
                   is_selectable={ bulk_actions.length > 0 } />
               </thead>
@@ -572,6 +767,8 @@ define(
                 onRenderItem={ this.handleRenderItem }
                 onDeleteItem={ this.handleDeleteItem }
                 onRestoreItem={ this.handleRestoreItem }
+                onTrashItem={ this.handleTrashItem }
+                onRefreshItems={ this.handleRefreshItems }
                 columns={ this.props.columns }
                 is_selectable={ bulk_actions.length > 0 }
                 onSelectItem={ this.handleSelectItem }
@@ -590,8 +787,8 @@ define(
                   onSort={ this.handleSort }
                   onSelectItems={ this.handleSelectItems }
                   selection={ this.state.selection }
-                  sort_by={ this.state.sort_by }
-                  sort_order={ this.state.sort_order }
+                  sort_by={ sort_by }
+                  sort_order={ sort_order }
                   columns={ this.props.columns }
                   is_selectable={ bulk_actions.length > 0 } />
               </tfoot>
@@ -599,6 +796,7 @@ define(
             </table>
             <div className="tablenav bottom">
               <ListingBulkActions
+                count={ this.state.count }
                 bulk_actions={ bulk_actions }
                 selection={ this.state.selection }
                 selected_ids={ this.state.selected_ids }

assets/js/src/listing/pages.jsx

@@ -1,4 +1,12 @@
-define(['react', 'classnames'], function(React, classNames) {
+define([
+    'react',
+    'classnames',
+    'mailpoet'
+  ], function(
+    React,
+    classNames,
+    MailPoet
+  ) {
 
   var ListingPages = React.createClass({
     getInitialState: function() {
@@ -7,7 +15,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 +28,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,42 +43,44 @@ 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);
     },
     render: function() {
       if(this.props.count === 0) {
-        return (<div></div>);
+        return false;
       } else {
-        var pagination,
-        firstPage = (
+        var pagination = false;
+        var firstPage = (
           <span aria-hidden="true" className="tablenav-pages-navspan">«</span>
-        ),
-        previousPage = (
+        );
+        var previousPage = (
           <span aria-hidden="true" className="tablenav-pages-navspan">‹</span>
-        ),
-        nextPage = (
+        );
+        var nextPage = (
           <span aria-hidden="true" className="tablenav-pages-navspan">›</span>
-        ),
-        lastPage = (
+        );
+        var lastPage = (
           <span aria-hidden="true" className="tablenav-pages-navspan">»</span>
         );
 
-        if(this.props.count > this.props.limit) {
+        if(this.props.limit > 0 && this.props.count > this.props.limit) {
           if(this.props.page > 1) {
             previousPage = (
               <a href="javascript:;"
                 onClick={ this.setPreviousPage }
                 className="prev-page">
-                <span className="screen-reader-text">Previous page</span>
+                <span className="screen-reader-text">{MailPoet.I18n.t('previousPage')}</span>
                 <span aria-hidden="true">‹</span>
               </a>
             );
@@ -73,7 +91,7 @@ define(['react', 'classnames'], function(React, classNames) {
               <a href="javascript:;"
                 onClick={ this.setFirstPage }
                 className="first-page">
-                <span className="screen-reader-text">First page</span>
+                <span className="screen-reader-text">{MailPoet.I18n.t('firstPage')}</span>
                 <span aria-hidden="true">«</span>
               </a>
             );
@@ -84,7 +102,7 @@ define(['react', 'classnames'], function(React, classNames) {
               <a href="javascript:;"
                 onClick={ this.setNextPage }
                 className="next-page">
-                <span className="screen-reader-text">Next page</span>
+                <span className="screen-reader-text">{MailPoet.I18n.t('nextPage')}</span>
                 <span aria-hidden="true">›</span>
               </a>
             );
@@ -95,39 +113,47 @@ define(['react', 'classnames'], function(React, classNames) {
               <a href="javascript:;"
                 onClick={ this.setLastPage }
                 className="last-page">
-                <span className="screen-reader-text">Last page</span>
+                <span className="screen-reader-text">{MailPoet.I18n.t('lastPage')}</span>
                 <span aria-hidden="true">»</span>
               </a>
             );
           }
 
+          let pageValue =  this.props.page;
+          if(this.state.page !== null) {
+            pageValue = this.state.page;
+          }
+
           pagination = (
             <span className="pagination-links">
               {firstPage}
+              &nbsp;
               {previousPage}
               &nbsp;
               <span className="paging-input">
                 <label
                   className="screen-reader-text"
-                  htmlFor="current-page-selector">Current Page</label>
+                  htmlFor="current-page-selector">{MailPoet.I18n.t('currentPage')}</label>
                 <input
                   type="text"
                   onChange={ this.handleChangeManualPage }
                   onKeyUp={ this.handleSetManualPage }
+                  onBlur={ this.handleBlurManualPage }
                   aria-describedby="table-paging"
-                  size="1"
+                  size="2"
                   ref="page"
-                  value={ this.state.page || this.props.page }
+                  value={ pageValue }
                   name="paged"
                   id="current-page-selector"
                   className="current-page" />
-                &nbsp;of&nbsp;
+                &nbsp;{MailPoet.I18n.t('pageOutOf')}&nbsp;
                 <span className="total-pages">
-                  {Math.ceil(this.props.count / this.props.limit)}
+                  {Math.ceil(this.props.count / this.props.limit).toLocaleString()}
                 </span>
               </span>
               &nbsp;
               {nextPage}
+              &nbsp;
               {lastPage}
             </span>
           );
@@ -140,7 +166,9 @@ define(['react', 'classnames'], function(React, classNames) {
 
         return (
           <div className={ classes }>
-            <span className="displaying-num">{ this.props.count } item(s)</span>
+            <span className="displaying-num">{
+              MailPoet.I18n.t('numberOfItems').replace('%$1d', this.props.count.toLocaleString())
+            }</span>
             { pagination }
           </div>
         );
@@ -149,4 +177,4 @@ define(['react', 'classnames'], function(React, classNames) {
   });
 
   return ListingPages;
-});
+});

assets/js/src/listing/search.jsx

@@ -1,4 +1,10 @@
-define(['react'], function(React) {
+define([
+    'mailpoet',
+    'react'
+  ], function(
+    MailPoet,
+    React
+  ) {
 
   var ListingSearch = React.createClass({
     handleSearch: function(e) {
@@ -7,26 +13,33 @@ define(['react'], function(React) {
         this.refs.search.value
       );
     },
+    componentWillReceiveProps: function(nextProps) {
+      this.refs.search.value = nextProps.search
+    },
     render: function() {
-      return (
-        <form name="search" onSubmit={this.handleSearch}>
-          <p className="search-box">
-            <label htmlFor="search_input" className="screen-reader-text">
-              Search
-            </label>
-            <input
-              type="search"
-              id="search_input"
-              ref="search"
-              name="s"
-              defaultValue={this.props.search} />
-            <input
-              type="submit"
-              defaultValue={MailPoetI18n.searchLabel}
-              className="button" />
-          </p>
-        </form>
-      );
+      if(this.props.search === false) {
+        return false;
+      } else {
+        return (
+          <form name="search" onSubmit={this.handleSearch}>
+            <p className="search-box">
+              <label htmlFor="search_input" className="screen-reader-text">
+              {MailPoet.I18n.t('searchLabel')}
+              </label>
+              <input
+                type="search"
+                id="search_input"
+                ref="search"
+                name="s"
+                defaultValue={this.props.search} />
+              <input
+                type="submit"
+                defaultValue={MailPoet.I18n.t('searchLabel')}
+                className="button" />
+            </p>
+          </form>
+        );
+      }
     }
   });
 

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
@@ -113,7 +112,16 @@ define([
             }
           }
         },
-      }).preventDefault('auto');
+      })
+      .preventDefault('auto')
+      .actionChecker(function (pointer, event, action) {
+        // Disable dragging with right click
+        if (event.button !== 0) {
+          return null;
+        }
+
+        return action;
+      });
 
       if (this.options.drop !== undefined) {
         interactable.getDropModel = this.options.drop;