Authored by weiqingting

Merge branch 'release/release' of http://git.dev.yoho.cn/platform/yohobuy-portal…

…-fe into release/release
@@ -69,35 +69,6 @@ @@ -69,35 +69,6 @@
69 <input type="hidden" id="is_show_name_brand" value="[[contentData.data.is_show_name]]" for="radio"/> 69 <input type="hidden" id="is_show_name_brand" value="[[contentData.data.is_show_name]]" for="radio"/>
70 </div> 70 </div>
71 </div> 71 </div>
72 - <div class="form-group">  
73 - <table class="table table-hover table-bordered responsive dataTable no-footer">  
74 - <tbody>  
75 - <tr>  
76 - <td>  
77 - <input type="file" name="file" value="[[contentData.data.image.src]]" class="observe" data-field="image.src"/>  
78 - </td>  
79 - <td>  
80 - <div class="form-group ">  
81 - <select name="goTo" class="form-control observe" value="[[contentData.data.image.url.action]]" data-field="image.url.action">  
82 - [[layout action_template]]  
83 - </select>  
84 - </div>  
85 - <div class="form-group ">  
86 - <input value="[[contentData.data.image.url.url]]" class="form-control observe"  
87 - data-field="image.url.url" placeholder="图片链接"/>  
88 -  
89 - <p style="color:#999;margin-top: 5px;">链接中不能有英文单引号</p>  
90 - </div>  
91 - <div class="form-group ">  
92 - <input value="[[contentData.data.image.alt]]" class="form-control observe"  
93 - data-field="image.alt" placeholder="图片描述"/>  
94 - </div>  
95 - </td>  
96 - </tr>  
97 - </tbody>  
98 - </table>  
99 - </div>  
100 -  
101 [[/if]] 72 [[/if]]
102 [[if contentData.template_name=='customBrands']] 73 [[if contentData.template_name=='customBrands']]
103 <div class="form-group"> 74 <div class="form-group">