From 221fe5454587ec683e4ed8c840bec22f76cc9ae9 Mon Sep 17 00:00:00 2001 From: Jan Eitzinger Date: Thu, 3 Feb 2022 07:25:02 +0100 Subject: [PATCH] Fix block overwrite issue for navbar --- templates/base.tmpl | 44 ++++++++++++++++++++++---------------------- templates/login.tmpl | 3 ++- 2 files changed, 24 insertions(+), 23 deletions(-) diff --git a/templates/base.tmpl b/templates/base.tmpl index 7a38de9..738a42f 100644 --- a/templates/base.tmpl +++ b/templates/base.tmpl @@ -69,28 +69,28 @@ {{end}} {{end}} - {{end}} - {{if .Infos.username }} -
- -
- {{if .Infos.admin }} - - {{else}} - - {{end}} - -
-
+ {{if .Infos.username }} +
+ +
+ {{if .Infos.admin }} + + {{else}} + + {{end}} + +
+
+ {{end}} {{end}} diff --git a/templates/login.tmpl b/templates/login.tmpl index bcd2462..796bb78 100644 --- a/templates/login.tmpl +++ b/templates/login.tmpl @@ -1,4 +1,5 @@ {{define "navigation"}} + {{""}} {{end}} {{define "content"}} @@ -32,7 +33,7 @@ - +