summaryrefslogtreecommitdiffhomepage
path: root/modules/luci-mod-dashboard/htdocs
diff options
context:
space:
mode:
Diffstat (limited to 'modules/luci-mod-dashboard/htdocs')
-rw-r--r--modules/luci-mod-dashboard/htdocs/luci-static/resources/view/dashboard/css/custom.css6
-rw-r--r--modules/luci-mod-dashboard/htdocs/luci-static/resources/view/dashboard/include/10_router.js6
-rw-r--r--modules/luci-mod-dashboard/htdocs/luci-static/resources/view/dashboard/include/30_wifi.js4
3 files changed, 9 insertions, 7 deletions
diff --git a/modules/luci-mod-dashboard/htdocs/luci-static/resources/view/dashboard/css/custom.css b/modules/luci-mod-dashboard/htdocs/luci-static/resources/view/dashboard/css/custom.css
index 8db3bbbe14..66dd81f79e 100644
--- a/modules/luci-mod-dashboard/htdocs/luci-static/resources/view/dashboard/css/custom.css
+++ b/modules/luci-mod-dashboard/htdocs/luci-static/resources/view/dashboard/css/custom.css
@@ -120,13 +120,11 @@
.Dashboard .settings-info p span:nth-child(2){
display: inline-block;
word-break: break-all;
- overflow: hidden;
- position: relative;
- top:2px;
}
.Dashboard .settings-info p span:nth-child(2).label {
- font-size: 8px;
+ padding: 1px 4px 1px 4px;
+ font-size: 9.75px;
}
.Dashboard .router-status-info .settings-info p span:nth-child(2){
diff --git a/modules/luci-mod-dashboard/htdocs/luci-static/resources/view/dashboard/include/10_router.js b/modules/luci-mod-dashboard/htdocs/luci-static/resources/view/dashboard/include/10_router.js
index e1ea347d59..c43e2ca544 100644
--- a/modules/luci-mod-dashboard/htdocs/luci-static/resources/view/dashboard/include/10_router.js
+++ b/modules/luci-mod-dashboard/htdocs/luci-static/resources/view/dashboard/include/10_router.js
@@ -146,6 +146,8 @@ return baseclass.extend({
var ifc = data[i];
if (v6) {
+ var uptime = ifc.getUptime();
+ this.params.internet.v6.uptime.value = (uptime > 0) ? '%t'.format(uptime) : '-';
this.params.internet.v6.ipprefixv6.value = ifc.getIP6Prefix() || '-';
this.params.internet.v6.gatewayv6.value = ifc.getGateway6Addr() || '-';
this.params.internet.v6.protocol.value= ifc.getI18n() || E('em', _('Not connected'));
@@ -178,7 +180,7 @@ return baseclass.extend({
},
uptime: {
- title: _('Connected since'),
+ title: _('Uptime'),
visible: true,
value: '-'
},
@@ -218,7 +220,7 @@ return baseclass.extend({
},
uptime: {
- title: _('Connected since'),
+ title: _('Uptime'),
visible: true,
value: '-'
},
diff --git a/modules/luci-mod-dashboard/htdocs/luci-static/resources/view/dashboard/include/30_wifi.js b/modules/luci-mod-dashboard/htdocs/luci-static/resources/view/dashboard/include/30_wifi.js
index f48622fd66..318c3abf87 100644
--- a/modules/luci-mod-dashboard/htdocs/luci-static/resources/view/dashboard/include/30_wifi.js
+++ b/modules/luci-mod-dashboard/htdocs/luci-static/resources/view/dashboard/include/30_wifi.js
@@ -262,6 +262,8 @@ return baseclass.extend({
this.renderUpdateData(data[0], data[1], data[2]);
- return this.renderHtml();
+ if (this.params.wifi.radios.length)
+ return this.renderHtml();
+ return E([]);
}
});