freifunk/hopglass
8
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'master' into l2tp-quickfix

Browse source
This commit is contained in:
Milan Pässler 2016-03-28 22:59:33 +02:00
parent 312fa6b8fd 08e00d4b91
commit dc6d3f24ca
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/infobox/node.js
View file

@ -219,9 +219,10 @@ define(["moment", "numeral", "tablesort", "tablesort.numeric"],
return au.enabled ? "aktiviert (" + au.branch + ")" : "deaktiviert" return au.enabled ? "aktiviert (" + au.branch + ")" : "deaktiviert"
} }
function showStatImg(o, nodeId) { function showStatImg(o, d) {
var subst = {} var subst = {}
subst["{NODE_ID}"] = nodeId subst["{NODE_ID}"] = d.nodeinfo.node_id ? d.nodeinfo.node_id : "unknown"
subst["{NODE_NAME}"] = d.nodeinfo.hostname ? d.nodeinfo.hostname : "unknown"
return showStat(o, subst) return showStat(o, subst)
} }
@ -263,7 +264,7 @@ define(["moment", "numeral", "tablesort", "tablesort.numeric"],
var h4 = document.createElement("h4") var h4 = document.createElement("h4")
h4.textContent = nodeInfo.name h4.textContent = nodeInfo.name
el.appendChild(h4) el.appendChild(h4)
el.appendChild(showStatImg(nodeInfo, d.nodeinfo.node_id)) el.appendChild(showStatImg(nodeInfo, d))
}) })
if (d.neighbours.length > 0) { if (d.neighbours.length > 0) {