From: XhmikosR <xhmikosr@gmail.com>
Date: Fri, 17 Apr 2020 16:47:19 +0000 (+0300)
Subject: Improve docs-sidebar.html (#30567)
X-Git-Tag: v5.0.0-alpha1~222
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d2325b65c88a27568accf606442c9d1d2204c05b;p=thirdparty%2Fbootstrap.git

Improve docs-sidebar.html (#30567)

Reduce the output HTML
---

diff --git a/site/layouts/partials/docs-sidebar.html b/site/layouts/partials/docs-sidebar.html
index 9af562340d..23e9bbad36 100644
--- a/site/layouts/partials/docs-sidebar.html
+++ b/site/layouts/partials/docs-sidebar.html
@@ -13,22 +13,20 @@
     {{- end -}}
 
     {{- $group_slug := $group.title | urlize -}}
-    {{- $active_group := eq $.Page.Params.group $group_slug }}
+    {{- $is_active_group := eq $.Page.Params.group $group_slug }}
 
-    <li class="my-1{{ if $active_group }} active{{ end }}">
-      <a class="{{ if not $active_group }} collapsed{{ end }}" data-toggle="collapse" href="#{{ $group_slug }}-collapse" role="button" aria-expanded="{{ $active_group }}"{{ if $active_group }} aria-current="true"{{ end }}>
+    <li class="my-1{{ if $is_active_group }} active{{ end }}">
+      <a class="{{ if not $is_active_group }}collapsed{{ end }}" data-toggle="collapse" href="#{{ $group_slug }}-collapse" role="button" aria-expanded="{{ $is_active_group }}"{{ if $is_active_group }} aria-current="true"{{ end }}>
         {{ $group.title }}
       </a>
 
       {{- if $group.pages }}
-      <ul class="list-unstyled mb-2 collapse{{ if $active_group }} show{{ end }}" id="{{ $group_slug }}-collapse">
+      <ul class="list-unstyled mb-2 collapse{{ if $is_active_group }} show{{ end }}" id="{{ $group_slug }}-collapse">
         {{- range $doc := $group.pages -}}
-          {{- $doc_slug := $doc.title | urlize }}
-          <li>
-            <a href="/docs/{{ $.Site.Params.docs_version }}/{{ $group_slug }}/{{ $doc_slug }}/"{{ if and $active_group (eq $page_slug $doc_slug) }} class="active" aria-current="page"{{ end }}>
-              {{- $doc.title -}}
-            </a>
-          </li>
+          {{- $doc_slug := $doc.title | urlize -}}
+          {{- $is_active := and $is_active_group (eq $page_slug $doc_slug) -}}
+          {{- $href := printf "/docs/%s/%s/%s/" $.Site.Params.docs_version $group_slug $doc_slug }}
+          <li><a href="{{ $href }}"{{ if $is_active }} class="active" aria-current="page"{{ end }}>{{ $doc.title }}</a></li>
         {{- end }}
       </ul>
       {{- end }}