From 71ac199935aca58cc41feec03d5d94fed8e20a9c Mon Sep 17 00:00:00 2001
From: Ted Unangst <tedu@tedunangst.com>
Date: Tue, 24 Sep 2019 13:52:06 -0400
Subject: [PATCH] add combos list to menu

---
 views/header.html | 7 ++++++-
 views/style.css   | 6 +++---
 web.go            | 6 +++++-
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/views/header.html b/views/header.html
index e6298f9..71022e1 100644
--- a/views/header.html
+++ b/views/header.html
@@ -22,7 +22,12 @@
 <ul>
 <li><a href="/{{ .UserSep }}/{{ .UserInfo.Username }}">{{ .UserInfo.Username }}</a>
 <li><a href="/honkers">honkers</a>
-<li><a href="/c">combos</a>
+<li>combos
+<ul>
+{{ range .Combos }}
+<li><a href="/c/{{ . }}">{{ . }}</a>
+{{ end }}
+</ul>
 <li><a href="/o">tags</a>
 <li><a href="/about">about</a>
 <li><a href="/front">front</a>
diff --git a/views/style.css b/views/style.css
index ac5ec76..164aef2 100644
--- a/views/style.css
+++ b/views/style.css
@@ -51,18 +51,18 @@ body > header p {
 body > header span {
 	margin-left: 2em;
 }
-header details {
+header > details {
 	background: $bg-page;
 	padding: 1em;
 	position: fixed;
 	top: 0;
 	display: inline;
 }
-header details[open] {
+header > details[open] {
 	background: $bg-dark;
 	border: 1px solid $fg;
 }
-header details li {
+header > details li {
 	margin: 1em 0em 1em 0em;
 }
 main {
diff --git a/web.go b/web.go
index f50bf5f..e6e4a1f 100644
--- a/web.go
+++ b/web.go
@@ -70,6 +70,11 @@ func getInfo(r *http.Request) map[string]interface{} {
 	templinfo["IconName"] = iconName
 	templinfo["UserInfo"] = u
 	templinfo["UserSep"] = userSep
+	if u != nil {
+		var combos []string
+		combocache.Get(u.UserID, &combos)
+		templinfo["Combos"] = combos
+	}
 	return templinfo
 }
 
@@ -1101,7 +1106,6 @@ func showcombos(w http.ResponseWriter, r *http.Request) {
 	var combos []string
 	combocache.Get(userinfo.UserID, &combos)
 	templinfo := getInfo(r)
-	templinfo["Combos"] = combos
 	err := readviews.Execute(w, "combos.html", templinfo)
 	if err != nil {
 		log.Print(err)