From b544a0d0029ea648afaa7c9670854fa9c1289554 Mon Sep 17 00:00:00 2001 From: Patrice Chalin Date: Sat, 2 Aug 2025 15:40:54 -0400 Subject: [PATCH 1/6] Always show lang menu in navbar --- assets/scss/_nav.scss | 53 +++++++++++++++++---- layouts/_partials/navbar-lang-selector.html | 35 +++++++++++--- layouts/_partials/navbar.html | 4 +- layouts/_partials/theme-toggler.html | 16 +++---- 4 files changed, 83 insertions(+), 25 deletions(-) diff --git a/assets/scss/_nav.scss b/assets/scss/_nav.scss index 3986ee8b22..1c4264e015 100644 --- a/assets/scss/_nav.scss +++ b/assets/scss/_nav.scss @@ -46,7 +46,7 @@ } .navbar-nav { - padding-top: $spacer * 0.5; + // padding-top: $spacer * 0.5; white-space: nowrap; } @@ -69,10 +69,6 @@ .nav-item { padding-inline-end: $spacer * 0.5; } - - .navbar-nav { - padding-top: 0 !important; - } } @include media-breakpoint-down(lg) { @@ -88,12 +84,17 @@ } .navbar-nav { - padding-bottom: 2rem; + // padding-bottom: 2rem; overflow-x: auto; } } .td-light-dark-menu { + position: unset !important; + display: flex; + align-items: center; + justify-content: center; + .bi { // Adapted from: https://github.com/twbs/bootstrap/blob/main/site/layouts/_default/examples.html width: 1em; @@ -101,12 +102,48 @@ vertical-align: -.125em; fill: currentcolor; } + } + + .td-lang-menu { + position: unset !important; + display: flex; + align-items: center; + justify-content: center; + + &__title { + padding-left: 0; + padding-right: 0; + + &::before { + font: var(--fa-font-solid); + content: fa-content($fa-var-globe); + padding-right: 0.5rem; + } - &.dropdown { @include media-breakpoint-down(lg) { - position: unset; + &-text { + display: none; + } + &::before { + padding-right: 0; + } + } + } + + .dropdown-item { + position: relative; + padding-left: 2.5rem; + + &.active::before { + font: var(--fa-font-solid); + content: fa-content($fa-var-check); + position: absolute; + left: 0.75rem; + top: 50%; + transform: translateY(-50%); } } + } } diff --git a/layouts/_partials/navbar-lang-selector.html b/layouts/_partials/navbar-lang-selector.html index 37ccc1139b..5c0f812cd8 100644 --- a/layouts/_partials/navbar-lang-selector.html +++ b/layouts/_partials/navbar-lang-selector.html @@ -1,12 +1,33 @@ {{/* Link directly to documentation etc., if possible. */ -}} {{ $langPage := cond (gt (len .Translations) 0) . .Site.Home -}} -
-
+ + {{ $allPages := slice . }} + {{ if .Translations }} + {{ $allPages = $allPages | append .Translations }} + {{ end }} + + {{ range $.Site.Languages }} + {{ $translatedPages := where $allPages "Language.Lang" .Lang -}} + {{ $translated := "" -}} + {{ if gt (len $translatedPages) 0 -}} + {{ $translated = index $translatedPages 0 -}} + {{- end -}} + {{ $isActive := eq $.Site.Language.Lang .Lang -}} +
  • + {{ if $isActive }} + {{ .LanguageName }} + {{ else if $translated }} + {{ .LanguageName }} + {{ else }} + {{ .LanguageName }} + {{ end }} +
    • + {{ end }} +
    \ No newline at end of file diff --git a/layouts/_partials/navbar.html b/layouts/_partials/navbar.html index 3ac3a365d8..c409b189b0 100644 --- a/layouts/_partials/navbar.html +++ b/layouts/_partials/navbar.html @@ -53,12 +53,12 @@ {{ end -}} {{ if (gt (len .Site.Home.Translations) 0) -}} -
  • +
  • {{ partial "navbar-lang-selector.html" . -}}
    • {{ end -}} {{ if .Site.Params.ui.showLightDarkModeMenu -}} -
  • +
  • {{ partial "theme-toggler" . }}
    • {{ end -}} diff --git a/layouts/_partials/theme-toggler.html b/layouts/_partials/theme-toggler.html index f954f8bf50..b19ec2e424 100644 --- a/layouts/_partials/theme-toggler.html +++ b/layouts/_partials/theme-toggler.html @@ -1,4 +1,6 @@ -{{/* Adapted from: https://github.com/twbs/bootstrap/blob/main/site/layouts/partials/icons.html */ -}} +
    + +{{- /* Adapted from: https://github.com/twbs/bootstrap/blob/main/site/layouts/partials/icons.html */ -}} @@ -16,25 +18,21 @@ -{{/* Adapted from: https://github.com/twbs/bootstrap/blob/main/site/layouts/partials/theme-toggler.html */ -}} +{{- /* Adapted from: https://github.com/twbs/bootstrap/blob/main/site/layouts/partials/theme-toggler.html */ -}} {{ $isExamples := eq .Layout "examples" -}} - -
      +
      +
    +{{/* */ -}} From a08c22e3648c51a52685afb323915f32b619ebee Mon Sep 17 00:00:00 2001 From: Patrice Chalin Date: Sat, 2 Aug 2025 15:45:49 -0400 Subject: [PATCH 2/6] Set up placeholder language --- layouts/_partials/head.html | 2 +- userguide/hugo.yaml | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/layouts/_partials/head.html b/layouts/_partials/head.html index d25e217128..04a55e6f8f 100644 --- a/layouts/_partials/head.html +++ b/layouts/_partials/head.html @@ -6,7 +6,7 @@ {{ end -}} {{ $outputFormat := partial "outputformat.html" . -}} -{{ if and hugo.IsProduction (ne $outputFormat "print") -}} +{{ if and hugo.IsProduction (ne $outputFormat "print") (ne .Site.Language.Lang "xx") -}} {{ else -}} diff --git a/userguide/hugo.yaml b/userguide/hugo.yaml index 1fce1b6856..f0d4d2e414 100644 --- a/userguide/hugo.yaml +++ b/userguide/hugo.yaml @@ -31,6 +31,11 @@ languages: languageName: English params: description: Docsy does docs + # Placeholder language used to demo multilingual support + xx: + languageName: Placeholder + params: + description: Docsy does multilingual docs markup: tableOfContents: @@ -147,5 +152,9 @@ module: target: content/project/changelog.md - source: ../CONTRIBUTING.md target: content/project/contributing.md + # Placeholder language used to demo multilingual support + - source: content/en + target: content + lang: xx # cSpell:ignore docsy github goldmark markmap plantuml readingtime userguide From 626749e098b90df9879cb38dfa39b76bfb7bd967 Mon Sep 17 00:00:00 2001 From: Patrice Chalin Date: Sat, 2 Aug 2025 15:55:28 -0400 Subject: [PATCH 3/6] On mobile use language code as menu title --- assets/scss/_nav.scss | 7 +++++++ layouts/_partials/navbar-lang-selector.html | 1 + 2 files changed, 8 insertions(+) diff --git a/assets/scss/_nav.scss b/assets/scss/_nav.scss index 1c4264e015..f1b7bf5418 100644 --- a/assets/scss/_nav.scss +++ b/assets/scss/_nav.scss @@ -120,10 +120,17 @@ padding-right: 0.5rem; } + &-code { + display: none; + } + @include media-breakpoint-down(lg) { &-text { display: none; } + &-code { + display: inline; + } &::before { padding-right: 0; } diff --git a/layouts/_partials/navbar-lang-selector.html b/layouts/_partials/navbar-lang-selector.html index 5c0f812cd8..6c4e2f9729 100644 --- a/layouts/_partials/navbar-lang-selector.html +++ b/layouts/_partials/navbar-lang-selector.html @@ -4,6 +4,7 @@ {{ $allPages := slice . }} From 8966ec0dd611472e5723595b8eb4b16ff5007f34 Mon Sep 17 00:00:00 2001 From: Patrice Chalin Date: Sat, 2 Aug 2025 16:24:55 -0400 Subject: [PATCH 4/6] Whitespace cleanup & don't link check placeholder pages --- layouts/_partials/navbar-lang-selector.html | 23 +++++++++++---------- layouts/_partials/theme-toggler.html | 3 ++- userguide/.htmltest.yml | 2 ++ userguide/static/refcache.json | 4 ++++ 4 files changed, 20 insertions(+), 12 deletions(-) diff --git a/layouts/_partials/navbar-lang-selector.html b/layouts/_partials/navbar-lang-selector.html index 6c4e2f9729..bf1ba44625 100644 --- a/layouts/_partials/navbar-lang-selector.html +++ b/layouts/_partials/navbar-lang-selector.html @@ -6,14 +6,15 @@ {{ $langPage.Language.LanguageName }} {{ $langPage.Language.Lang | upper }} - - {{ $allPages := slice . }} - {{ if .Translations }} - {{ $allPages = $allPages | append .Translations }} - {{ end }} + {{/* */ -}} + + {{ $allPages := slice . -}} + {{ if .Translations -}} + {{ $allPages = $allPages | append .Translations -}} + {{ end -}}
      - {{ range $.Site.Languages }} + {{ range $.Site.Languages -}} {{ $translatedPages := where $allPages "Language.Lang" .Lang -}} {{ $translated := "" -}} {{ if gt (len $translatedPages) 0 -}} @@ -21,14 +22,14 @@ {{- end -}} {{ $isActive := eq $.Site.Language.Lang .Lang -}}
    • - {{ if $isActive }} + {{- if $isActive -}} {{ .LanguageName }} - {{ else if $translated }} + {{- else if $translated -}} {{ .LanguageName }} - {{ else }} + {{- else -}} {{ .LanguageName }} - {{ end }} + {{- end -}}
      • - {{ end }} + {{- end }}
    \ No newline at end of file diff --git a/layouts/_partials/theme-toggler.html b/layouts/_partials/theme-toggler.html index b19ec2e424..b102f1752b 100644 --- a/layouts/_partials/theme-toggler.html +++ b/layouts/_partials/theme-toggler.html @@ -17,8 +17,9 @@ +{{/* */ -}} -{{- /* Adapted from: https://github.com/twbs/bootstrap/blob/main/site/layouts/partials/theme-toggler.html */ -}} +{{/* Adapted from: https://github.com/twbs/bootstrap/blob/main/site/layouts/partials/theme-toggler.html */ -}} {{ $isExamples := eq .Layout "examples" -}}