fix merge bug

pull/26/head
wangyong 2015-11-15 23:29:31 +08:00
parent 5d33493233
commit 1e41b79611
1 changed files with 1 additions and 6 deletions

View File

@ -41,6 +41,7 @@
{% endif %}
<form id="assetForm" method="post" class="form-horizontal">
{{ af.ip|bootstrap_horizontal }}
<div class="hr-line-dashed"></div>
@ -61,12 +62,6 @@
</div>
</div>
<div class="form-group" id="port" style="display: none">
<label class="col-sm-2 control-label"> 端口号<span class="red-fonts">*</span> </label>
<div class="col-sm-8">
<input type="text" placeholder="Port" name="port" class="form-control">
</div>
</div>
<div class="form-group" id="admin_account" style="display: none">
<label class="col-sm-2 control-label"> 管理用户名<span class="red-fonts">*</span> </label>
<div class="col-sm-3">