Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

Redesign the save part

Browse Source 
[MAILPOET-2281]
This commit is contained in:
Amine Ben hammou
2019-09-25 00:06:42 +01:00
committed by Jack Kitterhing
parent c1d38095d8
commit ff25324ed8
3 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
assets/css/src/components/newsletterEditor/components/_save.scss
View File

@ -81,11 +81,6 @@
float: right;
}
.mailpoet_editor_messages {
position: absolute;
right: 0;
}
.mailpoet_editor_last_saved {
color: $primary-inactive-color;
font-size: .9em;

6
assets/js/src/newsletter_editor/components/save.js
View File

@ -107,6 +107,7 @@ Module.SaveView = Marionette.View.extend({
templateContext: function () {
return {
wrapperClass: this.wrapperClass,
isWoocommerceTransactional: this.model.isWoocommerceTransactional(),
};
},
events: {
@ -356,8 +357,9 @@ App.on('before:start', function (BeforeStartApp) {
});
App.on('start', function (BeforeStartApp) {
var topSaveView = new Module.SaveView();
var bottomSaveView = new Module.SaveView();
var model = BeforeStartApp.getNewsletter();
var topSaveView = new Module.SaveView({ model: model });
var bottomSaveView = new Module.SaveView({ model: model });
bottomSaveView.setDropdownDirectionUp();
BeforeStartApp._appView.showChildView('topRegion', topSaveView);

15
views/newsletter/templates/components/save.hbs
View File

@ -1,10 +1,22 @@
<div class="mailpoet_save_wrapper {{ wrapperClass }}">
{{#if isWoocommerceTransactional}}
<div class="mailpoet_button_group mailpoet_save_button_group">
<input type="button" name="save" value="<%= __('Save') %>" class="button button-primary mailpoet_save_button" />
</div>
<div class="clearfix"></div>
<div class="mailpoet_editor_messages">
<div class="mailpoet_save_error"></div>
<div class="mailpoet_editor_last_saved mailpoet_hidden"><%= __('Autosaved') %> <span class="mailpoet_autosaved_at"></span></div>
</div>
<div class="clearfix"></div>
<a href="admin.php?page=wc-settings&tab=email" class="button button-primary mailpoet_save_button" style="margin-top: 7px"><%= __('Edit WooCommerce Email settings') %></a>
{{else}}
<input type="button" name="next" value="<%= __('Next') %>" class="button button-primary mailpoet_save_next" />
<div class="mailpoet_button_group mailpoet_save_button_group">
<input type="button" name="save" value="<%= __('Save') %>" class="button button-primary mailpoet_save_button" /><button class="button button-primary mailpoet_save_show_options" data-automation-id="newsletter_save_options_toggle" ><span class="dashicons mailpoet_save_show_options_icon"></span></button>
</div>
<div class="clearfix"></div>
<div class="mailpoet_editor_messages">
<div class="mailpoet_editor_messages">
<div class="mailpoet_save_error"></div>
<div class="mailpoet_editor_last_saved mailpoet_hidden"><%= __('Autosaved') %> <span class="mailpoet_autosaved_at"></span></div>
</div>
@ -24,4 +36,5 @@
<p><input type="text" name="export_template_name" value="" placeholder="<%= __('Template name') %>" class="mailpoet_input mailpoet_export_template_name" /></p>
<p><input type="button" name="export_template" value="<%= __('Export template') %>" class="button button-primary mailpoet_button_full mailpoet_export_template" /></p>
</div>
{{/if}}
</div>