diff --git a/assets/css/src/newsletter_editor/contentBlocks/base.styl b/assets/css/src/newsletter_editor/contentBlocks/base.styl
index c505812d9b..3e92931b74 100644
--- a/assets/css/src/newsletter_editor/contentBlocks/base.styl
+++ b/assets/css/src/newsletter_editor/contentBlocks/base.styl
@@ -32,5 +32,6 @@ $block-hover-highlight-color = $primary-active-color
position: relative
line-height: 1.61803398875
- p
+ p, h1, h2, h3, h4, h5, h6
line-height: 1.61803398875
+ font-style: normal
diff --git a/assets/css/src/newsletter_editor/contentBlocks/text.styl b/assets/css/src/newsletter_editor/contentBlocks/text.styl
index 923b401487..ea5a578aba 100644
--- a/assets/css/src/newsletter_editor/contentBlocks/text.styl
+++ b/assets/css/src/newsletter_editor/contentBlocks/text.styl
@@ -12,9 +12,11 @@
h1, h2, h3, h4, h5, h6
padding: 0
margin: 0
+ font-weight: normal
p
margin-top: 0
+ font-weight: normal
blockquote
margin: 1em
diff --git a/assets/js/src/newsletter_editor/components/sidebar.js b/assets/js/src/newsletter_editor/components/sidebar.js
index 3f0e5a2bbd..a73f55e995 100644
--- a/assets/js/src/newsletter_editor/components/sidebar.js
+++ b/assets/js/src/newsletter_editor/components/sidebar.js
@@ -230,15 +230,17 @@ define([
json.body = JSON.stringify(json.body);
}
+ MailPoet.Modal.loading(true);
+
MailPoet.Ajax.post({
endpoint: 'newsletters',
action: 'render',
data: json,
}).done(function(response){
- console.log('Should open a new window');
+ MailPoet.Modal.loading(false);
window.open('data:text/html;charset=utf-8,' + encodeURIComponent(response.rendered_body), '_blank');
}).fail(function(error) {
- console.log('Preview error', json);
+ MailPoet.Modal.loading(false);
alert('Something went wrong, check console');
});
},
@@ -246,11 +248,23 @@ define([
// testing sending method
console.log('trying to send a preview');
// get form data
+ var $emailField = this.$('#mailpoet_preview_to_email');
var data = {
- subscriber: this.$('#mailpoet_preview_to_email').val(),
+ subscriber: $emailField.val(),
id: App.getNewsletter().get('id'),
};
+ if (data.subscriber.length <= 0) {
+ MailPoet.Notice.error(
+ App.getConfig().get('translations.newsletterPreviewEmailMissing'),
+ {
+ positionAfter: $emailField,
+ scroll: true,
+ }
+ );
+ return false;
+ }
+
// send test email
MailPoet.Modal.loading(true);
diff --git a/lib/Config/Menu.php b/lib/Config/Menu.php
index a32d874407..d96aa49758 100644
--- a/lib/Config/Menu.php
+++ b/lib/Config/Menu.php
@@ -380,6 +380,7 @@ class Menu {
$data = array(
'customFields' => $custom_fields,
+ 'settings' => Setting::getAll(),
);
wp_enqueue_media();
wp_enqueue_script('tinymce-wplink', includes_url('js/tinymce/plugins/wplink/plugin.js'));
diff --git a/views/newsletter/editor.html b/views/newsletter/editor.html
deleted file mode 100644
index 4e27d79ee8..0000000000
--- a/views/newsletter/editor.html
+++ /dev/null
@@ -1,1879 +0,0 @@
-<% extends 'layout.html' %>
-
-<% block content %>
-
-
-
- <%= __('Select type') %> > <%= __('Template') %> > <%= __('Designer') %> > <%= __('Send') %>
-
-
-
-
-
-
-
-
-
-
-
-
-<% endblock %>
-
-<% block templates %>
- <%= partial('newsletter_editor_template_tools_generic', 'newsletter/templates/blocks/base/toolsGeneric.hbs') %>
-
- <%= partial('newsletter_editor_template_automated_latest_content_block', 'newsletter/templates/blocks/automatedLatestContent/block.hbs') %>
- <%= partial('newsletter_editor_template_automated_latest_content_widget', 'newsletter/templates/blocks/automatedLatestContent/widget.hbs') %>
- <%= partial('newsletter_editor_template_automated_latest_content_settings', 'newsletter/templates/blocks/automatedLatestContent/settings.hbs') %>
-
- <%= partial('newsletter_editor_template_button_block', 'newsletter/templates/blocks/button/block.hbs') %>
- <%= partial('newsletter_editor_template_button_widget', 'newsletter/templates/blocks/button/widget.hbs') %>
- <%= partial('newsletter_editor_template_button_settings', 'newsletter/templates/blocks/button/settings.hbs') %>
-
- <%= partial('newsletter_editor_template_container_block', 'newsletter/templates/blocks/container/block.hbs') %>
- <%= partial('newsletter_editor_template_container_block_empty', 'newsletter/templates/blocks/container/emptyBlock.hbs') %>
- <%= partial('newsletter_editor_template_container_one_column_widget', 'newsletter/templates/blocks/container/oneColumnLayoutWidget.hbs') %>
- <%= partial('newsletter_editor_template_container_two_column_widget', 'newsletter/templates/blocks/container/twoColumnLayoutWidget.hbs') %>
- <%= partial('newsletter_editor_template_container_three_column_widget', 'newsletter/templates/blocks/container/threeColumnLayoutWidget.hbs') %>
- <%= partial('newsletter_editor_template_container_settings', 'newsletter/templates/blocks/container/settings.hbs') %>
-
- <%= partial('newsletter_editor_template_divider_block', 'newsletter/templates/blocks/divider/block.hbs') %>
- <%= partial('newsletter_editor_template_divider_widget', 'newsletter/templates/blocks/divider/widget.hbs') %>
- <%= partial('newsletter_editor_template_divider_settings', 'newsletter/templates/blocks/divider/settings.hbs') %>
-
- <%= partial('newsletter_editor_template_footer_block', 'newsletter/templates/blocks/footer/block.hbs') %>
- <%= partial('newsletter_editor_template_footer_widget', 'newsletter/templates/blocks/footer/widget.hbs') %>
- <%= partial('newsletter_editor_template_footer_settings', 'newsletter/templates/blocks/footer/settings.hbs') %>
-
- <%= partial('newsletter_editor_template_header_block', 'newsletter/templates/blocks/header/block.hbs') %>
- <%= partial('newsletter_editor_template_header_widget', 'newsletter/templates/blocks/header/widget.hbs') %>
- <%= partial('newsletter_editor_template_header_settings', 'newsletter/templates/blocks/header/settings.hbs') %>
-
- <%= partial('newsletter_editor_template_image_block', 'newsletter/templates/blocks/image/block.hbs') %>
- <%= partial('newsletter_editor_template_image_widget', 'newsletter/templates/blocks/image/widget.hbs') %>
- <%= partial('newsletter_editor_template_image_settings', 'newsletter/templates/blocks/image/settings.hbs') %>
-
- <%= partial('newsletter_editor_template_posts_block', 'newsletter/templates/blocks/posts/block.hbs') %>
- <%= partial('newsletter_editor_template_posts_widget', 'newsletter/templates/blocks/posts/widget.hbs') %>
- <%= partial('newsletter_editor_template_posts_settings', 'newsletter/templates/blocks/posts/settings.hbs') %>
- <%= partial('newsletter_editor_template_posts_settings_display_options', 'newsletter/templates/blocks/posts/settingsDisplayOptions.hbs') %>
- <%= partial('newsletter_editor_template_posts_settings_selection', 'newsletter/templates/blocks/posts/settingsSelection.hbs') %>
- <%= partial('newsletter_editor_template_posts_settings_selection_empty', 'newsletter/templates/blocks/posts/settingsSelectionEmpty.hbs') %>
- <%= partial('newsletter_editor_template_posts_settings_single_post', 'newsletter/templates/blocks/posts/settingsSinglePost.hbs') %>
-
- <%= partial('newsletter_editor_template_social_block', 'newsletter/templates/blocks/social/block.hbs') %>
- <%= partial('newsletter_editor_template_social_block_icon', 'newsletter/templates/blocks/social/blockIcon.hbs') %>
- <%= partial('newsletter_editor_template_social_widget', 'newsletter/templates/blocks/social/widget.hbs') %>
- <%= partial('newsletter_editor_template_social_settings', 'newsletter/templates/blocks/social/settings.hbs') %>
- <%= partial('newsletter_editor_template_social_settings_icon', 'newsletter/templates/blocks/social/settingsIcon.hbs') %>
- <%= partial('newsletter_editor_template_social_settings_icon_selector', 'newsletter/templates/blocks/social/settingsIconSelector.hbs') %>
- <%= partial('newsletter_editor_template_social_settings_styles', 'newsletter/templates/blocks/social/settingsStyles.hbs') %>
-
- <%= partial('newsletter_editor_template_spacer_block', 'newsletter/templates/blocks/spacer/block.hbs') %>
- <%= partial('newsletter_editor_template_spacer_widget', 'newsletter/templates/blocks/spacer/widget.hbs') %>
- <%= partial('newsletter_editor_template_spacer_settings', 'newsletter/templates/blocks/spacer/settings.hbs') %>
-
- <%= partial('newsletter_editor_template_text_block', 'newsletter/templates/blocks/text/block.hbs') %>
- <%= partial('newsletter_editor_template_text_widget', 'newsletter/templates/blocks/text/widget.hbs') %>
- <%= partial('newsletter_editor_template_text_settings', 'newsletter/templates/blocks/text/settings.hbs') %>
-
- <%= partial('newsletter_editor_template_heading', 'newsletter/templates/components/heading.hbs') %>
- <%= partial('newsletter_editor_template_save', 'newsletter/templates/components/save.hbs') %>
- <%= partial('newsletter_editor_template_styles', 'newsletter/templates/components/styles.hbs') %>
-
- <%= partial('newsletter_editor_template_sidebar', 'newsletter/templates/components/sidebar/sidebar.hbs') %>
- <%= partial('newsletter_editor_template_sidebar_content', 'newsletter/templates/components/sidebar/content.hbs') %>
- <%= partial('newsletter_editor_template_sidebar_layout', 'newsletter/templates/components/sidebar/layout.hbs') %>
- <%= partial('newsletter_editor_template_sidebar_preview', 'newsletter/templates/components/sidebar/preview.hbs') %>
- <%= partial('newsletter_editor_template_sidebar_styles', 'newsletter/templates/components/sidebar/styles.hbs') %>
-
- <%= javascript(
- 'vendor.js',
- 'lib/tinymce/tinymce.jquery.min.js',
- 'lib/tinymce/jquery.tinymce.min.js',
- 'lib/mailpoet_custom_fields/plugin.js',
- 'lib/wplink/plugin.js',
- 'newsletter_editor.js'
- ) %>
-
- <%= stylesheet(
- 'newsletter_editor.css'
- ) %>
-
-
-
-
-<% endblock %>
diff --git a/views/newsletter/form.html b/views/newsletter/form.html
index 29cba23027..b1b1e5ebac 100644
--- a/views/newsletter/form.html
+++ b/views/newsletter/form.html
@@ -522,7 +522,7 @@
],
fonts: [
'Arial',
- 'Comic Sans',
+ 'Comic Sans MS',
'Courier New',
'Georgia',
'Lucida',
@@ -976,10 +976,10 @@
backgroundColor: '#2ea1cd',
borderColor: '#0074a2',
borderWidth: '1px',
- borderRadius: '7px',
+ borderRadius: '5px',
borderStyle: 'solid',
- width: '120px',
- lineHeight: '35px',
+ width: '180px',
+ lineHeight: '40px',
fontColor: '#ffffff',
fontFamily: 'Verdana',
fontSize: '18px',
@@ -1241,7 +1241,9 @@
customFieldsWindowTitle:
'<%= __('Select a shortcode') %>',
unsubscribeLinkMissing:
- '<%= __('Please include an unsubscribe link to continue.') %>',
+ '<%= __('All newsletter must include an "unsubscribe" link. Add a footer widget to your newsletter to continue.') %>',
+ newsletterPreviewEmailMissing:
+ '<%= __('Please enter an email where newsletter preview should be sent to.') %>',
newsletterPreviewSent:
'<%= __('Newsletter preview email has been successfully sent!') %>',
newsletterPreviewFailedToSend:
@@ -1264,7 +1266,7 @@
imageMissing: '<%= image_url(
"newsletter_editor/image-missing.svg"
) %>',
- }
+ },
};
var editor = null;
diff --git a/views/newsletter/templates/components/sidebar/preview.hbs b/views/newsletter/templates/components/sidebar/preview.hbs
index 794685493f..4f5448e458 100644
--- a/views/newsletter/templates/components/sidebar/preview.hbs
+++ b/views/newsletter/templates/components/sidebar/preview.hbs
@@ -4,7 +4,7 @@