郭盛 / community · 提交

转到一个项目

作者 Cool
提交 9905e21ab5d5e50703b5b87e2250030809c6e57c 2 个父辈 1d893283 246c7fb8

Merge branch 'master' of http://114.215.101.231:8099/guosheng/community into Branch_liuzhen

内嵌 并排对比
正在显示 3 个修改的文件 包含 33 行增加 和 4 行删除
@@ -9,13 +9,27 @@ @@ -9,13 +9,27 @@
9 <div class="form-group"> 9 <div class="form-group">
10 <label class="control-label col-xs-12 col-sm-2">{:__('Title')}:</label> 10 <label class="control-label col-xs-12 col-sm-2">{:__('Title')}:</label>
11 <div class="col-xs-12 col-sm-8"> 11 <div class="col-xs-12 col-sm-8">
12 - <input id="c-title" class="form-control" name="row[title]" type="text"> 12 + <input id="c-title" data-rule="required" class="form-control" name="row[title]" type="text">
13 </div> 13 </div>
14 </div> 14 </div>
15 <div class="form-group"> 15 <div class="form-group">
16 <label class="control-label col-xs-12 col-sm-2">{:__('Content')}:</label> 16 <label class="control-label col-xs-12 col-sm-2">{:__('Content')}:</label>
17 <div class="col-xs-12 col-sm-8"> 17 <div class="col-xs-12 col-sm-8">
18 - <textarea id="c-content" class="form-control editor" rows="5" name="row[content]" cols="50"></textarea> 18 + <textarea id="c-content" data-rule="required" class="form-control" rows="5" name="row[content]" cols="50"></textarea>
  19 + </div>
  20 + </div>
  21 + <div class="form-group">
  22 + <label class="control-label col-xs-12 col-sm-2">{:__('公告图片')}:</label>
  23 + <div class="col-xs-12 col-sm-8">
  24 + <div class="input-group">
  25 + <input id="c-images" class="form-control form-control" size="50" name="row[images]" type="text">
  26 + <div class="input-group-addon no-border no-padding">
  27 + <span><button type="button" id="plupload-images" class="btn btn-danger plupload" data-input-id="c-images" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp" data-multiple="true" data-preview-id="p-images"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
  28 + <span><button type="button" id="fachoose-images" class="btn btn-primary fachoose" data-input-id="c-images" data-mimetype="image/*" data-multiple="true"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
  29 + </div>
  30 + <span class="msg-box n-right" for="c-images"></span>
  31 + </div>
  32 + <ul class="row list-inline plupload-preview" id="p-images"></ul>
19 </div> 33 </div>
20 </div> 34 </div>
21 <!--<div class="form-group">--> 35 <!--<div class="form-group">-->
@@ -9,13 +9,27 @@ @@ -9,13 +9,27 @@
9 <div class="form-group"> 9 <div class="form-group">
10 <label class="control-label col-xs-12 col-sm-2">{:__('Title')}:</label> 10 <label class="control-label col-xs-12 col-sm-2">{:__('Title')}:</label>
11 <div class="col-xs-12 col-sm-8"> 11 <div class="col-xs-12 col-sm-8">
12 - <input id="c-title" class="form-control" name="row[title]" type="text" value="{$row.title|htmlentities}"> 12 + <input id="c-title" data-rule="required" class="form-control" name="row[title]" type="text" value="{$row.title|htmlentities}">
13 </div> 13 </div>
14 </div> 14 </div>
15 <div class="form-group"> 15 <div class="form-group">
16 <label class="control-label col-xs-12 col-sm-2">{:__('Content')}:</label> 16 <label class="control-label col-xs-12 col-sm-2">{:__('Content')}:</label>
17 <div class="col-xs-12 col-sm-8"> 17 <div class="col-xs-12 col-sm-8">
18 - <textarea id="c-content" class="form-control editor" rows="5" name="row[content]" cols="50">{$row.content|htmlentities}</textarea> 18 + <textarea id="c-content" data-rule="required" class="form-control" rows="5" name="row[content]" cols="50">{$row.content|htmlentities}</textarea>
  19 + </div>
  20 + </div>
  21 + <div class="form-group">
  22 + <label class="control-label col-xs-12 col-sm-2">{:__('公告图片')}:</label>
  23 + <div class="col-xs-12 col-sm-8">
  24 + <div class="input-group">
  25 + <input id="c-images" class="form-control form-control" size="50" name="row[images]" type="text" value="{$row.images}">
  26 + <div class="input-group-addon no-border no-padding">
  27 + <span><button type="button" id="plupload-images" class="btn btn-danger plupload" data-input-id="c-images" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp" data-multiple="true" data-preview-id="p-images"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
  28 + <span><button type="button" id="fachoose-images" class="btn btn-primary fachoose" data-input-id="c-images" data-mimetype="image/*" data-multiple="true"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
  29 + </div>
  30 + <span class="msg-box n-right" for="c-images"></span>
  31 + </div>
  32 + <ul class="row list-inline plupload-preview" id="p-images"></ul>
19 </div> 33 </div>
20 </div> 34 </div>
21 <!--<div class="form-group">--> 35 <!--<div class="form-group">-->
@@ -27,6 +27,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin @@ -27,6 +27,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
27 {field: 'id', title: __('Id'), operate:false}, 27 {field: 'id', title: __('Id'), operate:false},
28 {field: 'house_id', title: __('House_id'), operate:false}, 28 {field: 'house_id', title: __('House_id'), operate:false},
29 {field: 'title', title: __('Title'), operate:'like'}, 29 {field: 'title', title: __('Title'), operate:'like'},
  30 + {field: 'images', title: __('公告图片'), operate:false, events: Table.api.events.image, formatter: Table.api.formatter.images},
30 {field: 'look_num', title: __('Look_num'), operate:false}, 31 {field: 'look_num', title: __('Look_num'), operate:false},
31 {field: 'weigh', title: __('Weigh'), operate:false}, 32 {field: 'weigh', title: __('Weigh'), operate:false},
32 {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime}, 33 {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},