[Feature][S300][task-view-1920][app] remove login username and add ussd to first page
Change-Id: I535c4d09df455c1d6bd9b6c48bb66659d79c328d
diff --git a/lynq/S300/BJMTN/ap/app/zte_webui/subpg/entry.html b/lynq/S300/BJMTN/ap/app/zte_webui/subpg/entry.html
index 2de9260..e5397c1 100755
--- a/lynq/S300/BJMTN/ap/app/zte_webui/subpg/entry.html
+++ b/lynq/S300/BJMTN/ap/app/zte_webui/subpg/entry.html
@@ -14,7 +14,7 @@
<label data-trans="password" for="txtAdmin"></label>
</div>
</div>
- <div class="row form-group">
+ <div class="row form-group" style="display:none;">
<div class="col-xs-8">
<input id="txtUser" autocomplete="off" data-placeholder="username" data-bind="value:username, valueUpdate: 'keypress'" maxlength="32" name="txtUser" style="border:2px solid rgb(221, 221, 221);" class="required form-control"/>
</div>
diff --git a/lynq/S300/BJMTN/ap/app/zte_webui/subpg/ussd.html b/lynq/S300/BJMTN/ap/app/zte_webui/subpg/ussd.html
index 0407acf..4357cd7 100755
--- a/lynq/S300/BJMTN/ap/app/zte_webui/subpg/ussd.html
+++ b/lynq/S300/BJMTN/ap/app/zte_webui/subpg/ussd.html
@@ -7,12 +7,12 @@
</div>
<div class="col-xs-11">
<div class="form-title">
- <h1 data-trans='advanced_settings'></h1>
+ <h1 data-trans='USSD'></h1>
</div>
</div>
</div>
<div class="row">
- <div class="col-xs-2">
+ <!-- <div class="col-xs-2">
<div class="nav_right">
<ul>
<li><a data-trans="sleep_mode" href="#wlan_sleep"></a></li>
@@ -25,14 +25,16 @@
<li><a data-trans="tr069" href="#tr069"></a></li>
</ul>
</div>
- </div>
+ </div> -->
- <div class="col-xs-10">
+ <div class="innerContainer">
<form id="frmUSSD">
- <div class="form-body">
+ <div class="col-xs-1 margin-top-15">
+ </div>
+ <div class="col-xs-11">
<h3 data-trans="USSD" class="form-title"></h3>
- <div id="USSD_send_div" data-bind="visible: USSDLocation()==0" class="form-body margin-top-20">
+ <div id="USSD_send_div" data-bind="visible: USSDLocation()==0" class="margin-top-20">
<div class="content">
<div class="form-buttons">
<input type="button" data-trans="check_airtime" id="btn104" value="*104#" class="btn btn-default marginright10" data-bind="click:function(){USSDSend('*104#')}">
@@ -52,7 +54,7 @@
</div>
</div>
</div>
- <div id="USSD_reply_div" data-bind="visible: USSDLocation()==1" class="form-body margin-top-20">
+ <div id="USSD_reply_div" data-bind="visible: USSDLocation()==1" class="margin-top-20">
<!--<div class="form-title" data-trans='ussd_contents'></div>!-->
<div class="content">
<div class="row form-group">
diff --git a/lynq/S300/ap/app/zte_webui/js/com.js b/lynq/S300/ap/app/zte_webui/js/com.js
index 6e3a1c8..3078ac1 100755
--- a/lynq/S300/ap/app/zte_webui/js/com.js
+++ b/lynq/S300/ap/app/zte_webui/js/com.js
@@ -7884,6 +7884,7 @@
target.hasRj45 = set.RJ45_SUPPORT;
target.notDataCard = set.PRODUCT_TYPE != 'DATACARD';
target.hasParentalControl = set.HAS_PARENTAL_CONTROL;
+ target.hasUssd = set.HAS_USSD;
var wifiInfo = fnc.getWifiBasic();
if (set.WIFI_SUPPORT_QR_SWITCH) {
target.showQRCode = set.WIFI_SUPPORT_QR_CODE && wifiInfo.show_qrcode_flag;
diff --git a/lynq/S300/ap/app/zte_webui/js/ext/menu.js b/lynq/S300/ap/app/zte_webui/js/ext/menu.js
index 5aece43..f503820 100755
--- a/lynq/S300/ap/app/zte_webui/js/ext/menu.js
+++ b/lynq/S300/ap/app/zte_webui/js/ext/menu.js
@@ -231,8 +231,7 @@
}, {
hash: '#usat',
path: 'ussd',
- level: '2',
- parent: '#normal_set',
+ level: '1',
requireLogin: needLogin,
checkSIMStatus: false
}, {
diff --git a/lynq/S300/ap/app/zte_webui/js/ext/menu_pppoe.js b/lynq/S300/ap/app/zte_webui/js/ext/menu_pppoe.js
index ef87893..eb2ec73 100755
--- a/lynq/S300/ap/app/zte_webui/js/ext/menu_pppoe.js
+++ b/lynq/S300/ap/app/zte_webui/js/ext/menu_pppoe.js
@@ -231,8 +231,7 @@
}, {
hash: '#usat',
path: 'ussd',
- level: '2',
- parent: '#normal_set',
+ level: '1',
requireLogin: needLogin,
checkSIMStatus: false
}, {
diff --git a/lynq/S300/ap/app/zte_webui/js/net.js b/lynq/S300/ap/app/zte_webui/js/net.js
index fb1a2eb..f90b05c 100755
--- a/lynq/S300/ap/app/zte_webui/js/net.js
+++ b/lynq/S300/ap/app/zte_webui/js/net.js
@@ -2390,6 +2390,7 @@
target.hasSms = config.HAS_SMS;
target.hasPhonebook = config.HAS_PHONEBOOK;
target.isSupportSD = config.SD_CARD_SUPPORT;
+ target.hasUssd = config.HAS_USSD;
if (config.WIFI_SUPPORT_QR_SWITCH == false) {
target.showQRCode = config.WIFI_SUPPORT_QR_CODE;
} else {
diff --git a/lynq/S300/ap/app/zte_webui/js/sim_device.js b/lynq/S300/ap/app/zte_webui/js/sim_device.js
index b3d2158..54d3443 100755
--- a/lynq/S300/ap/app/zte_webui/js/sim_device.js
+++ b/lynq/S300/ap/app/zte_webui/js/sim_device.js
@@ -38,6 +38,7 @@
target.hasSms = config.HAS_SMS;
target.hasPhonebook = config.HAS_PHONEBOOK;
target.isSupportSD = config.SD_CARD_SUPPORT;
+ target.hasUssd = config.HAS_USSD;
if (config.WIFI_SUPPORT_QR_SWITCH) {
var wifiInfo = service.getWifiBasic();
target.showQRCode = config.WIFI_SUPPORT_QR_CODE && wifiInfo.show_qrcode_flag;
diff --git a/lynq/S300/ap/app/zte_webui/subpg/adm_lan.html b/lynq/S300/ap/app/zte_webui/subpg/adm_lan.html
index 43fdc65..c8fe67c 100755
--- a/lynq/S300/ap/app/zte_webui/subpg/adm_lan.html
+++ b/lynq/S300/ap/app/zte_webui/subpg/adm_lan.html
@@ -19,7 +19,7 @@
<li class="active"><a href="#route_set" data-trans="router_setting"></a></li>
<li><a href="#filter_main" data-trans="firewall"></a></li>
<li data-bind="visible:hasUpdateCheck"><a href="#fota" data-trans="update_settings"></a></li>
- <li data-bind="visible:hasUssd"><a href="#usat" data-trans="USSD"></a></li>
+ <!-- <li data-bind="visible:hasUssd"><a href="#usat" data-trans="USSD"></a></li> -->
<li data-bind="visible:hasDdns"><a href="#dynamic_dns" data-trans="DDNS"></a></li>
<li><a href="#more" data-trans="others"></a></li>
<li><a data-trans="tr069" href="#tr069"></a></li>
diff --git a/lynq/S300/ap/app/zte_webui/subpg/adm_others.html b/lynq/S300/ap/app/zte_webui/subpg/adm_others.html
index 112b09f..936b851 100755
--- a/lynq/S300/ap/app/zte_webui/subpg/adm_others.html
+++ b/lynq/S300/ap/app/zte_webui/subpg/adm_others.html
@@ -19,7 +19,7 @@
<li><a href="#route_set" data-trans="router_setting"></a></li>
<li><a href="#filter_main" data-trans="firewall"></a></li>
<li data-bind="visible:hasUpdateCheck"><a href="#fota" data-trans="update_settings"></a></li>
- <li data-bind="visible:hasUssd"><a href="#usat" data-trans="USSD"></a></li>
+ <!-- <li data-bind="visible:hasUssd"><a href="#usat" data-trans="USSD"></a></li> -->
<li data-bind="visible:hasDdns"><a href="#dynamic_dns" data-trans="DDNS"></a></li>
<li class="active"><a href="#more" data-trans="others"></a></li>
<li><a data-trans="tr069" href="#tr069"></a></li>
diff --git a/lynq/S300/ap/app/zte_webui/subpg/firewall.html b/lynq/S300/ap/app/zte_webui/subpg/firewall.html
index 06a702d..a106101 100755
--- a/lynq/S300/ap/app/zte_webui/subpg/firewall.html
+++ b/lynq/S300/ap/app/zte_webui/subpg/firewall.html
@@ -19,7 +19,7 @@
<li><a data-trans="router_setting" href="#route_set"></a></li>
<li class="active"><a data-trans="firewall" href="#filter_main"></a></li>
<li data-bind="visible:hasUpdateCheck"><a data-trans="update_settings" href="#fota"></a></li>
- <li data-bind="visible:hasUssd"><a data-trans="USSD" href="#usat"></a></li>
+ <!-- <li data-bind="visible:hasUssd"><a data-trans="USSD" href="#usat"></a></li> -->
<li data-bind="visible:hasDdns"><a data-trans="DDNS" href="#dynamic_dns"></a></li>
<li><a data-trans="others" href="#more"></a></li>
<li><a data-trans="tr069" href="#tr069"></a></li>
diff --git a/lynq/S300/ap/app/zte_webui/subpg/main.html b/lynq/S300/ap/app/zte_webui/subpg/main.html
index f0e745f..6dccacf 100755
--- a/lynq/S300/ap/app/zte_webui/subpg/main.html
+++ b/lynq/S300/ap/app/zte_webui/subpg/main.html
@@ -4,6 +4,7 @@
<ul>
<li><a href="#child_ctl" data-bind="visible: hasParentalControl" data-trans="parental_control" class="c0EC6DC"></a></li>
<li><a href="#msg_main" data-bind="visible: hasSms" data-trans="sms" class="cF53A58"></a></li>
+ <li><a href="#usat" data-bind="visible:hasUssd" data-trans="USSD"></a></li>
<li><a href="#pb_main" data-bind="visible: hasPhonebook" data-trans="phonebook" class="c00AEFF"></a></li>
<li><a href="#sdcard" data-bind="visible: isSupportSD" data-trans="sd" class="c2175FF"></a></li>
<li><a data-bind="attr: {href: notDataCard? '#route_set' : '#demilitarized_zone'}" data-trans="advanced_settings" class="cFFCE2B"></a></li>
diff --git a/lynq/S300/ap/app/zte_webui/subpg/ota_update.html b/lynq/S300/ap/app/zte_webui/subpg/ota_update.html
index 9a16f7a..166d337 100755
--- a/lynq/S300/ap/app/zte_webui/subpg/ota_update.html
+++ b/lynq/S300/ap/app/zte_webui/subpg/ota_update.html
@@ -21,7 +21,7 @@
<li data-bind="visible: !isDataCard"><a href="#route_set" data-trans="router_setting"></a></li>
<li data-bind="visible: !isDataCard"><a href="#filter_main" data-trans="firewall"></a></li>
<li data-bind="visible:hasUpdateCheck" class="active"><a href="#fota" data-trans="update_settings"></a></li>
- <li data-bind="visible:hasUssd"><a href="#usat" data-trans="USSD"></a></li>
+ <!-- <li data-bind="visible:hasUssd"><a href="#usat" data-trans="USSD"></a></li> -->
<li data-bind="visible:hasDdns"><a href="#dynamic_dns" data-trans="DDNS"></a></li>
<li data-bind="visible: !isDataCard"><a href="#more" data-trans="others"></a></li>
<li><a data-trans="tr069" href="#tr069"></a></li>
diff --git a/lynq/S300/ap/app/zte_webui/subpg/ussd.html b/lynq/S300/ap/app/zte_webui/subpg/ussd.html
index b58f7d3..8998e4f 100755
--- a/lynq/S300/ap/app/zte_webui/subpg/ussd.html
+++ b/lynq/S300/ap/app/zte_webui/subpg/ussd.html
@@ -7,12 +7,12 @@
</div>
<div class="col-xs-11">
<div class="form-title">
- <h1 data-trans='advanced_settings'></h1>
+ <h1 data-trans='USSD'></h1>
</div>
</div>
</div>
<div class="row">
- <div class="col-xs-2">
+ <!-- <div class="col-xs-2">
<div class="nav_right">
<ul>
<li><a data-trans="sleep_mode" href="#wlan_sleep"></a></li>
@@ -25,14 +25,16 @@
<li><a data-trans="tr069" href="#tr069"></a></li>
</ul>
</div>
- </div>
+ </div> -->
- <div class="col-xs-10">
+ <div class="innerContainer">
<form id="frmUSSD">
- <div class="form-body">
+ <div class="col-xs-1 margin-top-15">
+ </div>
+ <div class="col-xs-11">
<h3 data-trans="USSD" class="form-title"></h3>
- <div id="USSD_send_div" data-bind="visible: USSDLocation()==0" class="form-body margin-top-20">
+ <div id="USSD_send_div" data-bind="visible: USSDLocation()==0" class="margin-top-20">
<div class="content">
<div class="row form-group">
<label data-trans="ussd_send_to" class="col-xs-4 side-right"></label>
@@ -46,7 +48,7 @@
</div>
</div>
</div>
- <div id="USSD_reply_div" data-bind="visible: USSDLocation()==1" class="form-body margin-top-20">
+ <div id="USSD_reply_div" data-bind="visible: USSDLocation()==1" class="margin-top-20">
<!--<div class="form-title" data-trans='ussd_contents'></div>!-->
<div class="content">
<div class="row form-group">
diff --git a/lynq/S300/ap/app/zte_webui/subpg/wifi_sleep_mode.html b/lynq/S300/ap/app/zte_webui/subpg/wifi_sleep_mode.html
index 4706288..5b8c8d9 100755
--- a/lynq/S300/ap/app/zte_webui/subpg/wifi_sleep_mode.html
+++ b/lynq/S300/ap/app/zte_webui/subpg/wifi_sleep_mode.html
@@ -19,7 +19,7 @@
<li><a data-trans="router_setting" href="#route_set"></a></li>
<li><a data-trans="firewall" href="#filter_main"></a></li>
<li data-bind="visible:hasUpdateCheck"><a data-trans="update_settings" href="#fota"></a></li>
- <li data-bind="visible:hasUssd"><a data-trans="USSD" href="#usat"></a></li>
+ <!-- <li data-bind="visible:hasUssd"><a data-trans="USSD" href="#usat"></a></li> -->
<li data-bind="visible:hasDdns"><a data-trans="DDNS" href="#dynamic_dns"></a></li>
<li><a data-trans="others" href="#more"></a></li>
<li><a data-trans="tr069" href="#tr069"></a></li>