From f4eebef8a9c2508c213f79e8646051b090503f59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 4 Oct 2013 14:58:58 +0200 Subject: [PATCH] put page in container --- assets/app.js | 55 ++++++++++++++++++++++++++----------------------- html/index.html | 39 +++++++++++++++++++---------------- server.go | 4 ++-- 3 files changed, 52 insertions(+), 46 deletions(-) diff --git a/assets/app.js b/assets/app.js index bf0471e..76e0456 100644 --- a/assets/app.js +++ b/assets/app.js @@ -4,37 +4,40 @@ $(function() { function refreshNodes() { $("#nodeTable tr[data-node]").each(function(){ - var $this = $(this); - var node = $this.data("node"); - $.getJSON("/status/"+node, function (data) { - $this.find("span.loading").hide(); - var label; - if (data["Status"] === "UP") { - label = "label-success"; - $this.addClass("success"); - $this.find("td.ping").text(data["Ping"] + "ms"); - } else if (data["Status"] === "SLOW") { - label = "label-warning"; - $this.addClass("warning"); - $this.find("td.ping").text(data["Ping"] + "ms"); - } else { - label = "label-danger"; - $this.addClass("danger"); - } - if (data["Domain"] === "devkid-nas.vpn") { - setNasWakeUpLink($this, data); - } - $this.find("span.status").addClass(label).text(data["Status"]); - }) + refreshNode($(this)); }); } -function setNasWakeUpLink($row, data) { - var $nasStatus = $row.find("#nasStatus"); +function refreshNode($node) { + var node = $node.data("node"); + $.getJSON("/status/"+node, function (data) { + $node.find("span.loading").hide(); + var label; + if (data["Status"] === "UP") { + label = "label-success"; + $node.addClass("success"); + $node.find("td.ping").text(data["Ping"] + "ms"); + } else if (data["Status"] === "SLOW") { + label = "label-warning"; + $node.addClass("warning"); + $node.find("td.ping").text(data["Ping"] + "ms"); + } else { + label = "label-danger"; + $node.addClass("danger"); + } + if (data["Domain"] === "devkid-nas.vpn") { + setNasWakeUpLink($node, data); + } + $node.find("span.status-text").addClass(label).text(data["Status"]); + }) +} + +function setNasWakeUpLink($node, data) { + var $nasStatus = $node.find("#nasStatus"); if ($nasStatus.length == 0){ var ele = 'Wake up NAS' - $row.find(".host").append(ele); - $nasStatus = $row.find("#nasStatus") + $node.find(".host").append(ele); + $nasStatus = $node.find("#nasStatus") } if (data["Status"] == "DOWN") { $nasStatus.show(); diff --git a/html/index.html b/html/index.html index ef80076..3c5845a 100644 --- a/html/index.html +++ b/html/index.html @@ -1,16 +1,17 @@ - {{.Title}} - - - - - - - + {{.Title}} + + + + + + + +
{{.Title}}
@@ -21,17 +22,19 @@ Ping {{range $node := .Nodes}} - - {{$node}} - - Loading... - - - - - - - + + {{$node}} + + Loading... + + + + - + + {{end}}
+ Show Network Graph +
diff --git a/server.go b/server.go index 1afcca9..f147099 100644 --- a/server.go +++ b/server.go @@ -4,8 +4,8 @@ import ( "fmt" "net/http" "html/template" - "os/exec" "os" + "os/exec" "regexp" "strconv" "bytes" @@ -106,6 +106,6 @@ func main() { http.HandleFunc("/status/", statusHandler) http.Handle("/assets/", http.StripPrefix("/assets", http.FileServer(http.Dir("./assets/")))) http.HandleFunc("/", indexHandler) - fmt.Printf("Running on http://0.0.0.0:8080\n"); + fmt.Printf("Running on http://0.0.0.0:8080\n") http.ListenAndServe(":8080", nil) }