Merge pull request #1 from tcatm/master

merge upstream

lib/infobox/node.js

@@ -134,7 +134,6 @@ define(["moment", "numeral", "tablesort", "tablesort.numeric"],
   }
 
   function showStatImg(o, nodeId) {
-    return function (el) {
     var content, caption
 
     if (o.thumbnail) {
@@ -149,6 +148,8 @@ define(["moment", "numeral", "tablesort", "tablesort.numeric"],
         content = document.createTextNode(caption)
     }
 
+    var p = document.createElement("p")
+
     if (o.href) {
       var link = document.createElement("a")
       link.target = "_blank"
@@ -158,10 +159,11 @@ define(["moment", "numeral", "tablesort", "tablesort.numeric"],
       if (caption && o.thumbnail)
         link.title = caption
 
-        el.appendChild(link)
+      p.appendChild(link)
     } else
-        el.appendChild(content)
-    }
+      p.appendChild(content)
+
+    return p
   }
 
   return function(config, el, router, d) {
@@ -193,13 +195,17 @@ define(["moment", "numeral", "tablesort", "tablesort.numeric"],
     attributeEntry(attributes, "Autom. Updates", showAutoupdate(d))
     attributeEntry(attributes, "Clients", showClients(d))
 
+    el.appendChild(attributes)
+
+
     if (config.nodeInfos)
       config.nodeInfos.forEach( function (nodeInfo) {
-        attributeEntry(attributes, nodeInfo.name, showStatImg(nodeInfo, d.nodeinfo.node_id))
+        var h4 = document.createElement("h4")
+        h4.textContent = nodeInfo.name
+        el.appendChild(h4)
+        el.appendChild(showStatImg(nodeInfo, d.nodeinfo.node_id))
       })
 
-    el.appendChild(attributes)
-
     if (d.neighbours.length > 0) {
       var h3 = document.createElement("h3")
       h3.textContent = "Nachbarknoten (" + d.neighbours.length + ")"

scss/main.scss

@@ -212,10 +212,16 @@ button.close {
   padding-right: $buttondistance;
 }
 
-.sidebar p, .sidebar table, .sidebar pre, .sidebar ul {
+.sidebar {
+  p, pre, ul, h4 {
     padding: 0 $buttondistance 1em;
   }
 
+  table {
+    padding: 0 $buttondistance;
+  }
+}
+
 table {
   border-spacing: 0 0.5em;
   td, th {