From 6ba418c9b2fd02b2f784c20f83bd040585689c5f Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Thu, 22 Oct 2020 13:03:50 -0400
Subject: Generalize sidebar categorization logic

---
 themes/alps/mailbox.html | 21 ++-------------------
 1 file changed, 2 insertions(+), 19 deletions(-)

(limited to 'themes/alps/mailbox.html')

diff --git a/themes/alps/mailbox.html b/themes/alps/mailbox.html
index e09f2b7..fca34ba 100644
--- a/themes/alps/mailbox.html
+++ b/themes/alps/mailbox.html
@@ -1,5 +1,6 @@
 {{template "head.html" .}}
 {{template "nav.html" .}}
+{{template "util.html" .}}
 
 {{ define "mbox-link" }}
 {{ if not (.HasAttr "\\Noselect") }}
@@ -21,25 +22,7 @@
 {{ end }}
 
 <div class="page-wrap">
-  <aside>
-    <!-- the logo image, dimensions 200x32 may be present or not -->
-    <a href="/compose" class="new">Compose&nbsp;Mail</a>
-    {{ with .CategorizedMailboxes }}
-    {{ with .Common.Inbox }}{{ template "mbox-link" . }}{{ end}}
-    {{ with .Common.Drafts }}{{ template "mbox-link" . }}{{ end}}
-    {{ with .Common.Sent }}{{ template "mbox-link" . }}{{ end}}
-    {{ with .Common.Junk }}{{ template "mbox-link" . }}{{ end}}
-    {{ with .Common.Trash }}{{ template "mbox-link" . }}{{ end}}
-    {{ with .Common.Archive }}{{ template "mbox-link" . }}{{ end}}
-    {{ if .Additional }}
-    <hr />
-    {{ range .Additional }}
-    {{ template "mbox-link" . }}
-    {{ end }}
-    {{ end }}
-    {{ end }}
-  </aside>
-
+  {{ template "aside" . }}
   <div class="container">
     <form id="messages-form" method="post"></form>
     <main class="message-list">
-- 
cgit v1.2.3