Index: /branches/amp_3_7_2/src/webui/webui/htdocs/new/src/client/app/modules/device/detail/setting.controller.js
===================================================================
--- /branches/amp_3_7_2/src/webui/webui/htdocs/new/src/client/app/modules/device/detail/setting.controller.js	(revision 2767)
+++ /branches/amp_3_7_2/src/webui/webui/htdocs/new/src/client/app/modules/device/detail/setting.controller.js	(working copy)
@@ -25,19 +25,19 @@
             settingViewModal.snmpv3_private_passoword_protocol = 'DES';
 
             settingViewModal.securityLevels = [
-                {label: 'authNoPriv', value: 'authNoPriv'},
-                {label: 'authPriv', value: 'authPriv'}
+                { label: 'authNoPriv', value: 'authNoPriv' },
+                { label: 'authPriv', value: 'authPriv' }
             ]
 
             settingViewModal.authenticationProtocols = [
-                {label: 'MD5', value: 'MD5'},
-                {label: 'SHA1', value: 'SHA1'},
-                {label: 'SHA256', value: 'SHA256'}
+                { label: 'MD5', value: 'MD5' },
+                { label: 'SHA1', value: 'SHA1' },
+                { label: 'SHA256', value: 'SHA256' }
             ]
 
             settingViewModal.privatePasswordProtocols = [
-                {label: 'AES', value: 'AES'},
-                {label: 'DES', value: 'DES'}
+                { label: 'AES', value: 'AES' },
+                { label: 'DES', value: 'DES' }
             ]
 
             var device_type_info = localStorageService.getWebStorage("device_type_info");
@@ -137,17 +137,20 @@
 
             function updateDeviceSNMPv3Config() {
                 settingViewModal.showProgressBar();
-                let payload = JSON.stringify({
+                let payload = {
                     "device_ip": settingViewModal.detail.ip,
                     "device_type": settingViewModal.type,
                     "username": settingViewModal.snmpv3_username,
                     "auth_pass": settingViewModal.snmpv3_auth_password,
-                    "priv_pass": settingViewModal.snmpv3_private_password,
                     "auth_protocol": settingViewModal.snmpv3_auth_protocol,
-                    "priv_protocol": settingViewModal.snmpv3_private_passoword_protocol,
                     "sec_level": settingViewModal.snmpv3_security_level,
                     "enabled": settingViewModal.snmpv3,
-                })
+                }
+                if (settingViewModal.snmpv3_security_level === 'authPriv') {
+                    payload['priv_pass'] = settingViewModal.snmpv3_private_password;
+                    payload['priv_protocol'] = settingViewModal.snmpv3_private_passoword_protocol;
+                }
+                payload = JSON.stringify(payload);
                 deviceService.updateDeviceSNMPv3Config(payload).then(function (resp) {
                     $rootScope.$broadcast('endLoading', true);
                     if (resp && resp.status === 200) {
Index: /branches/amp_3_7_2/src/webui/webui/htdocs/new/src/client/app/modules/device/detail/setting.html
===================================================================
--- /branches/amp_3_7_2/src/webui/webui/htdocs/new/src/client/app/modules/device/detail/setting.html	(revision 2766)
+++ /branches/amp_3_7_2/src/webui/webui/htdocs/new/src/client/app/modules/device/detail/setting.html	(working copy)
@@ -4,30 +4,39 @@
 
             <div ng-if="setting.protocol == 'restapi'">
                 <div class="form-group">
-                    <label for="gateway_domain" class="col-md-3 control-label"><sup>*</sup>{{ 'RESTful API Port' | T}}</label>
+                    <label for="gateway_domain" class="col-md-3 control-label"><sup>*</sup>{{ 'RESTful API Port' |
+                        T}}</label>
                     <div class="col-md-6">
-                        <input ng-verify="required:true, max_length:65535, min_length:0" type="number" class="form-control" ng-model="setting.restapi_port">
+                        <input ng-verify="required:true, max_length:65535, min_length:0" type="number"
+                            class="form-control" ng-model="setting.restapi_port">
                     </div>
                 </div>
                 <div class="form-group">
-                    <label for="gateway_domain" class="col-md-3 control-label"><sup>*</sup>{{ 'Restful Username' | T}}</label>
+                    <label for="gateway_domain" class="col-md-3 control-label"><sup>*</sup>{{ 'Restful Username' |
+                        T}}</label>
                     <div class="col-md-6">
-                        <input ng-verify="required:true" type="text" class="form-control" ng-model="setting.restapi_username" resettable>
+                        <input ng-verify="required:true" type="text" class="form-control"
+                            ng-model="setting.restapi_username" resettable>
                     </div>
                 </div>
                 <div class="form-group">
-                    <label for="gateway_domain" class="col-md-3 control-label"><sup>*</sup>{{ 'Restful Password' | T}}</label>
+                    <label for="gateway_domain" class="col-md-3 control-label"><sup>*</sup>{{ 'Restful Password' |
+                        T}}</label>
                     <div class="col-md-6">
-                        <input ng-verify="required:true" type="{{inputType}}" class="form-control" ng-model="setting.restapi_password" resettable>
-                        <a class="psd-eye" ng-click="setting.changeInput()"><i ng-class="[{'array-openEye': inputType === 'text'}, {'array-closeEye': inputType === 'password'}]"></i></a>
+                        <input ng-verify="required:true" type="{{inputType}}" class="form-control"
+                            ng-model="setting.restapi_password" resettable>
+                        <a class="psd-eye" ng-click="setting.changeInput()"><i
+                                ng-class="[{'array-openEye': inputType === 'text'}, {'array-closeEye': inputType === 'password'}]"></i></a>
                     </div>
                 </div>
             </div>
             <div ng-if="setting.protocol == 'xmlrpc'">
                 <div class="form-group">
-                    <label for="gateway_domain" class="col-md-3 control-label"><sup>*</sup>{{ 'XML RPC Port' | T}}</label>
+                    <label for="gateway_domain" class="col-md-3 control-label"><sup>*</sup>{{ 'XML RPC Port' |
+                        T}}</label>
                     <div class="col-md-6">
-                        <input ng-verify="required:true, max_length:65535, min_length:0" type="number" class="form-control" ng-model="setting.restapi_port">
+                        <input ng-verify="required:true, max_length:65535, min_length:0" type="number"
+                            class="form-control" ng-model="setting.restapi_port">
                     </div>
                 </div>
                 <div class="form-group">
@@ -40,20 +49,23 @@
                     <label for="gateway_domain" class="col-md-3 control-label">{{ 'XML RPC Password' | T}}</label>
                     <div class="col-md-6">
                         <input type="{{inputType}}" class="form-control" ng-model="setting.restapi_password" resettable>
-                        <a class="psd-eye" ng-click="setting.changeInput()"><i ng-class="[{'array-openEye': inputType === 'text'}, {'array-closeEye': inputType === 'password'}]"></i></a>
+                        <a class="psd-eye" ng-click="setting.changeInput()"><i
+                                ng-class="[{'array-openEye': inputType === 'text'}, {'array-closeEye': inputType === 'password'}]"></i></a>
                     </div>
                 </div>
             </div>
             <div class="form-group">
                 <label for="gateway_domain" class="col-md-3 control-label">{{ 'Gateway Domain' | T}}</label>
                 <div class="col-md-6">
-                    <input ng-verify="required:false" type="text" class="form-control" ng-model="setting.gateway_domain" resettable>
+                    <input ng-verify="required:false" type="text" class="form-control" ng-model="setting.gateway_domain"
+                        resettable>
                 </div>
             </div>
             <div class="form-group">
                 <label for="location" class="col-md-3 control-label">{{ 'Location' | T}}</label>
                 <div class="col-md-6">
-                    <input ng-verify="required:false" type="text" class="form-control" ng-model="setting.location" resettable>
+                    <input ng-verify="required:false" type="text" class="form-control" ng-model="setting.location"
+                        resettable>
                 </div>
             </div>
             <!--<div class="form-group">
@@ -77,28 +89,35 @@
                 <input type="text" class="form-control ip-input" ng-model="setting.intranet_ip">
             </div>-->
             <div class="form-group" ng-if="setting.user_display">
-                <label for="username" class="col-md-3 control-label"><sup>*</sup>{{ 'WebUI Console Username' | T}}</label>
+                <label for="username" class="col-md-3 control-label"><sup>*</sup>{{ 'WebUI Console Username' |
+                    T}}</label>
                 <div class="col-md-6">
-                    <input ng-verify="required:true" type="text" class="form-control" ng-model="setting.console_username" resettable>
+                    <input ng-verify="required:true" type="text" class="form-control"
+                        ng-model="setting.console_username" resettable>
                 </div>
             </div>
             <div class="form-group" ng-if="setting.user_display">
-                <label for="password" class="col-md-3 control-label"><sup>*</sup>{{ 'WebUI Console Password' | T}}</label>
+                <label for="password" class="col-md-3 control-label"><sup>*</sup>{{ 'WebUI Console Password' |
+                    T}}</label>
                 <div class="col-md-6">
-                    <input ng-verify="required:true" type="{{console_inputType}}" class="form-control" ng-model="setting.console_password" resettable>
-                    <a class="psd-eye" ng-click="setting.changeConsoleInput()"><i ng-class="[{'array-openEye': console_inputType === 'text'}, {'array-closeEye': console_inputType === 'password'}]"></i></a>
+                    <input ng-verify="required:true" type="{{console_inputType}}" class="form-control"
+                        ng-model="setting.console_password" resettable>
+                    <a class="psd-eye" ng-click="setting.changeConsoleInput()"><i
+                            ng-class="[{'array-openEye': console_inputType === 'text'}, {'array-closeEye': console_inputType === 'password'}]"></i></a>
                 </div>
             </div>
             <div class="form-group">
                 <label class="col-md-3 control-label"><sup>*</sup>{{ 'WebUI Port' | T}}</label>
                 <div class="col-md-6">
-                    <input ng-verify="required:true,min_length:1,max_length:65535" type="number" class="form-control" ng-model="setting.webui_port" resettable>
+                    <input ng-verify="required:true,min_length:1,max_length:65535" type="number" class="form-control"
+                        ng-model="setting.webui_port" resettable>
                 </div>
             </div>
             <div class="form-group">
                 <label for="device_group" class="col-md-3 control-label">{{ 'Device Group' | T}}</label>
                 <div class="col-md-6">
-                     <select ng-verify="required:false" name="deviceGroup" class="form-control" ng-model="setting.device_group" resettable>
+                    <select ng-verify="required:false" name="deviceGroup" class="form-control"
+                        ng-model="setting.device_group" resettable>
                         <option ng-repeat="row in setting.deviceGroupList" value="{{row.name}}">{{row.name}}</option>
                     </select>
                 </div>
@@ -106,8 +125,10 @@
             <div class="form-group">
                 <label class="col-md-3 control-label">{{ 'Enable Password' | T}}</label>
                 <div class="col-md-6">
-                    <input ng-verify="required:false" type="{{enable_inputType}}" class="form-control" ng-model="setting.enable_password" resettable>
-                    <a class="psd-eye" ng-click="setting.changeEnableInput()"><i ng-class="[{'array-openEye': enable_inputType === 'text'}, {'array-closeEye': enable_inputType === 'password'}]"></i></a>
+                    <input ng-verify="required:false" type="{{enable_inputType}}" class="form-control"
+                        ng-model="setting.enable_password" resettable>
+                    <a class="psd-eye" ng-click="setting.changeEnableInput()"><i
+                            ng-class="[{'array-openEye': enable_inputType === 'text'}, {'array-closeEye': enable_inputType === 'password'}]"></i></a>
                 </div>
             </div>
             <!-- <div class="form-group">
@@ -120,63 +141,74 @@
                 <label for="snmpv3" class="col-md-3 control-label">{{ 'Enable SNMPv3 (Default SNMPv2)' | T}}</label>
                 <div class="col-md-8">
                     <label>
-                        <input type="checkbox" bs-switch class="switch" ng-model="setting.snmpv3"
-                               switch-active="true" resettable>
+                        <input type="checkbox" bs-switch class="switch" ng-model="setting.snmpv3" switch-active="true"
+                            resettable>
                     </label>
                 </div>
             </div>
             <div class="form-group" ng-if="setting.snmpv3 === true">
-                <label for="snmpv3_username" class="col-md-3 control-label"><sup>*</sup>{{ 'SNMPv3 Username' | T}}</label>
+                <label for="snmpv3_username" class="col-md-3 control-label"><sup>*</sup>{{ 'SNMPv3 Username' |
+                    T}}</label>
                 <div class="col-md-8">
                     <div class="account-wrap">
                         <i class="array-user"></i>
                         <input ng-verify="required:true" type="text" class="form-control"
-                               ng-model="setting.snmpv3_username" placeholder="{{ 'SNMPv3 Username' | T}}">
+                            ng-model="setting.snmpv3_username" placeholder="{{ 'SNMPv3 Username' | T}}">
                     </div>
                 </div>
             </div>
             <div class="form-group" ng-if="setting.snmpv3 === true">
                 <label for="snmpv3_security_level" class="col-md-3 control-label"><sup>*</sup>Security Level</label>
                 <div class="col-md-8">
-                    <select ng-verify="required:true" name="type" class="form-control" ng-model="setting.snmpv3_security_level">
+                    <select ng-verify="required:true" name="type" class="form-control"
+                        ng-model="setting.snmpv3_security_level">
                         <option ng-repeat="row in setting.securityLevels" value="{{row.value}}">{{row.label}}</option>
                     </select>
                 </div>
             </div>
             <div class="form-group" ng-if="setting.snmpv3 === true">
-                <label for="snmpv3_auth_password" class="col-md-3 control-label"><sup>*</sup>{{ 'Authentication Password' | T}}</label>
+                <label for="snmpv3_auth_password" class="col-md-3 control-label"><sup>*</sup>{{ 'Authentication
+                    Password' | T}}</label>
                 <div class="col-md-8">
                     <input ng-verify="required:false" type="password" class="form-control"
-                           ng-model="setting.snmpv3_auth_password">
+                        ng-model="setting.snmpv3_auth_password">
                 </div>
             </div>
             <div class="form-group" ng-if="setting.snmpv3 === true">
-                <label for="snmpv3_auth_protocol" class="col-md-3 control-label"><sup>*</sup>Authentication Protocol</label>
+                <label for="snmpv3_auth_protocol" class="col-md-3 control-label"><sup>*</sup>Authentication
+                    Protocol</label>
                 <div class="col-md-8">
-                    <select ng-verify="required:true" name="type" class="form-control" ng-model="setting.snmpv3_auth_protocol">
-                        <option ng-repeat="row in setting.authenticationProtocols" value="{{row.value}}">{{row.label}}</option>
+                    <select ng-verify="required:true" name="type" class="form-control"
+                        ng-model="setting.snmpv3_auth_protocol">
+                        <option ng-repeat="row in setting.authenticationProtocols" value="{{row.value}}">{{row.label}}
+                        </option>
                     </select>
                 </div>
             </div>
             <div class="form-group" ng-if="setting.snmpv3 === true && setting.snmpv3_security_level === 'authPriv'">
-                <label for="snmpv3_private_password" class="col-md-3 control-label"><sup>*</sup>{{ 'Private Password' | T}}</label>
+                <label for="snmpv3_private_password" class="col-md-3 control-label"><sup>*</sup>{{ 'Private Password' |
+                    T}}</label>
                 <div class="col-md-8">
                     <input ng-verify="required:false" type="password" class="form-control"
-                           ng-model="setting.snmpv3_auth_password">
+                        ng-model="setting.snmpv3_private_password">
                 </div>
             </div>
             <div class="form-group" ng-if="setting.snmpv3 === true && setting.snmpv3_security_level === 'authPriv'">
-                <label for="snmpv3_private_passoword_protocol" class="col-md-3 control-label"><sup>*</sup>Private Password Protocol</label>
+                <label for="snmpv3_private_passoword_protocol" class="col-md-3 control-label"><sup>*</sup>Private
+                    Password Protocol</label>
                 <div class="col-md-8">
-                    <select ng-verify="required:true" name="type" class="form-control" ng-model="setting.snmpv3_private_passoword_protocol">
-                        <option ng-repeat="row in setting.privatePasswordProtocols" value="{{row.value}}">{{row.label}}</option>
+                    <select ng-verify="required:true" name="type" class="form-control"
+                        ng-model="setting.snmpv3_private_passoword_protocol">
+                        <option ng-repeat="row in setting.privatePasswordProtocols" value="{{row.value}}">{{row.label}}
+                        </option>
                     </select>
                 </div>
             </div>
             <div class="form-group">
                 <label class="col-md-3 control-label">{{ 'Enable Log' | T}}</label>
                 <div class="col-md-6">
-                    <input type="checkbox" bs-switch class="switch" ng-model="setting.log_enable" switch-active="true" resettable>
+                    <input type="checkbox" bs-switch class="switch" ng-model="setting.log_enable" switch-active="true"
+                        resettable>
                 </div>
             </div>
             <!-- <div class="form-group">
@@ -186,11 +218,13 @@
             </div> -->
             <div class="form-group" ng-if="settingsForm.$dirty">
                 <div class="col-md-offset-3 col-md-6">
-                    <button ng-verify="control:'settingsForm'" class="btn btn-primary" ng-click="setting.changeSetting(settingsForm)">{{ 'Save Changes' | T}}</button>
-                    <button class="btn btn-default" ng-click="settingsForm.$dirty=false;setting.cancle()">{{ 'Cancel' | T}}</button>
+                    <button ng-verify="control:'settingsForm'" class="btn btn-primary"
+                        ng-click="setting.changeSetting(settingsForm)">{{ 'Save Changes' | T}}</button>
+                    <button class="btn btn-default" ng-click="settingsForm.$dirty=false;setting.cancle()">{{ 'Cancel' |
+                        T}}</button>
                 </div>
             </div>
 
         </form>
 
-    </div>
+    </div>
\ No newline at end of file
Index: /branches/amp_3_7_2/src/webui/webui/htdocs/new/src/client/app/modules/device/modal/device.add.controller.js
===================================================================
--- /branches/amp_3_7_2/src/webui/webui/htdocs/new/src/client/app/modules/device/modal/device.add.controller.js	(revision 2767)
+++ /branches/amp_3_7_2/src/webui/webui/htdocs/new/src/client/app/modules/device/modal/device.add.controller.js	(working copy)
@@ -31,19 +31,19 @@
             addViewModal.snmpv3_private_passoword_protocol = 'DES';
 
             addViewModal.securityLevels = [
-                {label: 'authNoPriv', value: 'authNoPriv'},
-                {label: 'authPriv', value: 'authPriv'}
+                { label: 'authNoPriv', value: 'authNoPriv' },
+                { label: 'authPriv', value: 'authPriv' }
             ]
 
             addViewModal.authenticationProtocols = [
-                {label: 'MD5', value: 'MD5'},
-                {label: 'SHA1', value: 'SHA1'},
-                {label: 'SHA256', value: 'SHA256'}
+                { label: 'MD5', value: 'MD5' },
+                { label: 'SHA1', value: 'SHA1' },
+                { label: 'SHA256', value: 'SHA256' }
             ]
 
             addViewModal.privatePasswordProtocols = [
-                {label: 'AES', value: 'AES'},
-                {label: 'DES', value: 'DES'}
+                { label: 'AES', value: 'AES' },
+                { label: 'DES', value: 'DES' }
             ]
 
             var device_type_info = localStorageService.getWebStorage("device_type_info");
@@ -197,7 +197,7 @@
                         console_password: ''
                     },
                     group_name_from: addViewModal.deviceGroupFrom,
-                    device_group: [{'name': addViewModal.deviceGroup}],
+                    device_group: [{ 'name': addViewModal.deviceGroup }],
                     enable_password: addViewModal.enable_password
                 }
                 if (addViewModal.protocol === 'xmlrpc' || device_type_info.ADC_TYPE_LIST.indexOf(addViewModal.type.toLowerCase()) !== -1 || device_type_info.WAF_TYPE_LIST.indexOf(addViewModal.type.toLowerCase()) !== -1) {
@@ -246,28 +246,31 @@
                     if (res && res.status === 200) {
                         if (res.data[0]) { // add successful
                             if (addViewModal.snmpv3) {
-                            addViewModal.showProgressBar();
-                            let payload = JSON.stringify({
-                                "device_ip": addViewModal.ip,
-                                "device_type": addViewModal.type,
-                                "username": addViewModal.snmpv3_username,
-                                "auth_pass": addViewModal.snmpv3_auth_password,
-                                "priv_pass": addViewModal.snmpv3_private_password,
-                                "auth_protocol": addViewModal.snmpv3_auth_protocol,
-                                "priv_protocol": addViewModal.snmpv3_private_passoword_protocol,
-                                "sec_level": addViewModal.snmpv3_security_level,
-                                "enabled": addViewModal.snmpv3,
-                            })
-                            deviceService.updateDeviceSNMPv3Config(payload).then(function (resp) {
-                                $rootScope.$broadcast('endLoading', true);
-                                if (resp && resp.status === 200) {
-                                    if (resp.data && resp.data.message) {
-                                        $uibModalInstance.close(true);
-                                    } else {
-                                        addViewModal.failed = $filter('T')(resp.data[1]);
-                                    }
+                                addViewModal.showProgressBar();
+                                let payload = {
+                                    "device_ip": addViewModal.ip,
+                                    "device_type": addViewModal.type,
+                                    "username": addViewModal.snmpv3_username,
+                                    "auth_pass": addViewModal.snmpv3_auth_password,
+                                    "auth_protocol": addViewModal.snmpv3_auth_protocol,
+                                    "sec_level": addViewModal.snmpv3_security_level,
+                                    "enabled": addViewModal.snmpv3,
                                 }
-                            })
+                                if (addViewModal.snmpv3_security_level === 'authPriv') {
+                                    payload['priv_pass'] = addViewModal.snmpv3_private_password;
+                                    payload['priv_protocol'] = addViewModal.snmpv3_private_passoword_protocol;
+                                }
+                                payload = JSON.stringify(payload);
+                                deviceService.updateDeviceSNMPv3Config(payload).then(function (resp) {
+                                    $rootScope.$broadcast('endLoading', true);
+                                    if (resp && resp.status === 200) {
+                                        if (resp.data && resp.data.message) {
+                                            $uibModalInstance.close(true);
+                                        } else {
+                                            addViewModal.failed = $filter('T')(resp.data[1]);
+                                        }
+                                    }
+                                })
                             } else {
                                 $uibModalInstance.close(true);
                             }
Index: /branches/amp_3_7_2/src/webui/webui/htdocs/new/src/client/app/modules/device/modal/device.add.html
===================================================================
--- /branches/amp_3_7_2/src/webui/webui/htdocs/new/src/client/app/modules/device/modal/device.add.html	(revision 2766)
+++ /branches/amp_3_7_2/src/webui/webui/htdocs/new/src/client/app/modules/device/modal/device.add.html	(working copy)
@@ -1,6 +1,7 @@
 <div>
     <div class="modal-header">
-        <button type="button" class="close" ng-click="deviceAdd.close()" aria-label="Close"><span aria-hidden="true">&times;</span>
+        <button type="button" class="close" ng-click="deviceAdd.close()" aria-label="Close"><span
+                aria-hidden="true">&times;</span>
         </button>
         <h6 class="modal-title">{{ 'Add New Device' | T}}</h6>
 
@@ -11,13 +12,14 @@
                 <label for="name" class="col-md-3 control-label"><sup>*</sup>{{ 'Device Name' | T }}</label>
                 <div class="col-md-8">
                     <input ng-verify="required:true, max:32, min:1, skip_chainese_verify:true" type="text"
-                           class="form-control" ng-model="deviceAdd.name">
+                        class="form-control" ng-model="deviceAdd.name">
                 </div>
             </div>
             <div class="form-group">
                 <label for="type" class="col-md-3 control-label"><sup>*</sup>{{ 'Device Type' | T }}</label>
                 <div class="col-md-8">
-                    <select ng-verify="required:true" name="type" class="form-control" ng-model="deviceAdd.type" ng-change="deviceAdd.typeChanged()">
+                    <select ng-verify="required:true" name="type" class="form-control" ng-model="deviceAdd.type"
+                        ng-change="deviceAdd.typeChanged()">
                         <option value="">{{'--- Please Select ---' | T}}</option>
                         <option ng-repeat="row in deviceAdd.deviceTypeList" value="{{row}}">{{row}}</option>
                     </select>
@@ -54,21 +56,21 @@
 
             <div ng-if="deviceAdd.protocol == 'restapi'">
                 <div class="form-group">
-                    <label for="restapi_port"
-                           class="col-md-3 control-label"><sup>*</sup>{{ 'RESTful API Port' | T}}</label>
+                    <label for="restapi_port" class="col-md-3 control-label"><sup>*</sup>{{ 'RESTful API Port' |
+                        T}}</label>
                     <div class="col-md-8">
                         <input ng-verify="required:true, max_length:65535, min_length:0" type="number"
-                               class="form-control" ng-model="deviceAdd.port">
+                            class="form-control" ng-model="deviceAdd.port">
                     </div>
                 </div>
                 <div class="form-group">
-                    <label for="restapi_account"
-                           class="col-md-3 control-label"><sup>*</sup>{{ 'Restful Account' | T}}</label>
+                    <label for="restapi_account" class="col-md-3 control-label"><sup>*</sup>{{ 'Restful Account' |
+                        T}}</label>
                     <div class="col-md-8">
                         <div class="account-wrap">
                             <i class="array-user"></i>
                             <input ng-verify="required:true" type="text" class="form-control"
-                                   ng-model="deviceAdd.username" placeholder="{{ 'Username' | T}}">
+                                ng-model="deviceAdd.username" placeholder="{{ 'Username' | T}}">
                         </div>
                     </div>
                 </div>
@@ -78,7 +80,7 @@
                         <div class="account-wrap">
                             <i class="array-password"></i>
                             <input ng-verify="required:true" type="password" class="form-control"
-                                   ng-model="deviceAdd.password" placeholder="{{ 'Password' | T}}">
+                                ng-model="deviceAdd.password" placeholder="{{ 'Password' | T}}">
                         </div>
                     </div>
                 </div>
@@ -88,7 +90,7 @@
                     <label for="restapi_port" class="col-md-3 control-label"><sup>*</sup>{{ 'XML RPC Port' | T}}</label>
                     <div class="col-md-8">
                         <input ng-verify="required:true, max_length:65535, min_length:0" type="number"
-                               class="form-control" ng-model="deviceAdd.port">
+                            class="form-control" ng-model="deviceAdd.port">
                     </div>
                 </div>
                 <div class="form-group">
@@ -97,7 +99,7 @@
                         <div class="account-wrap">
                             <i class="array-user"></i>
                             <input type="text" class="form-control" ng-model="deviceAdd.username"
-                                   placeholder="{{ 'Username' | T}}">
+                                placeholder="{{ 'Username' | T}}">
                         </div>
                     </div>
                 </div>
@@ -107,7 +109,7 @@
                         <div class="account-wrap">
                             <i class="array-password"></i>
                             <input type="password" class="form-control" ng-model="deviceAdd.password"
-                                   placeholder="{{ 'Password' | T}}">
+                                placeholder="{{ 'Password' | T}}">
                         </div>
                     </div>
                 </div>
@@ -117,14 +119,14 @@
                 <label for="gateway_domain" class="col-md-3 control-label">{{ 'Gateway Domain' | T}}</label>
                 <div class="col-md-8">
                     <input ng-verify="required:false" type="text" class="form-control" ng-model="deviceAdd.domain"
-                           maxlength="128">
+                        maxlength="128">
                 </div>
             </div>
             <div class="form-group">
                 <label for="location" class="col-md-3 control-label">{{ 'Location' | T}}</label>
                 <div class="col-md-8">
                     <input ng-verify="required:false" type="text" class="form-control" ng-model="deviceAdd.location"
-                           maxlength="128">
+                        maxlength="128">
                 </div>
             </div>
             <div class="form-group" ng-if="false">
@@ -142,7 +144,7 @@
             <div class="form-group" ng-if="false">
                 <div class="col-md-offset-3 col-md-8">
                     <input ng-verify="required:false" type="text" class="form-control ip-input"
-                           ng-model="deviceAdd.firewallIP">
+                        ng-model="deviceAdd.firewallIP">
                 </div>
             </div>
 
@@ -160,17 +162,18 @@
             <div class="form-group" ng-if="false">
                 <div class="col-md-offset-3 col-md-8">
                     <input ng-verify="required:false" type="text" class="form-control ip-input"
-                           ng-model="deviceAdd.intranetIP">
+                        ng-model="deviceAdd.intranetIP">
                 </div>
             </div>
 
             <div class="form-group" ng-if="deviceAdd.user_display">
-                <label for="restapi_account" class="col-md-3 control-label"><sup>*</sup>{{ 'WebUI Console Account' | T}}</label>
+                <label for="restapi_account" class="col-md-3 control-label"><sup>*</sup>{{ 'WebUI Console Account' |
+                    T}}</label>
                 <div class="col-md-8">
                     <div class="account-wrap">
                         <i class="array-user"></i>
                         <input ng-verify="required:true" type="text" class="form-control"
-                               ng-model="deviceAdd.console_username" placeholder="{{ 'Username' | T}}">
+                            ng-model="deviceAdd.console_username" placeholder="{{ 'Username' | T}}">
                     </div>
                 </div>
             </div>
@@ -179,7 +182,7 @@
                     <div class="account-wrap">
                         <i class="array-password"></i>
                         <input ng-verify="required:true" type="password" class="form-control"
-                               ng-model="deviceAdd.console_password" placeholder="{{ 'Password' | T}}">
+                            ng-model="deviceAdd.console_password" placeholder="{{ 'Password' | T}}">
                     </div>
                 </div>
             </div>
@@ -189,11 +192,11 @@
                 <div class="col-md-8">
                     <label class="radio-inline">
                         <input type="radio" name="choiceDeviceGroup" ng-model="deviceAdd.deviceGroupFrom"
-                               value="created">{{ 'Created' | T }}
+                            value="created">{{ 'Created' | T }}
                     </label>
                     <label class="radio-inline">
-                        <input type="radio" name="choiceDeviceGroup" ng-model="deviceAdd.deviceGroupFrom"
-                               value="new">{{ 'New' | T}}
+                        <input type="radio" name="choiceDeviceGroup" ng-model="deviceAdd.deviceGroupFrom" value="new">{{
+                        'New' | T}}
                     </label>
                 </div>
             </div>
@@ -219,70 +222,80 @@
                 <label for="webui_port" class="col-md-3 control-label">{{ 'WebUI Port' | T}}</label>
                 <div class="col-md-8">
                     <input ng-verify="required:true, min_length:1, max_length:65535" type="number" class="form-control"
-                           ng-model="deviceAdd.webui_port">
+                        ng-model="deviceAdd.webui_port">
                 </div>
             </div>
             <div class="form-group">
                 <label for="enable_password" class="col-md-3 control-label">{{ 'Enable Password' | T}}</label>
                 <div class="col-md-8">
                     <input ng-verify="required:false" type="password" class="form-control"
-                           ng-model="deviceAdd.enable_password">
+                        ng-model="deviceAdd.enable_password">
                 </div>
             </div>
             <div class="form-group">
                 <label for="snmpv3" class="col-md-3 control-label">{{ 'Enable SNMPv3 (Default SNMPv2)' | T}}</label>
                 <div class="col-md-8">
                     <label>
-                        <input type="checkbox" bs-switch class="switch" ng-model="deviceAdd.snmpv3"
-                               switch-active="true" resettable>
+                        <input type="checkbox" bs-switch class="switch" ng-model="deviceAdd.snmpv3" switch-active="true"
+                            resettable>
                     </label>
                 </div>
             </div>
             <div class="form-group" ng-if="deviceAdd.snmpv3 === true">
-                <label for="snmpv3_username" class="col-md-3 control-label"><sup>*</sup>{{ 'SNMPv3 Username' | T}}</label>
+                <label for="snmpv3_username" class="col-md-3 control-label"><sup>*</sup>{{ 'SNMPv3 Username' |
+                    T}}</label>
                 <div class="col-md-8">
                     <div class="account-wrap">
                         <i class="array-user"></i>
                         <input ng-verify="required:true" type="text" class="form-control"
-                               ng-model="deviceAdd.snmpv3_username" placeholder="{{ 'SNMPv3 Username' | T}}">
+                            ng-model="deviceAdd.snmpv3_username" placeholder="{{ 'SNMPv3 Username' | T}}">
                     </div>
                 </div>
             </div>
             <div class="form-group" ng-if="deviceAdd.snmpv3 === true">
                 <label for="snmpv3_security_level" class="col-md-3 control-label"><sup>*</sup>Security Level</label>
                 <div class="col-md-8">
-                    <select ng-verify="required:true" name="type" class="form-control" ng-model="deviceAdd.snmpv3_security_level">
+                    <select ng-verify="required:true" name="type" class="form-control"
+                        ng-model="deviceAdd.snmpv3_security_level">
                         <option ng-repeat="row in deviceAdd.securityLevels" value="{{row.value}}">{{row.label}}</option>
                     </select>
                 </div>
             </div>
             <div class="form-group" ng-if="deviceAdd.snmpv3 === true">
-                <label for="snmpv3_auth_password" class="col-md-3 control-label"><sup>*</sup>{{ 'Authentication Password' | T}}</label>
+                <label for="snmpv3_auth_password" class="col-md-3 control-label"><sup>*</sup>{{ 'Authentication
+                    Password' | T}}</label>
                 <div class="col-md-8">
                     <input ng-verify="required:false" type="password" class="form-control"
-                           ng-model="deviceAdd.snmpv3_auth_password">
+                        ng-model="deviceAdd.snmpv3_auth_password">
                 </div>
             </div>
             <div class="form-group" ng-if="deviceAdd.snmpv3 === true">
-                <label for="snmpv3_auth_protocol" class="col-md-3 control-label"><sup>*</sup>Authentication Protocol</label>
+                <label for="snmpv3_auth_protocol" class="col-md-3 control-label"><sup>*</sup>Authentication
+                    Protocol</label>
                 <div class="col-md-8">
-                    <select ng-verify="required:true" name="type" class="form-control" ng-model="deviceAdd.snmpv3_auth_protocol">
-                        <option ng-repeat="row in deviceAdd.authenticationProtocols" value="{{row.value}}">{{row.label}}</option>
+                    <select ng-verify="required:true" name="type" class="form-control"
+                        ng-model="deviceAdd.snmpv3_auth_protocol">
+                        <option ng-repeat="row in deviceAdd.authenticationProtocols" value="{{row.value}}">{{row.label}}
+                        </option>
                     </select>
                 </div>
             </div>
             <div class="form-group" ng-if="deviceAdd.snmpv3 === true && deviceAdd.snmpv3_security_level === 'authPriv'">
-                <label for="snmpv3_private_password" class="col-md-3 control-label"><sup>*</sup>{{ 'Private Password' | T}}</label>
+                <label for="snmpv3_private_password" class="col-md-3 control-label"><sup>*</sup>{{ 'Private Password' |
+                    T}}</label>
                 <div class="col-md-8">
                     <input ng-verify="required:false" type="password" class="form-control"
-                           ng-model="deviceAdd.snmpv3_auth_password">
+                        ng-model="deviceAdd.snmpv3_private_password">
                 </div>
             </div>
             <div class="form-group" ng-if="deviceAdd.snmpv3 === true && deviceAdd.snmpv3_security_level === 'authPriv'">
-                <label for="snmpv3_private_passoword_protocol" class="col-md-3 control-label"><sup>*</sup>Private Password Protocol</label>
+                <label for="snmpv3_private_passoword_protocol" class="col-md-3 control-label"><sup>*</sup>Private
+                    Password Protocol</label>
                 <div class="col-md-8">
-                    <select ng-verify="required:true" name="type" class="form-control" ng-model="deviceAdd.snmpv3_private_passoword_protocol">
-                        <option ng-repeat="row in deviceAdd.privatePasswordProtocols" value="{{row.value}}">{{row.label}}</option>
+                    <select ng-verify="required:true" name="type" class="form-control"
+                        ng-model="deviceAdd.snmpv3_private_passoword_protocol">
+                        <option ng-repeat="row in deviceAdd.privatePasswordProtocols" value="{{row.value}}">
+                            {{row.label}}</option>
                     </select>
                 </div>
             </div>
@@ -291,7 +304,7 @@
                 <div class="col-md-8">
                     <label>
                         <input type="checkbox" bs-switch class="switch" ng-model="deviceAdd.log_enable"
-                               switch-active="true" resettable>
+                            switch-active="true" resettable>
                     </label>
                 </div>
             </div>
@@ -300,7 +313,7 @@
                 <div class="col-md-8">
                     <label>
                         <input type="checkbox" bs-switch class="switch" ng-model="deviceAdd.backup_enable"
-                               switch-active="true" resettable>
+                            switch-active="true" resettable>
                     </label>
                 </div>
             </div>
@@ -312,7 +325,7 @@
             <div class="form-group">
                 <div class="col-md-offset-3 col-md-8">
                     <button ng-verify="control:'addDeviceForm'" class="btn btn-primary" ng-click="deviceAdd.submit()"
-                            id="addSubmit">{{ 'Create' | T}}
+                        id="addSubmit">{{ 'Create' | T}}
                     </button>
                     <button class="btn btn-default" ng-click="deviceAdd.close()">{{ 'Cancel' | T}}</button>
                 </div>
@@ -328,5 +341,4 @@
         margin-top: 30px;
         width: 940px;
     }
-</style>
-
+</style>
\ No newline at end of file