wip

2 files changed, 52 insertions, 45 deletions

diff --git a/layouts/partials/header.nav.google.translate.html b/layouts/partials/header.nav.google.translate.html
index 6f2f227..381ec89 100644
--- a/layouts/partials/header.nav.google.translate.html
+++ b/layouts/partials/header.nav.google.translate.html
@@ -1,13 +1,18 @@
 {{- if or $.Site.Params.debug (findRE `\bhtml-comment\b` $.Site.Params.traceFlags) }}
   {{ `<!-- partials/header.nav.google.translate.html -->` | safeHTML }}
 {{- end}}
+{{/*
 <span class="w3-bar-item w3-right" id="google_translate_element"></span>
+*/}}
+
+<div class="w3-bar-item w3-right" id="google_translate_element"></div>
 <script>
   function googleTranslateElementInit() {
     new google.translate.TranslateElement(
       {
           pageLanguage: '{{ .Site.LanguageCode }}'
-        , layout: google.translate.TranslateElement.FloatPosition.TOP_RIGHT
+        // , layout: google.translate.TranslateElement.FloatPosition.TOP_RIGHT
+        , layout: google.translate.TranslateElement.InlineLayout.SIMPLE
         , includedLanguages: 'de,en,fr'
         //, includedLanguages: 'en,fr,da,ms,zh-CN'
         , multilanguagePage: true
diff --git a/layouts/partials/header.nav.html b/layouts/partials/header.nav.html
index eda0a5d..f512ba4 100644
--- a/layouts/partials/header.nav.html
+++ b/layouts/partials/header.nav.html
@@ -38,20 +38,20 @@
   {{- template `header-nav-entry` . }}
 
   {{- if .Site.Menus.topbar }}
-  {{- if $.Site.Params.menutopbar.socialEnable }}
-    {{- if or $.Site.Params.debug (findRE `\bhtml-comment\b` $.Site.Params.traceFlags) }}
-      {{ `<!-- range .Site.Menus.topbar.ByWeight -->` | safeHTML }}
-    {{- end}}
-    {{- range .Site.Menus.topbar.ByWeight }}
-  <a href='{{ .URL }}' target="_blank" class="w3-bar-item w3-button w3-right" ><i class='{{ .Pre }}'></i></a>
-    {{- end }}
-  {{- end }}
+    {{- if $.Site.Params.menutopbar.socialEnable }}
+      {{- if or $.Site.Params.debug (findRE `\bhtml-comment\b` $.Site.Params.traceFlags) }}
+        {{ `<!-- range .Site.Menus.topbar.ByWeight -->` | safeHTML }}
+      {{- end}}
+      {{- range .Site.Menus.topbar.ByWeight }}
+    <a href='{{ .URL }}' target="_blank" class="w3-bar-item w3-button w3-right" ><i class='{{ .Pre }}'></i></a>
+      {{- end }}
+    {{- end }} {{/* socialEnable */}}
 
-  {{- if $.Site.Params.menutopbar.googleTranslateEnable }}
-    {{- if or (not .IsHome) $.Site.Params.menutopbar.googleTranslateShowOnHome }}
-      {{ partial `header.nav.google.translate.html` . -}}
+    {{- if $.Site.Params.menutopbar.googleTranslateEnable }}
+      {{- if or (not .IsHome) $.Site.Params.menutopbar.googleTranslateShowOnHome }}
+        {{ partial `header.nav.google.translate.html` . -}}
+      {{- end }}
     {{- end }}
-  {{- end }}
 
   {{- end }} {{/* topbar */}}
 
@@ -71,16 +71,17 @@
   {{- template `header-nav-entry` . }}
 
   {{- if .Site.Menus.topbar }}
-  {{- if $.Site.Params.menutopbar.socialEnable }}
-  {{- if $.Site.Params.menutopbar.numOfItemsIfMediumDisplay }}
-    {{- if or $.Site.Params.debug (findRE `\bhtml-comment\b` $.Site.Params.traceFlags) }}
-      {{ `<!-- range first $.Site.Params.menutopbar.numOfItemsIfMediumDisplay .Site.Menus.topbar.ByWeight -->` | safeHTML }}
-    {{- end}}
-    {{- range first $.Site.Params.menutopbar.numOfItemsIfMediumDisplay .Site.Menus.topbar.ByWeight }}
-  <a href='{{ .URL }}' target="_blank" class="w3-bar-item w3-button w3-right header-nav-menu-topbar-medium" ><i class='{{ .Pre }}'></i></a>
-    {{- end }} {{/* range */}}
-  {{- end }} {{/* numOfItemsIfMediumDisplay */}}
-  {{- end }}{{/* socialEnable */}}
+    {{- if $.Site.Params.menutopbar.socialEnable }}
+      {{- if $.Site.Params.menutopbar.numOfItemsIfMediumDisplay }}
+        {{- if or $.Site.Params.debug (findRE `\bhtml-comment\b` $.Site.Params.traceFlags) }}
+          {{ `<!-- range first $.Site.Params.menutopbar.numOfItemsIfMediumDisplay .Site.Menus.topbar.ByWeight -->` | safeHTML }}
+        {{- end}}
+        {{- range first $.Site.Params.menutopbar.numOfItemsIfMediumDisplay .Site.Menus.topbar.ByWeight }}
+      <a href='{{ .URL }}' target="_blank" class="w3-bar-item w3-button w3-right header-nav-menu-topbar-medium" ><i class='{{ .Pre }}'></i></a>
+        {{- end }} {{/* range */}}
+      {{- end }} {{/* numOfItemsIfMediumDisplay */}}
+    {{- end }}{{/* socialEnable */}}
+
 
   {{- end }} {{/* topbar */}}
 
@@ -100,17 +101,17 @@
   {{- end}}
 
   {{- if $.Site.Params.menutopbar.socialEnable }}
-  {{- if .Site.Menus.topbar }}
-  {{- if $.Site.Params.menutopbar.numOfItemsIfSmallDisplayCollapsed }}
-    {{- if or $.Site.Params.debug (findRE `\bhtml-comment\b` $.Site.Params.traceFlags) }}
-      {{ `<!-- range first $.Site.Params.menutopbar.numOfItemsIfSmallDisplay .Site.Menus.topbar.ByWeight -->` | safeHTML }}
-    {{- end}}
-    {{- range first $.Site.Params.menutopbar.numOfItemsIfSmallDisplayCollapsed .Site.Menus.topbar.ByWeight }}
-  <a href='{{ .URL }}' target="_blank" class="w3-bar-item w3-button w3-right header-nav-menu-topbar-small" ><i class='{{ .Pre }}'></i></a>
-    {{- end }}
-  {{- end }}
-  {{- end }}
-  {{- end }}
+    {{- if .Site.Menus.topbar }}
+      {{- if $.Site.Params.menutopbar.numOfItemsIfSmallDisplayCollapsed }}
+        {{- if or $.Site.Params.debug (findRE `\bhtml-comment\b` $.Site.Params.traceFlags) }}
+          {{ `<!-- range first $.Site.Params.menutopbar.numOfItemsIfSmallDisplay .Site.Menus.topbar.ByWeight -->` | safeHTML }}
+        {{- end}}
+        {{- range first $.Site.Params.menutopbar.numOfItemsIfSmallDisplayCollapsed .Site.Menus.topbar.ByWeight }}
+      <a href='{{ .URL }}' target="_blank" class="w3-bar-item w3-button w3-right header-nav-menu-topbar-small" ><i class='{{ .Pre }}'></i></a>
+        {{- end }}
+      {{- end }} {{/* numOfItemsIfSmallDisplayCollapsed */}}
+    {{- end }}{{/* topbar */}}
+  {{- end }}{{/* socialEnable */}}
 
   <a href="javascript:void(0)" class="w3-bar-item w3-button w3-left w3-hide-large w3-hide-medium" onclick="showMenu()"><i class="{{default `fas fa-bars` $.Site.Params.menuConfig.smallDispMenuCollapseIcon }}"></i></a>
   {{/* &#9776; */}}
@@ -132,17 +133,18 @@
   {{- template `header-nav-entry` . }}
 
   {{- if $.Site.Params.menutopbar.socialEnable }}
-  {{- if .Site.Menus.topbar }}
-  {{- if $.Site.Params.menutopbar.numOfItemsIfSmallDisplay }}
-    {{- if or $.Site.Params.debug (findRE `\bhtml-comment\b` $.Site.Params.traceFlags) }}
-      {{ `<!-- range first $.Site.Params.menutopbar.numOfItemsIfSmallDisplay .Site.Menus.topbar.ByWeight -->` | safeHTML }}
-    {{- end}}
-    {{- range first $.Site.Params.menutopbar.numOfItemsIfSmallDisplay .Site.Menus.topbar.ByWeight }}
-  <a href='{{ .URL }}' target="_blank" class="w3-bar-item w3-button w3-right header-nav-menu-topbar-small" ><i class='{{ .Pre }}'></i></a>
-    {{- end }}
-  {{- end }}
-  {{- end }}
-  {{- end }}
+    {{- if .Site.Menus.topbar }}
+      {{- if $.Site.Params.menutopbar.numOfItemsIfSmallDisplay }}
+        {{- if or $.Site.Params.debug (findRE `\bhtml-comment\b` $.Site.Params.traceFlags) }}
+          {{ `<!-- range first $.Site.Params.menutopbar.numOfItemsIfSmallDisplay .Site.Menus.topbar.ByWeight -->` | safeHTML }}
+        {{- end}}
+        {{- range first $.Site.Params.menutopbar.numOfItemsIfSmallDisplay .Site.Menus.topbar.ByWeight }}
+      <a href='{{ .URL }}' target="_blank" class="w3-bar-item w3-button w3-right header-nav-menu-topbar-small" ><i class='{{ .Pre }}'></i></a>
+        {{- end }}
+      {{- end }} {{/* numOfItemsIfSmallDisplayCollapsed */}}
+    {{- end }}{{/* topbar */}}
+  {{- end }}{{/* socialEnable */}}
+
 </div> <!-- w3-bar -->
 {{- end }}