donghuang/lemo-crm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

application content normal text

Browse Source
This commit is contained in:
东皇 2018-04-02 20:55:36 +08:00
parent 518eeb062f
commit fb7072260a
4 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
web/app/styles/app.less
View File

@ -98,3 +98,13 @@ input[type="number"] {
.index-content > p { .index-content > p {
margin: 0 0 6px; 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;
}

9
web/app/templates/components/customer-application/preview-btn.hbs
View File

@ -1,4 +1,4 @@
<a {{action 'show'}} title="Content Preview"> <a {{action 'show'}}>
{{!-- <i class="fa fa-search" aria-hidden="true"></i> --}} {{!-- <i class="fa fa-search" aria-hidden="true"></i> --}}
{{model.name}} {{model.name}}
</a> </a>
@ -12,7 +12,9 @@
close-to-parent=false}} close-to-parent=false}}
<div class="widget-main"> <div class="widget-main">
<div class="space-12"></div> <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 /> <hr />
<p>{{model.note}}</p> <p>{{model.note}}</p>
<hr /> <hr />
@ -23,7 +25,6 @@
{{#if image.title}} {{#if image.title}}
<h5 class="grey" style="margin-bottom: 4px;">{{image.title}}</h5> <h5 class="grey" style="margin-bottom: 4px;">{{image.title}}</h5>
{{/if}} {{/if}}
{{image-previews {{image-previews
image-height=null image-height=null
image-style=(if (is-screen '<md') image-style=(if (is-screen '<md')
@ -31,9 +32,9 @@
'border-radius: 2%; border: 1px solid #DCDCDC; max-width: 56%;') 'border-radius: 2%; border: 1px solid #DCDCDC; max-width: 56%;')
previews=images previews=images
index=index}} index=index}}
<div class="space-12"></div>
</div> </div>
</div> </div>
<div class="space-12"></div>
{{/each}} {{/each}}
{{/with}} {{/with}}
</div> </div>

4
web/app/templates/customer-application/create.hbs
View File

@ -10,9 +10,7 @@
}} }}
{{form-input name='name' label='Name'}} {{form-input name='name' label='Name'}}
{{form-input name='note' label='Remark'}} {{form-input name='note' label='Remark'}}
{{#form-input name='content' label='Content'}} {{form-input name='content' label='Content' type='textarea'}}
{{wysiwyg-editor model=model name='content'}}
{{/form-input}}
{{#form-input name='image' label='Images'}} {{#form-input name='image' label='Images'}}
<div class="widget-box transparent"> <div class="widget-box transparent">

5
web/app/templates/customer-application/edit.hbs
View File

@ -14,9 +14,10 @@
{{form-input name='name' label='Name'}} {{form-input name='name' label='Name'}}
{{form-input name='note' label='Remark'}} {{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'}} {{wysiwyg-editor model=model name='content'}}
{{/form-input}} {{/form-input}} --}}
{{#form-input label='Images' name='images'}} {{#form-input label='Images' name='images'}}
<div class="widget-box transparent" style="opacity: 1;"> <div class="widget-box transparent" style="opacity: 1;">