gallery fixes, new params

gallery folder check logic added
fix #326
fix #317
appbarSearchIcon = true
appbarLangIcon = true

8 files changed, 84 insertions, 43 deletions

diff --git a/layouts/gallery/single.html b/layouts/gallery/single.html
index 5d7afd2..e3bf250 100644
--- a/layouts/gallery/single.html
+++ b/layouts/gallery/single.html
@@ -6,26 +6,22 @@
   </div>
 </header>
 
-{{ $root := . }}
 {{ if in (lower .Params.Mode) "one" }}
 <main class="gallery main">
   <div class="grid gallery__container">
     <div class="grid-sizer"></div>
-    {{ if .File.Dir }}
-      {{ $basename := (replace .File.Dir "\\" "/") }}
-      {{ range .Params.Images }}
-      <div class="grid-item">
-        <img src="{{ $basename | relURL }}{{ .image }}" alt="{{ print .caption }}" />
-        <div class="grid-item__desc hide">
-          <span class="grid-item__desc--text">
-            {{ .caption }}
-          </span>
-        </div>
+    {{ $basename := (replace .File.Dir "\\" "/") }}
+    {{ range .Params.Images }}
+    <div class="grid-item">
+      <img src="{{ $basename | relURL }}{{ .image }}" alt="{{ print .caption }}" />
+      <div class="grid-item__desc hide">
+        <span class="grid-item__desc--text">
+          {{ .caption }}
+        </span>
       </div>
-      {{ end }}
+    </div>
     {{ end }}
   </div>
-  {{ partial "pagination/pagination-single" . }}
 </main>
 
 {{ else if eq (lower .Params.mode) "remote" }}
@@ -43,28 +39,31 @@
     </div>
     {{ end }}
   </div>
-  {{ partial "pagination/pagination-single" . }}
 </main>
 
 {{ else }}
 <main class="gallery main">
   <div class="grid gallery__container">
     <div class="grid-sizer"></div>
-    {{ if .File.Dir }}
-      {{ $basename := (replace .File.Dir "\\" "/") }}
-      {{ range (readDir (print "./static/" $basename)) }}
-      <div class="grid-item">
-        <img src="{{ $basename | relURL }}{{ .Name }}" alt="{{ index (split .Name ".") 0 }}"/>
-        <div class="grid-item__desc hide">
-          <span class="grid-item__desc--text">
-            {{ index (split .Name ".") 0 }}
-          </span>
+    {{ $basename := (replace .File.Dir "\\" "/") }}
+    {{ $galleryFolderPath := (print "./static/" $basename) }}
+    {{ if (fileExists $galleryFolderPath) }}
+      {{ range readDir $galleryFolderPath }}
+        <div class="grid-item">
+          <img src="{{ $basename | relURL }}{{ .Name }}" alt="{{ index (split .Name ".") 0 }}" />
+          <div class="grid-item__desc hide">
+            <span class="grid-item__desc--text">
+              {{ index (split .Name ".") 0 }}
+            </span>
+          </div>
         </div>
-      </div>
       {{ end }}
+    {{ else }}
+    <div class="basicflex">
+      Make a gallery folder first.
+    </div>
     {{ end }}
   </div>
-  {{ partial "pagination/pagination-single" . }}
 </main>
 
 {{ end }}
diff --git a/layouts/partials/footer/select-lang.html b/layouts/partials/footer/select-lang.html
index de71251..1bb7a8d 100644
--- a/layouts/partials/footer/select-lang.html
+++ b/layouts/partials/footer/select-lang.html
@@ -1,6 +1,6 @@
 {{ if $.Param "enableLangChange" }}
 <div class="dropdown">
-  <button class="dropdown-trigger" aria-label="Select Theme Button">
+  <button class="dropdown-trigger" aria-label="Select Language Button">
     {{ partial "svgs/etc/translate.svg" (dict "width" 24 "height" 24) }}
   </button>
   <div class="dropdown-content">
diff --git a/layouts/partials/head/scripts.html b/layouts/partials/head/scripts.html
index 80ca22a..2a0e818 100644
--- a/layouts/partials/head/scripts.html
+++ b/layouts/partials/head/scripts.html
@@ -1099,7 +1099,7 @@
   // ====================== mobile search =======================
     var mobileSearchInputElem = document.querySelector('#search-mobile');
     var mobileSearchClassElem = document.querySelector('.mobile-search');
-    var mobileSearchBtnElem = document.querySelector('#mobileSearchBtn');
+    var mobileSearchBtnElems = document.querySelectorAll('.navbar-search');
     var mobileSearchCloseBtnElem = document.querySelector('#search-mobile-close');
     var mobileSearchContainer = document.querySelector('#search-mobile-container');
     var mobileSearchResultsElem = document.querySelector('#search-mobile-results');
@@ -1109,19 +1109,21 @@
       mobileSearchClassElem.style.display = 'none';
     }
 
-    mobileSearchBtnElem ? 
-    mobileSearchBtnElem.addEventListener('click', function () {
-      if (mobileSearchContainer) {
-        mobileSearchContainer.style.display = 'block';
-      }
+    mobileSearchBtnElems ? 
+    mobileSearchBtnElems.forEach(function (elem, idx) {
+      elem.addEventListener('click', function () {
+        if (mobileSearchContainer) {
+          mobileSearchContainer.style.display = 'block';
+        }
 
-      if (mobileSearchInputElem) {
-        mobileSearchInputElem.focus();
-      }
+        if (mobileSearchInputElem) {
+          mobileSearchInputElem.focus();
+        }
 
-      if (htmlElem) {
-        htmlElem.style.overflowY = 'hidden';
-      }
+        if (htmlElem) {
+          htmlElem.style.overflowY = 'hidden';
+        }
+      });
     }) : null;
 
     mobileSearchCloseBtnElem ? 
diff --git a/layouts/partials/navbar/language-icon.html b/layouts/partials/navbar/language-icon.html
new file mode 100644
index 0000000..d39d3c6
--- /dev/null
+++ b/layouts/partials/navbar/language-icon.html
@@ -0,0 +1,28 @@
+<div class="theme">
+  <div class="dropdown">
+    <button class="dropdown-trigger navbar__slide-down" aria-label="Select Language Button" data-ani="{{ $.Site.Params.enableUiAnimation | default "true" }}">
+      {{ partial "svgs/etc/translate.svg" (dict "width" 22 "height" 22) }}      
+    </button>
+    <div class="dropdown-content select-theme">
+      {{ $siteLanguages := .Site.Languages }}
+      {{ $pageLang := .Page.Lang }}
+      {{ range .Page.AllTranslations }}
+        {{ $translation := . }}
+        {{ range $siteLanguages }}
+          {{ if eq $translation.Lang .Lang }}
+          {{ $selected := false }}
+            {{ if eq $pageLang .Lang }}
+              {{ if .LanguageName }}
+                <a href="{{ $translation.Permalink }}" data-lang="{{ .Lang }}" class="dropdown-item select-theme__item is-active">{{ .LanguageName }}</a>
+              {{ end }}
+            {{ else }}
+              {{ if .LanguageName }}
+                <a href="{{ $translation.Permalink }}" data-lang="{{ .Lang }}" class="dropdown-item ">{{ .LanguageName }}</a>
+              {{ end }}
+            {{ end }}
+          {{ end }}
+        {{ end }}
+      {{ end }}
+    </div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/layouts/partials/navbar/nav-menu.html b/layouts/partials/navbar/nav-menu.html
index 10db01a..dcf68a6 100644
--- a/layouts/partials/navbar/nav-menu.html
+++ b/layouts/partials/navbar/nav-menu.html
@@ -1,4 +1,10 @@
 <div class="navbar__menu">

+  {{ if $.Site.Params.enableAppbarSearchIcon }}

+    {{ partial "navbar/search-icon" . }}

+  {{ end }}

+  {{ if $.Site.Params.enableAppbarLangIcon }}

+    {{ partial "navbar/language-icon" . }}

+  {{ end }}

   {{ partial "navbar/select-theme" . }}

   {{ $current := . }}

   {{ range .Site.Menus.main }}

diff --git a/layouts/partials/navbar/search-icon.html b/layouts/partials/navbar/search-icon.html
new file mode 100644
index 0000000..bd9d6ce
--- /dev/null
+++ b/layouts/partials/navbar/search-icon.html
@@ -0,0 +1,9 @@
+<div class="theme">
+  <div class="dropdown">
+    <button class="dropdown-trigger navbar__slide-down navbar-search" aria-label="Search Button" data-ani="{{ $.Site.Params.enableUiAnimation | default "true" }}">
+      {{ partial "svgs/etc/search.svg" (dict "width" 22 "height" 22) }}
+    </button>
+    <div class="dropdown-content select-theme">
+    </div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/layouts/partials/pagination/pagination.html b/layouts/partials/pagination/pagination.html
index a88b91d..80f0440 100644
--- a/layouts/partials/pagination/pagination.html
+++ b/layouts/partials/pagination/pagination.html
@@ -20,11 +20,8 @@
   <ul class="pagination">
     {{ range $pag.Pagers }}
       {{ $cur := .PageNumber }}
-      <script>
-      </script>
       {{ if in ($.Scratch.Get "show") $cur }}
-        <li
-        {{ if eq . $pag }}class="active"{{ end }}><a href="{{ .URL }}">{{ .PageNumber }}</a></li>
+        <li {{ if eq . $pag }}class="active"{{ end }}><a href="{{ .URL }}">{{ .PageNumber }}</a></li>
       {{ else if in (slice 2 (sub $total 1)) $cur }}
         <li class="disabled"><a name="">&hellip;</a></li>
       {{ end }}
diff --git a/layouts/partials/search/site-search-mobile.html b/layouts/partials/search/site-search-mobile.html
index 370a0a8..f2e9381 100644
--- a/layouts/partials/search/site-search-mobile.html
+++ b/layouts/partials/search/site-search-mobile.html
@@ -1,5 +1,5 @@
 {{ if $.Param "enableSearch" }}
-<div id="mobileSearchBtn" class="mobile-search__btn" data-ani="{{ $.Site.Params.enableUiAnimation | default "true" }}">
+<div class="mobile-search__btn navbar-search" data-ani="{{ $.Site.Params.enableUiAnimation | default "true" }}">
   {{ partial "svgs/etc/search.svg" (dict "width" 22 "height" 22) }}
 </div>