From 4003fc212eeef0eb9591e9fcfc531601ce8a3281 Mon Sep 17 00:00:00 2001
From: Daniel Aberger <da@ixab.de>
Date: Thu, 2 Feb 2017 17:52:09 +0100
Subject: [PATCH] Web UI corrections

---
 templates/header.html |  2 +-
 templates/item.html   |  2 +-
 webserver.go          | 22 +++++++++-------------
 3 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/templates/header.html b/templates/header.html
index e4b7fce..d71c14d 100644
--- a/templates/header.html
+++ b/templates/header.html
@@ -22,7 +22,7 @@
             background-color: #f2f2f2;
         }
     </style>
-    <link href="static/css/main.css" rel="stylesheet">
+     <link href="static/css/main.css" rel="stylesheet">
     <!-- These two are what you want to use by default -->
     <link rel="apple-touch-icon" href="static/icon.png">
     <link rel="apple-touch-icon-precomposed" href="static/icon.png">
diff --git a/templates/item.html b/templates/item.html
index f696334..946b847 100644
--- a/templates/item.html
+++ b/templates/item.html
@@ -1 +1 @@
-<div class="col-sm-3 text-center"><div class="sounditem" style="background-image: linear-gradient(rgba(255,255,255,0.8),rgba(255,255,255,0.8)), url(/static/img/{{ .Itemprefix }}.jpg); background-size: 100%;"><div data-toggle="tooltip" data-placement="top" title="{{ .Itemtext }}">{{ .Itemcommand }} {{ .Itemsoundname }}<br/>{{ .Itemshorttext }}<br/><a class="btn btn-primary" href="javascript:playSound('{{ .Itemcommand }}', '{{ .Itemsoundname }}')" role="button">Play!</a><br/></div></div></div>
+<div class="col-sm-3 text-center"><div class="sounditem"><div data-toggle="tooltip" data-placement="top" title="{{ .Itemtext }}">{{ .Itemcommand }} {{ .Itemsoundname }}<br/>{{ .Itemshorttext }}<br/><a class="btn btn-primary" href="javascript:playSound('{{ .Itemcommand }}', '{{ .Itemsoundname }}')" role="button">Play!</a><br/></div></div></div>
diff --git a/webserver.go b/webserver.go
index 6af37ac..6854871 100644
--- a/webserver.go
+++ b/webserver.go
@@ -142,15 +142,21 @@ func handleMain(w http.ResponseWriter, r *http.Request) {
 		}
 
 		var currentPrefix string = ""
-		var prefixChanged bool = false
-		for i, snd := range si {
+		var i int = 0
+		for _, snd := range si {
 			if snd.Itemprefix != currentPrefix {
 				if i != 0 {
+					err = tmpls["itemrowend.html"].Execute(w, nil)
+					if err != nil {
+						fmt.Println(err)
+						return
+					}
 					err = tmpls["collwrapend.html"].Execute(w, nil)
 					if err != nil {
 						fmt.Println(err)
 						return
 					}
+					i = 0
 				}
 				err = tmpls["collwrapstart.html"].Execute(w, snd)
 				if err != nil {
@@ -158,9 +164,6 @@ func handleMain(w http.ResponseWriter, r *http.Request) {
 					return
 				}
 				currentPrefix = snd.Itemprefix
-				if i != 0 {
-					prefixChanged = true
-				}
 			}
 			if i%4 == 0 {
 				err = tmpls["itemrowstart.html"].Execute(w, nil)
@@ -181,14 +184,7 @@ func handleMain(w http.ResponseWriter, r *http.Request) {
 					return
 				}
 			}
-			if prefixChanged {
-				err = tmpls["collwrapend.html"].Execute(w, nil)
-				if err != nil {
-					fmt.Println(err)
-					return
-				}
-				prefixChanged = false
-			}
+			i++
 		}
 
 		err = tmpls["internal.html"].ExecuteTemplate(w, "footer", map[string]interface{}{})