Index: /branches/amp_3_7/extensions/license_server/webui/client/device/device-import-vm.html
===================================================================
--- /branches/amp_3_7/extensions/license_server/webui/client/device/device-import-vm.html	(revision 2573)
+++ /branches/amp_3_7/extensions/license_server/webui/client/device/device-import-vm.html	(working copy)
@@ -4,70 +4,79 @@
 </div>
 
 <div class="modal-body">
-    <div class="row">
-        <div class="col-lg-12">
-            <form class="form-horizontal" name="general" verify-scope="tipStyle: 1">
-                <div class="form-group">
-                    <label class="col-md-3 control-label">{{'IP'|T}}</label>
-                    <div class="col-md-8">
-                        <input ng-verify="required:true" type="ipv4" class="form-control" ng-model="vmDeviceImport.ip" name="ip" >
-                    </div>
+    <div class="col-lg-12">
+        <form class="form-horizontal" name="general" verify-scope="tipStyle: 1">
+            <div class="form-group">
+                <label class="col-md-3 control-label">{{'IP'|T}}</label>
+                <div class="col-md-8">
+                    <input ng-verify="required:true" type="ipv4" class="form-control" ng-model="vmDeviceImport.ip"
+                           name="ip">
                 </div>
-                <div class="form-group">
-                    <label class="col-md-3 control-label">{{'RESTful API Protocol'|T}}</label>
-                    <div class="col-md-8">
-                        <select ng-verify class="form-control" ng-model="vmDeviceImport.restapi_config.restapi_protocol" name="protocol">
-                            <option value="">{{'---Please Select---'|T}}</option>
-                            <option value="https">HTTPS</option>
-                            <option value="http">HTTP</option>
-                        </select>
-                    </div>
+            </div>
+            <div class="form-group">
+                <label class="col-md-3 control-label">{{'RESTful API Protocol'|T}}</label>
+                <div class="col-md-8">
+                    <select ng-verify class="form-control" ng-model="vmDeviceImport.restapi_config.restapi_protocol"
+                            name="protocol">
+                        <option value="">{{'---Please Select---'|T}}</option>
+                        <option value="https">HTTPS</option>
+                        <option value="http">HTTP</option>
+                    </select>
                 </div>
-                <div class="form-group">
-                    <label class="col-md-3 control-label">{{'RESTful API Port'|T}}</label>
-                    <div class="col-md-8">
-                        <input ng-verify="required:true" type="text" class="form-control" ng-model="vmDeviceImport.restapi_config.restapi_port" name="port" >
-                    </div>
+            </div>
+            <div class="form-group">
+                <label class="col-md-3 control-label">{{'RESTful API Port'|T}}</label>
+                <div class="col-md-8">
+                    <input ng-verify="required:true" type="text" class="form-control"
+                           ng-model="vmDeviceImport.restapi_config.restapi_port" name="port">
                 </div>
-                <div class="form-group">
-                    <label class="col-md-3 control-label">{{'RESTful API Username'|T}}</label>
-                    <div class="col-md-8">
-                        <input ng-verify="required:true" type="text" class="form-control" ng-model="vmDeviceImport.restapi_config.restapi_username" name="restapi_username" >
-                    </div>
+            </div>
+            <div class="form-group">
+                <label class="col-md-3 control-label">{{'RESTful API Username'|T}}</label>
+                <div class="col-md-8">
+                    <input ng-verify="required:true" type="text" class="form-control"
+                           ng-model="vmDeviceImport.restapi_config.restapi_username" name="restapi_username">
                 </div>
-                <div class="form-group">
-                    <label class="col-md-3 control-label">{{'RESTful API Password'|T}}</label>
-                    <div class="col-md-8">
-                        <input ng-verify="required:true" type="password" class="form-control" ng-model="vmDeviceImport.restapi_config.restapi_password" name="restapi_password" >
-                    </div>
+            </div>
+            <div class="form-group">
+                <label class="col-md-3 control-label">{{'RESTful API Password'|T}}</label>
+                <div class="col-md-8">
+                    <input ng-verify="required:true" type="password" class="form-control"
+                           ng-model="vmDeviceImport.restapi_config.restapi_password" name="restapi_password">
                 </div>
-                <div class="form-group">
-                    <label class="col-md-3 control-label">{{'License'|T}}</label>
-                    <div class="col-md-8">
-                        <select ng-verify class="form-control" ng-model="vmDeviceImport.license" name="license">
-                            <option value="">{{'---Please Select---'|T}}</option>
-                            <option value="{{row.name}}" ng-repeat="row in vmDeviceImport.license_list">{{row.name}}</option>
-                        </select>
-                    </div>
+            </div>
+            <div class="form-group">
+                <label class="col-md-3 control-label">{{'License'|T}}</label>
+                <div class="col-md-8">
+                    <select ng-verify class="form-control" ng-model="vmDeviceImport.license" name="license">
+                        <option value="">{{'---Please Select---'|T}}</option>
+                        <option value="{{row.name}}" ng-repeat="row in vmDeviceImport.license_list">{{row.name}}
+                        </option>
+                    </select>
                 </div>
-                <div class="form-group col-md-12">
-                    <div class="checkbox pull-left">
-                        <label>
-                            <input type="checkbox" name="" ng-model="vmDeviceImport.atuoBandwidthMode" >{{'Assign Bandwidth Automatically'|T}}
-                        </label>
-                    </div>
+            </div>
+            <div class="form-group col-md-12">
+                <label class="col-md-3 control-label"></label>
+                <div class="checkbox-row">
+                    <label>
+                        &nbsp;&nbsp;&nbsp;<input type="checkbox" name="" ng-model="vmDeviceImport.atuoBandwidthMode">
+                        &nbsp;&nbsp;&nbsp;{{'Assign Bandwidth Automatically'|T}}
+                    </label>
                 </div>
-                <div class="form-group" ng-if="!vmDeviceImport.atuoBandwidthMode">
-                    <label class="col-md-3 control-label">{{'Bandwidth Value'|T}}</label>
-                    <div class="col-md-9">
-                        <input ng-verify="required:true" type="number" class="form-control" ng-model="vmDeviceImport.bandwidth" name="bandwidth">
-                    </div>
+            </div>
+            <div class="form-group" ng-if="!vmDeviceImport.atuoBandwidthMode">
+                <label class="col-md-3 control-label">{{'Bandwidth Value'|T}}</label>
+                <div class="col-md-8">
+                    <input ng-verify="required:true" type="number" class="form-control"
+                           ng-model="vmDeviceImport.bandwidth" name="bandwidth">
                 </div>
-            </form>
-        </div>
+            </div>
+        </form>
     </div>
 </div>
 <div class="modal-footer">
-    <button ng-verify="control:'general'" type="button" class="btn btn-primary" ng-click="vmDeviceImport.save()">{{'Save'|T}}</button>
+    <button ng-verify="control:'general'" type="button" class="btn btn-primary" ng-click="vmDeviceImport.save()">
+        {{'Save'|T}}
+    </button>
     <button type="button" class="btn btn-default" ng-click="vmDeviceImport.modalClose()">{{'Cancel'|T}}</button>
 </div>
\ No newline at end of file
Index: /branches/amp_3_7/extensions/license_server/webui/client/device/discover-enable-config.html
===================================================================
--- /branches/amp_3_7/extensions/license_server/webui/client/device/discover-enable-config.html	(revision 2573)
+++ /branches/amp_3_7/extensions/license_server/webui/client/device/discover-enable-config.html	(working copy)
@@ -4,60 +4,39 @@
 </div>
 
 <div class="modal-body">
-    <div class="row">
-        <div class="col-lg-12">
-            <form class="form-horizontal" name="licenseSelect" verify-scope="tipStyle: 1">
-                <div class="form-group">
-                    <label class="col-md-3 control-label">{{'License'|T}}</label>
-                    <div class="col-md-8">
-                        <select ng-verify class="form-control" ng-model="discoverEnableConfig.license" name="license">
-                            <option value="">{{'---Please Select---'|T}}</option>
-                            <option value="{{row.name}}" ng-repeat="row in discoverEnableConfig.license_list">{{row.name}}</option>
-                        </select>
-                    </div>
+    <div class="col-lg-12">
+        <form class="form-horizontal" name="licenseSelect" verify-scope="tipStyle: 1">
+            <div class="form-group">
+                <label class="col-md-3 control-label">{{'License'|T}}</label>
+                <div class="col-md-8">
+                    <select ng-verify class="form-control" ng-model="discoverEnableConfig.license" name="license">
+                        <option value="">{{'---Please Select---'|T}}</option>
+                        <option value="{{row.name}}" ng-repeat="row in discoverEnableConfig.license_list">{{row.name}}
+                        </option>
+                    </select>
                 </div>
-                <!-- <div class="form-group">
-                    <label class="col-md-3 control-label">{{'ESTful API Protocol'|T}}</label>
-                    <div class="col-md-8">
-                        <input ng-verify="required:true" type="text" class="form-control" ng-model="discoverEnableConfig.restapi_protocol" name="protocol" >
-                    </div>
+            </div>
+            <div class="form-group col-md-12">
+                <div class="checkbox pull-left">
+                    <label>
+                        <input type="checkbox" name="" ng-model="discoverEnableConfig.atuoBandwidthMode">{{'Assign
+                        Bandwidth Automatically'|T}}
+                    </label>
                 </div>
-                <div class="form-group">
-                    <label class="col-md-3 control-label">{{'ESTful API Port'|T}}</label>
-                    <div class="col-md-8">
-                        <input ng-verify="required:true" type="text" class="form-control" ng-model="discoverEnableConfig.restapi_port" name="port" >
-                    </div>
+            </div>
+            <div class="form-group" ng-if="!discoverEnableConfig.atuoBandwidthMode">
+                <label class="col-md-3 control-label">{{'Bandwidth Value'|T}}</label>
+                <div class="col-md-9">
+                    <input ng-verify="required:true" type="number" class="form-control"
+                           ng-model="discoverEnableConfig.bandwidth" name="bandwidth">
                 </div>
-                <div class="form-group">
-                    <label class="col-md-3 control-label">{{'ESTful API Username'|T}}</label>
-                    <div class="col-md-8">
-                        <input ng-verify="required:true" type="text" class="form-control" ng-model="discoverEnableConfig.restapi_username" name="restapi_username" >
-                    </div>
-                </div>
-                <div class="form-group">
-                    <label class="col-md-3 control-label">{{'ESTful API Password'|T}}</label>
-                    <div class="col-md-8">
-                        <input ng-verify="required:true" type="password" class="form-control" ng-model="discoverEnableConfig.restapi_password" name="restapi_password" >
-                    </div>
-                </div> -->
-                <div class="form-group col-md-12">
-                    <div class="checkbox pull-left">
-                        <label>
-                            <input type="checkbox" name="" ng-model="discoverEnableConfig.atuoBandwidthMode" >{{'Assign Bandwidth Automatically'|T}}
-                        </label>
-                    </div>
-                </div>
-                <div class="form-group" ng-if="!discoverEnableConfig.atuoBandwidthMode">
-                    <label class="col-md-3 control-label">{{'Bandwidth Value'|T}}</label>
-                    <div class="col-md-9">
-                        <input ng-verify="required:true" type="number" class="form-control" ng-model="discoverEnableConfig.bandwidth" name="bandwidth">
-                    </div>
-                </div>
-            </form>
-        </div>
+            </div>
+        </form>
     </div>
 </div>
 <div class="modal-footer">
-    <button ng-verify="control:'licenseSelect'" type="button" class="btn btn-primary" ng-click="discoverEnableConfig.save()">{{'Save'|T}}</button>
+    <button ng-verify="control:'licenseSelect'" type="button" class="btn btn-primary"
+            ng-click="discoverEnableConfig.save()">{{'Save'|T}}
+    </button>
     <button type="button" class="btn btn-default" ng-click="discoverEnableConfig.modalClose()">{{'Cancel'|T}}</button>
 </div>
\ No newline at end of file
Index: /branches/amp_3_7/extensions/license_server/webui/client/device/edit-device-resource.html
===================================================================
--- /branches/amp_3_7/extensions/license_server/webui/client/device/edit-device-resource.html	(revision 2573)
+++ /branches/amp_3_7/extensions/license_server/webui/client/device/edit-device-resource.html	(working copy)
@@ -4,27 +4,30 @@
 </div>
 
 <div class="modal-body">
-    <div class="row">
-        <div class="col-lg-12">
-            <form class="form-horizontal" name="deviceResource" verify-scope="tipStyle: 1">
-                <div class="form-group col-md-12">
-                    <div class="checkbox pull-left">
-                        <label>
-                            <input type="checkbox" name="" ng-model="editDeviceRedource.atuoBandwidthMode" >{{'Assign Bandwidth Automatically'|T}}
-                        </label>
-                    </div>
+    <div class="col-lg-12">
+        <form class="form-horizontal" name="deviceResource" verify-scope="tipStyle: 1">
+            <div class="form-group col-md-12">
+                <label class="col-md-3 control-label"></label>
+                <div class="checkbox">
+                    <label>
+                        &nbsp;&nbsp;&nbsp;<input type="checkbox" name="" ng-model="editDeviceRedource.atuoBandwidthMode">
+                        &nbsp;&nbsp;&nbsp;{{'Assign Bandwidth Automatically'|T}}
+                    </label>
                 </div>
-                <div class="form-group" ng-if="!editDeviceRedource.atuoBandwidthMode">
-                    <label class="col-md-3 control-label">{{'Bandwidth Value'|T}}</label>
-                    <div class="col-md-9">
-                        <input ng-verify="required:true, min_length:2" type="number" class="form-control" ng-model="editDeviceRedource.bandwidth" name="bandwidth">
-                    </div>
+            </div>
+            <div class="form-group" ng-if="!editDeviceRedource.atuoBandwidthMode">
+                <label class="col-md-3 control-label">{{'Bandwidth Value'|T}}</label>
+                <div class="col-md-9">
+                    <input ng-verify="required:true, min_length:2" type="number" class="form-control"
+                           ng-model="editDeviceRedource.bandwidth" name="bandwidth">
                 </div>
-            </form>
-        </div>
+            </div>
+        </form>
     </div>
 </div>
 <div class="modal-footer">
-    <button ng-verify="control:'deviceResource'" type="button" class="btn btn-primary" ng-click="editDeviceRedource.save()">{{'Save'|T}}</button>
+    <button ng-verify="control:'deviceResource'" type="button" class="btn btn-primary"
+            ng-click="editDeviceRedource.save()">{{'Save'|T}}
+    </button>
     <button type="button" class="btn btn-default" ng-click="editDeviceRedource.modalClose()">{{'Cancel'|T}}</button>
 </div>
\ No newline at end of file
Index: /branches/amp_3_7/extensions/license_server/webui/client/device/enable-select-license.html
===================================================================
--- /branches/amp_3_7/extensions/license_server/webui/client/device/enable-select-license.html	(revision 2573)
+++ /branches/amp_3_7/extensions/license_server/webui/client/device/enable-select-license.html	(working copy)
@@ -4,23 +4,25 @@
 </div>
 
 <div class="modal-body">
-    <div class="row">
-        <div class="col-lg-12">
-            <form class="form-horizontal" name="licenseSelect" verify-scope="tipStyle: 1">
-                <div class="form-group">
-                    <label class="col-md-3 control-label">{{'License Name'|T}}</label>
-                    <div class="col-md-8">
-                        <select ng-verify class="form-control" ng-model="enableSelectLicense.licenseName" name="licenseName">
-                            <option value="">{{'---Please Select---'|T}}</option>
-                            <option value="{{row.name}}" ng-repeat="row in enableSelectLicense.license_list">{{row.name}}</option>
-                        </select>
-                    </div>
+    <div class="col-lg-12">
+        <form class="form-horizontal" name="licenseSelect" verify-scope="tipStyle: 1">
+            <div class="form-group">
+                <label class="col-md-3 control-label">{{'License Name'|T}}</label>
+                <div class="col-md-8">
+                    <select ng-verify class="form-control" ng-model="enableSelectLicense.licenseName"
+                            name="licenseName">
+                        <option value="">{{'---Please Select---'|T}}</option>
+                        <option value="{{row.name}}" ng-repeat="row in enableSelectLicense.license_list">{{row.name}}
+                        </option>
+                    </select>
                 </div>
-            </form>
-        </div>
+            </div>
+        </form>
     </div>
 </div>
 <div class="modal-footer">
-    <button ng-verify="control:'licenseSelect'" type="button" class="btn btn-primary" ng-click="enableSelectLicense.save()">{{'Save'|T}}</button>
+    <button ng-verify="control:'licenseSelect'" type="button" class="btn btn-primary"
+            ng-click="enableSelectLicense.save()">{{'Save'|T}}
+    </button>
     <button type="button" class="btn btn-default" ng-click="enableSelectLicense.modalClose()">{{'Cancel'|T}}</button>
 </div>
\ No newline at end of file