Merge pull request #179 from edrlab/fixes

Footer revisited
edrlab · Jan 16, 2025 · 811a51c · 811a51c
2 parents b2c48d8 + bfd00da
commit 811a51c
Show file tree

Hide file tree

Showing 17 changed files with 122 additions and 57 deletions.
diff --git a/assets/scss/_styles_project.scss b/assets/scss/_styles_project.scss
@@ -687,9 +687,10 @@ kbd {
     background-color: $color-dark-blue;
     position: relative;
     min-height: fit-content;
+    text-align: center;
 
     small {
-        position: absolute;
+        // position: absolute;
         bottom: 10px;
         left: 20px;
         a {
@@ -1265,15 +1266,16 @@ kbd {
     }
 
     footer {
-        .navbar-nav, .left {
-            display: none;
-        }
-
-        .row {
-            div {
-                flex: 0;
-            }
-        }
+        text-align: center;
+        // .navbar-nav, .left {
+        //     display: none;
+        // }
+
+        // .row {
+        //     div {
+        //         flex: 0;
+        //     }
+        // }
     }
 
     .about_title {

diff --git a/config.toml b/config.toml
@@ -9,6 +9,12 @@ enableMissingTranslationPlaceholders = true
 
 enableRobotsTXT = true
 
+[sitemap]
+  changeFreq = ''
+  disable = false
+  filename = 'sitemap.xml'
+  priority = -1
+
 # Will give values to .Lastmod etc.
 enableGitInfo = true
 
@@ -98,10 +104,11 @@ section = ["HTML", "print", "RSS"]
 
 [params]
 copyright = "EDRLab"
-# thorium2 = "../../docs/"
-# privacy_policy = "../../th3/900_about_thorium/902_thorium-privacy-policy/"
-# accessibility = "../../th3/900_about_thorium/903_thorium-accessibility-policy/"
-# tou = "../../th3/900_about_thorium/901_thorium-terms-of-use/"
+# thorium2 = "/docs/"
+# privacy_policy = "/th3/900_about_thorium/902_thorium-privacy-policy/"
+# accessibility = "/th3/900_about_thorium/903_thorium-accessibility-policy/"
+# tou = "/th3/900_about_thorium/901_thorium-terms-of-use/"
+sitemap = "sitemap"
 
 # First one is picked as the Twitter card image if not set on page.
 # images = ["images/project-illustration.png"]

diff --git a/content/en/sitemap.md b/content/en/sitemap.md
@@ -0,0 +1,7 @@
+---
+title: "Sitemap"
+---
+
+
+{{< sitemap >}}
+
diff --git a/content/es/sitemap.md b/content/es/sitemap.md
@@ -0,0 +1,7 @@
+---
+title: "Sitemap"
+---
+
+
+{{< sitemap >}}
+
diff --git a/content/fr/sitemap.md b/content/fr/sitemap.md
@@ -0,0 +1,7 @@
+---
+title: "Sitemap"
+---
+
+
+{{< sitemap >}}
+
diff --git a/i18n/en.toml b/i18n/en.toml
@@ -21,6 +21,9 @@ other = "in"
 other = "all"
 
 # Footer text
+[sitemap]
+other = "Site Map"
+
 [footer_all_rights_reserved]
 other = "All Rights Reserved"
 

diff --git a/i18n/es.toml b/i18n/es.toml
@@ -23,6 +23,9 @@ other = "en"
 other = "todos"
 
 # Footer text
+[sitemap]
+other = "Mapa del sitio"
+
 [footer_all_rights_reserved]
 other = "Derechos reservados"
 

diff --git a/i18n/fr.toml b/i18n/fr.toml
@@ -21,6 +21,9 @@ other = "dans"
 other = "toutes les"
 
 # Footer text
+[sitemap]
+other = "Carte du site"
+
 [footer_all_rights_reserved]
 other = "Tous droits résérvés"
 

diff --git a/layouts/docs/list.html b/layouts/docs/list.html
@@ -14,10 +14,7 @@ <h1>{{ .Title }}</h1>
 		{{ partial "feedback.html" .Site.Params.ui.feedback }}
 		<br />
 	{{ end }}
-	{{ if (.Site.DisqusShortname) }}
-		<br />
-		{{ partial "disqus-comment.html" . }}
-	{{ end }}
+
 	{{ partial "page-meta-lastmod.html" . }}
 </div>
 {{ end }}
diff --git a/layouts/partials/disqus-comment.html b/layouts/partials/disqus-comment.html
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
@@ -1,5 +1,5 @@
 {{ $links := .Site.Params.links }}
-<footer class="py-5 row d-print-none footer">
+<footer class="py-5 d-print-none footer center">
   {{/*  <div class="container-fluid mx-sm-5">
     <div class="row">
       <div class="">
@@ -33,7 +33,7 @@
             <!-- <input type="checkbox" name="accordion-1" id="cb2"> -->
             <label for="cb2" class="tab__label">
               {{ with .Site.Params.thorium2 }}
-                <a href="{{ . }}">
+                <a href="{{ .Site.Params.Baseurl }}/{{ .Language.Lang }}/{{ . }}">
                   <img src="/images/icons/footer-th2-icon.svg" alt="" role="presentation"/>
                   {{ T "footer_thorium2" }}
                   <div class="tab__content"></div>
@@ -45,7 +45,7 @@
             <!-- <input type="checkbox" name="accordion-1" id="cb3"> -->
             <label for="cb3" class="tab__label">
               {{ with .Site.Params.privacy_policy }}
-                <a href="{{ . }}">
+                <a href="{{ .Site.Params.Baseurl }}/{{ .Language.Lang }}/{{ . }}">
                   <img src="/images/icons/footer-privacy-icon.svg" alt="" role="presentation"/>
                   {{ T "footer_privacy_policy" }}
                   <div class="tab__content"></div>
@@ -57,7 +57,7 @@
             <!-- <input type="checkbox" name="accordion-1" id="cb4"> -->
             <label for="cb4" class="tab__label">
               {{ with .Site.Params.accessibility }}
-                <a href="{{ . }}">
+                <a href="{{ .Site.Params.Baseurl }}/{{ .Language.Lang }}/{{ . }}">">
                   <img src="/images/icons/footer-access-icon.svg" alt="" role="presentation"/>
                   {{ T "footer_accessibility" }}
                   <div class="tab__content"></div>
@@ -69,7 +69,7 @@
             <!-- <input type="checkbox" name="accordion-1" id="cb5"> -->
             <label for="cb5" class="tab__label">
               {{ with .Site.Params.tou }}
-                <a  href="{{ . }}">
+                <a href="{{ .Site.Params.Baseurl }}/{{ .Language.Lang }}/{{ . }}">
                   <img src="/images/icons/footer-tou-icon.svg" alt="" role="presentation"/>
                   {{ T "footer_tou" }}
                   <div class="tab__content"></div>
@@ -119,8 +119,16 @@
     </div>
   </div>  */}}
   <small class="text-white center">© 2024 <a href="https://edrlab.org">EDRLab </a> | <a
-      href="https://github.com/edrlab/thorium-reader-doc?tab=CC-BY-4.0-1-ov-file#readme">CC by license</a> </small>
-</footer>
+      href="https://github.com/edrlab/thorium-reader-doc?tab=CC-BY-4.0-1-ov-file#readme">license CC by 4.0</a> | 
+      {{/*  <a href="{{ .RelPermalink }}">{{ .Language.Lang }}: {{ .LinkTitle }}{{ if .IsPage }} ({{ i18n "wordCount" . }}){{ end }}</a>
+        */}}
+      <a
+      href="{{ .Site.Params.Baseurl }}/{{ .Language.Lang }}/sitemap/"> {{ T "sitemap" }}</a> {{ with .Site.Params.sitemap }}
+      {{/*  <a href="{{ . }}">     
+        {{ T "sitemap" }}
+      </a>  */}}
+    {{ end}}</small>
+{{/*  </footer>
 {{ define "footer-links-block" }}
 <ul class="list-inline mb-0">
   {{ range . }}
@@ -131,6 +139,6 @@
   </li> -->
   {{ end }}
 </ul>
-{{ end }}
+{{ end }}  */}}
 
 
diff --git a/layouts/shortcodes/sitemap.html b/layouts/shortcodes/sitemap.html
@@ -0,0 +1,5 @@
+<ul>
+{{ range .Site.AllPages }}
+<li><a href="{{ .RelPermalink }}">{{ .Title }}</a></li>
+{{ end }}
+</ul>
diff --git a/layouts/sitemap.xml b/layouts/sitemap.xml
@@ -0,0 +1,24 @@
+{{ printf "<?xml version=\"1.0\" encoding=\"utf-8\" standalone=\"yes\" ?>" | safeHTML }}
+<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"
+  xmlns:xhtml="http://www.w3.org/1999/xhtml">
+  {{ range .Data.Pages }}
+  {{ if not (or (hasPrefix .RelPermalink "/tags") (hasPrefix .RelPermalink "/categories")) }}
+  <url>
+    <loc>{{ .Permalink }}</loc>{{ if not .Lastmod.IsZero }}
+    <lastmod>{{ safeHTML ( .Lastmod.Format "2006-01-02T15:04:05-07:00" ) }}</lastmod>{{ end }}{{ with .Sitemap.ChangeFreq }}
+    <changefreq>{{ . }}</changefreq>{{ end }}{{ if ge .Sitemap.Priority 0.0 }}
+    <priority>{{ .Sitemap.Priority }}</priority>{{ end }}{{ if .IsTranslated }}{{ range .Translations }}
+    <xhtml:link
+                rel="alternate"
+                hreflang="{{ .Lang }}"
+                href="{{ .Permalink }}"
+                />{{ end }}
+    <xhtml:link
+                rel="alternate"
+                hreflang="{{ .Lang }}"
+                href="{{ .Permalink }}"
+                />{{ end }}
+  </url>
+  {{ end }}
+  {{ end }}
+</urlset>
diff --git a/layouts/sitemapindex.html b/layouts/sitemapindex.html
@@ -0,0 +1,11 @@
+{{ printf "<?xml version=\"1.0\" encoding=\"utf-8\" standalone=\"yes\"?>" | safeHTML }}
+<sitemapindex xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
+  {{ range . }}
+  <sitemap>
+    <loc>{{ .SitemapAbsURL }}</loc>
+    {{ if not .Lastmod.IsZero }}
+      <lastmod>{{ .Lastmod.Format "2006-01-02T15:04:05-07:00" | safeHTML }}</lastmod>
+    {{ end }}
+  </sitemap>
+  {{ end }}
+</sitemapindex>
diff --git a/layouts/sitemapindex.xml b/layouts/sitemapindex.xml
@@ -0,0 +1,12 @@
+{{ printf "<?xml version=\"1.0\" encoding=\"utf-8\" standalone=\"yes\"?>" | safeHTML }}
+<?xml-stylesheet type="text/xsl" href="/sitemap.xsl"?>
+<sitemapindex xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
+  {{ range . }}
+  <sitemap>
+    <loc>{{ .SitemapAbsURL }}</loc>
+    {{ if not .Lastmod.IsZero }}
+      <lastmod>{{ .Lastmod.Format "2006-01-02T15:04:05-07:00" | safeHTML }}</lastmod>
+    {{ end }}
+  </sitemap>
+  {{ end }}
+</sitemapindex>
diff --git a/layouts/swagger/list.html b/layouts/swagger/list.html
@@ -14,10 +14,6 @@ <h1>{{ .Title }}</h1>
 		{{ partial "feedback.html" .Site.Params.ui.feedback }}
 		<br />
 	{{ end }}
-	{{ if (.Site.DisqusShortname) }}
-		<br />
-		{{ partial "disqus-comment.html" . }}
-	{{ end }}
 	{{ partial "page-meta-lastmod.html" . }}
 </div>
 {{ end }}
diff --git a/layouts/th3/list.html b/layouts/th3/list.html
@@ -14,10 +14,6 @@ <h1>{{ .Title }}</h1>
 		{{ partial "feedback.html" .Site.Params.ui.feedback }}
 		<br />
 	{{ end }}
-	{{ if (.Site.DisqusShortname) }}
-		<br />
-		{{ partial "disqus-comment.html" . }}
-	{{ end }}
 	{{ partial "page-meta-lastmod.html" . }}
 </div>
 {{ end }}