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

Change post types to plural labels, move Posts/ALC UI elements

Browse Source
This commit is contained in:
Tautvidas Sipavičius
2015-11-19 19:08:48 +02:00
parent fbc6f54ddc
commit 786fbc36a2
6 changed files with 32 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
assets/js/src/newsletter_editor/blocks/automatedLatestContent.js
View File

@@ -306,7 +306,7 @@ define([
_.each(postTypes, function(type) { _.each(postTypes, function(type) {
select.append(jQuery('<option>', { select.append(jQuery('<option>', {
value: type.name, value: type.name,
text: type.labels.singular_name, text: type.label,
})); }));
}); });
select.val(selectedValue); select.val(selectedValue);

2
assets/js/src/newsletter_editor/blocks/posts.js
View File

@@ -344,7 +344,7 @@ define([
_.each(postTypes, function(type) { _.each(postTypes, function(type) {
select.append(jQuery('<option>', { select.append(jQuery('<option>', {
value: type.name, value: type.name,
text: type.labels.singular_name, text: type.label,
})); }));
}); });
select.val(selectedValue); select.val(selectedValue);

2
lib/Newsletter/Editor/PostListTransformer.php
View File

@@ -14,7 +14,7 @@ class PostListTransformer {
function transform($posts) { function transform($posts) {
$results = array(); $results = array();
$use_divider = (bool)$this->args['showDivider']; $use_divider = $this->args['showDivider'] === 'true';
foreach ($posts as $index => $post) { foreach ($posts as $index => $post) {
if ($use_divider && $index > 0) { if ($use_divider && $index > 0) {

2
lib/Newsletter/Editor/PostTransformer.php
View File

@@ -22,7 +22,7 @@ class PostTransformer {
$content = $content_manager->filterContent($content); $content = $content_manager->filterContent($content);
$structure_transformer = new StructureTransformer(); $structure_transformer = new StructureTransformer();
$structure = $structure_transformer->transform($content, (bool)$this->args['imagePadded']); $structure = $structure_transformer->transform($content, $this->args['imagePadded'] === 'true');
$structure = $this->appendFeaturedImage( $structure = $this->appendFeaturedImage(
$post, $post,

23
views/newsletter/templates/blocks/automatedLatestContent/settings.hbs
View File

@@ -37,6 +37,15 @@
<hr class="mailpoet_separator" /> <hr class="mailpoet_separator" />
<div class="mailpoet_form_field">
<a href="javascript:;" class="mailpoet_automated_latest_content_show_display_options"><%= __('Display options') %></a>
</div>
<div class="mailpoet_automated_latest_content_display_options mailpoet_hidden">
<div class="mailpoet_form_field">
<a href="javascript:;" class="mailpoet_automated_latest_content_hide_display_options"><%= __('Hide display options') %></a>
</div>
<div class="mailpoet_form_field"> <div class="mailpoet_form_field">
<div class="mailpoet_form_field_radio_option"> <div class="mailpoet_form_field_radio_option">
<label> <label>
@@ -58,14 +67,6 @@
</div> </div>
</div> </div>
<div class="mailpoet_form_field">
<a href="javascript:;" class="mailpoet_automated_latest_content_show_display_options"><%= __('Display options') %></a>
</div>
<div class="mailpoet_automated_latest_content_display_options mailpoet_hidden">
<div class="mailpoet_form_field">
<a href="javascript:;" class="mailpoet_automated_latest_content_hide_display_options"><%= __('Hide display options') %></a>
</div>
<div class="mailpoet_form_field"> <div class="mailpoet_form_field">
<div class="mailpoet_form_field_title"><%= __('Title Format') %></div> <div class="mailpoet_form_field_title"><%= __('Title Format') %></div>
<div class="mailpoet_form_field_radio_option"> <div class="mailpoet_form_field_radio_option">
@@ -251,7 +252,7 @@
</div> </div>
<div class="mailpoet_form_field"> <div class="mailpoet_form_field">
<div class="mailpoet_form_field_title mailpoet_form_field_title_small mailpoet_form_field_title_inline"><%= __('Sort by') %></div> <div class="mailpoet_form_field_title mailpoet_form_field_title_small"><%= __('Sort by') %></div>
<div class="mailpoet_form_field_radio_option"> <div class="mailpoet_form_field_radio_option">
<label> <label>
<input type="radio" name="mailpoet_automated_latest_content_sort_by" class="mailpoet_automated_latest_content_sort_by" value="newest" {{#ifCond model.sortBy '==' 'newest'}}CHECKED{{/ifCond}}/> <input type="radio" name="mailpoet_automated_latest_content_sort_by" class="mailpoet_automated_latest_content_sort_by" value="newest" {{#ifCond model.sortBy '==' 'newest'}}CHECKED{{/ifCond}}/>
@@ -268,7 +269,7 @@
<div class="mailpoet_automated_latest_content_non_title_list_options {{#ifCond model.displayType '==' 'titleOnly'}}{{#ifCond model.titleFormat '==' 'ul'}}mailpoet_hidden{{/ifCond}}{{/ifCond}}"> <div class="mailpoet_automated_latest_content_non_title_list_options {{#ifCond model.displayType '==' 'titleOnly'}}{{#ifCond model.titleFormat '==' 'ul'}}mailpoet_hidden{{/ifCond}}{{/ifCond}}">
<div class="mailpoet_form_field"> <div class="mailpoet_form_field">
<div class="mailpoet_form_field_title mailpoet_form_field_title_small mailpoet_form_field_title_inline"><%= __('Show divider between posts') %></div> <div class="mailpoet_form_field_title mailpoet_form_field_title_small"><%= __('Show divider between posts') %></div>
<div class="mailpoet_form_field_radio_option"> <div class="mailpoet_form_field_radio_option">
<label> <label>
<input type="radio" name="mailpoet_automated_latest_content_show_divider"class="mailpoet_automated_latest_content_show_divider" value="true" {{#if model.showDivider}}CHECKED{{/if}}/> <input type="radio" name="mailpoet_automated_latest_content_show_divider"class="mailpoet_automated_latest_content_show_divider" value="true" {{#if model.showDivider}}CHECKED{{/if}}/>
@@ -281,7 +282,7 @@
<%= __('No') %> <%= __('No') %>
</label> </label>
</div> </div>
<div class="mailpoet_form_field_input_option"> <div>
<a href="javascript:;" class="mailpoet_automated_latest_content_select_divider"><%= __('Select divider') %></a> <a href="javascript:;" class="mailpoet_automated_latest_content_select_divider"><%= __('Select divider') %></a>
</div> </div>
</div> </div>

4
views/newsletter/templates/blocks/posts/settings.hbs
View File

@@ -2,7 +2,9 @@
<div class="mailpoet_settings_posts_selection"></div> <div class="mailpoet_settings_posts_selection"></div>
<div class="mailpoet_settings_posts_display_options mailpoet_hidden"></div> <div class="mailpoet_settings_posts_display_options mailpoet_hidden"></div>
<div class="mailpoet_settings_posts_controls"> <div class="mailpoet_settings_posts_controls">
<input type="button" class="mailpoet_button mailpoet_button_primary mailpoet_settings_posts_insert_selected" value="<%= __('Insert selected') %>" /> <div class="mailpoet_form_field">
<a href="javascript:;" class="mailpoet_settings_posts_show_post_selection mailpoet_hidden"><%= __('Back to selection') %></a> <a href="javascript:;" class="mailpoet_settings_posts_show_post_selection mailpoet_hidden"><%= __('Back to selection') %></a>
<a href="javascript:;" class="mailpoet_settings_posts_show_display_options"><%= __('Display options') %></a> <a href="javascript:;" class="mailpoet_settings_posts_show_display_options"><%= __('Display options') %></a>
</div> </div>
<input type="button" class="mailpoet_button mailpoet_button_primary mailpoet_settings_posts_insert_selected" value="<%= __('Insert selected') %>" />
</div>