From 786fbc36a2d9f3e7a684d37a62746a72a69bae2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tautvidas=20Sipavi=C4=8Dius?= <t.9b5as@gmail.com>
Date: Thu, 19 Nov 2015 19:08:48 +0200
Subject: [PATCH] Change post types to plural labels, move Posts/ALC UI
 elements

---
 .../blocks/automatedLatestContent.js          |  2 +-
 .../js/src/newsletter_editor/blocks/posts.js  |  2 +-
 lib/Newsletter/Editor/PostListTransformer.php |  2 +-
 lib/Newsletter/Editor/PostTransformer.php     |  2 +-
 .../automatedLatestContent/settings.hbs       | 47 ++++++++++---------
 .../templates/blocks/posts/settings.hbs       |  6 ++-
 6 files changed, 32 insertions(+), 29 deletions(-)

diff --git a/assets/js/src/newsletter_editor/blocks/automatedLatestContent.js b/assets/js/src/newsletter_editor/blocks/automatedLatestContent.js
index 867a3cf3de..1387f66aa1 100644
--- a/assets/js/src/newsletter_editor/blocks/automatedLatestContent.js
+++ b/assets/js/src/newsletter_editor/blocks/automatedLatestContent.js
@@ -306,7 +306,7 @@ define([
       _.each(postTypes, function(type) {
         select.append(jQuery('<option>', {
           value: type.name,
-          text: type.labels.singular_name,
+          text: type.label,
         }));
       });
       select.val(selectedValue);
diff --git a/assets/js/src/newsletter_editor/blocks/posts.js b/assets/js/src/newsletter_editor/blocks/posts.js
index 0c363fa7eb..a6f792112d 100644
--- a/assets/js/src/newsletter_editor/blocks/posts.js
+++ b/assets/js/src/newsletter_editor/blocks/posts.js
@@ -344,7 +344,7 @@ define([
       _.each(postTypes, function(type) {
         select.append(jQuery('<option>', {
           value: type.name,
-          text: type.labels.singular_name,
+          text: type.label,
         }));
       });
       select.val(selectedValue);
diff --git a/lib/Newsletter/Editor/PostListTransformer.php b/lib/Newsletter/Editor/PostListTransformer.php
index 1728cfd874..e2da0e75ef 100644
--- a/lib/Newsletter/Editor/PostListTransformer.php
+++ b/lib/Newsletter/Editor/PostListTransformer.php
@@ -14,7 +14,7 @@ class PostListTransformer {
 
   function transform($posts) {
     $results = array();
-    $use_divider = (bool)$this->args['showDivider'];
+    $use_divider = $this->args['showDivider'] === 'true';
 
     foreach ($posts as $index => $post) {
       if ($use_divider && $index > 0) {
diff --git a/lib/Newsletter/Editor/PostTransformer.php b/lib/Newsletter/Editor/PostTransformer.php
index e9c56db245..d97b07e5a9 100644
--- a/lib/Newsletter/Editor/PostTransformer.php
+++ b/lib/Newsletter/Editor/PostTransformer.php
@@ -22,7 +22,7 @@ class PostTransformer {
     $content = $content_manager->filterContent($content);
 
     $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(
       $post,
diff --git a/views/newsletter/templates/blocks/automatedLatestContent/settings.hbs b/views/newsletter/templates/blocks/automatedLatestContent/settings.hbs
index c9af62e9cd..09d70c4775 100644
--- a/views/newsletter/templates/blocks/automatedLatestContent/settings.hbs
+++ b/views/newsletter/templates/blocks/automatedLatestContent/settings.hbs
@@ -37,26 +37,6 @@
 
 <hr class="mailpoet_separator" />
 
-<div class="mailpoet_form_field">
-    <div class="mailpoet_form_field_radio_option">
-        <label>
-            <input type="radio" name="mailpoet_automated_latest_content_display_type" class="mailpoet_automated_latest_content_display_type" value="excerpt" {{#ifCond model.displayType '==' 'excerpt'}}CHECKED{{/ifCond}}/>
-            <%= __('Excerpt') %>
-        </label>
-    </div>
-    <div class="mailpoet_form_field_radio_option">
-        <label>
-            <input type="radio" name="mailpoet_automated_latest_content_display_type" class="mailpoet_automated_latest_content_display_type" value="full" {{#ifCond model.displayType '==' 'full'}}CHECKED{{/ifCond}}/>
-            <%= __('Full post') %>
-        </label>
-    </div>
-    <div class="mailpoet_form_field_radio_option">
-        <label>
-            <input type="radio" name="mailpoet_automated_latest_content_display_type" class="mailpoet_automated_latest_content_display_type" value="titleOnly" {{#ifCond model.displayType '==' 'titleOnly'}}CHECKED{{/ifCond}} />
-            <%= __('Title only') %>
-        </label>
-    </div>
-</div>
 
 <div class="mailpoet_form_field">
     <a href="javascript:;" class="mailpoet_automated_latest_content_show_display_options"><%= __('Display options') %></a>
@@ -66,6 +46,27 @@
         <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_radio_option">
+            <label>
+                <input type="radio" name="mailpoet_automated_latest_content_display_type" class="mailpoet_automated_latest_content_display_type" value="excerpt" {{#ifCond model.displayType '==' 'excerpt'}}CHECKED{{/ifCond}}/>
+                <%= __('Excerpt') %>
+            </label>
+        </div>
+        <div class="mailpoet_form_field_radio_option">
+            <label>
+                <input type="radio" name="mailpoet_automated_latest_content_display_type" class="mailpoet_automated_latest_content_display_type" value="full" {{#ifCond model.displayType '==' 'full'}}CHECKED{{/ifCond}}/>
+                <%= __('Full post') %>
+            </label>
+        </div>
+        <div class="mailpoet_form_field_radio_option">
+            <label>
+                <input type="radio" name="mailpoet_automated_latest_content_display_type" class="mailpoet_automated_latest_content_display_type" value="titleOnly" {{#ifCond model.displayType '==' 'titleOnly'}}CHECKED{{/ifCond}} />
+                <%= __('Title only') %>
+            </label>
+        </div>
+    </div>
+
     <div class="mailpoet_form_field">
         <div class="mailpoet_form_field_title"><%= __('Title Format') %></div>
         <div class="mailpoet_form_field_radio_option">
@@ -251,7 +252,7 @@
     </div>
 
     <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">
             <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}}/>
@@ -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_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">
                 <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}}/>
@@ -281,7 +282,7 @@
                     <%= __('No') %>
                 </label>
             </div>
-            <div class="mailpoet_form_field_input_option">
+            <div>
                 <a href="javascript:;" class="mailpoet_automated_latest_content_select_divider"><%= __('Select divider') %></a>
             </div>
         </div>
diff --git a/views/newsletter/templates/blocks/posts/settings.hbs b/views/newsletter/templates/blocks/posts/settings.hbs
index 8212045556..567322ef6b 100644
--- a/views/newsletter/templates/blocks/posts/settings.hbs
+++ b/views/newsletter/templates/blocks/posts/settings.hbs
@@ -2,7 +2,9 @@
 <div class="mailpoet_settings_posts_selection"></div>
 <div class="mailpoet_settings_posts_display_options mailpoet_hidden"></div>
 <div class="mailpoet_settings_posts_controls">
+  <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_display_options"><%= __('Display options') %></a>
+  </div>
   <input type="button" class="mailpoet_button mailpoet_button_primary mailpoet_settings_posts_insert_selected" value="<%= __('Insert selected') %>" />
-  <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>
 </div>