From fb7072260a1226b79419207db0263b0eecccc297 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=9C=E7=9A=87?= <donghuang@wacai.com>
Date: Mon, 2 Apr 2018 20:55:36 +0800
Subject: [PATCH] application content normal text

---
 web/app/styles/app.less                                | 10 ++++++++++
 .../components/customer-application/preview-btn.hbs    |  9 +++++----
 web/app/templates/customer-application/create.hbs      |  4 +---
 web/app/templates/customer-application/edit.hbs        |  5 +++--
 4 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/web/app/styles/app.less b/web/app/styles/app.less
index 1f81fcc..ae4f466 100644
--- a/web/app/styles/app.less
+++ b/web/app/styles/app.less
@@ -98,3 +98,13 @@ input[type="number"] {
 .index-content > p {
   margin: 0 0 6px;  
 }
+
+.application-content {
+    white-space: pre-wrap;       /* Since CSS 2.1 */
+    white-space: -moz-pre-wrap;  /* Mozilla, since 1999 */
+    white-space: -pre-wrap;      /* Opera 4-6 */
+    white-space: -o-pre-wrap;    /* Opera 7 */
+    word-wrap: break-word;       /* Internet Explorer 5.5+ */
+    background-color: inherit;
+    border: 0;
+}
\ No newline at end of file
diff --git a/web/app/templates/components/customer-application/preview-btn.hbs b/web/app/templates/components/customer-application/preview-btn.hbs
index bb9864a..c5fc635 100644
--- a/web/app/templates/components/customer-application/preview-btn.hbs
+++ b/web/app/templates/components/customer-application/preview-btn.hbs
@@ -1,4 +1,4 @@
-<a {{action 'show'}} title="Content Preview">
+<a {{action 'show'}}>
     {{!-- <i class="fa fa-search" aria-hidden="true"></i> --}}
     {{model.name}}
 </a>
@@ -12,7 +12,9 @@
         close-to-parent=false}}
         <div class="widget-main">
         <div class="space-12"></div>
-        <p style="overflow-x: auto;">{{content}}</p>
+        <p style="overflow-x: auto;">
+            <pre class="application-content">{{content}}</pre> 
+        </p>
         <hr />
         <p>{{model.note}}</p>
         <hr />
@@ -23,7 +25,6 @@
                         {{#if image.title}}
                         <h5 class="grey" style="margin-bottom: 4px;">{{image.title}}</h5>
                         {{/if}}
-
                         {{image-previews
                             image-height=null
                             image-style=(if (is-screen '<md')
@@ -31,9 +32,9 @@
                                 'border-radius: 2%; border: 1px solid #DCDCDC; max-width: 56%;')
                             previews=images
                             index=index}}
-                        <div class="space-12"></div>
                     </div>
                 </div>
+                <div class="space-12"></div>
             {{/each}}
         {{/with}}
         </div>
diff --git a/web/app/templates/customer-application/create.hbs b/web/app/templates/customer-application/create.hbs
index 1398e74..19a006b 100644
--- a/web/app/templates/customer-application/create.hbs
+++ b/web/app/templates/customer-application/create.hbs
@@ -10,9 +10,7 @@
     }}
     {{form-input name='name' label='Name'}}
     {{form-input name='note' label='Remark'}}
-    {{#form-input name='content' label='Content'}}
-        {{wysiwyg-editor model=model name='content'}}
-    {{/form-input}}
+    {{form-input name='content' label='Content' type='textarea'}}
 
     {{#form-input name='image' label='Images'}}
         <div class="widget-box transparent">
diff --git a/web/app/templates/customer-application/edit.hbs b/web/app/templates/customer-application/edit.hbs
index 6c0b85b..b47991b 100644
--- a/web/app/templates/customer-application/edit.hbs
+++ b/web/app/templates/customer-application/edit.hbs
@@ -14,9 +14,10 @@
     {{form-input name='name' label='Name'}}
     {{form-input name='note' label='Remark'}}
 
-    {{#form-input name='content' label='Content'}}
+    {{form-input name='content' label='Content' type='textarea'}}
+    {{!-- {{#form-input name='content' label='Content'}}
         {{wysiwyg-editor model=model name='content'}}
-    {{/form-input}}
+    {{/form-input}} --}}
 
     {{#form-input label='Images' name='images'}}
         <div class="widget-box transparent" style="opacity: 1;">