From 73d6101f5a73d7499544eb7399bcc90acff53dea Mon Sep 17 00:00:00 2001
From: Camil Staps
Date: Wed, 23 Jun 2021 09:02:52 +0200
Subject: Simplify layout-sidebar

---
 resources/pug/include/layout-ham.pug     |  4 ++--
 resources/pug/include/layout-sidebar.pug | 12 ++++--------
 2 files changed, 6 insertions(+), 10 deletions(-)

(limited to 'resources/pug/include')

diff --git a/resources/pug/include/layout-ham.pug b/resources/pug/include/layout-ham.pug
index 64199b7..1958c78 100644
--- a/resources/pug/include/layout-ham.pug
+++ b/resources/pug/include/layout-ham.pug
@@ -5,5 +5,5 @@ block title
 
 block append menu
 	- var base_url = '/ham/'
-	+menuItem('home' == page, base_url, 'Home')
-	+menuItem('cw-decoder' == page, base_url + 'cw-decoder.html', 'CW Decoder')
+	+menuItem('', 'Home')
+	+menuItem('cw-decoder', 'CW Decoder')
diff --git a/resources/pug/include/layout-sidebar.pug b/resources/pug/include/layout-sidebar.pug
index 3d87689..75a5f12 100644
--- a/resources/pug/include/layout-sidebar.pug
+++ b/resources/pug/include/layout-sidebar.pug
@@ -1,21 +1,17 @@
 extends layout.pug
 
-block append titleHeading
-	|  – 
-	block subtitle
-
 block content
 	div.row
 		div.col-lg-3.col-md-4
 			ul.nav.nav-pills.nav-stacked
 				block menu
-					mixin menuItem(active, link, text)
-						li(role='presentation', class=active ? 'active' : '')
-							a(href=link)= text
 
+					mixin menuItem(link, text)
+						li(role='presentation', class=(page == link) ? 'active' : '')
+							a(href=base_url + (link == '' ? '' : link + '.html'))= text
 
 		div.col-lg-7.col-md-6
-			h3(style={'margin-top': 0})
+			h3
 				block subtitle
 				|  
 				small
-- 
cgit v1.2.3