Merge branch 'dev' into feature/blog

that was FAR LESS PAINFUL!

templates/html/music-gateway.html

@@ -83,9 +83,9 @@
 
                 {{else if .IsSingle}}
 
-                {{$Track := index .Tracks 0}}
-                {{if $Track.Description}}
-                <p id="description">{{$Track.Description}}</p>
+                {{index .Tracks 0}}
+                {{if .Description}}
+                <p id="description">{{.Description}}</p>
                 {{end}}
 
                 {{end}}
@@ -132,18 +132,18 @@
             {{else if .Tracks}}
             <div id="tracks">
                 <h2>TRACKS</h2>
-                {{range $i, $track := .Tracks}}
+                {{range .Tracks}}
                 <details>
-                    <summary class="album-track-title">{{add $i 1}}. {{$track.Title}}</summary>
+                    <summary class="album-track-title">{{.Number}}. {{.Title}}</summary>
 
-                    {{if $track.Description}}
+                    {{if .Description}}
                     <p class="album-track-subheading">DESCRIPTION</p>
-                    {{$track.Description}}
+                    {{.Description}}
                     {{end}}
 
                     <p class="album-track-subheading">LYRICS</p>
-                    {{if $track.Lyrics}}
-                    {{$track.GetLyricsHTML}}
+                    {{if .Lyrics}}
+                    {{.GetLyricsHTML}}
                     {{else}}
                     <span class="empty">No lyrics.</span>
                     {{end}}

templates/templates.go

@@ -28,11 +28,7 @@ var blogHTML string
 var blogPostHTML string
 
 var BaseTemplate = template.Must(
-    template.New("base").Funcs(
-        template.FuncMap{
-            "add": func (a int, b int) int { return a + b },
-        },
-    ).Parse(strings.Join([]string{
+    template.New("base").Parse(strings.Join([]string{
         layoutHTML,
         headerHTML,
         footerHTML,