summaryrefslogtreecommitdiffhomepage
path: root/modules/luci-mod-status/htdocs/luci-static
diff options
context:
space:
mode:
authorJo-Philipp Wich <jo@mein.io>2020-11-27 20:54:18 +0100
committerJo-Philipp Wich <jo@mein.io>2020-11-27 21:36:40 +0100
commit03c77dafe3cfb922b995adfe9c0f8a75c98a18af (patch)
tree27bb29481b28cd8caed7d582510fd59c8cdf0e39 /modules/luci-mod-status/htdocs/luci-static
parentc850608dcf58e1872692ca48af7985e528651e80 (diff)
treewide: transition div tables to actual table markup
Modern browsers allow decomposing table markup equally well as nested div constructs, therefor migrate our <div> table markup to actual <table> tags but keep the old table/tr/th/td CSS classes for now to allow for a smooth theme transition. Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Diffstat (limited to 'modules/luci-mod-status/htdocs/luci-static')
-rw-r--r--modules/luci-mod-status/htdocs/luci-static/resources/view/status/bandwidth.js30
-rw-r--r--modules/luci-mod-status/htdocs/luci-static/resources/view/status/connections.js62
-rw-r--r--modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/10_system.js8
-rw-r--r--modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/20_memory.js8
-rw-r--r--modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/30_network.js8
-rw-r--r--modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js28
-rw-r--r--modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js16
-rw-r--r--modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js24
-rw-r--r--modules/luci-mod-status/htdocs/luci-static/resources/view/status/load.js44
-rw-r--r--modules/luci-mod-status/htdocs/luci-static/resources/view/status/processes.js16
-rw-r--r--modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js52
-rw-r--r--modules/luci-mod-status/htdocs/luci-static/resources/view/status/wireless.js46
12 files changed, 171 insertions, 171 deletions
diff --git a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/bandwidth.js b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/bandwidth.js
index 7953d8dbf5..cb7cf8c23d 100644
--- a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/bandwidth.js
+++ b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/bandwidth.js
@@ -260,26 +260,26 @@ return view.extend({
E('div', { 'class': 'right' }, E('small', { 'id': 'scale' }, '-')),
E('br'),
- E('div', { 'class': 'table', 'style': 'width:100%;table-layout:fixed' }, [
- E('div', { 'class': 'tr' }, [
- E('div', { 'class': 'td right top' }, E('strong', { 'style': 'border-bottom:2px solid blue' }, [ _('Inbound:') ])),
- E('div', { 'class': 'td', 'id': 'rx_bw_cur' }, rate(0, true)),
+ E('table', { 'class': 'table', 'style': 'width:100%;table-layout:fixed' }, [
+ E('tr', { 'class': 'tr' }, [
+ E('td', { 'class': 'td right top' }, E('strong', { 'style': 'border-bottom:2px solid blue' }, [ _('Inbound:') ])),
+ E('td', { 'class': 'td', 'id': 'rx_bw_cur' }, rate(0, true)),
- E('div', { 'class': 'td right top' }, E('strong', {}, [ _('Average:') ])),
- E('div', { 'class': 'td', 'id': 'rx_bw_avg' }, rate(0, true)),
+ E('td', { 'class': 'td right top' }, E('strong', {}, [ _('Average:') ])),
+ E('td', { 'class': 'td', 'id': 'rx_bw_avg' }, rate(0, true)),
- E('div', { 'class': 'td right top' }, E('strong', {}, [ _('Peak:') ])),
- E('div', { 'class': 'td', 'id': 'rx_bw_peak' }, rate(0, true))
+ E('td', { 'class': 'td right top' }, E('strong', {}, [ _('Peak:') ])),
+ E('td', { 'class': 'td', 'id': 'rx_bw_peak' }, rate(0, true))
]),
- E('div', { 'class': 'tr' }, [
- E('div', { 'class': 'td right top' }, E('strong', { 'style': 'border-bottom:2px solid green' }, [ _('Outbound:') ])),
- E('div', { 'class': 'td', 'id': 'tx_bw_cur' }, rate(0, true)),
+ E('tr', { 'class': 'tr' }, [
+ E('td', { 'class': 'td right top' }, E('strong', { 'style': 'border-bottom:2px solid green' }, [ _('Outbound:') ])),
+ E('td', { 'class': 'td', 'id': 'tx_bw_cur' }, rate(0, true)),
- E('div', { 'class': 'td right top' }, E('strong', {}, [ _('Average:') ])),
- E('div', { 'class': 'td', 'id': 'tx_bw_avg' }, rate(0, true)),
+ E('td', { 'class': 'td right top' }, E('strong', {}, [ _('Average:') ])),
+ E('td', { 'class': 'td', 'id': 'tx_bw_avg' }, rate(0, true)),
- E('div', { 'class': 'td right top' }, E('strong', {}, [ _('Peak:') ])),
- E('div', { 'class': 'td', 'id': 'tx_bw_peak' }, rate(0, true))
+ E('td', { 'class': 'td right top' }, E('strong', {}, [ _('Peak:') ])),
+ E('td', { 'class': 'td', 'id': 'tx_bw_peak' }, rate(0, true))
])
])
]));
diff --git a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/connections.js b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/connections.js
index cc89811428..9d97569d22 100644
--- a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/connections.js
+++ b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/connections.js
@@ -321,36 +321,36 @@ return view.extend({
E('div', { 'class': 'right' }, E('small', { 'id': 'scale' }, '-')),
E('br'),
- E('div', { 'class': 'table', 'style': 'width:100%;table-layout:fixed' }, [
- E('div', { 'class': 'tr' }, [
- E('div', { 'class': 'td right top' }, E('strong', { 'style': 'border-bottom:2px solid blue' }, [ _('UDP:') ])),
- E('div', { 'class': 'td', 'id': 'lb_udp_cur' }, [ '0' ]),
+ E('table', { 'class': 'table', 'style': 'width:100%;table-layout:fixed' }, [
+ E('tr', { 'class': 'tr' }, [
+ E('td', { 'class': 'td right top' }, E('strong', { 'style': 'border-bottom:2px solid blue' }, [ _('UDP:') ])),
+ E('td', { 'class': 'td', 'id': 'lb_udp_cur' }, [ '0' ]),
- E('div', { 'class': 'td right top' }, E('strong', {}, [ _('Average:') ])),
- E('div', { 'class': 'td', 'id': 'lb_udp_avg' }, [ '0' ]),
+ E('td', { 'class': 'td right top' }, E('strong', {}, [ _('Average:') ])),
+ E('td', { 'class': 'td', 'id': 'lb_udp_avg' }, [ '0' ]),
- E('div', { 'class': 'td right top' }, E('strong', {}, [ _('Peak:') ])),
- E('div', { 'class': 'td', 'id': 'lb_udp_peak' }, [ '0' ])
+ E('td', { 'class': 'td right top' }, E('strong', {}, [ _('Peak:') ])),
+ E('td', { 'class': 'td', 'id': 'lb_udp_peak' }, [ '0' ])
]),
- E('div', { 'class': 'tr' }, [
- E('div', { 'class': 'td right top' }, E('strong', { 'style': 'border-bottom:2px solid green' }, [ _('TCP:') ])),
- E('div', { 'class': 'td', 'id': 'lb_tcp_cur' }, [ '0' ]),
+ E('tr', { 'class': 'tr' }, [
+ E('td', { 'class': 'td right top' }, E('strong', { 'style': 'border-bottom:2px solid green' }, [ _('TCP:') ])),
+ E('td', { 'class': 'td', 'id': 'lb_tcp_cur' }, [ '0' ]),
- E('div', { 'class': 'td right top' }, E('strong', {}, [ _('Average:') ])),
- E('div', { 'class': 'td', 'id': 'lb_tcp_avg' }, [ '0' ]),
+ E('td', { 'class': 'td right top' }, E('strong', {}, [ _('Average:') ])),
+ E('td', { 'class': 'td', 'id': 'lb_tcp_avg' }, [ '0' ]),
- E('div', { 'class': 'td right top' }, E('strong', {}, [ _('Peak:') ])),
- E('div', { 'class': 'td', 'id': 'lb_tcp_peak' }, [ '0' ])
+ E('td', { 'class': 'td right top' }, E('strong', {}, [ _('Peak:') ])),
+ E('td', { 'class': 'td', 'id': 'lb_tcp_peak' }, [ '0' ])
]),
- E('div', { 'class': 'tr' }, [
- E('div', { 'class': 'td right top' }, E('strong', { 'style': 'border-bottom:2px solid red' }, [ _('Other:') ])),
- E('div', { 'class': 'td', 'id': 'lb_otr_cur' }, [ '0' ]),
+ E('tr', { 'class': 'tr' }, [
+ E('td', { 'class': 'td right top' }, E('strong', { 'style': 'border-bottom:2px solid red' }, [ _('Other:') ])),
+ E('td', { 'class': 'td', 'id': 'lb_otr_cur' }, [ '0' ]),
- E('div', { 'class': 'td right top' }, E('strong', {}, [ _('Average:') ])),
- E('div', { 'class': 'td', 'id': 'lb_otr_avg' }, [ '0' ]),
+ E('td', { 'class': 'td right top' }, E('strong', {}, [ _('Average:') ])),
+ E('td', { 'class': 'td', 'id': 'lb_otr_avg' }, [ '0' ]),
- E('div', { 'class': 'td right top' }, E('strong', {}, [ _('Peak:') ])),
- E('div', { 'class': 'td', 'id': 'lb_otr_peak' }, [ '0' ])
+ E('td', { 'class': 'td right top' }, E('strong', {}, [ _('Peak:') ])),
+ E('td', { 'class': 'td', 'id': 'lb_otr_peak' }, [ '0' ])
])
]),
@@ -376,16 +376,16 @@ return view.extend({
E('br'),
E('div', { 'class': 'cbi-section-node' }, [
- E('div', { 'class': 'table', 'id': 'connections' }, [
- E('div', { 'class': 'tr table-titles' }, [
- E('div', { 'class': 'th col-2 hide-xs' }, [ _('Network') ]),
- E('div', { 'class': 'th col-2' }, [ _('Protocol') ]),
- E('div', { 'class': 'th col-7' }, [ _('Source') ]),
- E('div', { 'class': 'th col-7' }, [ _('Destination') ]),
- E('div', { 'class': 'th col-4' }, [ _('Transfer') ])
+ E('table', { 'class': 'table', 'id': 'connections' }, [
+ E('tr', { 'class': 'tr table-titles' }, [
+ E('th', { 'class': 'th col-2 hide-xs' }, [ _('Network') ]),
+ E('th', { 'class': 'th col-2' }, [ _('Protocol') ]),
+ E('th', { 'class': 'th col-7' }, [ _('Source') ]),
+ E('th', { 'class': 'th col-7' }, [ _('Destination') ]),
+ E('th', { 'class': 'th col-4' }, [ _('Transfer') ])
]),
- E('div', { 'class': 'tr placeholder' }, [
- E('div', { 'class': 'td' }, [
+ E('tr', { 'class': 'tr placeholder' }, [
+ E('td', { 'class': 'td' }, [
E('em', {}, [ _('Collecting data...') ])
])
])
diff --git a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/10_system.js b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/10_system.js
index 942b2dd567..ea8f2bb239 100644
--- a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/10_system.js
+++ b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/10_system.js
@@ -65,12 +65,12 @@ return baseclass.extend({
) : null
];
- var table = E('div', { 'class': 'table' });
+ var table = E('table', { 'class': 'table' });
for (var i = 0; i < fields.length; i += 2) {
- table.appendChild(E('div', { 'class': 'tr' }, [
- E('div', { 'class': 'td left', 'width': '33%' }, [ fields[i] ]),
- E('div', { 'class': 'td left' }, [ (fields[i + 1] != null) ? fields[i + 1] : '?' ])
+ table.appendChild(E('tr', { 'class': 'tr' }, [
+ E('td', { 'class': 'td left', 'width': '33%' }, [ fields[i] ]),
+ E('td', { 'class': 'td left' }, [ (fields[i + 1] != null) ? fields[i + 1] : '?' ])
]));
}
diff --git a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/20_memory.js b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/20_memory.js
index ceb13b56fa..3e89578002 100644
--- a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/20_memory.js
+++ b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/20_memory.js
@@ -43,12 +43,12 @@ return baseclass.extend({
if (swap.total > 0)
fields.push(_('Swap free'), swap.free, swap.total);
- var table = E('div', { 'class': 'table' });
+ var table = E('table', { 'class': 'table' });
for (var i = 0; i < fields.length; i += 3) {
- table.appendChild(E('div', { 'class': 'tr' }, [
- E('div', { 'class': 'td left', 'width': '33%' }, [ fields[i] ]),
- E('div', { 'class': 'td left' }, [
+ table.appendChild(E('tr', { 'class': 'tr' }, [
+ E('td', { 'class': 'td left', 'width': '33%' }, [ fields[i] ]),
+ E('td', { 'class': 'td left' }, [
(fields[i + 1] != null) ? progressbar(fields[i + 1], fields[i + 2], true) : '?'
])
]));
diff --git a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/30_network.js b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/30_network.js
index d528408236..3359ca82cc 100644
--- a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/30_network.js
+++ b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/30_network.js
@@ -81,12 +81,12 @@ return baseclass.extend({
_('Active Connections'), ct_max ? ct_count : null
];
- var ctstatus = E('div', { 'class': 'table' });
+ var ctstatus = E('table', { 'class': 'table' });
for (var i = 0; i < fields.length; i += 2) {
- ctstatus.appendChild(E('div', { 'class': 'tr' }, [
- E('div', { 'class': 'td left', 'width': '33%' }, [ fields[i] ]),
- E('div', { 'class': 'td left' }, [
+ ctstatus.appendChild(E('tr', { 'class': 'tr' }, [
+ E('td', { 'class': 'td left', 'width': '33%' }, [ fields[i] ]),
+ E('td', { 'class': 'td left' }, [
(fields[i + 1] != null) ? progressbar(fields[i + 1], ct_max) : '?'
])
]));
diff --git a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js
index 36452cd062..e06b555e83 100644
--- a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js
+++ b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js
@@ -81,13 +81,13 @@ return baseclass.extend({
}
};
- var table = E('div', { 'class': 'table lases' }, [
- E('div', { 'class': 'tr table-titles' }, [
- E('div', { 'class': 'th' }, _('Hostname')),
- E('div', { 'class': 'th' }, _('IPv4-Address')),
- E('div', { 'class': 'th' }, _('MAC-Address')),
- E('div', { 'class': 'th' }, _('Lease time remaining')),
- E('div', { 'class': 'th cbi-section-actions' }, _('Static Lease'))
+ var table = E('table', { 'class': 'table lases' }, [
+ E('tr', { 'class': 'tr table-titles' }, [
+ E('th', { 'class': 'th' }, _('Hostname')),
+ E('th', { 'class': 'th' }, _('IPv4-Address')),
+ E('th', { 'class': 'th' }, _('MAC-Address')),
+ E('th', { 'class': 'th' }, _('Lease time remaining')),
+ E('th', { 'class': 'th cbi-section-actions' }, _('Static Lease'))
])
]);
@@ -120,13 +120,13 @@ return baseclass.extend({
return rows;
}, this)), E('em', _('There are no active leases')));
- var table6 = E('div', { 'class': 'table leases6' }, [
- E('div', { 'class': 'tr table-titles' }, [
- E('div', { 'class': 'th' }, _('Host')),
- E('div', { 'class': 'th' }, _('IPv6-Address')),
- E('div', { 'class': 'th' }, _('DUID')),
- E('div', { 'class': 'th' }, _('Lease time remaining')),
- E('div', { 'class': 'th cbi-section-actions' }, _('Static Lease'))
+ var table6 = E('table', { 'class': 'table leases6' }, [
+ E('tr', { 'class': 'tr table-titles' }, [
+ E('th', { 'class': 'th' }, _('Host')),
+ E('th', { 'class': 'th' }, _('IPv6-Address')),
+ E('th', { 'class': 'th' }, _('DUID')),
+ E('th', { 'class': 'th' }, _('Lease time remaining')),
+ E('th', { 'class': 'th cbi-section-actions' }, _('Static Lease'))
])
]);
diff --git a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js
index 1019365836..f057f8512a 100644
--- a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js
+++ b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js
@@ -223,13 +223,13 @@ return baseclass.extend({
if (!table.lastElementChild)
return null;
- var assoclist = E('div', { 'class': 'table assoclist' }, [
- E('div', { 'class': 'tr table-titles' }, [
- E('div', { 'class': 'th nowrap' }, _('Network')),
- E('div', { 'class': 'th hide-xs' }, _('MAC-Address')),
- E('div', { 'class': 'th' }, _('Host')),
- E('div', { 'class': 'th' }, '%s / %s'.format(_('Signal'), _('Noise'))),
- E('div', { 'class': 'th' }, '%s / %s'.format(_('RX Rate'), _('TX Rate')))
+ var assoclist = E('table', { 'class': 'table assoclist' }, [
+ E('tr', { 'class': 'tr table-titles' }, [
+ E('th', { 'class': 'th nowrap' }, _('Network')),
+ E('th', { 'class': 'th hide-xs' }, _('MAC-Address')),
+ E('th', { 'class': 'th' }, _('Host')),
+ E('th', { 'class': 'th' }, '%s / %s'.format(_('Signal'), _('Noise'))),
+ E('th', { 'class': 'th' }, '%s / %s'.format(_('RX Rate'), _('TX Rate')))
])
]);
@@ -324,7 +324,7 @@ return baseclass.extend({
if (networks[i].isClientDisconnectSupported() && hasWritePermission) {
if (assoclist.firstElementChild.childNodes.length < 6)
- assoclist.firstElementChild.appendChild(E('div', { 'class': 'th cbi-section-actions' }));
+ assoclist.firstElementChild.appendChild(E('th', { 'class': 'th cbi-section-actions' }));
if (macfilter != null && macfilter != 'disable' && !this.isDeviceAdded[bss.mac]) {
row.push(new L.ui.ComboButton('button', {
diff --git a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js
index 84d2b10556..2ce744c60e 100644
--- a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js
+++ b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js
@@ -58,18 +58,18 @@ return view.extend({
if (!cdiv) {
cdiv = E('div', { 'data-chain': chain }, [
E('h4', { 'id': 'rule_%s-%s_%s'.format(is_ipv6 ? 'ipv6' : 'ipv4', table.toLowerCase(), chain) }, title),
- E('div', { 'class': 'table' }, [
- E('div', { 'class': 'tr table-titles' }, [
- E('div', { 'class': 'th center' }, _('Pkts.')),
- E('div', { 'class': 'th center' }, _('Traffic')),
- E('div', { 'class': 'th' }, _('Target')),
- E('div', { 'class': 'th' }, _('Prot.')),
- E('div', { 'class': 'th' }, _('In')),
- E('div', { 'class': 'th' }, _('Out')),
- E('div', { 'class': 'th' }, _('Source')),
- E('div', { 'class': 'th' }, _('Destination')),
- E('div', { 'class': 'th' }, _('Options')),
- E('div', { 'class': 'th' }, _('Comment'))
+ E('table', { 'class': 'table' }, [
+ E('tr', { 'class': 'tr table-titles' }, [
+ E('th', { 'class': 'th center' }, _('Pkts.')),
+ E('th', { 'class': 'th center' }, _('Traffic')),
+ E('th', { 'class': 'th' }, _('Target')),
+ E('th', { 'class': 'th' }, _('Prot.')),
+ E('th', { 'class': 'th' }, _('In')),
+ E('th', { 'class': 'th' }, _('Out')),
+ E('th', { 'class': 'th' }, _('Source')),
+ E('th', { 'class': 'th' }, _('Destination')),
+ E('th', { 'class': 'th' }, _('Options')),
+ E('th', { 'class': 'th' }, _('Comment'))
])
])
]);
diff --git a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/load.js b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/load.js
index cfb7a96b08..2766f5d1b5 100644
--- a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/load.js
+++ b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/load.js
@@ -226,36 +226,36 @@ return view.extend({
E('div', { 'class': 'right' }, E('small', { 'id': 'scale' }, '-')),
E('br'),
- E('div', { 'class': 'table', 'style': 'width:100%;table-layout:fixed' }, [
- E('div', { 'class': 'tr' }, [
- E('div', { 'class': 'td right top' }, E('strong', { 'style': 'border-bottom:2px solid #f00' }, [ _('1 Minute Load:') ])),
- E('div', { 'class': 'td', 'id': 'lb_load01_cur' }, [ '0.00' ]),
+ E('table', { 'class': 'table', 'style': 'width:100%;table-layout:fixed' }, [
+ E('tr', { 'class': 'tr' }, [
+ E('td', { 'class': 'td right top' }, E('strong', { 'style': 'border-bottom:2px solid #f00' }, [ _('1 Minute Load:') ])),
+ E('td', { 'class': 'td', 'id': 'lb_load01_cur' }, [ '0.00' ]),
- E('div', { 'class': 'td right top' }, E('strong', {}, [ _('Average:') ])),
- E('div', { 'class': 'td', 'id': 'lb_load01_avg' }, [ '0.00' ]),
+ E('td', { 'class': 'td right top' }, E('strong', {}, [ _('Average:') ])),
+ E('td', { 'class': 'td', 'id': 'lb_load01_avg' }, [ '0.00' ]),
- E('div', { 'class': 'td right top' }, E('strong', {}, [ _('Peak:') ])),
- E('div', { 'class': 'td', 'id': 'lb_load01_peak' }, [ '0.00' ])
+ E('td', { 'class': 'td right top' }, E('strong', {}, [ _('Peak:') ])),
+ E('td', { 'class': 'td', 'id': 'lb_load01_peak' }, [ '0.00' ])
]),
- E('div', { 'class': 'tr' }, [
- E('div', { 'class': 'td right top' }, E('strong', { 'style': 'border-bottom:2px solid #f60' }, [ _('5 Minute Load:') ])),
- E('div', { 'class': 'td', 'id': 'lb_load05_cur' }, [ '0.00' ]),
+ E('tr', { 'class': 'tr' }, [
+ E('td', { 'class': 'td right top' }, E('strong', { 'style': 'border-bottom:2px solid #f60' }, [ _('5 Minute Load:') ])),
+ E('td', { 'class': 'td', 'id': 'lb_load05_cur' }, [ '0.00' ]),
- E('div', { 'class': 'td right top' }, E('strong', {}, [ _('Average:') ])),
- E('div', { 'class': 'td', 'id': 'lb_load05_avg' }, [ '0.00' ]),
+ E('td', { 'class': 'td right top' }, E('strong', {}, [ _('Average:') ])),
+ E('td', { 'class': 'td', 'id': 'lb_load05_avg' }, [ '0.00' ]),
- E('div', { 'class': 'td right top' }, E('strong', {}, [ _('Peak:') ])),
- E('div', { 'class': 'td', 'id': 'lb_load05_peak' }, [ '0.00' ])
+ E('td', { 'class': 'td right top' }, E('strong', {}, [ _('Peak:') ])),
+ E('td', { 'class': 'td', 'id': 'lb_load05_peak' }, [ '0.00' ])
]),
- E('div', { 'class': 'tr' }, [
- E('div', { 'class': 'td right top' }, E('strong', { 'style': 'border-bottom:2px solid #fa0' }, [ _('15 Minute Load:') ])),
- E('div', { 'class': 'td', 'id': 'lb_load15_cur' }, [ '0.00' ]),
+ E('tr', { 'class': 'tr' }, [
+ E('td', { 'class': 'td right top' }, E('strong', { 'style': 'border-bottom:2px solid #fa0' }, [ _('15 Minute Load:') ])),
+ E('td', { 'class': 'td', 'id': 'lb_load15_cur' }, [ '0.00' ]),
- E('div', { 'class': 'td right top' }, E('strong', {}, [ _('Average:') ])),
- E('div', { 'class': 'td', 'id': 'lb_load15_avg' }, [ '0.00' ]),
+ E('td', { 'class': 'td right top' }, E('strong', {}, [ _('Average:') ])),
+ E('td', { 'class': 'td', 'id': 'lb_load15_avg' }, [ '0.00' ]),
- E('div', { 'class': 'td right top' }, E('strong', {}, [ _('Peak:') ])),
- E('div', { 'class': 'td', 'id': 'lb_load15_peak' }, [ '0.00' ])
+ E('td', { 'class': 'td right top' }, E('strong', {}, [ _('Peak:') ])),
+ E('td', { 'class': 'td', 'id': 'lb_load15_peak' }, [ '0.00' ])
])
])
]);
diff --git a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/processes.js b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/processes.js
index 8a77306e57..e7d094a7f9 100644
--- a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/processes.js
+++ b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/processes.js
@@ -64,14 +64,14 @@ return view.extend({
E('h2', _('Processes')),
E('div', { 'class': 'cbi-map-descr' }, _('This list gives an overview over currently running system processes and their status.')),
- E('div', { 'class': 'table' }, [
- E('div', { 'class': 'tr table-titles' }, [
- E('div', { 'class': 'th' }, _('PID')),
- E('div', { 'class': 'th' }, _('Owner')),
- E('div', { 'class': 'th' }, _('Command')),
- E('div', { 'class': 'th' }, _('CPU usage (%)')),
- E('div', { 'class': 'th' }, _('Memory usage (%)')),
- E('div', { 'class': 'th center nowrap cbi-section-actions' })
+ E('table', { 'class': 'table' }, [
+ E('tr', { 'class': 'tr table-titles' }, [
+ E('th', { 'class': 'th' }, _('PID')),
+ E('th', { 'class': 'th' }, _('Owner')),
+ E('th', { 'class': 'th' }, _('Command')),
+ E('th', { 'class': 'th' }, _('CPU usage (%)')),
+ E('th', { 'class': 'th' }, _('Memory usage (%)')),
+ E('th', { 'class': 'th center nowrap cbi-section-actions' })
])
])
]);
diff --git a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js
index fa2315fb55..9d959f34a5 100644
--- a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js
+++ b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js
@@ -150,41 +150,41 @@ return view.extend({
ip6neigh = data[3].stdout || '',
ip6route = data[4].stdout || '';
- var neigh4tbl = E('div', { 'class': 'table' }, [
- E('div', { 'class': 'tr table-titles' }, [
- E('div', { 'class': 'th' }, [ _('IPv4-Address') ]),
- E('div', { 'class': 'th' }, [ _('MAC-Address') ]),
- E('div', { 'class': 'th' }, [ _('Interface') ])
+ var neigh4tbl = E('table', { 'class': 'table' }, [
+ E('tr', { 'class': 'tr table-titles' }, [
+ E('th', { 'class': 'th' }, [ _('IPv4-Address') ]),
+ E('th', { 'class': 'th' }, [ _('MAC-Address') ]),
+ E('th', { 'class': 'th' }, [ _('Interface') ])
])
]);
- var route4tbl = E('div', { 'class': 'table' }, [
- E('div', { 'class': 'tr table-titles' }, [
- E('div', { 'class': 'th' }, [ _('Network') ]),
- E('div', { 'class': 'th' }, [ _('Target') ]),
- E('div', { 'class': 'th' }, [ _('IPv4-Gateway') ]),
- E('div', { 'class': 'th' }, [ _('Metric') ]),
- E('div', { 'class': 'th' }, [ _('Table') ]),
- E('div', { 'class': 'th' }, [ _('Protocol') ]),
+ var route4tbl = E('table', { 'class': 'table' }, [
+ E('tr', { 'class': 'tr table-titles' }, [
+ E('th', { 'class': 'th' }, [ _('Network') ]),
+ E('th', { 'class': 'th' }, [ _('Target') ]),
+ E('th', { 'class': 'th' }, [ _('IPv4-Gateway') ]),
+ E('th', { 'class': 'th' }, [ _('Metric') ]),
+ E('th', { 'class': 'th' }, [ _('Table') ]),
+ E('th', { 'class': 'th' }, [ _('Protocol') ]),
])
]);
- var neigh6tbl = E('div', { 'class': 'table' }, [
- E('div', { 'class': 'tr table-titles' }, [
- E('div', { 'class': 'th' }, [ _('IPv6-Address') ]),
- E('div', { 'class': 'th' }, [ _('MAC-Address') ]),
- E('div', { 'class': 'th' }, [ _('Interface') ])
+ var neigh6tbl = E('table', { 'class': 'table' }, [
+ E('tr', { 'class': 'tr table-titles' }, [
+ E('th', { 'class': 'th' }, [ _('IPv6-Address') ]),
+ E('th', { 'class': 'th' }, [ _('MAC-Address') ]),
+ E('th', { 'class': 'th' }, [ _('Interface') ])
])
]);
- var route6tbl = E('div', { 'class': 'table' }, [
- E('div', { 'class': 'tr table-titles' }, [
- E('div', { 'class': 'th' }, [ _('Network') ]),
- E('div', { 'class': 'th' }, [ _('Target') ]),
- E('div', { 'class': 'th' }, [ _('Source') ]),
- E('div', { 'class': 'th' }, [ _('Metric') ]),
- E('div', { 'class': 'th' }, [ _('Table') ]),
- E('div', { 'class': 'th' }, [ _('Protocol') ]),
+ var route6tbl = E('table', { 'class': 'table' }, [
+ E('tr', { 'class': 'tr table-titles' }, [
+ E('th', { 'class': 'th' }, [ _('Network') ]),
+ E('th', { 'class': 'th' }, [ _('Target') ]),
+ E('th', { 'class': 'th' }, [ _('Source') ]),
+ E('th', { 'class': 'th' }, [ _('Metric') ]),
+ E('th', { 'class': 'th' }, [ _('Table') ]),
+ E('th', { 'class': 'th' }, [ _('Protocol') ]),
])
]);
diff --git a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/wireless.js b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/wireless.js
index 95077bc10a..a7fa69095c 100644
--- a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/wireless.js
+++ b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/wireless.js
@@ -255,26 +255,26 @@ return view.extend({
E('div', { 'class': 'right' }, E('small', { 'id': 'scale' }, '-')),
E('br'),
- E('div', { 'class': 'table', 'style': 'width:100%;table-layout:fixed' }, [
- E('div', { 'class': 'tr' }, [
- E('div', { 'class': 'td right top' }, E('strong', { 'style': 'border-bottom:2px solid blue' }, [ _('Signal:') ])),
- E('div', { 'class': 'td', 'id': 'rssi_bw_cur' }, [ '0 ' + _('dBm') ]),
+ E('table', { 'class': 'table', 'style': 'width:100%;table-layout:fixed' }, [
+ E('tr', { 'class': 'tr' }, [
+ E('td', { 'class': 'td right top' }, E('strong', { 'style': 'border-bottom:2px solid blue' }, [ _('Signal:') ])),
+ E('td', { 'class': 'td', 'id': 'rssi_bw_cur' }, [ '0 ' + _('dBm') ]),
- E('div', { 'class': 'td right top' }, E('strong', {}, [ _('Average:') ])),
- E('div', { 'class': 'td', 'id': 'rssi_bw_avg' }, [ '0 ' + _('dBm') ]),
+ E('td', { 'class': 'td right top' }, E('strong', {}, [ _('Average:') ])),
+ E('td', { 'class': 'td', 'id': 'rssi_bw_avg' }, [ '0 ' + _('dBm') ]),
- E('div', { 'class': 'td right top' }, E('strong', {}, [ _('Peak:') ])),
- E('div', { 'class': 'td', 'id': 'rssi_bw_peak' }, [ '0 ' + _('dBm') ])
+ E('td', { 'class': 'td right top' }, E('strong', {}, [ _('Peak:') ])),
+ E('td', { 'class': 'td', 'id': 'rssi_bw_peak' }, [ '0 ' + _('dBm') ])
]),
- E('div', { 'class': 'tr' }, [
- E('div', { 'class': 'td right top' }, E('strong', { 'style': 'border-bottom:2px solid red' }, [ _('Noise:') ])),
- E('div', { 'class': 'td', 'id': 'noise_bw_cur' }, [ '0 ' + _('dBm') ]),
+ E('tr', { 'class': 'tr' }, [
+ E('td', { 'class': 'td right top' }, E('strong', { 'style': 'border-bottom:2px solid red' }, [ _('Noise:') ])),
+ E('td', { 'class': 'td', 'id': 'noise_bw_cur' }, [ '0 ' + _('dBm') ]),
- E('div', { 'class': 'td right top' }, E('strong', {}, [ _('Average:') ])),
- E('div', { 'class': 'td', 'id': 'noise_bw_avg' }, [ '0 ' + _('dBm') ]),
+ E('td', { 'class': 'td right top' }, E('strong', {}, [ _('Average:') ])),
+ E('td', { 'class': 'td', 'id': 'noise_bw_avg' }, [ '0 ' + _('dBm') ]),
- E('div', { 'class': 'td right top' }, E('strong', {}, [ _('Peak:') ])),
- E('div', { 'class': 'td', 'id': 'noise_bw_peak' }, [ '0 ' + _('dBm') ])
+ E('td', { 'class': 'td right top' }, E('strong', {}, [ _('Peak:') ])),
+ E('td', { 'class': 'td', 'id': 'noise_bw_peak' }, [ '0 ' + _('dBm') ])
])
]),
E('br'),
@@ -283,16 +283,16 @@ return view.extend({
E('div', { 'class': 'right' }, E('small', { 'id': 'scale2' }, '-')),
E('br'),
- E('div', { 'class': 'table', 'style': 'width:100%;table-layout:fixed' }, [
- E('div', { 'class': 'tr' }, [
- E('div', { 'class': 'td right top' }, E('strong', { 'style': 'border-bottom:2px solid green' }, [ _('Phy Rate:') ])),
- E('div', { 'class': 'td', 'id': 'rate_bw_cur' }, [ '0 MBit/s' ]),
+ E('table', { 'class': 'table', 'style': 'width:100%;table-layout:fixed' }, [
+ E('tr', { 'class': 'tr' }, [
+ E('td', { 'class': 'td right top' }, E('strong', { 'style': 'border-bottom:2px solid green' }, [ _('Phy Rate:') ])),
+ E('td', { 'class': 'td', 'id': 'rate_bw_cur' }, [ '0 MBit/s' ]),
- E('div', { 'class': 'td right top' }, E('strong', {}, [ _('Average:') ])),
- E('div', { 'class': 'td', 'id': 'rate_bw_avg' }, [ '0 MBit/s' ]),
+ E('td', { 'class': 'td right top' }, E('strong', {}, [ _('Average:') ])),
+ E('td', { 'class': 'td', 'id': 'rate_bw_avg' }, [ '0 MBit/s' ]),
- E('div', { 'class': 'td right top' }, E('strong', {}, [ _('Peak:') ])),
- E('div', { 'class': 'td', 'id': 'rate_bw_peak' }, [ '0 MBit/s' ])
+ E('td', { 'class': 'td right top' }, E('strong', {}, [ _('Peak:') ])),
+ E('td', { 'class': 'td', 'id': 'rate_bw_peak' }, [ '0 MBit/s' ])
])
])
]));