fix: treeview icons and documentation

jgazeau · Feb 20, 2022 · 15a0cbb · 15a0cbb
1 parent 623532a
commit 15a0cbb
Show file tree

Hide file tree

Showing 7 changed files with 117 additions and 27 deletions.
diff --git a/data/themeParams.toml b/data/themeParams.toml
@@ -122,17 +122,15 @@
 [shortcodes]
   [shortcodes.treeview]
     [shortcodes.treeview.kinds]
-      default     = "fa-solid fa-circle-exclamation"
-      defaultDir  = "fa-solid fa-folder"
-      defaultFile = "fa-solid fa-file"
+      default     = "fa-solid fa-circle-question"
+      dir         = "fa-solid fa-folder"
+      file        = "fa-solid fa-file"
       home        = "fa-solid fa-house-chimney"
       page        = "fa-solid fa-file-lines"
       section     = "fa-solid fa-folder-tree"
       taxonomy    = "fa-solid fa-tags"
       term        = "fa-solid fa-tag"
-      dir         = "fa-solid fa-folder"
       archive     = "fa-solid fa-file-zipper"
-      file        = "fa-solid fa-file"
       image       = "fa-solid fa-file-image"
       video       = "fa-solid fa-file-video"
       script      = "fa-solid fa-file-code"
@@ -141,4 +139,4 @@
       powerpoint  = "fa-solid fa-file-powerpoint"
       excel       = "fa-solid fa-file-excel"
       csv         = "fa-solid fa-file-csv"
-      word        = "fa-solid fa-file-word"
+      word        = "fa-solid fa-file-word"
diff --git a/exampleSite/content/english/shortcodes/treeview.md b/exampleSite/content/english/shortcodes/treeview.md
@@ -117,9 +117,33 @@ Possible values:
             "kind": "file",
             "label": "***Flat file** in a directory*"
         }]
+},{
+    "kind": "default",
+    "label": "***Default***"
+},{
+    "kind": "dir",
+    "label": "***Directory***"
 },{
     "kind": "file",
-    "label": "***Flat file***"
+    "label": "***File***"
+},{
+    "kind": "home",
+    "label": "***Home***"
+},{
+    "kind": "page",
+    "label": "***Page***"
+},{
+    "kind": "section",
+    "label": "***Section***"
+},{
+    "kind": "taxonomy",
+    "label": "***Taxonomy***"
+},{
+    "kind": "term",
+    "label": "***Taxonomy's term***"
+},{
+    "kind": "archive",
+    "label": "***Archive***"
 },{
     "kind": "image",
     "label": "***Image file***"
@@ -174,9 +198,33 @@ Possible values:
             "kind": "file",
             "label": "***Flat file** in a directory*"
         }]
+},{
+    "kind": "default",
+    "label": "***Default***"
+},{
+    "kind": "dir",
+    "label": "***Directory***"
 },{
     "kind": "file",
-    "label": "***Flat file***"
+    "label": "***File***"
+},{
+    "kind": "home",
+    "label": "***Home***"
+},{
+    "kind": "page",
+    "label": "***Page***"
+},{
+    "kind": "section",
+    "label": "***Section***"
+},{
+    "kind": "taxonomy",
+    "label": "***Taxonomy***"
+},{
+    "kind": "term",
+    "label": "***Taxonomy's term***"
+},{
+    "kind": "archive",
+    "label": "***Archive***"
 },{
     "kind": "image",
     "label": "***Image file***"

diff --git a/exampleSite/content/french/shortcodes/treeview.md b/exampleSite/content/french/shortcodes/treeview.md
@@ -117,9 +117,33 @@ Valeurs possibles:
             "kind": "file",
             "label": "***Fichier plat** dans un répertoire*"
         }]
+},{
+    "kind": "default",
+    "label": "***Par défaut***"
+},{
+    "kind": "dir",
+    "label": "***Répertoire***"
 },{
     "kind": "file",
-    "label": "***Fichier plat***"
+    "label": "***Fichier***"
+},{
+    "kind": "home",
+    "label": "***Accueil***"
+},{
+    "kind": "page",
+    "label": "***Page***"
+},{
+    "kind": "section",
+    "label": "***Section***"
+},{
+    "kind": "taxonomy",
+    "label": "***Taxonomie***"
+},{
+    "kind": "term",
+    "label": "***Terme de taxonomie***"
+},{
+    "kind": "archive",
+    "label": "***Archive***"
 },{
     "kind": "image",
     "label": "***Fichier image***"
@@ -174,9 +198,33 @@ Valeurs possibles:
             "kind": "file",
             "label": "***Fichier plat** dans un répertoire*"
         }]
+},{
+    "kind": "default",
+    "label": "***Par défaut***"
+},{
+    "kind": "dir",
+    "label": "***Répertoire***"
 },{
     "kind": "file",
-    "label": "***Fichier plat***"
+    "label": "***Fichier***"
+},{
+    "kind": "home",
+    "label": "***Accueil***"
+},{
+    "kind": "page",
+    "label": "***Page***"
+},{
+    "kind": "section",
+    "label": "***Section***"
+},{
+    "kind": "taxonomy",
+    "label": "***Taxonomie***"
+},{
+    "kind": "term",
+    "label": "***Terme de taxonomie***"
+},{
+    "kind": "archive",
+    "label": "***Archive***"
 },{
     "kind": "image",
     "label": "***Fichier image***"

diff --git a/exampleSite/templates/configuration/themeParams.en.toml b/exampleSite/templates/configuration/themeParams.en.toml
@@ -121,17 +121,15 @@
 [shortcodes]
   [shortcodes.treeview]
     [shortcodes.treeview.kinds]
-      default     = "fa-solid fa-circle-exclamation"
-      defaultDir  = "fa-solid fa-folder"
-      defaultFile = "fa-solid fa-file"
+      default     = "fa-solid fa-circle-question"
+      dir         = "fa-solid fa-folder"
+      file        = "fa-solid fa-file"
       home        = "fa-solid fa-house-chimney"
       page        = "fa-solid fa-file-lines"
       section     = "fa-solid fa-folder-tree"
       taxonomy    = "fa-solid fa-tags"
       term        = "fa-solid fa-tag"
-      dir         = "fa-solid fa-folder"
       archive     = "fa-solid fa-file-zipper"
-      file        = "fa-solid fa-file"
       image       = "fa-solid fa-file-image"
       video       = "fa-solid fa-file-video"
       script      = "fa-solid fa-file-code"
@@ -140,4 +138,4 @@
       powerpoint  = "fa-solid fa-file-powerpoint"
       excel       = "fa-solid fa-file-excel"
       csv         = "fa-solid fa-file-csv"
-      word        = "fa-solid fa-file-word"
+      word        = "fa-solid fa-file-word"
diff --git a/exampleSite/templates/configuration/themeParams.fr.toml b/exampleSite/templates/configuration/themeParams.fr.toml
@@ -121,17 +121,15 @@
 [shortcodes]
   [shortcodes.treeview]
     [shortcodes.treeview.kinds]
-      default     = "fa-solid fa-circle-exclamation"
-      defaultDir  = "fa-solid fa-folder"
-      defaultFile = "fa-solid fa-file"
+      default     = "fa-solid fa-circle-question"
+      dir         = "fa-solid fa-folder"
+      file        = "fa-solid fa-file"
       home        = "fa-solid fa-house-chimney"
       page        = "fa-solid fa-file-lines"
       section     = "fa-solid fa-folder-tree"
       taxonomy    = "fa-solid fa-tags"
       term        = "fa-solid fa-tag"
-      dir         = "fa-solid fa-folder"
       archive     = "fa-solid fa-file-zipper"
-      file        = "fa-solid fa-file"
       image       = "fa-solid fa-file-image"
       video       = "fa-solid fa-file-video"
       script      = "fa-solid fa-file-code"
@@ -140,4 +138,4 @@
       powerpoint  = "fa-solid fa-file-powerpoint"
       excel       = "fa-solid fa-file-excel"
       csv         = "fa-solid fa-file-csv"
-      word        = "fa-solid fa-file-word"
+      word        = "fa-solid fa-file-word"
diff --git a/layouts/partials/theme/toc.html b/layouts/partials/theme/toc.html
@@ -8,9 +8,9 @@ <h6 class='toc-title is-marginless'>{{i18n "toc_title"}}</h6>
       {{if in (string .TableOfContents) "<ul>"}}
         {{.TableOfContents}}
       {{else}}
-      <nav id="TableOfContents">
-        <p><strong>{{i18n "no_data"}}</strong></p>
-      </nav>
+        <nav id="TableOfContents">
+          <p><strong>{{i18n "no_data"}}</strong></p>
+        </nav>
       {{end}}
     </div>
     <div id='taxonomies'>

diff --git a/layouts/shortcodes/treeview.html b/layouts/shortcodes/treeview.html
@@ -96,9 +96,9 @@
         {{end}}
       {{else}}
         {{with .content}}
-          {{$scratch.Set "kind" $.context.Site.Data.themeParams.shortcodes.treeview.kinds.defaultDir}}
+          {{$scratch.Set "kind" $.context.Site.Data.themeParams.shortcodes.treeview.kinds.dir}}
         {{else}}
-          {{$scratch.Set "kind" $.context.Site.Data.themeParams.shortcodes.treeview.kinds.defaultFile}}
+          {{$scratch.Set "kind" $.context.Site.Data.themeParams.shortcodes.treeview.kinds.file}}
         {{end}}
       {{end}}
       {{with $element.label}}