summaryrefslogtreecommitdiffhomepage
path: root/modules/luci-mod-network/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-network/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-network/htdocs/luci-static')
-rw-r--r--modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js32
-rw-r--r--modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js10
-rw-r--r--modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js36
3 files changed, 39 insertions, 39 deletions
diff --git a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js
index 7f46740da4..541c2fca1b 100644
--- a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js
+++ b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js
@@ -31,15 +31,15 @@ CBILeaseStatus = form.DummyValue.extend({
renderWidget: function(section_id, option_id, cfgvalue) {
return E([
E('h4', _('Active DHCP Leases')),
- E('div', { 'id': 'lease_status_table', 'class': 'table' }, [
- 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('table', { 'id': 'lease_status_table', 'class': 'table' }, [
+ 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('div', { 'class': 'tr placeholder' }, [
- E('div', { 'class': 'td' }, E('em', _('Collecting data...')))
+ E('tr', { 'class': 'tr placeholder' }, [
+ E('td', { 'class': 'td' }, E('em', _('Collecting data...')))
])
])
]);
@@ -50,15 +50,15 @@ CBILease6Status = form.DummyValue.extend({
renderWidget: function(section_id, option_id, cfgvalue) {
return E([
E('h4', _('Active DHCPv6 Leases')),
- E('div', { 'id': 'lease6_status_table', 'class': 'table' }, [
- 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('table', { 'id': 'lease6_status_table', 'class': 'table' }, [
+ 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('div', { 'class': 'tr placeholder' }, [
- E('div', { 'class': 'td' }, E('em', _('Collecting data...')))
+ E('tr', { 'class': 'tr placeholder' }, [
+ E('td', { 'class': 'td' }, E('em', _('Collecting data...')))
])
])
]);
diff --git a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js
index 1855ee6422..5d6bd4765e 100644
--- a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js
+++ b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js
@@ -66,9 +66,9 @@ return view.extend({
return E([], [
E('h2', {}, [ _('Network Utilities') ]),
- E('div', { 'class': 'table' }, [
- E('div', { 'class': 'tr' }, [
- E('div', { 'class': 'td left' }, [
+ E('table', { 'class': 'table' }, [
+ E('tr', { 'class': 'tr' }, [
+ E('td', { 'class': 'td left' }, [
E('input', {
'style': 'margin:5px 0',
'type': 'text',
@@ -91,7 +91,7 @@ return view.extend({
])
]),
- E('div', { 'class': 'td left' }, [
+ E('td', { 'class': 'td left' }, [
E('input', {
'style': 'margin:5px 0',
'type': 'text',
@@ -114,7 +114,7 @@ return view.extend({
])
]),
- E('div', { 'class': 'td left' }, [
+ E('td', { 'class': 'td left' }, [
E('input', {
'style': 'margin:5px 0',
'type': 'text',
diff --git a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js
index bb98772179..01a12c5728 100644
--- a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js
+++ b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js
@@ -649,7 +649,7 @@ return view.extend({
if (bss.network.isClientDisconnectSupported()) {
if (table.firstElementChild.childNodes.length < 6)
- table.firstElementChild.appendChild(E('div', { 'class': 'th cbi-section-actions'}));
+ table.firstElementChild.appendChild(E('th', { 'class': 'th cbi-section-actions'}));
row.push(E('button', {
'class': 'cbi-button cbi-button-remove',
@@ -850,7 +850,7 @@ return view.extend({
];
}
- return E('div', { 'class': 'td middle cbi-section-actions' }, E('div', btns));
+ return E('td', { 'class': 'td middle cbi-section-actions' }, E('div', btns));
};
s.addModalOptions = function(s) {
@@ -1656,15 +1656,15 @@ return view.extend({
};
s.handleScan = function(radioDev, ev) {
- var table = E('div', { 'class': 'table' }, [
- E('div', { 'class': 'tr table-titles' }, [
- E('div', { 'class': 'th col-2 middle center' }, _('Signal')),
- E('div', { 'class': 'th col-4 middle left' }, _('SSID')),
- E('div', { 'class': 'th col-2 middle center hide-xs' }, _('Channel')),
- E('div', { 'class': 'th col-2 middle left hide-xs' }, _('Mode')),
- E('div', { 'class': 'th col-3 middle left hide-xs' }, _('BSSID')),
- E('div', { 'class': 'th col-3 middle left' }, _('Encryption')),
- E('div', { 'class': 'th cbi-section-actions right' }, ' '),
+ var table = E('table', { 'class': 'table' }, [
+ E('tr', { 'class': 'tr table-titles' }, [
+ E('th', { 'class': 'th col-2 middle center' }, _('Signal')),
+ E('th', { 'class': 'th col-4 middle left' }, _('SSID')),
+ E('th', { 'class': 'th col-2 middle center hide-xs' }, _('Channel')),
+ E('th', { 'class': 'th col-2 middle left hide-xs' }, _('Mode')),
+ E('th', { 'class': 'th col-3 middle left hide-xs' }, _('BSSID')),
+ E('th', { 'class': 'th col-3 middle left' }, _('Encryption')),
+ E('th', { 'class': 'th cbi-section-actions right' }, ' '),
])
]);
@@ -2073,13 +2073,13 @@ return view.extend({
.then(L.bind(this.poll_status, this, nodes));
}, this), 5);
- var table = E('div', { 'class': 'table assoclist', 'id': 'wifi_assoclist_table' }, [
- 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' }, _('Signal / Noise')),
- E('div', { 'class': 'th' }, _('RX Rate / TX Rate'))
+ var table = E('table', { 'class': 'table assoclist', 'id': 'wifi_assoclist_table' }, [
+ 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' }, _('Signal / Noise')),
+ E('th', { 'class': 'th' }, _('RX Rate / TX Rate'))
])
]);