From 7b0dc01feedbb373a98d29d75e1f4294ccd5f2ad Mon Sep 17 00:00:00 2001
From: Helmut Merz <helmutm@cy55.de>
Date: Sat, 8 Jan 2022 17:41:17 +0100
Subject: [PATCH] code improvements

---
 layouts/partials/sidebar.html | 7 +++----
 layouts/shortcodes/ilink.html | 3 +--
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/layouts/partials/sidebar.html b/layouts/partials/sidebar.html
index 4006955..d4e83cd 100644
--- a/layouts/partials/sidebar.html
+++ b/layouts/partials/sidebar.html
@@ -20,19 +20,18 @@
     </div>
     {{- end }}
 
-    {{- $site := .Site -}}
     {{ with .Params.Topics -}}
     <div class="card mt-3">
       <div class="card-header">
         <h4 class="card-text">{{i18n "topics"}}</h4>
       </div>
       <div class="card-body">
-          {{ range . -}}
-          {{- $page := $site.GetPage (printf "/topics/%s" .) -}}
+        {{ range . -}}
+          {{- $page := $.GetPage (printf "/topics/%s" .) -}}
           <span class="badge rounded-pill bg-secondary m-1">
             <a href="{{ $page.Permalink }}">{{ $page.Title }}</a>
           </span>
-          {{- end }}
+        {{- end }}
       </div>
     </div>
     {{- end }}
diff --git a/layouts/shortcodes/ilink.html b/layouts/shortcodes/ilink.html
index 9503b36..6ba734a 100644
--- a/layouts/shortcodes/ilink.html
+++ b/layouts/shortcodes/ilink.html
@@ -2,8 +2,7 @@
 {{- $pid := or (.Get "pid") (.Get "pageid") -}}
 {{- $pages := where .Site.RegularPages "Params.pageid" "eq" $pid -}}
 {{- $frag := .Get "id" -}}
-{{- $fragsep := "" -}}
-{{- if ne $frag "" -}}{{- $fragsep = "#" -}}{{- end -}}
+{{- $fragsep := cond (eq $frag "") "" "#" -}}
 {{- $inner := .Inner -}}
 {{- range $pages -}}
   {{- $url := printf "%s%s%s" .Permalink $fragsep $frag -}}