Merge pull request #37 from ajmalsiddiqui/fix-email-template

Fix email hyperlink templating

README.md

@@ -101,6 +101,7 @@ orcid = "#"
 
 # Travel
 googlemaps = "#"
+tripadvisor = "#"
 ```
 
 

assets/css/main.scss

@@ -339,16 +339,14 @@ nav {
     height: auto;
 }
 
-.footnote-ref {
-    a {
+a.footnote-ref {
     margin-left: 0.3em;
-    }
 
-    a::before {
+    &::before {
         content: "[";
     }
 
-    a::after {
+    &::after {
         content: "]";
     }
 }

exampleSite/config.toml

@@ -75,6 +75,7 @@ disqusShortname = ""
 
     # Travel
     googlemaps = "#"
+    tripadvisor = "#"
 
 # Menu links along the sidebar navigation.
 [[menu.main]]

i18n/en.toml

@@ -0,0 +1,23 @@
+[page]
+other = "Page"
+
+[of]
+other = "of"
+
+[newer]
+other = "Newer"
+
+[older]
+other = "Older"
+
+[tagged]
+other = "Tagged"
+
+[read_more]
+other = "Read more..."
+
+[noteworthy_theme]
+other = "Noteworthy theme"
+
+[built_with_hugo]
+other = "Built with Hugo"

i18n/it.toml

@@ -0,0 +1,23 @@
+[page]
+other = "Pagina"
+
+[of]
+other = "di"
+
+[newer]
+other = "Successivi"
+
+[older]
+other = "Precedenti"
+
+[tagged]
+other = "Contrassegnato"
+
+[read_more]
+other = "Continua a leggere..."
+
+[noteworthy_theme]
+other = "Tema Noteworthy"
+
+[built_with_hugo]
+other = "Realizzato con Hugo"

layouts/_default/taxonomy.html

@@ -1,6 +1,6 @@
 {{ define "main" }}
 <!-- Page that displays after clicking on a post's tag -->
-  <h1>Tagged "{{ .Data.Term }}"</h1>
+  <h1>{{ i18n "tagged" }} "{{ .Data.Term }}"</h1>
   {{range .Pages}}
   
     <!-- Display the posts with the tag -->
@@ -13,7 +13,7 @@
             <div>
                 <p>{{ .Summary }}</p>
                 {{ if (and (.Site.Params.showReadMore) (.Truncated)) }}
-                <p><a href="{{ .RelPermalink }}">Read more...</a></p>
+                <p><a href="{{ .RelPermalink }}">{{ i18n "read_more" }}</a></p>
                 {{ end }}
             </div>
             <div class="post-footer">

layouts/index.html

@@ -17,7 +17,7 @@
             <div>
                 <p>{{ .Summary }}</p>
                 {{ if (and (.Site.Params.showReadMore) (.Truncated)) }}
-                <p><a href="{{ .RelPermalink }}">Read more...</a></p>
+                <p><a href="{{ .RelPermalink }}">{{ i18n "read_more" }}</a></p>
                 {{ end }}
             </div>
             <div class="post-footer">
@@ -26,7 +26,7 @@
             <!-- Display tags -->
             {{if .Params.tags}}
                 {{ range .Params.tags }}
-                    <a class="tag" href="/tags/{{ . | urlize }}">#{{.}}</a>
+                    <a class="tag" href="{{ "/tags/" | relLangURL }}{{ . | urlize }}">#{{.}}</a>
                 {{ end }}
             {{ end }}
             </div> 
@@ -38,22 +38,22 @@
         <div class="paginator">
         {{ $paginator := .Paginator }}
         {{ if gt .Paginator.TotalPages 1 }}
-        <p>Page {{ $paginator.PageNumber}} of {{ $paginator.TotalPages }}</p>
+        <p>{{ i18n "page" }} {{ $paginator.PageNumber}} {{ i18n "of" }} {{ $paginator.TotalPages }}</p>
         <div class="paginator-group">
             {{ if $paginator.HasPrev }}
-            <a class="color-link" href="{{ $paginator.Prev.URL | relLangURL }}">
+            <a class="color-link" href="{{ $paginator.Prev.URL }}">
                     <svg width="13px" height="9px" viewBox="0 0 13 9" version="1.1" xmlns="https://www.w3.org/2000/svg" xmlns:xlink="https://www.w3.org/1999/xlink">
                         <g class="color-arrow" fill="#63BDA2" fill-rule="nonzero">
                             <polygon id="Path" points="1.75929935 4.50000282 5.3292523 7.62371165 4.6707477 8.37628835 0.240700645 4.49999718 4.67081049 0.623709205 5.32930951 1.37629079"></polygon>
                             <polygon id="Path" points="13 4 13 5 1 5 1 4"></polygon>
                         </g>
                 </svg>
-                Newer          
+                {{ i18n "newer" }}
             </a>
             {{ end }}
             {{ if $paginator.HasNext }}
-                <a class="color-link older" href="{{ $paginator.Next.URL | relLangURL }}">
-                    Older
+                <a class="color-link older" href="{{ $paginator.Next.URL }}">
+                    {{ i18n "older" }}
                     <svg width="13px" height="9px" viewBox="0 0 13 9" version="1.1" xmlns="https://www.w3.org/2000/svg" xmlns:xlink="https://www.w3.org/1999/xlink">
                             <g class="color-arrow" fill="#63BDA2" fill-rule="nonzero">
                                 <polygon points="7.6707477 1.37628835 8.3292523 0.623711653 12.7592994 4.50000282 8.32918951 8.37629079 7.67069049 7.62370921 11.2407006 4.49999718"></polygon>

layouts/partials/footer-mobile.html

@@ -2,9 +2,9 @@
 	{{ partial "social.html" . }}
 
 	<div class="footer-mobile-links">
-		<p><a href="https://github.com/kimcc/hugo-theme-noteworthy" target="_blank" rel="noopener">Noteworthy theme</a></p>
+        <p><a href="https://github.com/kimcc/hugo-theme-noteworthy" target="_blank" rel="noopener">{{ i18n "noteworthy_theme" }}</a></p>
 		<span class="divider-bar">|</span>
-		<p><a href="https://gohugo.io" target="_blank" rel="noopener">Built with Hugo</a></p>
+        <p><a href="https://gohugo.io" target="_blank" rel="noopener">{{ i18n "built_with_hugo" }}</a></p>
 	</div>
 
 	{{ $script := resources.Get "js/main.js" | minify | fingerprint -}}

layouts/partials/footer.html

@@ -1,8 +1,8 @@
 <footer class="footer">
 	{{ partial "social.html" . }}
 
-	<p><a href="https://github.com/kimcc/hugo-theme-noteworthy" target="_blank" rel="noopener">Noteworthy theme</a></p>
-	<p><a href="https://gohugo.io" target="_blank" rel="noopener">Built with Hugo</a></p>
+    <p><a href="https://github.com/kimcc/hugo-theme-noteworthy" target="_blank" rel="noopener">{{ i18n "noteworthy_theme" }}</a></p>
+    <p><a href="https://gohugo.io" target="_blank" rel="noopener">{{ i18n "built_with_hugo" }}</a></p>
 
 	{{ $script := resources.Get "js/main.js" | minify | fingerprint -}}
 	<script src="{{ $script.Permalink }}" {{ printf "integrity=%q" $script.Data.Integrity | safeHTMLAttr }} crossorigin="anonymous"></script>

layouts/partials/nav.html

@@ -3,7 +3,7 @@
   {{ partial "header.html" . }}
   <div class="nav-menu">
   {{ range .Site.Menus.main }}
-    <a class="color-link nav-link" href="{{ .URL | relLangURL }}">{{ .Name }}</a>
+    <a class="color-link nav-link" href="{{ .URL }}">{{ .Name }}</a>
   {{ end }}
   <a class="color-link nav-link" href="{{ .Site.RSSLink }}" target="_blank" rel="noopener" type="application/rss+xml">RSS</a>
 </div>

layouts/partials/social.html

@@ -1,6 +1,6 @@
 <div class="social-icons">
         {{ if isset .Site.Params "email" }}
-    <a class="social-icon" href="{{ .Site.Params.Email }}" target="_blank" rel="noopener" title="Email">
+    <a class="social-icon" href="mailto:{{ .Site.Params.Email }}" target="_blank" rel="noopener" title="Email">
         <svg width="28px" height="28px" viewBox="0 0 28 28" version="1.1" fill="#ABABAB" xmlns="https://www.w3.org/2000/svg" xmlns:xlink="https://www.w3.org/1999/xlink">
             <path d="M25.2794292,5.59128519 L14,16.8707144 L2.72057081,5.59128519 C3.06733103,5.30237414 3.51336915,5.12857603 4,5.12857603 L24,5.12857603 C24.4866308,5.12857603 24.932669,5.30237414 25.2794292,5.59128519 Z M25.9956978,6.99633695 C25.998551,7.04004843 26,7.08414302 26,7.12857603 L26,20.871424 C26,21.0798433 25.9681197,21.2808166 25.9089697,21.4697335 L18.7156355,14.2763993 L25.9956978,6.99633695 Z M24.9498374,22.6319215 C24.6672737,22.7846939 24.3437653,22.871424 24,22.871424 L4,22.871424 C3.5268522,22.871424 3.09207889,22.7071233 2.74962118,22.432463 L10.0950247,15.0870594 L13.9848068,18.9768415 L14.1878486,18.7737996 L14.2030419,18.7889929 L17.6549753,15.3370594 L24.9498374,22.6319215 Z M2.00810114,21.0526627 C2.00273908,20.9929669 2,20.9325153 2,20.871424 L2,7.12857603 C2,7.08414302 2.00144896,7.04004843 2.00430222,6.99633695 L9.03436454,14.0263993 L2.00810114,21.0526627 Z"></path>
         </svg>
@@ -227,6 +227,15 @@
     </a>
     {{ end }}
 
+    {{ if isset .Site.Params "tripadvisor" }}
+    <a class="social-icon" href="{{ .Site.Params.Tripadvisor }}" target="_blank" rel="noopener" title="Tripadvisor">
+        <!-- Tripadvisor icon by https://icons8.com/icons/set/tripadvisor -->
+        <svg width="28px" height="28px" viewBox="0 0 50 50" version="1.1" fill="#ABABAB" xmlns="https://www.w3.org/2000/svg" xmlns:xlink="https://www.w3.org/1999/xlink">
+            <path d="M 25 11 C 19.167969 11 13.84375 12.511719 9.789063 15 L 2 15 C 2 15 3.753906 17.152344 4.578125 19.578125 C 2.96875 21.621094 2 24.195313 2 27 C 2 33.628906 7.371094 39 14 39 C 17.496094 39 20.636719 37.492188 22.828125 35.105469 L 25 38 L 27.171875 35.105469 C 29.363281 37.492188 32.503906 39 36 39 C 42.628906 39 48 33.628906 48 27 C 48 24.195313 47.03125 21.621094 45.421875 19.578125 C 46.246094 17.152344 48 15 48 15 L 40.203125 15 C 36.148438 12.511719 30.828125 11 25 11 Z M 14 18 C 18.972656 18 23 22.027344 23 27 C 23 31.972656 18.972656 36 14 36 C 9.027344 36 5 31.972656 5 27 C 5 22.027344 9.027344 18 14 18 Z M 36 18 C 40.972656 18 45 22.027344 45 27 C 45 31.972656 40.972656 36 36 36 C 31.027344 36 27 31.972656 27 27 C 27 22.027344 31.027344 18 36 18 Z M 14 21 C 10.6875 21 8 23.6875 8 27 C 8 30.3125 10.6875 33 14 33 C 17.3125 33 20 30.3125 20 27 C 20 23.6875 17.3125 21 14 21 Z M 36 21 C 32.6875 21 30 23.6875 30 27 C 30 30.3125 32.6875 33 36 33 C 39.3125 33 42 30.3125 42 27 C 42 23.6875 39.3125 21 36 21 Z M 14 23 C 16.210938 23 18 24.789063 18 27 C 18 29.210938 16.210938 31 14 31 C 11.789063 31 10 29.210938 10 27 C 10 24.789063 11.789063 23 14 23 Z M 36 23 C 38.210938 23 40 24.789063 40 27 C 40 29.210938 38.210938 31 36 31 C 33.789063 31 32 29.210938 32 27 C 32 24.789063 33.789063 23 36 23 Z M 14 25 C 12.894531 25 12 25.894531 12 27 C 12 28.105469 12.894531 29 14 29 C 15.105469 29 16 28.105469 16 27 C 16 25.894531 15.105469 25 14 25 Z M 36 25 C 34.894531 25 34 25.894531 34 27 C 34 28.105469 34.894531 29 36 29 C 37.105469 29 38 28.105469 38 27 C 38 25.894531 37.105469 25 36 25 Z"/>
+        </svg>
+    </a>
+    {{ end }}
+
 </div>