Add ratio & alt attribute to stats images

This commit is contained in:
Xaver Maierhofer 2020-06-04 19:11:14 +02:00
parent 6e35ace89d
commit c601fc93d1
No known key found for this signature in database
GPG Key ID: 7FDCE23FD2EC9FE8
6 changed files with 31 additions and 11 deletions

View File

@ -6,32 +6,42 @@ module.exports = function () {
'name': 'Clientstatistik', 'name': 'Clientstatistik',
'href': 'https://regensburg.freifunk.net/netz/statistik/node/{NODE_ID}/', 'href': 'https://regensburg.freifunk.net/netz/statistik/node/{NODE_ID}/',
'image': 'https://grafana.regensburg.freifunk.net/render/d-solo/000000026/node?panelId=1&var-node={NODE_ID}&from=now-1d&width=650&height=350&theme=light&_t={TIME}', 'image': 'https://grafana.regensburg.freifunk.net/render/d-solo/000000026/node?panelId=1&var-node={NODE_ID}&from=now-1d&width=650&height=350&theme=light&_t={TIME}',
'title': 'Clientstatistik für {NODE_ID} - weiteren Statistiken' 'title': 'Clientstatistik für {NODE_ID} - weiteren Statistiken',
'width': 650,
'height': 350
}, },
{ {
'name': 'Trafficstatistik', 'name': 'Trafficstatistik',
'href': 'https://regensburg.freifunk.net/netz/statistik/node/{NODE_ID}/', 'href': 'https://regensburg.freifunk.net/netz/statistik/node/{NODE_ID}/',
'image': 'https://grafana.regensburg.freifunk.net/render/d-solo/000000026/node?panelId=2&from=now-1d&var-node={NODE_ID}&width=650&height=350&theme=light&_t={TIME}', 'image': 'https://grafana.regensburg.freifunk.net/render/d-solo/000000026/node?panelId=2&from=now-1d&var-node={NODE_ID}&width=650&height=350&theme=light&_t={TIME}',
'title': 'Trafficstatistik für {NODE_ID} - weiteren Statistiken' 'title': 'Trafficstatistik für {NODE_ID} - weiteren Statistiken',
'width': 650,
'height': 350
}, },
{ {
'name': 'Systemlast', 'name': 'Systemlast',
'href': 'https://regensburg.freifunk.net/netz/statistik/node/{NODE_ID}/', 'href': 'https://regensburg.freifunk.net/netz/statistik/node/{NODE_ID}/',
'image': 'https://grafana.regensburg.freifunk.net/render/d-solo/000000026/node?panelId=4&from=now-1d&var-node={NODE_ID}&width=650&height=350&theme=light&_t={TIME}', 'image': 'https://grafana.regensburg.freifunk.net/render/d-solo/000000026/node?panelId=4&from=now-1d&var-node={NODE_ID}&width=650&height=350&theme=light&_t={TIME}',
'title': 'Systemlast für {NODE_ID} - weiteren Statistiken' 'title': 'Systemlast für {NODE_ID} - weiteren Statistiken',
'width': 650,
'height': 350
}, },
{ {
'name': 'Airtime', 'name': 'Airtime',
'href': 'https://regensburg.freifunk.net/netz/statistik/node/{NODE_ID}/', 'href': 'https://regensburg.freifunk.net/netz/statistik/node/{NODE_ID}/',
'image': 'https://grafana.regensburg.freifunk.net/render/d-solo/000000026/node?panelId=5&from=now-1d&var-node={NODE_ID}&width=650&height=350&theme=light&_t={TIME}', 'image': 'https://grafana.regensburg.freifunk.net/render/d-solo/000000026/node?panelId=5&from=now-1d&var-node={NODE_ID}&width=650&height=350&theme=light&_t={TIME}',
'title': 'Airtime für {NODE_ID} - weiteren Statistiken' 'title': 'Airtime für {NODE_ID} - weiteren Statistiken',
'width': 650,
'height': 350
} }
], ],
'linkInfos': [ 'linkInfos': [
{ {
'name': 'Statistik für alle Links zwischen diese Knoten', 'name': 'Statistik für alle Links zwischen diese Knoten',
'image': 'https://grafana.regensburg.freifunk.net/render/d-solo/nvSNqoHmz/link?panelId=7&var-node={SOURCE_ID}&var-nodetolink={TARGET_ID}&from=now-1d&&width=650&height=350&theme=light&_t={TIME}', 'image': 'https://grafana.regensburg.freifunk.net/render/d-solo/nvSNqoHmz/link?panelId=7&var-node={SOURCE_ID}&var-nodetolink={TARGET_ID}&from=now-1d&&width=650&height=350&theme=light&_t={TIME}',
'title': 'Linkstatistik des letzten Tages, min und max aller Links zwischen diesen Knoten' 'title': 'Linkstatistik des letzten Tages, min und max aller Links zwischen diesen Knoten',
'width': 650,
'height': 350
} }
], ],
'globalInfos': [ 'globalInfos': [
@ -39,7 +49,9 @@ module.exports = function () {
'name': 'Globale Statistik', 'name': 'Globale Statistik',
'href': 'https://regensburg.freifunk.net/netz/statistik', 'href': 'https://regensburg.freifunk.net/netz/statistik',
'image': 'https://grafana.regensburg.freifunk.net/render/d-solo/000000028/globals?panelId=2&from=now-7d&&width=650&height=350&theme=light&_t={TIME}', 'image': 'https://grafana.regensburg.freifunk.net/render/d-solo/000000028/globals?panelId=2&from=now-7d&&width=650&height=350&theme=light&_t={TIME}',
'title': 'Globale Statistik - weiteren Statistiken' 'title': 'Globale Statistik - weiteren Statistiken',
'width': 650,
'height': 350
} }
], ],
// Array of data provider are supported // Array of data provider are supported

View File

@ -117,10 +117,10 @@ define({
} }
}, },
showStat: function showStat(V, o, subst) { showStat: function showStat(V, o, subst) {
var content = V.h('img', { attrs: { src: require('helper').listReplace(o.image, subst) } }); var content = V.h('img', { attrs: { src: require('helper').listReplace(o.image, subst), width: o.width, height: o.height, alt: _.t('loading', { name: o.name }) } });
if (o.href) { if (o.href) {
return V.h('p', V.h('a', { return V.h('div', V.h('a', {
attrs: attrs:
{ {
href: require('helper').listReplace(o.href, subst), href: require('helper').listReplace(o.href, subst),
@ -129,7 +129,7 @@ define({
} }
}, content)); }, content));
} }
return V.h('p', content); return V.h('div', content);
}, },
getTileBBox: function getTileBBox(s, map, tileSize, margin) { getTileBBox: function getTileBBox(s, map, tileSize, margin) {

View File

@ -93,5 +93,6 @@
"others": "andere", "others": "andere",
"none": "keine", "none": "keine",
"remove": "entfernen", "remove": "entfernen",
"close": "schließen" "close": "schließen",
"loading": "%{name} graoh (wird generiert)"
} }

View File

@ -93,5 +93,6 @@
"others": "other", "others": "other",
"none": "none", "none": "none",
"remove": "remove", "remove": "remove",
"close": "close" "close": "close",
"loading": "%{name} graph (is generated)"
} }

View File

@ -55,6 +55,7 @@ h4 {
img { img {
max-width: 100%; max-width: 100%;
height: auto;
} }
a { a {

View File

@ -29,6 +29,11 @@
padding-bottom: 15px; padding-bottom: 15px;
} }
img {
padding: 0 $button-distance 1em;
box-sizing: border-box;
}
.node-list, .node-list,
.node-links, .node-links,
.link-list { .link-list {