diff --git a/assets/css/src/in_app_announcements.styl b/assets/css/src/in_app_announcements.styl index 9ff800589b..031d550c66 100644 --- a/assets/css/src/in_app_announcements.styl +++ b/assets/css/src/in_app_announcements.styl @@ -37,7 +37,7 @@ top: -3px left: 8px -.mailpoet_in_app_announcement_background_videos, .mailpoet_drag_and_drop_tutorial +.mailpoet_drag_and_drop_tutorial text-align: center h2 font-size: 28px diff --git a/assets/css/src/newsletter_editor/components/heading.styl b/assets/css/src/newsletter_editor/components/heading.styl index cb437abba1..af5bab969b 100644 --- a/assets/css/src/newsletter_editor/components/heading.styl +++ b/assets/css/src/newsletter_editor/components/heading.styl @@ -20,8 +20,3 @@ p margin: 0 - -.mailpoet_editor_announcement - position: absolute - right: 20px - top: 90px diff --git a/assets/css/src/newsletter_editor/layout.styl b/assets/css/src/newsletter_editor/layout.styl index 4dfb186563..af09732ee0 100644 --- a/assets/css/src/newsletter_editor/layout.styl +++ b/assets/css/src/newsletter_editor/layout.styl @@ -4,7 +4,6 @@ $content-border-color = $structure-border-color #mailpoet_editor width: 100% clear: both - position: relative #mailpoet_editor_heading padding-left: 15px diff --git a/assets/js/src/newsletter_editor/background_image_announcement.jsx b/assets/js/src/newsletter_editor/background_image_announcement.jsx deleted file mode 100644 index a7cb53fad3..0000000000 --- a/assets/js/src/newsletter_editor/background_image_announcement.jsx +++ /dev/null @@ -1,27 +0,0 @@ -import PropTypes from 'prop-types'; -import React from 'react'; -import MailPoet from 'mailpoet'; -import InAppAnnouncement from 'announcements/in_app_announcement.jsx'; - -const BackgroundImageAnnouncement = props => ( - -
-

- {MailPoet.I18n.t('announcementBackgroundImagesHeading').replace('%username%', props.username)} -

-

{MailPoet.I18n.t('announcementBackgroundImagesMessage')}

- -
- -); - -BackgroundImageAnnouncement.propTypes = { - username: PropTypes.string.isRequired, - videoUrl: PropTypes.string.isRequired, -}; - -export default BackgroundImageAnnouncement; diff --git a/assets/js/src/newsletter_editor/initializer.jsx b/assets/js/src/newsletter_editor/initializer.jsx index 79cda278ec..e9e53f2b48 100644 --- a/assets/js/src/newsletter_editor/initializer.jsx +++ b/assets/js/src/newsletter_editor/initializer.jsx @@ -3,7 +3,6 @@ import Breadcrumb from 'newsletters/breadcrumb.jsx'; import MailPoet from 'mailpoet'; import React from 'react'; import ReactDOM from 'react-dom'; -import BackgroundImageAnnouncement from './background_image_announcement.jsx'; import displayTutorial from './tutorial.jsx'; const renderBreadcrumb = (newsletterType) => { @@ -18,16 +17,6 @@ const renderBreadcrumb = (newsletterType) => { ReactDOM.render(breadcrumb, breadcrumbContainer); }; -const renderAnnouncement = () => { - const container = document.getElementById('mailpoet_editor_announcement'); - ReactDOM.render( - , container - ); -}; - const initializeEditor = (config) => { const editorContainer = document.getElementById('mailpoet_editor'); const getUrlParam = param => (location.search.split(`${param}=`)[1] || '').split('&')[0]; @@ -62,7 +51,6 @@ const initializeEditor = (config) => { }); renderBreadcrumb(newsletter.type); - renderAnnouncement(); if (newsletter.status === 'sending' && newsletter.queue && newsletter.queue.status === null) { MailPoet.Ajax.post({ diff --git a/plugin_repository/assets/newsletter-editor/background-image-demo.20181121-1440.mp4 b/plugin_repository/assets/newsletter-editor/background-image-demo.20181121-1440.mp4 deleted file mode 100644 index 6bee3db9eb..0000000000 Binary files a/plugin_repository/assets/newsletter-editor/background-image-demo.20181121-1440.mp4 and /dev/null differ diff --git a/views/newsletter/editor.html b/views/newsletter/editor.html index 223ffff8ca..610fb51053 100644 --- a/views/newsletter/editor.html +++ b/views/newsletter/editor.html @@ -248,7 +248,6 @@

<%= __('Newsletter Editor') %>

-
@@ -367,8 +366,6 @@ 'cancelColorSelection': _x('Cancel', 'cancel color selection'), 'newsletterIsPaused': __('Email sending has been paused.'), 'tutorialVideoTitle': __('Before you start, this is how you drag and drop in MailPoet'), - 'announcementBackgroundImagesHeading': __('Hey %username%, you can now put text over any image.'), - 'announcementBackgroundImagesMessage': __('Simply edit any column block to add a background image. It works in pretty much every email client, even on mobile.'), 'selectType': __('Select type'), 'events': __('Events'), 'conditions': _x('Conditions', 'Configuration options for automatic email events'), @@ -1342,14 +1339,10 @@ ) %>', }, dragDemoUrl: '<%= cdn_url('newsletter-editor/editor-drag-demo.20181121-1440.mp4') %>', - backgroundImageDemoUrl: '<%= cdn_url('newsletter-editor/background-image-demo.20181121-1440.mp4') %>', currentUserId: '<%= current_wp_user.wp_user_id %>', - currentUserFirstName: '<%= current_wp_user.first_name %>', - currentUserUsername: '<%= current_wp_user.login %>', dragDemoUrlSettings: '<%= settings["user_seen_editor_tutorial" ~ current_wp_user.wp_user_id] %>', installedAt: '<%= settings["installed_at"] %>', }; - var mailpoet_in_app_announcements = <%= json_encode(settings.in_app_announcements) %>; wp.hooks.doAction('mailpoet_newsletters_editor_initialize', config);