From f7292cfcc7086bad1579757cad977aa811ab8dad Mon Sep 17 00:00:00 2001 From: Jeremy Chadwick Date: Mon, 9 Jan 2017 00:35:11 -0800 Subject: [PATCH] UI cleanup, phase 5, MIPS (mostly cosmetic) This commit mainly tries to minimise the number of differences between the MIPS and ARM branches. In the process I found several oddities in MIPS that needed to be cleaned up. advanced-firewall.asp - Entry should be indented (tabbed) bwm-common.js - Don't need surrounding parens nas-samba.asp - Remove duplicate tag status-overview.asp - Add blank line for code readability tomato.css - Remove .about class (unused, ARM has it gone too) tools-survey.asp - Use tabs not spaces --- release/src/router/www/advanced-firewall.asp | 2 +- release/src/router/www/bwm-common.js | 2 +- release/src/router/www/nas-samba.asp | 1 - release/src/router/www/status-overview.asp | 1 + release/src/router/www/tomato.css | 4 ---- release/src/router/www/tools-survey.asp | 2 +- 6 files changed, 4 insertions(+), 8 deletions(-) diff --git a/release/src/router/www/advanced-firewall.asp b/release/src/router/www/advanced-firewall.asp index ac96ad70fa..45d2029f3c 100644 --- a/release/src/router/www/advanced-firewall.asp +++ b/release/src/router/www/advanced-firewall.asp @@ -137,7 +137,7 @@ createFieldTable('', [ null, { title: 'Enable SYN cookies', name: 'f_syncookies', type: 'checkbox', value: nvram.ne_syncookies != '0' }, { title: 'Enable DSCP Fix', name: 'f_DSCP_fix_enable', type: 'checkbox', value: nvram.DSCP_fix_enable != '0', suffix: ' (set DSCP to 0 for all WAN packets; primarily for Comcast)' }, -{ title: 'IPv6 IPSec Passthrough', name: 'f_ipv6_ipsec', type: 'checkbox', value: nvram.ipv6_ipsec != '0' } + { title: 'IPv6 IPSec Passthrough', name: 'f_ipv6_ipsec', type: 'checkbox', value: nvram.ipv6_ipsec != '0' } ]); diff --git a/release/src/router/www/bwm-common.js b/release/src/router/www/bwm-common.js index 2eed2b9b5b..8da477d84d 100644 --- a/release/src/router/www/bwm-common.js +++ b/release/src/router/www/bwm-common.js @@ -151,7 +151,7 @@ function showTab(name) E('tx-total').innerHTML = scaleSize(h.tx_total); if (svgReady) { - max = (scaleMode ? MAX(h.rx_max, h.tx_max) : xx_max); + max = scaleMode ? MAX(h.rx_max, h.tx_max) : xx_max; if (max > 12500) max = Math.round((max + 12499) / 12500) * 12500; else max += 100; updateSVG(h.rx, h.tx, max, drawMode, diff --git a/release/src/router/www/nas-samba.asp b/release/src/router/www/nas-samba.asp index 5ddd21c6e1..bed33c8a2d 100644 --- a/release/src/router/www/nas-samba.asp +++ b/release/src/router/www/nas-samba.asp @@ -220,7 +220,6 @@ function toggleVisibility(whichone) { -

diff --git a/release/src/router/www/status-overview.asp b/release/src/router/www/status-overview.asp index 5de9c68147..840d8f818c 100644 --- a/release/src/router/www/status-overview.asp +++ b/release/src/router/www/status-overview.asp @@ -221,6 +221,7 @@ function ethstates() code += '

» Configure

'; E("ports").innerHTML = code; } + function show() { c('cpu', stats.cpuload); diff --git a/release/src/router/www/tomato.css b/release/src/router/www/tomato.css index e0a77e532d..598f46c5ba 100644 --- a/release/src/router/www/tomato.css +++ b/release/src/router/www/tomato.css @@ -440,7 +440,3 @@ table.fields { padding: 0.2em 1em 0.2em 1em; background: #fec; } - -.about { -margin:20px 20px; -} diff --git a/release/src/router/www/tools-survey.asp b/release/src/router/www/tools-survey.asp index 1e91a5d932..8e59ebdecc 100644 --- a/release/src/router/www/tools-survey.asp +++ b/release/src/router/www/tools-survey.asp @@ -212,7 +212,7 @@ sg.populate = function() mac = e.bssid; if (mac.match(/^(..):(..):(..)/)) - mac = '' + mac + ''; + mac = '' + mac + ''; sg.insert(-1, e, [ '' + seen + '', -- 2.11.4.GIT