From 11c85270a7bbce1923e0a3fe856a0f4556f7696a Mon Sep 17 00:00:00 2001
From: Angus McLeod <angus@mcleod.org.au>
Date: Sun, 15 Apr 2018 12:49:12 +1000
Subject: [PATCH] Update wizard composer

---
 assets/javascripts/wizard/components/wizard-editor.js.es6   | 6 ------
 assets/javascripts/wizard/initializers/custom.js.es6        | 3 ++-
 .../wizard/templates/components/wizard-editor.hbs           | 2 +-
 .../wizard/templates/components/wizard-field-composer.hbs   | 2 +-
 assets/stylesheets/wizard/wizard_composer.scss              | 4 ++--
 assets/stylesheets/wizard/wizard_custom.scss                | 5 ++++-
 config/locales/client.en.yml                                | 4 ++--
 lib/wizard_edits.rb                                         | 2 +-
 8 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/assets/javascripts/wizard/components/wizard-editor.js.es6 b/assets/javascripts/wizard/components/wizard-editor.js.es6
index 4cd89426..892b0ff6 100644
--- a/assets/javascripts/wizard/components/wizard-editor.js.es6
+++ b/assets/javascripts/wizard/components/wizard-editor.js.es6
@@ -182,12 +182,6 @@ export default Ember.Component.extend({
   _mouseTrap: null,
   showPreview: false,
 
-  @computed('placeholder')
-  placeholderTranslated(placeholder) {
-    if (placeholder) return I18n.t(placeholder);
-    return null;
-  },
-
   _readyNow() {
     this.set('ready', true);
 
diff --git a/assets/javascripts/wizard/initializers/custom.js.es6 b/assets/javascripts/wizard/initializers/custom.js.es6
index 6c81fa4a..3e0573d4 100644
--- a/assets/javascripts/wizard/initializers/custom.js.es6
+++ b/assets/javascripts/wizard/initializers/custom.js.es6
@@ -66,7 +66,8 @@ export default {
         const src = this.get('step.banner');
         if (!src) return;
 
-        if (src.indexOf('/uploads/') > -1 || src.indexOf('/plugins/') > -1) {
+        const localPaths = ['uploads', 'plugins', 'images'];
+        if (localPaths.indexOf(src.split('/')[1]) > -1) {
           return getUrl(src);
         } else {
           return getUrl(`/images/wizard/${src}`);
diff --git a/assets/javascripts/wizard/templates/components/wizard-editor.hbs b/assets/javascripts/wizard/templates/components/wizard-editor.hbs
index 3d736e9e..78870ac8 100644
--- a/assets/javascripts/wizard/templates/components/wizard-editor.hbs
+++ b/assets/javascripts/wizard/templates/components/wizard-editor.hbs
@@ -47,7 +47,7 @@
       </div>
 
       {{conditional-loading-spinner condition=loading}}
-      {{textarea tabindex=tabindex value=value class="d-editor-input" placeholder=placeholderTranslated}}
+      {{textarea tabindex=tabindex value=value class="d-editor-input" placeholder=placeholder}}
     </div>
   {{/if}}
 </div>
diff --git a/assets/javascripts/wizard/templates/components/wizard-field-composer.hbs b/assets/javascripts/wizard/templates/components/wizard-field-composer.hbs
index 8a5c4ebb..7ff7d3d6 100644
--- a/assets/javascripts/wizard/templates/components/wizard-field-composer.hbs
+++ b/assets/javascripts/wizard/templates/components/wizard-field-composer.hbs
@@ -1,2 +1,2 @@
+{{wizard-editor showPreview=showPreview value=field.value placeholder=field.placeholder}}
 {{d-button class='wizard-btn primary' action='togglePreview' label=togglePreviewLabel}}
-{{wizard-editor showPreview=showPreview value=field.value}}
diff --git a/assets/stylesheets/wizard/wizard_composer.scss b/assets/stylesheets/wizard/wizard_composer.scss
index 0dcef708..14b115ce 100644
--- a/assets/stylesheets/wizard/wizard_composer.scss
+++ b/assets/stylesheets/wizard/wizard_composer.scss
@@ -46,15 +46,15 @@
 
 .d-editor-textarea-wrapper,
 .d-editor-preview-wrapper {
+  background-color: $secondary;
+  border: 1px solid #919191;
   flex: 1;
 }
 
 .d-editor-textarea-wrapper {
   display: flex;
   flex-direction: column;
-  background-color: $secondary;
   position: relative;
-  border: 1px solid #919191;
 
   textarea {
     background: transparent;
diff --git a/assets/stylesheets/wizard/wizard_custom.scss b/assets/stylesheets/wizard/wizard_custom.scss
index 0d166d70..caf85e7b 100644
--- a/assets/stylesheets/wizard/wizard_custom.scss
+++ b/assets/stylesheets/wizard/wizard_custom.scss
@@ -37,6 +37,10 @@
       margin-right: 7px;
     }
 
+    ul li {
+      margin: 10px 0;
+    }
+
     .image-container {
       padding: 0 20px;
       margin: 50px 0;
@@ -167,7 +171,6 @@
 
     &> .field-description {
       margin-top: 0;
-      margin-left: 10px;
       order: 2;
     }
   }
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index eeb1bca5..98e1d387 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -161,8 +161,8 @@ en:
       none: "There is no wizard here."
 
     wizard_composer:
-      show_preview: "Show Post Preview"
-      hide_preview: "Hide Post Preview"
+      show_preview: "Preview Your Post"
+      hide_preview: "Hide Preview"
       quote_post_title: "Quote whole post"
       bold_label: "B"
       bold_title: "Strong"
diff --git a/lib/wizard_edits.rb b/lib/wizard_edits.rb
index 9d8f9949..bfa94e87 100644
--- a/lib/wizard_edits.rb
+++ b/lib/wizard_edits.rb
@@ -118,7 +118,7 @@ end
 
   def description
     return object.description if object.description
-    I18n.t("#{object.key || i18n_key}.description", default: '', base_url: Discourse.base_url)
+    PrettyText.cook(I18n.t("#{object.key || i18n_key}.description", default: '', base_url: Discourse.base_url))
   end
 end