From 0a72c4b3bd9c759b209506cf1d5a3078920dc989 Mon Sep 17 00:00:00 2001 From: Jeremy Chadwick Date: Thu, 12 Jan 2017 20:48:48 +0700 Subject: [PATCH] Migrate UI cleanup phase 4 from MIPS into ARM This effort was done manually. Verification of the changes was done by doing a git diff -U0 of the changes in Toastman-ARM, then a git diff -U0 of Toastman-RT-AC 928f554 vs. ec9c993, and then diffing *those* (after some mangling of the outputs for path differences, etc). --- release/src-rt-6.x.4708/router/www/about.asp | 10 +++--- .../src-rt-6.x.4708/router/www/admin-access.asp | 1 + .../src-rt-6.x.4708/router/www/admin-buttons.asp | 1 + release/src-rt-6.x.4708/router/www/admin-bwm.asp | 1 + release/src-rt-6.x.4708/router/www/admin-cifs.asp | 1 + .../src-rt-6.x.4708/router/www/admin-config.asp | 1 + release/src-rt-6.x.4708/router/www/admin-debug.asp | 1 + .../src-rt-6.x.4708/router/www/admin-iptraffic.asp | 1 + release/src-rt-6.x.4708/router/www/admin-jffs2.asp | 1 + release/src-rt-6.x.4708/router/www/admin-log.asp | 1 + release/src-rt-6.x.4708/router/www/admin-nfs.asp | 1 + release/src-rt-6.x.4708/router/www/admin-sched.asp | 1 + .../src-rt-6.x.4708/router/www/admin-scripts.asp | 1 + release/src-rt-6.x.4708/router/www/admin-sdhc.asp | 1 + release/src-rt-6.x.4708/router/www/admin-snmp.asp | 1 + .../src-rt-6.x.4708/router/www/admin-upgrade.asp | 1 + .../src-rt-6.x.4708/router/www/advanced-access.asp | 1 + .../src-rt-6.x.4708/router/www/advanced-ctnf.asp | 1 + .../router/www/advanced-dhcpdns.asp | 3 +- .../router/www/advanced-firewall.asp | 1 + .../src-rt-6.x.4708/router/www/advanced-mac.asp | 1 + .../src-rt-6.x.4708/router/www/advanced-misc.asp | 1 + .../router/www/advanced-routing.asp | 1 + .../src-rt-6.x.4708/router/www/advanced-tor.asp | 1 + .../src-rt-6.x.4708/router/www/advanced-vlan.asp | 3 +- .../router/www/advanced-wireless.asp | 1 + .../router/www/advanced-wlanvifs.asp | 2 +- release/src-rt-6.x.4708/router/www/basic-ddns.asp | 1 + release/src-rt-6.x.4708/router/www/basic-ident.asp | 1 + release/src-rt-6.x.4708/router/www/basic-ipv6.asp | 1 + .../src-rt-6.x.4708/router/www/basic-network.asp | 14 ++------ .../src-rt-6.x.4708/router/www/basic-static.asp | 35 ++++++++++++------- release/src-rt-6.x.4708/router/www/basic-time.asp | 1 + .../src-rt-6.x.4708/router/www/basic-wfilter.asp | 1 + release/src-rt-6.x.4708/router/www/bwlimit.asp | 1 + release/src-rt-6.x.4708/router/www/bwm-24.asp | 1 + release/src-rt-6.x.4708/router/www/bwm-common.js | 2 +- release/src-rt-6.x.4708/router/www/bwm-daily.asp | 1 + release/src-rt-6.x.4708/router/www/bwm-monthly.asp | 1 + .../src-rt-6.x.4708/router/www/bwm-realtime.asp | 1 + release/src-rt-6.x.4708/router/www/bwm-weekly.asp | 1 + .../src-rt-6.x.4708/router/www/clearcookies.asp | 1 + release/src-rt-6.x.4708/router/www/error.asp | 1 + .../router/www/forward-basic-ipv6.asp | 7 ++-- .../src-rt-6.x.4708/router/www/forward-basic.asp | 1 + release/src-rt-6.x.4708/router/www/forward-dmz.asp | 1 + .../router/www/forward-triggered.asp | 1 + .../src-rt-6.x.4708/router/www/forward-upnp.asp | 1 + release/src-rt-6.x.4708/router/www/ipt-24.asp | 1 + release/src-rt-6.x.4708/router/www/ipt-daily.asp | 1 + release/src-rt-6.x.4708/router/www/ipt-details.asp | 1 + release/src-rt-6.x.4708/router/www/ipt-monthly.asp | 1 + .../src-rt-6.x.4708/router/www/ipt-realtime.asp | 1 + release/src-rt-6.x.4708/router/www/logout.asp | 1 + release/src-rt-6.x.4708/router/www/mnoise.asp | 1 + .../src-rt-6.x.4708/router/www/nas-bittorrent.asp | 1 + release/src-rt-6.x.4708/router/www/nas-ftp.asp | 1 + release/src-rt-6.x.4708/router/www/nas-media.asp | 1 + release/src-rt-6.x.4708/router/www/nas-samba.asp | 39 +++++++++++----------- release/src-rt-6.x.4708/router/www/nas-ups.asp | 1 + release/src-rt-6.x.4708/router/www/nas-usb.asp | 1 + .../src-rt-6.x.4708/router/www/qos-classify.asp | 1 + release/src-rt-6.x.4708/router/www/qos-ctrate.asp | 3 +- .../src-rt-6.x.4708/router/www/qos-detailed.asp | 7 ++-- release/src-rt-6.x.4708/router/www/qos-graphs.asp | 1 + .../src-rt-6.x.4708/router/www/qos-settings.asp | 2 +- .../src-rt-6.x.4708/router/www/reboot-default.asp | 1 + release/src-rt-6.x.4708/router/www/reboot.asp | 1 + .../src-rt-6.x.4708/router/www/restrict-edit.asp | 3 +- release/src-rt-6.x.4708/router/www/restrict.asp | 1 + release/src-rt-6.x.4708/router/www/saved-moved.asp | 1 + release/src-rt-6.x.4708/router/www/saved.asp | 1 + release/src-rt-6.x.4708/router/www/shutdown.asp | 1 + release/src-rt-6.x.4708/router/www/splashd.asp | 1 + .../src-rt-6.x.4708/router/www/status-devices.asp | 4 +-- release/src-rt-6.x.4708/router/www/status-log.asp | 1 + .../src-rt-6.x.4708/router/www/status-overview.asp | 1 + .../src-rt-6.x.4708/router/www/status-webmon.asp | 1 + release/src-rt-6.x.4708/router/www/tools-ping.asp | 1 + release/src-rt-6.x.4708/router/www/tools-shell.asp | 1 + .../src-rt-6.x.4708/router/www/tools-survey.asp | 3 +- release/src-rt-6.x.4708/router/www/tools-trace.asp | 1 + release/src-rt-6.x.4708/router/www/tools-wol.asp | 1 + release/src-rt-6.x.4708/router/www/vpn-client.asp | 1 + .../src-rt-6.x.4708/router/www/vpn-pptp-online.asp | 1 + .../src-rt-6.x.4708/router/www/vpn-pptp-server.asp | 1 + release/src-rt-6.x.4708/router/www/vpn-pptp.asp | 1 + release/src-rt-6.x.4708/router/www/vpn-server.asp | 1 + release/src-rt-6.x.4708/router/www/vpn-tinc.asp | 1 + release/src-rt-6.x.4708/router/www/web-mysql.asp | 1 + release/src-rt-6.x.4708/router/www/web-nginx.asp | 1 + 91 files changed, 150 insertions(+), 63 deletions(-) diff --git a/release/src-rt-6.x.4708/router/www/about.asp b/release/src-rt-6.x.4708/router/www/about.asp index f6f32bace2..4e347f36d3 100644 --- a/release/src-rt-6.x.4708/router/www/about.asp +++ b/release/src-rt-6.x.4708/router/www/about.asp @@ -11,6 +11,7 @@ + [<% ident(); %>] About <% css(); %> @@ -91,8 +92,8 @@ function init()
Tomato Firmware v<% version(1); %>
-Built on <% build_time(); %>

+Built on <% build_time(); %>

Based on TomatoUSB by Fedor Kozhevnikov
- Linux kernel <% version(2); %> and Broadcom Wireless Driver <% version(3); %> updates
@@ -175,12 +176,12 @@ Based on TomatoUSB by Fedor Kozhevnikov
- HFS / HFS+ filesystem integration
-Copyright (C) 2007-2014 Ofer Chen & Vicente Soriano
+Copyright (C) 2007-2014 Ofer Chen & Vicente Soriano
http://victek.is-a-geek.com

"Teaman" features:
-- QOS-detailed & ctrate filters
+- QOS-detailed & ctrate filters
- Realtime bandwidth monitoring of LAN clients
- Static ARP binding
- VLAN administration GUI
@@ -243,7 +244,7 @@ Based on TomatoUSB by Fedor Kozhevnikov
"Toastman" Features:
-- 250 entry limit in Static DHCP & Wireless Filter
+- 250 entry limit in Static DHCP & Wireless Filter
- 500 entry limit in Access Restriction rules*
- Up to 128 Port Forward rules*
- Up to 128 QOS rules* (*all dependent on nvram space)
@@ -260,7 +261,6 @@ working on it, you can make a PayPal donation:
-
Based on Tomato Firmware v<% version(); %>
diff --git a/release/src-rt-6.x.4708/router/www/admin-access.asp b/release/src-rt-6.x.4708/router/www/admin-access.asp index 4ae336d31e..12feab917d 100644 --- a/release/src-rt-6.x.4708/router/www/admin-access.asp +++ b/release/src-rt-6.x.4708/router/www/admin-access.asp @@ -11,6 +11,7 @@ + [<% ident(); %>] Admin: Access diff --git a/release/src-rt-6.x.4708/router/www/admin-buttons.asp b/release/src-rt-6.x.4708/router/www/admin-buttons.asp index 29c1487431..77037ec0b8 100644 --- a/release/src-rt-6.x.4708/router/www/admin-buttons.asp +++ b/release/src-rt-6.x.4708/router/www/admin-buttons.asp @@ -11,6 +11,7 @@ + [<% ident(); %>] Admin: Buttons diff --git a/release/src-rt-6.x.4708/router/www/admin-bwm.asp b/release/src-rt-6.x.4708/router/www/admin-bwm.asp index 0802862367..618378c05a 100644 --- a/release/src-rt-6.x.4708/router/www/admin-bwm.asp +++ b/release/src-rt-6.x.4708/router/www/admin-bwm.asp @@ -11,6 +11,7 @@ + [<% ident(); %>] Admin: Bandwidth Monitoring diff --git a/release/src-rt-6.x.4708/router/www/admin-cifs.asp b/release/src-rt-6.x.4708/router/www/admin-cifs.asp index bdd8255d24..3cad241127 100644 --- a/release/src-rt-6.x.4708/router/www/admin-cifs.asp +++ b/release/src-rt-6.x.4708/router/www/admin-cifs.asp @@ -11,6 +11,7 @@ + [<% ident(); %>] Admin: CIFS Client diff --git a/release/src-rt-6.x.4708/router/www/admin-config.asp b/release/src-rt-6.x.4708/router/www/admin-config.asp index af3dc5677b..f822f776cc 100644 --- a/release/src-rt-6.x.4708/router/www/admin-config.asp +++ b/release/src-rt-6.x.4708/router/www/admin-config.asp @@ -11,6 +11,7 @@ + [<% ident(); %>] Admin: Configuration diff --git a/release/src-rt-6.x.4708/router/www/admin-debug.asp b/release/src-rt-6.x.4708/router/www/admin-debug.asp index 393277c55b..02d5a58ff0 100644 --- a/release/src-rt-6.x.4708/router/www/admin-debug.asp +++ b/release/src-rt-6.x.4708/router/www/admin-debug.asp @@ -11,6 +11,7 @@ + [<% ident(); %>] Admin: Debugging diff --git a/release/src-rt-6.x.4708/router/www/admin-iptraffic.asp b/release/src-rt-6.x.4708/router/www/admin-iptraffic.asp index 9dfc470b11..95bd6bd58b 100644 --- a/release/src-rt-6.x.4708/router/www/admin-iptraffic.asp +++ b/release/src-rt-6.x.4708/router/www/admin-iptraffic.asp @@ -11,6 +11,7 @@ + [<% ident(); %>] Admin: IP Traffic Monitoring <% css(); %> diff --git a/release/src-rt-6.x.4708/router/www/admin-jffs2.asp b/release/src-rt-6.x.4708/router/www/admin-jffs2.asp index 11a5560865..2843f9248b 100644 --- a/release/src-rt-6.x.4708/router/www/admin-jffs2.asp +++ b/release/src-rt-6.x.4708/router/www/admin-jffs2.asp @@ -11,6 +11,7 @@ + [<% ident(); %>] Admin: JFFS diff --git a/release/src-rt-6.x.4708/router/www/admin-log.asp b/release/src-rt-6.x.4708/router/www/admin-log.asp index ae658d2d00..e529ce891e 100644 --- a/release/src-rt-6.x.4708/router/www/admin-log.asp +++ b/release/src-rt-6.x.4708/router/www/admin-log.asp @@ -11,6 +11,7 @@ + [<% ident(); %>] Admin: Logging diff --git a/release/src-rt-6.x.4708/router/www/admin-nfs.asp b/release/src-rt-6.x.4708/router/www/admin-nfs.asp index 825688c529..0399ec4f1c 100644 --- a/release/src-rt-6.x.4708/router/www/admin-nfs.asp +++ b/release/src-rt-6.x.4708/router/www/admin-nfs.asp @@ -10,6 +10,7 @@ + [<% ident(); %>] Admin: NFS Server diff --git a/release/src-rt-6.x.4708/router/www/admin-sched.asp b/release/src-rt-6.x.4708/router/www/admin-sched.asp index 7c3990b17a..0d1e6d6449 100644 --- a/release/src-rt-6.x.4708/router/www/admin-sched.asp +++ b/release/src-rt-6.x.4708/router/www/admin-sched.asp @@ -11,6 +11,7 @@ + [<% ident(); %>] Scheduler diff --git a/release/src-rt-6.x.4708/router/www/admin-scripts.asp b/release/src-rt-6.x.4708/router/www/admin-scripts.asp index a6d76784f8..8ac96353ef 100644 --- a/release/src-rt-6.x.4708/router/www/admin-scripts.asp +++ b/release/src-rt-6.x.4708/router/www/admin-scripts.asp @@ -11,6 +11,7 @@ + [<% ident(); %>] Admin: Scripts diff --git a/release/src-rt-6.x.4708/router/www/admin-sdhc.asp b/release/src-rt-6.x.4708/router/www/admin-sdhc.asp index dd02439f49..24a6452705 100644 --- a/release/src-rt-6.x.4708/router/www/admin-sdhc.asp +++ b/release/src-rt-6.x.4708/router/www/admin-sdhc.asp @@ -12,6 +12,7 @@ + [<% ident(); %>] Admin: SDHC/MMC diff --git a/release/src-rt-6.x.4708/router/www/admin-snmp.asp b/release/src-rt-6.x.4708/router/www/admin-snmp.asp index c1611e8f75..b784d5f471 100644 --- a/release/src-rt-6.x.4708/router/www/admin-snmp.asp +++ b/release/src-rt-6.x.4708/router/www/admin-snmp.asp @@ -10,6 +10,7 @@ + [<% ident(); %>] Admin: SNMP diff --git a/release/src-rt-6.x.4708/router/www/admin-upgrade.asp b/release/src-rt-6.x.4708/router/www/admin-upgrade.asp index 2ff39ab6c5..9ec0d08688 100644 --- a/release/src-rt-6.x.4708/router/www/admin-upgrade.asp +++ b/release/src-rt-6.x.4708/router/www/admin-upgrade.asp @@ -11,6 +11,7 @@ + [<% ident(); %>] Admin: Upgrade diff --git a/release/src-rt-6.x.4708/router/www/advanced-access.asp b/release/src-rt-6.x.4708/router/www/advanced-access.asp index c041667710..c77e618dda 100644 --- a/release/src-rt-6.x.4708/router/www/advanced-access.asp +++ b/release/src-rt-6.x.4708/router/www/advanced-access.asp @@ -11,6 +11,7 @@ + [<% ident(); %>] Advanced: LAN Access <% css(); %> diff --git a/release/src-rt-6.x.4708/router/www/advanced-ctnf.asp b/release/src-rt-6.x.4708/router/www/advanced-ctnf.asp index ab182084d7..5631c9fc3d 100644 --- a/release/src-rt-6.x.4708/router/www/advanced-ctnf.asp +++ b/release/src-rt-6.x.4708/router/www/advanced-ctnf.asp @@ -11,6 +11,7 @@ + [<% ident(); %>] Advanced: Conntrack / Netfilter diff --git a/release/src-rt-6.x.4708/router/www/advanced-dhcpdns.asp b/release/src-rt-6.x.4708/router/www/advanced-dhcpdns.asp index 88f5f7927a..971ae0fd12 100644 --- a/release/src-rt-6.x.4708/router/www/advanced-dhcpdns.asp +++ b/release/src-rt-6.x.4708/router/www/advanced-dhcpdns.asp @@ -11,6 +11,7 @@ + [<% ident(); %>] Advanced: DHCP / DNS <% css(); %> @@ -169,7 +170,7 @@ createFieldTable('', [ { title: 'Mute dhcpv4 logging', name: 'f_dnsmasq_q4', type: 'checkbox', value: (nvram.dnsmasq_q & 1) }, { title: 'Mute dhcpv6 logging', name: 'f_dnsmasq_q6', type: 'checkbox', value: (nvram.dnsmasq_q & 2) }, { title: 'Mute RA logging', name: 'f_dnsmasq_qr', type: 'checkbox', value: (nvram.dnsmasq_q & 4) }, - { title: 'Dnsmasq
Custom configuration', name: 'dnsmasq_custom', type: 'textarea', value: nvram.dnsmasq_custom } + { title: 'Dnsmasq
Custom configuration', name: 'dnsmasq_custom', type: 'textarea', value: nvram.dnsmasq_custom } ]); diff --git a/release/src-rt-6.x.4708/router/www/advanced-firewall.asp b/release/src-rt-6.x.4708/router/www/advanced-firewall.asp index 5cd125b603..45d2029f3c 100644 --- a/release/src-rt-6.x.4708/router/www/advanced-firewall.asp +++ b/release/src-rt-6.x.4708/router/www/advanced-firewall.asp @@ -15,6 +15,7 @@ + [<% ident(); %>] Advanced: Firewall <% css(); %> diff --git a/release/src-rt-6.x.4708/router/www/advanced-mac.asp b/release/src-rt-6.x.4708/router/www/advanced-mac.asp index 0c2e886ae3..3792860108 100644 --- a/release/src-rt-6.x.4708/router/www/advanced-mac.asp +++ b/release/src-rt-6.x.4708/router/www/advanced-mac.asp @@ -11,6 +11,7 @@ + [<% ident(); %>] Advanced: MAC Address <% css(); %> diff --git a/release/src-rt-6.x.4708/router/www/advanced-misc.asp b/release/src-rt-6.x.4708/router/www/advanced-misc.asp index b825ae99c7..f812676e56 100644 --- a/release/src-rt-6.x.4708/router/www/advanced-misc.asp +++ b/release/src-rt-6.x.4708/router/www/advanced-misc.asp @@ -11,6 +11,7 @@ + [<% ident(); %>] Advanced: Miscellaneous diff --git a/release/src-rt-6.x.4708/router/www/advanced-routing.asp b/release/src-rt-6.x.4708/router/www/advanced-routing.asp index 68af279ab5..ac1a2e41d6 100644 --- a/release/src-rt-6.x.4708/router/www/advanced-routing.asp +++ b/release/src-rt-6.x.4708/router/www/advanced-routing.asp @@ -11,6 +11,7 @@ + [<% ident(); %>] Advanced: Routing <% css(); %> diff --git a/release/src-rt-6.x.4708/router/www/advanced-tor.asp b/release/src-rt-6.x.4708/router/www/advanced-tor.asp index 90010168dd..edd18e3628 100644 --- a/release/src-rt-6.x.4708/router/www/advanced-tor.asp +++ b/release/src-rt-6.x.4708/router/www/advanced-tor.asp @@ -10,6 +10,7 @@ + [<% ident(); %>] Advanced: TOR Project diff --git a/release/src-rt-6.x.4708/router/www/advanced-vlan.asp b/release/src-rt-6.x.4708/router/www/advanced-vlan.asp index 5c48a89cfb..4e43737989 100644 --- a/release/src-rt-6.x.4708/router/www/advanced-vlan.asp +++ b/release/src-rt-6.x.4708/router/www/advanced-vlan.asp @@ -29,6 +29,7 @@ + [<% ident(); %>] Advanced: VLAN <% css(); %> @@ -209,7 +210,7 @@ function save() { fom['lan1_ifnames'].value = ''; fom['lan2_ifnames'].value = ''; fom['lan3_ifnames'].value = ''; - + var v = ''; var d = vlg.getAllData(); diff --git a/release/src-rt-6.x.4708/router/www/advanced-wireless.asp b/release/src-rt-6.x.4708/router/www/advanced-wireless.asp index 46f62ce0d3..0a82d1cf8f 100644 --- a/release/src-rt-6.x.4708/router/www/advanced-wireless.asp +++ b/release/src-rt-6.x.4708/router/www/advanced-wireless.asp @@ -11,6 +11,7 @@ + [<% ident(); %>] Advanced: Wireless <% css(); %> diff --git a/release/src-rt-6.x.4708/router/www/advanced-wlanvifs.asp b/release/src-rt-6.x.4708/router/www/advanced-wlanvifs.asp index 35a522854b..6e47b80eec 100644 --- a/release/src-rt-6.x.4708/router/www/advanced-wlanvifs.asp +++ b/release/src-rt-6.x.4708/router/www/advanced-wlanvifs.asp @@ -18,6 +18,7 @@ + [<% ident(); %>] Advanced: Virtual Wireless Interfaces <% css(); %> @@ -1490,7 +1491,6 @@ for (var i = 1; i < tabs.length; ++i) { options: wl_modes_available, value: ((eval('nvram["wl'+u+'_mode"]') == 'ap') && (eval('nvram["wl'+u+'_wds_enable"]') == '1')) ? 'apwds' : eval('nvram["wl'+u+'_mode"]'), suffix: '   ' } - ); // only if primary VIF diff --git a/release/src-rt-6.x.4708/router/www/basic-ddns.asp b/release/src-rt-6.x.4708/router/www/basic-ddns.asp index 4d7621d112..5188a4f4ba 100644 --- a/release/src-rt-6.x.4708/router/www/basic-ddns.asp +++ b/release/src-rt-6.x.4708/router/www/basic-ddns.asp @@ -11,6 +11,7 @@ + [<% ident(); %>] Basic: DDNS diff --git a/release/src-rt-6.x.4708/router/www/basic-ident.asp b/release/src-rt-6.x.4708/router/www/basic-ident.asp index aeac376295..6fea5a3205 100644 --- a/release/src-rt-6.x.4708/router/www/basic-ident.asp +++ b/release/src-rt-6.x.4708/router/www/basic-ident.asp @@ -11,6 +11,7 @@ + [<% ident(); %>] Basic: Identification diff --git a/release/src-rt-6.x.4708/router/www/basic-ipv6.asp b/release/src-rt-6.x.4708/router/www/basic-ipv6.asp index 15e29066cb..6a656c7b6f 100644 --- a/release/src-rt-6.x.4708/router/www/basic-ipv6.asp +++ b/release/src-rt-6.x.4708/router/www/basic-ipv6.asp @@ -11,6 +11,7 @@ + [<% ident(); %>] Basic: IPv6 diff --git a/release/src-rt-6.x.4708/router/www/basic-network.asp b/release/src-rt-6.x.4708/router/www/basic-network.asp index be8166a012..d7513c6dc3 100644 --- a/release/src-rt-6.x.4708/router/www/basic-network.asp +++ b/release/src-rt-6.x.4708/router/www/basic-network.asp @@ -11,6 +11,7 @@ + [<% ident(); %>] Basic: Network <% css(); %> @@ -45,7 +46,7 @@ @@ -261,9 +262,9 @@ createFieldTable('', [ ], suffix: ' (start cmd.exe and type chcp to see the current code page)', value: nvram.smbd_cpage }, - { title: 'Network Interfaces', name: 'smbd_ifnames', type: 'text', maxlen: 50, size: 32, - suffix: ' (space-delimited)', - value: nvram.smbd_ifnames }, + { title: 'Network Interfaces', name: 'smbd_ifnames', type: 'text', maxlen: 50, size: 32, + suffix: ' (space-delimited)', + value: nvram.smbd_ifnames }, { title: 'Samba
Custom Configuration', name: 'smbd_custom', type: 'textarea', value: nvram.smbd_custom }, { title: 'Auto-share all USB Partitions', name: 'smbd_autoshare', type: 'select', options: [['0', 'Disabled'],['1', 'Read Only'],['2', 'Read / Write'],['3', 'Hidden Read / Write']], diff --git a/release/src-rt-6.x.4708/router/www/nas-ups.asp b/release/src-rt-6.x.4708/router/www/nas-ups.asp index 950e4dfb9a..1c725c16f8 100644 --- a/release/src-rt-6.x.4708/router/www/nas-ups.asp +++ b/release/src-rt-6.x.4708/router/www/nas-ups.asp @@ -8,6 +8,7 @@ + [<% ident(); %>] NAS: UPS Monitor <% css(); %> diff --git a/release/src-rt-6.x.4708/router/www/nas-usb.asp b/release/src-rt-6.x.4708/router/www/nas-usb.asp index cf1db28797..01a3408c91 100644 --- a/release/src-rt-6.x.4708/router/www/nas-usb.asp +++ b/release/src-rt-6.x.4708/router/www/nas-usb.asp @@ -10,6 +10,7 @@ + [<% ident(); %>] NAS: USB Support diff --git a/release/src-rt-6.x.4708/router/www/qos-classify.asp b/release/src-rt-6.x.4708/router/www/qos-classify.asp index 04475cf994..9a6b5f88ec 100644 --- a/release/src-rt-6.x.4708/router/www/qos-classify.asp +++ b/release/src-rt-6.x.4708/router/www/qos-classify.asp @@ -11,6 +11,7 @@ + [<% ident(); %>] QoS: Classification <% css(); %> diff --git a/release/src-rt-6.x.4708/router/www/qos-ctrate.asp b/release/src-rt-6.x.4708/router/www/qos-ctrate.asp index 616fa19694..7a76da17c0 100644 --- a/release/src-rt-6.x.4708/router/www/qos-ctrate.asp +++ b/release/src-rt-6.x.4708/router/www/qos-ctrate.asp @@ -15,6 +15,7 @@ + [<% ident(); %>] QoS: View Per-Connection Transfer Rates <% css(); %> @@ -215,7 +216,7 @@ grid.setName = function(ip, name) { grid.setup = function() { this.init('grid', 'sort'); - this.headerSet(['Protocol', 'Source', 'S Port', 'Destination', 'D Port', 'UL Rate', 'DL Rate']); + this.headerSet(['Protocol', 'Source', 'Src Port', 'Destination', 'Dst Port', 'UL Rate', 'DL Rate']); } var ref = new TomatoRefresh('update.cgi', '', 0, 'qos_ctrate'); diff --git a/release/src-rt-6.x.4708/router/www/qos-detailed.asp b/release/src-rt-6.x.4708/router/www/qos-detailed.asp index daea65e69b..df6f508577 100644 --- a/release/src-rt-6.x.4708/router/www/qos-detailed.asp +++ b/release/src-rt-6.x.4708/router/www/qos-detailed.asp @@ -15,6 +15,7 @@ + [<% ident(); %>] QoS: View Details <% css(); %> @@ -137,8 +138,8 @@ grid.sortCompare = function(a, b) { var r; switch (col) { - case 2: // S port - case 4: // D port + case 2: // Src port + case 4: // Dst port case 6: // Rule # case 7: // Bytes out case 8: // Bytes in @@ -223,7 +224,7 @@ grid.setName = function(ip, name) { grid.setup = function() { this.init('grid', 'sort'); - this.headerSet(['Protocol', 'Source', 'S Port', 'Destination', 'D Port', 'Class', 'Rule', 'Bytes Out', 'Bytes In']); + this.headerSet(['Protocol', 'Source', 'Src Port', 'Destination', 'Dst Port', 'Class', 'Rule', 'Bytes Out', 'Bytes In']); } var ref = new TomatoRefresh('update.cgi', '', 0, 'qos_detailed'); diff --git a/release/src-rt-6.x.4708/router/www/qos-graphs.asp b/release/src-rt-6.x.4708/router/www/qos-graphs.asp index 904fd55d81..f835a81d0f 100644 --- a/release/src-rt-6.x.4708/router/www/qos-graphs.asp +++ b/release/src-rt-6.x.4708/router/www/qos-graphs.asp @@ -11,6 +11,7 @@ + [<% ident(); %>] QoS: View Graphs diff --git a/release/src-rt-6.x.4708/router/www/qos-settings.asp b/release/src-rt-6.x.4708/router/www/qos-settings.asp index f751561ca5..013b871acc 100644 --- a/release/src-rt-6.x.4708/router/www/qos-settings.asp +++ b/release/src-rt-6.x.4708/router/www/qos-settings.asp @@ -11,6 +11,7 @@ + [<% ident(); %>] QoS: Basic Settings @@ -325,7 +326,6 @@ createFieldTable('', f);
-