From 4263d4d1ab5fd63feb078c74c597981131e47c3f Mon Sep 17 00:00:00 2001 From: Jeremy Chadwick Date: Mon, 2 Jan 2017 08:30:12 +0700 Subject: [PATCH] UI cleanup, phase 2 (partially cosmetic) One of several commits that are intended to "clean up" parts of the TomatoUSB GUI. Expect more in the future (some are hard to test). Non-cosmetic changes are denoted with an asterisk (*). Changes: about.asp - Move "Built on" date under version and bold text admin-log.asp - Remove parens on things that denote units (ex. minutes, seconds) admin-upgrade.asp * Add display of FW build date (NVRAM os_date) - Bold version text advanced-vlan.asp - Add Notes section sub-headers for each respective area - Fix capitalisation on LAN port order issue description - Add trailing periods where applicable - HREF links need to be quoted - Bold word "must", not italicise - Some general HTML cleanup (superfluous small, etc.) - Addition of some HTML and JS comments to reflect things such as "double div" closure (this is intentional!) and similar advanced-wlanvifs.asp - HREF links need to be quoted basic-ddns.asp - Add Notes section covering "@IP" string/parameter in URL field * Remove custmsgX nonsense; nothing uses truly uses it bwlimit.asp - Add Notes section covering IP/IP Ranges/MAC Address field syntax - IPs, not IP's (no apostrophe) ipt-daily.asp - Lowercase "Comma"; consistent with rest of GUI ipt-details.asp - Lowercase "Comma"; consistent with rest of GUI ipt-monthly.asp - Lowercase "Comma"; consistent with rest of GUI nas-ftp.asp - Use "/sec" instead of "/s" (consistent with more of GUI) qos-ctrate.asp - Change "Proto" to "Protocol" in table; consistent with rest of GUI qos-detailed.asp - Change "Proto" to "Protocol" in table; consistent with rest of GUI - Lowercase "Comma"; consistent with rest of GUI qos-settings.asp - Lowercase "Comma"; consistent with rest of GUI - Lowercase "Set" - Remove extraneous spaces (HTML doesn't work that way) vpn-pptp-server.asp - HREF links need to be quoted --- release/src-rt-6.x.4708/router/www/about.asp | 4 +- release/src-rt-6.x.4708/router/www/admin-log.asp | 2 +- .../src-rt-6.x.4708/router/www/admin-upgrade.asp | 3 +- .../src-rt-6.x.4708/router/www/advanced-vlan.asp | 49 ++++++++++++++-------- .../router/www/advanced-wlanvifs.asp | 9 ++-- release/src-rt-6.x.4708/router/www/basic-ddns.asp | 11 ++++- release/src-rt-6.x.4708/router/www/bwlimit.asp | 29 +++++++------ release/src-rt-6.x.4708/router/www/ipt-daily.asp | 4 +- release/src-rt-6.x.4708/router/www/ipt-details.asp | 4 +- release/src-rt-6.x.4708/router/www/ipt-monthly.asp | 4 +- release/src-rt-6.x.4708/router/www/nas-ftp.asp | 4 +- release/src-rt-6.x.4708/router/www/qos-ctrate.asp | 6 +-- .../src-rt-6.x.4708/router/www/qos-detailed.asp | 6 +-- .../src-rt-6.x.4708/router/www/qos-settings.asp | 4 +- .../src-rt-6.x.4708/router/www/vpn-pptp-server.asp | 2 +- 15 files changed, 84 insertions(+), 57 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 60ac818b64..f6f32bace2 100644 --- a/release/src-rt-6.x.4708/router/www/about.asp +++ b/release/src-rt-6.x.4708/router/www/about.asp @@ -91,6 +91,8 @@ function init()
Tomato Firmware v<% version(1); %>
+Built on <% build_time(); %>
+

Based on TomatoUSB by Fedor Kozhevnikov
- Linux kernel <% version(2); %> and Broadcom Wireless Driver <% version(3); %> updates
@@ -250,8 +252,6 @@ Based on TomatoUSB by Fedor Kozhevnikov
Copyright (C) 2010-2015 Toastman
http://www.toastmanfirmware.yolasite.com

-Built on <% build_time(); %>
-
If you enjoy this firmware, and would like to thank me for all the time I spent
working on it, you can make a PayPal donation:
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 323b84969c..ae658d2d00 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 @@ -193,7 +193,7 @@ createFieldTable('', [ { title: 'Connection Logging' }, { title: 'Inbound', indent: 2, name: 'log_in', type: 'select', options: [[0,'Disabled (recommended)'],[1,'If Blocked By Firewall'],[2,'If Allowed By Firewall'],[3,'Both']], value: nvram.log_in }, { title: 'Outbound', indent: 2, name: 'log_out', type: 'select', options: [[0,'Disabled (recommended)'],[1,'If Blocked By Firewall'],[2,'If Allowed By Firewall'],[3,'Both']], value: nvram.log_out }, - { title: 'Limit', indent: 2, name: 'log_limit', type: 'text', maxlen: 4, size: 5, value: nvram.log_limit, suffix: ' (messages per minute / 0 for unlimited)' } + { title: 'Limit', indent: 2, name: 'log_limit', type: 'text', maxlen: 4, size: 5, value: nvram.log_limit, suffix: ' messages per minute (0 for unlimited)' } ]);
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 34f5cc7574..2ff39ab6c5 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 @@ -101,7 +101,8 @@ function upgrade()
- + + + +
Notes (Click here to hide)
- + + + + + + + +
Current Version:<% version(1); %>
Current Version:<% version(1); %>
Current Build Date:<% build_time(); %>