Merge "[Bugfix][R305E][bug-view-1602][sleep] before add WiFi sleep page with only a 10 minute option"
diff --git a/lynq/R305/R305E/ap/app/zte_webui/subpg/main.html b/lynq/R305/R305E/ap/app/zte_webui/subpg/main.html
new file mode 100755
index 0000000..1f83a34
--- /dev/null
+++ b/lynq/R305/R305E/ap/app/zte_webui/subpg/main.html
@@ -0,0 +1,233 @@
+
+<div class="row margin-top-20">
+<div class="type_items">
+ <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>
+ <li><a href="#fast_set" data-bind="visible: isSupportQuicksetting()" data-trans="quick_setting" class="cFFCE2B"></a></li>
+ </ul>
+</div>
+</div>
+
+<div class="row margin-top-20" id="home_image">
+
+<div class="row">
+ <div style="position: relative">
+ <div class="internet_status_container">
+ <div data-bind=" css: {'item_icon_connect': cStatus()== 1, 'item_icon_disconnect': cStatus() != 1}"></div>
+ <h3 data-trans="net_surfing" class="home_h3"></h3>
+ <div class="net_surfing_list">
+ <ul>
+ <li><a id="h_connect_btn" href="javascript: void(0)" data-bind="visible: canConnect() && isShowHomeConnect(), click: connectHandler , css: {'h_connect_on': cStatus()== 1, 'h_connect_off': cStatus() != 1}" style="display: none;"></a></li>
+ <li><i class="up"></i><span data-bind="text: up_Speed"></span></li>
+ <li><i class="down"></i><span data-bind="text: down_Speed"></span></li>
+ <li><span data-bind="text: connected_Time"></span></li>
+ </ul>
+ </div>
+ </div>
+
+ <div class="network_control_container">
+ <div class="item_icon"></div>
+ <h3 data-trans="my_router" class="home_h3"></h3>
+ <!--div id="h_network_type" data-bind="text: networkType, css: {'no-btn': !(canConnect() && isShowHomeConnect())}"></div-->
+ <div class="my_router_list">
+ <ul>
+ <li data-bind="visible: hasRj45"><a id="opmode" data-bind="click: showOpModeWindow, css: {'not-allowed': enableFlag}" href="javascript:void(0)"></a></li>
+ <li><a data-bind="click: showNetworkSettingsWindow" data-trans="settings_internet" href="javascript:void(0)"></a></li>
+ <!--li><div id="h_ssid"></div></li-->
+ <li data-bind="visible: notDataCard"><a data-trans="settings_wireless" href="#wlan_main"></a></li>
+ </ul>
+ </div>
+ </div>
+
+ <!--div id="h_connect_status" data-bind="visible:notDataCard, css: {'h_status_connected': cStatus()== 1, 'h_status_disconnected': cStatus()== 2, 'h_status_connecting': cStatus()== 3, 'h_status_disconnecting': cStatus()== 4, }">
+ </div-->
+
+ <div data-bind="visible: notDataCard" onclick="window.location.hash='#conn_device'" class="connected_devices_container">
+ <div class="item_icon"></div>
+ <h3 data-trans="station_info" class="home_h3" ></h3>
+ <div style="text-align:center;display:inline" class="margin-top-20">
+ <div id="h_wire_device" data-bind="visible: hasRj45 && isCPE">
+ <span data-bind="text: wireDeviceNum" style="font-size:70px;"><em></em></span><sub data-trans="device_unit" style="font-size: 16px;"></sub>
+ <span data-trans="cable" style="font-size:15px;text-align:center;display:block"></span>
+ </div>
+ <div id="h_wireless_device" style="display-block">
+ <span data-bind="text: wirelessDeviceNum" style="font-size:70px"></span><sub data-trans="device_unit" style="font-size: 16px;"></sub>
+ <span data-trans="wireless" style="font-size:15px;text-align:center;display:block"></span>
+ </div>
+ </div>
+ <!--a href="#conn_device" id="h_attached_device_link">
+ </a-->
+ </div>
+ </div>
+</div>
+</div>
+
+
+<div class="row margin-top-20 label-font-normal margin-bottom-20">
+ <div class="text-center traffic_control_container" data-bind="visible: showTraffic()">
+ <h4 data-trans="traffic_data_plan" style="font-size:14px;text-align:right;padding-right:15px"></h4>
+ <div style="display:inline-block">
+ <div id="traffic_graphic" style="width: 200px; height: 165px; visibility: visible;"></div>
+ </div>
+ <div style="text-align: left;padding-left:20px;font-size:18px">
+ <span style="background-color: #8CC916;" class="color_block"></span>
+ <span data-trans="traffic_used" class="color_block_desc"></span>
+ <span class="color_block_desc">:</span>
+ <span data-bind="text: trafficUsed" class="color_block_desc"></span>
+ </div>
+ <div class="statistics_list">
+ <ul>
+ <li><a href="#flow_ctl">
+ <div data-bind="visible: trafficAlertEnable">
+ <span data-bind="text: trafficLimited" class="line-height-20"></span>
+ <span data-trans="traffic_limit_data" class="line-height-20"></span>
+ </div>
+ <div data-bind="visible: trafficAlertEnable() == false">
+ <div data-trans="traffic_not_set_limited" class="line-height-20"></div>
+ </div>
+ </a></li>
+ </ul>
+ </div>
+ </div>
+
+
+ <div data-bind="css:{'device_info_container_hastraffic':showTraffic(),'device_info_container_notraffic':!showTraffic()}" class="device_info_container">
+ <h4 data-trans="device_info" style="font-size:14px;text-align:left;padding-left:15px;color:#fff"></h4>
+ <div style="color:#fff;position: relative;height: 210px;font-size: 18px;line-height: 1.5em;padding:20px 0px 0px 15px;">
+ <div class="row">
+ <label data-trans="sim_serial_number" class="col-xs-5"></label>
+ <label data-bind="text: simSerialNumber" class="col-xs-7"></label>
+ </div>
+ <div class="row">
+ <label data-trans="imei" class="col-xs-5"></label>
+ <label data-bind="text: imei" class="col-xs-7"></label>
+ </div>
+ <div class="row">
+ <label data-trans="imsi" class="col-xs-5"></label>
+ <label data-bind="text: imsi" class="col-xs-7"></label>
+ </div>
+ <div class="row">
+ <label data-trans="iccid" class="col-xs-5"></label>
+ <label data-bind="text: iccid" class="col-xs-7"></label>
+ </div>
+ <div class="row">
+ <label data-trans="cellid" class="col-xs-5"></label>
+ <label data-bind="text: cellid" class="col-xs-7"></label>
+ </div>
+ <!--div class="row" data-bind="visible: notDataCard">
+ <label class="col-xs-5" data-trans="wifi_range"></label>
+ <label class="col-xs-7" data-bind="attr: {'data-trans': wifiLongMode}"></label>
+ </div-->
+ <div class="row">
+ <label data-trans="signal_strength_label" class="col-xs-5"></label>
+ <label id="fresh_signal_strength" class="col-xs-7"></label>
+ </div>
+ <div class="row" data-bind="visible: hasWifi && showMultiSsid()">
+ <label data-trans="network_name_ssid1" class="col-xs-5"></label>
+ <label data-bind="text: ssid" style="word-wrap: break-word;" class="col-xs-7"></label>
+ </div>
+ <div class="row" data-bind="visible: hasWifi && !showMultiSsid()">
+ <label data-trans="network_name" class="col-xs-5"></label>
+ <label data-bind="text: ssid" style="word-wrap: break-word;" class="col-xs-7"></label>
+ </div>
+ </div>
+ <div style="text-align:right;">
+ <a href="javascript: void(0)" data-trans="detail_info" id="showDetailInfo" tabindex="0"></a>
+ </div>
+ </div>
+</div>
+
+
+<div id="h_qrcode" data-bind="visible: showQRCode" style="float:right" class="text-center">
+ <img id="qrcode_img" data-bind="attr: {src: qrcodeSrc}" src="./pic/res_blacktrans.png" width="111"/>
+</div>
+
+<script type="text/x-jquery-tmpl" id="detailInfoTmpl">
+<div class="row">
+ <label class="col-xs-6" data-trans="sim_serial_number" class="col-xs-6"></label>
+ <label class="col-xs-6"><%= simSerialNumber %></label>
+</div>
+<div class="row">
+ <label data-trans="imei" class="col-xs-6"></label>
+ <label class="col-xs-6"><%= imei %></label>
+</div>
+<div class="row">
+ <label data-trans="imsi" class="col-xs-6"></label>
+ <label class="col-xs-6"><%= imsi %></label>
+</div>
+<div class="row">
+ <label data-trans="iccid" class="col-xs-6"></label>
+ <label class="col-xs-6"><%= iccid %></label>
+</div>
+<div class="row">
+ <label data-trans="cellid" class="col-xs-6"></label>
+ <label class="col-xs-6"><%= cellid %></label>
+</div>
+<div class="row">
+ <label data-trans="signal_strength_label" class="col-xs-6"></label>
+ <label class="col-xs-6" id="popoverSignalTxt"><%= signal %></label>
+</div>
+<% if(hasWifi){ %>
+<div class="row">
+ <label data-trans="<%= showMultiSsid ? 'network_name_ssid1': 'network_name' %>" class="col-xs-6"></label>
+ <label style="word-wrap: break-word; word-break: break-all;" class="col-xs-6"><%= ssid %></label>
+</div>
+<div class="row">
+ <label data-trans="<%= showMultiSsid ? 'max_access_num_ssid1': 'max_access_num' %>" class="col-xs-6"></label>
+ <label class="col-xs-6"><%= max_access_num %></label>
+</div>
+ <% if(showMultiSsid){ %>
+ <div class="row">
+ <label data-trans="network_name_ssid2" class="col-xs-6"></label>
+ <label style="word-wrap: break-word; word-break: break-all;" class="col-xs-6"><%= m_ssid %></label>
+ </div>
+ <div class="row">
+ <label data-trans="max_access_num_ssid2" class="col-xs-6"></label>
+ <label class="col-xs-6"><%= m_max_access_num %></label>
+ </div>
+ <% } %>
+<div class="row" style="display:none">
+ <label data-trans="wifi_range" class="col-xs-6"></label>
+ <label data-trans="<%= wifi_long_mode %>" class="col-xs-6"></label>
+</div>
+<% } %>
+<div class="row">
+ <label data-trans="lan_domain" class="col-xs-6"></label>
+ <label class="col-xs-6"><%= lanDomain %></label>
+</div>
+<div class="row">
+ <label data-trans="ip_address" class="col-xs-6"></label>
+ <label class="col-xs-6"><%= ipAddress %></label>
+</div>
+<% if(showMacAddress){ %>
+<div class="row">
+ <label data-trans="mac_address" class="col-xs-6"></label>
+ <label class="col-xs-6"><%= macAddress %></label>
+</div>
+<% } %>
+<% if(showIpv4WanIpAddr){ %>
+<div class="row">
+ <label data-trans="wan_ip_address" class="col-xs-6"></label>
+ <label class="col-xs-6"><%= wanIpAddress %></label>
+</div>
+<% } %>
+<% if(showIpv6WanIpAddr){ %>
+<div class="row">
+ <label data-trans="ipv6_wan_ip_address" class="col-xs-6"></label>
+ <label class="col-xs-6"><%= ipv6WanIpAddress %></label>
+</div>
+<% } %>
+<div class="row">
+ <label data-trans="software_version" class="col-xs-6"></label>
+ <label class="col-xs-6"><%= sw_version %></label>
+</div>
+<div class="row">
+ <label data-trans="hardware_version" class="col-xs-6"></label>
+ <label class="col-xs-6"><%= hw_version %></label>
+</div>
+</script>
diff --git a/lynq/R305/R305E/ap/app/zte_webui/subpg/sim_abnormal.html b/lynq/R305/R305E/ap/app/zte_webui/subpg/sim_abnormal.html
new file mode 100755
index 0000000..32c26ba
--- /dev/null
+++ b/lynq/R305/R305E/ap/app/zte_webui/subpg/sim_abnormal.html
@@ -0,0 +1,123 @@
+<div id="innerContainer">
+ <div class="row header-row">
+ <div class="col-xs-1">
+ <a data-bind="visible: !isHomePage()" href="#main">
+ <img alt="" src="pic/direct-back.png">
+ </a>
+ </div>
+ <div class="col-xs-11">
+ <div class="form-title">
+ <h1 data-trans='no_sim_card_title'></h1>
+ </div>
+ </div>
+ </div>
+ <div style="margin-top:-15px;margin-bottom:30px;color:#428bca;" class="row">
+ <div style="position: relative;" class="col-xs-7"></div>
+ <div id="currentOpMode" data-bind="visible: hasRj45" class="col-xs-5 text-right">
+ <label data-trans="current_mode"></label>
+ <span id="opmode"></span>
+ <input id="change" data-trans="change" data-bind="click: showOpModeWindow, visible: isLoggedIn, enable: enableFlag" style="display:none" type="button" class="btn btn-primary" />
+ </div>
+ </div>
+ <div id="div-nosimcard" class="row form-group">
+ <div class="col-xs-1 margin-top-15">
+ </div>
+
+ <!--div data-bind="visible: !isHomePage()" class="col-xs-1 margin-top-15">
+ <a href="#main">
+ <img alt="" src="pic/direct-back.png">
+ </a>
+ </div-->
+ <div class="col-xs-11">
+ <div data-bind="visible:page()==pageState.NO_SIM" class="content">
+ <div data-trans="no_sim_card_message" class="colorRed font18"></div>
+ </div>
+ <form id="frmPIN" data-bind="visible:page()==pageState.WAIT_PIN">
+ <div class="form-body">
+ <div class="content">
+ <div class="prompt">
+ <p data-trans="enter_pin"></p>
+
+ <p data-bind="visible:pinNumber()>1" class="important-prompt">
+ <span data-trans="attempts_left"></span> <span data-bind='text:pinNumber'></span>
+ </p>
+
+ <p data-bind="visible:pinNumber()==1" data-trans="last_enter_pin" class="important-prompt"></p>
+ </div>
+ <div class="row form-group">
+ <label for='txtPIN' data-trans='pin' class="col-xs-3 side-right"></label>
+
+ <div class="col-xs-6">
+ <input id='txtPIN' name="txtPIN" autocomplete="off" data-bind="value:PIN, valueUpdate: 'keypress'" maxlength='8' type="password" class="required form-control"/>
+ </div>
+ </div>
+ <div class="form-buttons">
+ <input id="btnPinApply" data-trans="apply" type="submit" formmethod="post" class="btn btn-primary "/>
+ </div>
+ </div>
+ </div>
+ </form>
+ <form id="frmPUK" data-bind="visible:page()==pageState.WAIT_PUK">
+ <div class="form-body">
+ <div class="content">
+ <div class="prompt">
+ <p data-trans="enter_puk"></p>
+
+ <p class="important-prompt" data-bind="visible:pukNumber()>1">
+ <span data-trans="attempts_left"></span> <span data-bind='text:pukNumber'></span>
+ </p>
+
+ <p data-bind="visible:pukNumber()==1" data-trans="last_enter_puk" class="important-prompt"></p>
+ </div>
+ <div class="row form-group">
+ <label data-trans='puk' for='txtPUK' class="col-xs-3 side-right"></label>
+
+ <div class="col-xs-6">
+ <input id='txtPUK' name="txtPUK" autocomplete="off" data-bind="value:PUK, valueUpdate: 'keypress'" maxlength='8' type="password" class="required form-control"/>
+ </div>
+ </div>
+ <div class="row form-group">
+ <label data-trans='new_pin' for='txtNewPIN' class="col-xs-3 side-right"></label>
+
+ <div class="col-xs-6">
+ <input id='txtNewPIN' name="txtNewPIN" autocomplete="off" data-bind="value:newPIN, valueUpdate: 'keypress'" maxlength='8' type="password" class="required form-control"/>
+ </div>
+ <div class="clear"></div>
+ </div>
+ <div class="row form-group">
+ <label data-trans='confirm_pin' for='txtConfirmPIN' class="col-xs-3 side-right"></label>
+
+ <div class="col-xs-6">
+ <input id='txtConfirmPIN' name="txtConfirmPIN" autocomplete="off" data-bind="value:confirmPIN, valueUpdate: 'keypress'" maxlength='8' type="password" class="required form-control"/>
+ </div>
+ <div class="clear"></div>
+ </div>
+ <div class="form-buttons">
+ <input id="btnPUKApply" data-trans="apply" type="submit" formmethod="post" class="btn btn-primary"/>
+ </div>
+ </div>
+ </div>
+ </form>
+ <div class="content" data-bind="visible:page()==pageState.PUK_LOCKED">
+ <div data-trans="no_sim_card_message" class="colorRed font18"></div>
+ </div>
+ </div>
+</div>
+<div data-bind="visible: isHomePage" class="row margin-top-50">
+ <div class="type_items" style="margin:0px 0px 0px 35px">
+ <ul>
+ <li><a data-trans="station_info" href="#conn_device"></a></li>
+ <li><a data-trans="wifi_wireless_settings" href="#wlan_main"></a></li>
+ <li><a data-bind="visible: hasParentalControl()" data-trans="parental_control" href="#child_ctl"></a></li>
+ <li><a data-bind="visible: hasSms" data-trans="sms" href="#msg_main"></a></li>
+ <li><a data-bind="visible: hasPhonebook" data-trans="phonebook" href="#pb_main"></a></li>
+ <li><a data-bind="visible: isSupportSD" data-trans="sd" href="#sdcard"></a></li>
+ <li><a data-trans="advanced_settings" href="#route_set"></a></li>
+ <!--li data-bind="visible: showNetSettings"><a href="#network_set" data-trans="settings_internet"></a></li-->
+ </ul>
+ </div>
+ <div id="h_qrcode" data-bind="visible: showQRCode" style="float:right" class="text-center margin-top-15">
+ <img id="qrcode_img" data-bind="attr: {src: qrcodeSrc}" src="./pic/res_blacktrans.png" width="111"/>
+ </div>
+</div>
+</div>