Unverified Commit eb719c36 authored by James Elliott's avatar James Elliott
Browse files

fix(layouts): use the permalink instead of url

parent 29428c69

layouts/partials/sidebar/auto-default-menu.html

+4 −4
Original line number Diff line number Diff line
@@ -18,18 +18,18 @@ 
                <ul class="list-unstyled ms-3">

                  {{ range .Pages }}

                    {{ $active := in $currentPage.RelPermalink .RelPermalink }}

                    <li><a class="docs-link{{ if $active }} active{{ end }}" href="{{ .URL | relURL }}">{{ .Name }}</a></li>

                    <li><a class="docs-link{{ if $active }} active{{ end }}" href="{{ .Permalink }}">{{ .Name }}</a></li>

                  {{ end }}

                </ul>

              {{ else }}

                {{ $active := in $currentPage.RelPermalink .RelPermalink }}

                <li><a class="docs-link{{ if $active }} active{{ end }}" href="{{ .URL | relURL }}">{{ .Name }}</a></li>

                <li><a class="docs-link{{ if $active }} active{{ end }}" href="{{ .Permalink }}">{{ .Name }}</a></li>

              {{ end }}

            {{ end }}

          </ul>

        {{ else }}

          {{ $active := in $currentPage.RelPermalink .RelPermalink }}

          <li><a class="docs-link{{ if $active }} active{{ end }}" href="{{ .URL | relURL }}">{{ .Name }}</a></li>

          <li><a class="docs-link{{ if $active }} active{{ end }}" href="{{ .Permalink }}">{{ .Name }}</a></li>

        {{ end }}

      {{ end }}

    </ul>

layouts/partials/sidebar/manual-collapsible-menu.html

+4 −4
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
                                  {{ range .Children -}}

                                    {{- $active := or ($currentPage.IsMenuCurrent $section .) ($currentPage.HasMenuCurrent $section .) -}}

                                    {{- $active = or $active (eq $currentPage.Section .Identifier) -}}

                                    <li><a class="docs-link rounded{{ if $active }} active{{ end }}" href="{{ .URL | relURL }}">{{ .Name }}</a></li>

                                    <li><a class="docs-link rounded{{ if $active }} active{{ end }}" href="{{ .Permalink }}">{{ .Name }}</a></li>

                                  {{ end -}}

                                  </ul>

                                </div>
@@ -42,7 +42,7 @@ 
                          {{ else -}}

                            {{- $active := or ($currentPage.IsMenuCurrent $section .) ($currentPage.HasMenuCurrent $section .) -}}

                            {{- $active = or $active (eq $currentPage.Section .Identifier) -}}

                            <li><a class="docs-link rounded{{ if $active }} active{{ end }}" href="{{ .URL | relURL }}">{{ .Name }}</a></li>

                            <li><a class="docs-link rounded{{ if $active }} active{{ end }}" href="{{ .Permalink }}">{{ .Name }}</a></li>

                          {{ end -}}

                        {{ end -}}

                      </ul>
@@ -52,7 +52,7 @@ 
              {{ else -}}

                {{- $active := or ($currentPage.IsMenuCurrent $section .) ($currentPage.HasMenuCurrent $section .) -}}

                {{- $active = or $active (eq $currentPage.Section .Identifier) -}}

                <li><a class="docs-link rounded{{ if $active }} active{{ end }}" href="{{ .URL | relURL }}">{{ .Name }}</a></li>

                <li><a class="docs-link rounded{{ if $active }} active{{ end }}" href="{{ .Permalink }}">{{ .Name }}</a></li>

              {{ end -}}

            {{ end -}}

          </ul>

layouts/partials/sidebar/manual-default-menu.html

+4 −4
Original line number Diff line number Diff line
@@ -18,14 +18,14 @@ 
                      {{ range .Children -}}

                        {{- $active := or ($currentPage.IsMenuCurrent $section .) ($currentPage.HasMenuCurrent $section .) -}}

                        {{- $active = or $active (eq $currentPage.Section .Identifier) -}}

                        <li><a class="docs-link{{ if $active }} active{{ end }}" href="{{ .URL | relURL }}">{{ .Name }}</a></li>

                        <li><a class="docs-link{{ if $active }} active{{ end }}" href="{{ .Permalink }}">{{ .Name }}</a></li>

                      {{ end -}}

                    </ul>

                  {{ end -}}

                {{ else -}}

                  {{- $active := or ($currentPage.IsMenuCurrent $section .) ($currentPage.HasMenuCurrent $section .) -}}

                  {{- $active = or $active (eq $currentPage.Section .Identifier) -}}

                  <li><a class="docs-link{{ if $active }} active{{ end }}" href="{{ .URL | relURL }}">{{ .Name }}</a></li>

                  <li><a class="docs-link{{ if $active }} active{{ end }}" href="{{ .Permalink }}">{{ .Name }}</a></li>

                {{ end -}}

              {{ end -}}

            </ul>
@@ -33,7 +33,7 @@ 
        {{ else -}}

          {{- $active := or ($currentPage.IsMenuCurrent $section .) ($currentPage.HasMenuCurrent $section .) -}}

          {{- $active = or $active (eq $currentPage.Section .Identifier) -}}

          <li><a class="docs-link{{ if $active }} active{{ end }}" href="{{ .URL | relURL }}">{{ .Name }}</a></li>

          <li><a class="docs-link{{ if $active }} active{{ end }}" href="{{ .Permalink }}">{{ .Name }}</a></li>

        {{ end -}}

      {{ end -}}

    </ul>