Index: /branches/amp_3_7/extensions/avx_mgmt/webui/host/host-add.html
===================================================================
--- /branches/amp_3_7/extensions/avx_mgmt/webui/host/host-add.html	(revision 2608)
+++ /branches/amp_3_7/extensions/avx_mgmt/webui/host/host-add.html	(working copy)
@@ -1,77 +1,84 @@
 <div class="modal-header">
     <button type="button" class="close" ng-click="hostAdd.modalClose()">&times;</button>
-    <h4 class="modal-title">{{'Add a New AVX Device'|T}}</h4>
+    <h5 class="modal-title">{{'Add a New AVX Device' | T}}</h5>
 </div>
 
 <div class="modal-body">
-    <div class="row">
-        <div class="col-lg-12">
-            <div class="alert alert-warning" role="alert" style="margin-left: 10px; margin-right: 10px;">{{'Please make sure that the RESTful API Service is enabled with "https" protocol on the target AVX device.'|T}}</div>
-            <form class="form-horizontal" name="general" verify-scope="tipStyle: 1">
-                <div class="form-group">
-                    <label class="col-md-3 control-label">{{'Name'|T}}</label>
-                    <div class="col-md-9">
-                        <input ng-verify="required:true" type="text" class="form-control" ng-model="hostAdd.data.name" name="name" >
-                    </div>
+    <div class="col-lg-12">
+        <div class="alert alert-warning" role="alert" style="margin-left: 10px; margin-right: 10px;">
+            {{'Please make sure that the RESTful API Service is enabled with "https" protocol on the target AVX device.' | T}}
+        </div>
+        <form class="form-horizontal" name="general" verify-scope="tipStyle: 1">
+            <div class="form-group">
+                <label class="col-md-3 control-label">{{'Name' | T}}</label>
+                <div class="col-md-9">
+                    <input ng-verify="required:true" type="text" class="form-control" ng-model="hostAdd.data.name"
+                           name="name">
                 </div>
-                <div class="form-group">
-                    <label class="col-md-3 control-label">{{'IP'|T}}</label>
-                    <div class="col-md-9">
-                        <input ng-verify="required:true" type="ip" class="form-control" ng-model="hostAdd.data.ip" name="ip" >
-                    </div>
+            </div>
+            <div class="form-group">
+                <label class="col-md-3 control-label">{{'IP' | T}}</label>
+                <div class="col-md-9">
+                    <input ng-verify="required:true" type="ip" class="form-control" ng-model="hostAdd.data.ip"
+                           name="ip">
                 </div>
-                <div class="form-group">
-                    <label class="col-md-3 control-label" style="font-weight: bold;">{{'RESTful API'|T}}</label>
-                    <div class="col-md-9">
-                        
-                    </div>
+            </div>
+            <div class="form-group">
+                <label class="col-md-3 control-label" style="font-weight: bold;">{{'RESTful API' | T}}</label>
+                <div class="col-md-9">
+
                 </div>
-                <div class="form-group">
-                    <label class="col-md-3 control-label">{{'Port'|T}}</label>
-                    <div class="col-md-9">
-                        <input ng-verify="required:true" type="number" class="form-control" ng-model="hostAdd.data.restapi_port" name="restapi_port" >
-                    </div>
+            </div>
+            <div class="form-group">
+                <label class="col-md-3 control-label">{{'Port' | T}}</label>
+                <div class="col-md-9">
+                    <input ng-verify="required:true" type="number" class="form-control"
+                           ng-model="hostAdd.data.restapi_port" name="restapi_port">
                 </div>
-                <div class="form-group">
-                    <label class="col-md-3 control-label">{{'Username'|T}}</label>
-                    <div class="col-md-9">
-                        <input ng-verify="required:true" type="text" class="form-control" ng-model="hostAdd.data.restapi_account.restapi_username" name="restapi_username" >
-                    </div>
+            </div>
+            <div class="form-group">
+                <label class="col-md-3 control-label">{{'Username' | T}}</label>
+                <div class="col-md-9">
+                    <input ng-verify="required:true" type="text" class="form-control"
+                           ng-model="hostAdd.data.restapi_account.restapi_username" name="restapi_username">
                 </div>
-                <div class="form-group">
-                    <label class="col-md-3 control-label">{{'Password'|T}}</label>
-                    <div class="col-md-9">
-                        <input ng-verify="required:true" type="password" class="form-control" ng-model="hostAdd.data.restapi_account.restapi_password" name="restapi_password" >
-                    </div>
+            </div>
+            <div class="form-group">
+                <label class="col-md-3 control-label">{{'Password' | T}}</label>
+                <div class="col-md-9">
+                    <input ng-verify="required:true" type="password" class="form-control"
+                           ng-model="hostAdd.data.restapi_account.restapi_password" name="restapi_password">
                 </div>
-                <!-- <div class="form-group">
-                    <label class="col-md-3 control-label">{{'WebUI Port'|T}}</label>
-                    <div class="col-md-9">
-                        <input ng-verify="required:true" type="number" class="form-control" ng-model="hostAdd.data.webui_port" name="webui_port" >
+            </div>
+            <!-- <div class="form-group">
+                <label class="col-md-3 control-label">{{'WebUI Port'|T}}</label>
+                <div class="col-md-9">
+                    <input ng-verify="required:true" type="number" class="form-control" ng-model="hostAdd.data.webui_port" name="webui_port" >
+                </div>
+            </div> -->
+            <!-- <div class="form-group">
+                <label class="col-md-3 control-label">{{'Console'|T}}</label>
+                <div class="col-md-9">
+                    <div class="form-group">
+                        <label class="col-md-3 control-label">{{'Username'|T}}</label>
+                        <div class="col-md-9">
+                            <input ng-verify="required:true" type="text" class="form-control" ng-model="hostAdd.console_account.console_username" name="console_username" >
+                        </div>
                     </div>
-                </div> -->
-                <!-- <div class="form-group">
-                    <label class="col-md-3 control-label">{{'Console'|T}}</label>
-                    <div class="col-md-9">
-                        <div class="form-group">
-                            <label class="col-md-3 control-label">{{'Username'|T}}</label>
-                            <div class="col-md-9">
-                                <input ng-verify="required:true" type="text" class="form-control" ng-model="hostAdd.console_account.console_username" name="console_username" >
-                            </div>
+                    <div class="form-group">
+                        <label class="col-md-3 control-label">{{'Password'|T}}</label>
+                        <div class="col-md-9">
+                            <input ng-verify="required:true" type="password" class="form-control" ng-model="hostAdd.console_account.console_password" name="console_password" >
                         </div>
-                        <div class="form-group">
-                            <label class="col-md-3 control-label">{{'Password'|T}}</label>
-                            <div class="col-md-9">
-                                <input ng-verify="required:true" type="password" class="form-control" ng-model="hostAdd.console_account.console_password" name="console_password" >
-                            </div>
-                        </div>
                     </div>
-                </div> -->
-            </form>
-        </div>
+                </div>
+            </div> -->
+        </form>
     </div>
 </div>
 <div class="modal-footer">
-    <button ng-verify="control:'general'" type="button" class="btn btn-primary" ng-click="hostAdd.save(hostAdd.data)">{{'Save'|T}}</button>
-    <button type="button" class="btn btn-default" ng-click="hostAdd.modalClose()">{{'Cancel'|T}}</button>
+    <button ng-verify="control:'general'" type="button" class="btn btn-primary" ng-click="hostAdd.save(hostAdd.data)">
+        {{'Save' | T}}
+    </button>
+    <button type="button" class="btn btn-default" ng-click="hostAdd.modalClose()">{{'Cancel' | T}}</button>
 </div>
\ No newline at end of file
Index: /branches/amp_3_7/extensions/license_server/webui/client/license/license-import-vm.html
===================================================================
--- /branches/amp_3_7/extensions/license_server/webui/client/license/license-import-vm.html	(revision 2608)
+++ /branches/amp_3_7/extensions/license_server/webui/client/license/license-import-vm.html	(working copy)
@@ -1,29 +1,31 @@
 <div class="modal-header">
     <button type="button" class="close" ng-click="vmLicenseImport.modalClose()">&times;</button>
-    <h4 class="modal-title">{{'Import a Volume License Key'|T}}</h4>
+    <h5 class="modal-title">{{'Import a Volume License Key' | T}}</h5>
 </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">{{'Name'|T}}</label>
-                    <div class="col-md-9">
-                        <input ng-verify="required:true" type="text" class="form-control" ng-model="vmLicenseImport.data.name" name="name" >
-                    </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">{{'Name' | T}}</label>
+                <div class="col-md-9">
+                    <input ng-verify="required:true" type="text" class="form-control"
+                           ng-model="vmLicenseImport.data.name" name="name">
                 </div>
-                <div class="form-group">
-                    <label class="col-md-3 control-label">{{'License Key'|T}}</label>
-                    <div class="col-md-9">
-                        <input ng-verify="required:true" type="text" class="form-control" ng-model="vmLicenseImport.data.license" name="ip" >
-                    </div>
+            </div>
+            <div class="form-group">
+                <label class="col-md-3 control-label">{{'License Key' | T}}</label>
+                <div class="col-md-9">
+                    <input ng-verify="required:true" type="text" class="form-control"
+                           ng-model="vmLicenseImport.data.license" name="ip">
                 </div>
-            </form>
-        </div>
+            </div>
+        </form>
     </div>
 </div>
 <div class="modal-footer">
-    <button ng-verify="control:'general'" type="button" class="btn btn-primary" ng-click="vmLicenseImport.save(vmLicenseImport.data)">{{'Save'|T}}</button>
-    <button type="button" class="btn btn-default" ng-click="vmLicenseImport.modalClose()">{{'Cancel'|T}}</button>
+    <button ng-verify="control:'general'" type="button" class="btn btn-primary"
+            ng-click="vmLicenseImport.save(vmLicenseImport.data)">{{'Save' | T}}
+    </button>
+    <button type="button" class="btn btn-default" ng-click="vmLicenseImport.modalClose()">{{'Cancel' | T}}</button>
 </div>
\ No newline at end of file
Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/device_group/device_group_add.html
===================================================================
--- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/device_group/device_group_add.html	(revision 2608)
+++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/device_group/device_group_add.html	(working copy)
@@ -1,26 +1,24 @@
 <div class="modal-header">
     <button type="button" class="close" ng-click="deviceGroupAdd.modalClose()">&times;</button>
-    <h6 class="modal-title">{{'Add a Device Group'|T}}</h6>
+    <h6 class="modal-title">{{'Add a Device Group' | T}}</h6>
 </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">{{'Name'|T}}</label>
-                    <div class="col-md-8">
-                        <input ng-verify="required:true, max:32, skip_chainese_verify:true" type="text"
-                               class="form-control" ng-model="deviceGroupAdd.data.name" name="name">
-                    </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">{{'Name' | T}}</label>
+                <div class="col-md-8">
+                    <input ng-verify="required:true, max:32, skip_chainese_verify:true" type="text"
+                           class="form-control" ng-model="deviceGroupAdd.data.name" name="name">
                 </div>
-            </form>
-        </div>
+            </div>
+        </form>
     </div>
 </div>
 <div class="modal-footer">
     <button ng-verify="control:'general'" type="button" class="btn btn-primary"
-            ng-click="deviceGroupAdd.save(deviceGroupAdd.data)">{{'Save'|T}}
+            ng-click="deviceGroupAdd.save(deviceGroupAdd.data)">{{'Save' | T}}
     </button>
-    <button type="button" class="btn btn-default" ng-click="deviceGroupAdd.modalClose()">{{'Cancel'|T}}</button>
+    <button type="button" class="btn btn-default" ng-click="deviceGroupAdd.modalClose()">{{'Cancel' | T}}</button>
 </div>
Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/system/submenu/log/log-host-add.html
===================================================================
--- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/system/submenu/log/log-host-add.html	(revision 2608)
+++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/system/submenu/log/log-host-add.html	(working copy)
@@ -1,41 +1,43 @@
 <div class="modal-header">
     <button type="button" class="close" ng-click="systemLogHostAdd.close()">&times;</button>
-    <h4 class="modal-title">{{'Add a Remote Syslog Host'|T}}</h4>
+    <h5 class="modal-title">{{'Add a Remote Syslog Host' | T}}</h5>
 </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 Address'|T}}</label>
-                    <div class="col-md-9">
-                        <input ng-verify="required:true" type="text" class="form-control" ng-model="systemLogHostAdd.ip" name="host_name" >
-                    </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 Address' | T}}</label>
+                <div class="col-md-9">
+                    <input ng-verify="required:true" type="text" class="form-control" ng-model="systemLogHostAdd.ip"
+                           name="host_name">
                 </div>
-                <div class="form-group">
-                    <label class="col-md-3 control-label">{{'Port'|T}}</label>
-                    <div class="col-md-9">
-                        <input ng-verify="required:true" class="form-control" ng-model="systemLogHostAdd.port" name="port" >
-                    </div>
+            </div>
+            <div class="form-group">
+                <label class="col-md-3 control-label">{{'Port' | T}}</label>
+                <div class="col-md-9">
+                    <input ng-verify="required:true" class="form-control" ng-model="systemLogHostAdd.port" name="port">
                 </div>
-                <div class="form-group">
-                    <label class="col-md-3 control-label">{{'Protocol'|T}}</label>
-                    <div class="col-md-9">
-                        <select ng-verify="required:true"  class="form-control" placeholder="" ng-model="systemLogHostAdd.protocol" id="protocol">
-                            <option value="0">TCP</option>
-                            <option value="1">UDP</option>
-                        </select>
-                    </div>
+            </div>
+            <div class="form-group">
+                <label class="col-md-3 control-label">{{'Protocol' | T}}</label>
+                <div class="col-md-9">
+                    <select ng-verify="required:true" class="form-control" placeholder=""
+                            ng-model="systemLogHostAdd.protocol" id="protocol">
+                        <option value="0">TCP</option>
+                        <option value="1">UDP</option>
+                    </select>
                 </div>
-                <div class="form-group">
-                    <div class="col-md-offset-3 col-md-9 errorMsg">{{ systemLogHostAdd.failed }}</div>
-                </div>
-            </form>
-        </div>
+            </div>
+            <div class="form-group">
+                <div class="col-md-offset-3 col-md-9 errorMsg">{{ systemLogHostAdd.failed }}</div>
+            </div>
+        </form>
     </div>
 </div>
 <div class="modal-footer">
-    <button ng-verify="control:'general'" type="button" class="btn btn-primary" ng-click="systemLogHostAdd.add()">{{'Confirm'|T}}</button>
-    <button type="button" class="btn btn-default" ng-click="systemLogHostAdd.close()">{{'Cancel'|T}}</button>
+    <button ng-verify="control:'general'" type="button" class="btn btn-primary" ng-click="systemLogHostAdd.add()">
+        {{'Confirm' | T}}
+    </button>
+    <button type="button" class="btn btn-default" ng-click="systemLogHostAdd.close()">{{'Cancel' | T}}</button>
 </div>