Authored by weiqingting

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

…-fe into release/release
... ... @@ -69,35 +69,6 @@
<input type="hidden" id="is_show_name_brand" value="[[contentData.data.is_show_name]]" for="radio"/>
</div>
</div>
<div class="form-group">
<table class="table table-hover table-bordered responsive dataTable no-footer">
<tbody>
<tr>
<td>
<input type="file" name="file" value="[[contentData.data.image.src]]" class="observe" data-field="image.src"/>
</td>
<td>
<div class="form-group ">
<select name="goTo" class="form-control observe" value="[[contentData.data.image.url.action]]" data-field="image.url.action">
[[layout action_template]]
</select>
</div>
<div class="form-group ">
<input value="[[contentData.data.image.url.url]]" class="form-control observe"
data-field="image.url.url" placeholder="图片链接"/>
<p style="color:#999;margin-top: 5px;">链接中不能有英文单引号</p>
</div>
<div class="form-group ">
<input value="[[contentData.data.image.alt]]" class="form-control observe"
data-field="image.alt" placeholder="图片描述"/>
</div>
</td>
</tr>
</tbody>
</table>
</div>
[[/if]]
[[if contentData.template_name=='customBrands']]
<div class="form-group">
... ...