Refactor config.toml

assets/js/initMoment.js

@@ -1,4 +1,4 @@
 $(document).ready(function() {
-    var time = moment().tz("{{ .Site.Params.timeZone }}").format("h:mm A");
+    var time = moment().tz("{{ .Site.Params.home.timeZone }}").format("h:mm A");
     $('#time').html(time);
 })

exampleSite/config.toml

@@ -1,54 +1,57 @@
 baseURL                          = "https://example.org/"  # Your domain name. Must end with "/"
-DefaultContentLanguage      = "en"
 theme                            = "introduction"
-# disqusshortname           = ""                                # Enable Disqus for comments https://gohugo.io/content-management/comments
+DefaultContentLanguage           = "en"                    # Default language for multilingual sites
-# googleAnalytics           = ""                                # Enable Google Analytics https://gohugo.io/templates/internal/#google-analytics
+# disqusshortname                 = ""                       # https://gohugo.io/content-management/comments
+# googleAnalytics                 = ""                       # https://gohugo.io/templates/internal/#google-analytics
 
 [params]
-    introHeight             = "large"                           # Input either 'medium' or 'large' or 'fullheight'
+    themeStyle                   = "light"                 # Choose "light" or "dark"
-    themeStyle              = "light"                           # Choose 'light' or 'dark'
+    favicon                      = "/img/fav.ico"          # Path to favicon file
-    faviconFile             = "img/fav.ico"
+    showRSSButton                = false                   # Show rss button in navigation
+    fadeIn                       = true                    # Turn on/off the fade-in effect
+    dateFormat                   = "Jan 2, 2006"
+    customCSS                    = ["css/foo.css"]         # Include custom css files
+
+    # Configure the home page
+    [params.home]
+        introHeight             = "large"                  # Input either "medium" or "large" or "fullheight"
+        showLatest              = true                     # Show latest blog post summary
+        showAllPosts            = false                    # Set true to list all posts on home page, or set false to link to separate blog list page
+        numberOfProjectsToShow  = 3                        # Maximum number of projects to show on home page. Unset or comment out to show all projects
         email                   = "youremail@email.com"    # Shows in contact section, or leave blank to omit
         localTime               = true                     # Show your current local time in contact section
         timeZone                = "America/Los_Angeles"    # Your timezone as in the TZ* column of this list: https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
-    dateForm                = "Jan 2, 2006"
-    fadeIn                  = true                              # Turn on/off the fade-in effect
-    showRSSButton           = true                              # Show rss button in navigation
-    customCSS               = []                                # Include custom css files e.g. ["css/foo.css", "css/bar.css"]
 
-    showAllPosts            = false                             # Set 'true' to list all posts on home page, or set 'false' to link to separate blog list page
-    showLatest              = true                              # Show latest blog post summary
     # Share buttons on blog post pages
-    shareButtons            = true                              # Show "Share this:" social buttons
+    [params.share]
-    shareTwitter            = true
+        twitter                 = true
-    shareFacebook           = true
+        facebook                = true
-    sharePinterest          = false
+        googlePlus              = true
-    shareGooglePlus         = true
+        pinterest               = true
 
-    numberOfProjectsToShow  = 3                                 # Maximum number of projects to show on home page. Unset or comment out to show all projects.
+    # Social icons appear in introduction and contact section. Add as many more as you like.
-
+    # Find icon names here: https://fontawesome.com/cheatsheet/
-# Social icons appear in introduction and contact section. Add as many more as you like.
+    [[params.social]]
-# Find icon names here: http://fontawesome.io/cheatsheet/
-[[params.social]]
         url   = "https://twitter.com/"
         icon  = "twitter"
-[[params.social]]
+    [[params.social]]
         url   = "https://facebook.com/"
         icon  = "facebook-f"
-[[params.social]]
+    [[params.social]]
         url   = "https://linkedin.com/"
         icon  = "linkedin-in"
 
-# If you don`t want to use the default menu, you can define one by yoursel
+# If you don`t want to use the default menu, you can define one by yourself
 # [[menu.main]]
 #     name    = "Home"
 #     url     = "/"
 #     weight  = 0
 # [[menu.main]]
 #     name    = "Blog"
-#     url = "/blog"
+#     url     = "/blog/"
 #     weight  = 1
 
+#
 [languages]
     [languages.en]
         languageName     = "English"
@@ -58,7 +61,8 @@ theme                       = "introduction"
         title            = "Introduction"
         [languages.en.params]
             description  = "Website Description"   # Max 160 characters show in search results
-            footerText          = ""                      # Text to override default footer text (markdown allowed)
+            # footerText   = ""                      # Text to override default footer text (markdown allowed)
+
     [languages.es]
         languageName     = "Español"
         languageCode     = "es"
@@ -67,7 +71,8 @@ theme                       = "introduction"
         title            = "Introducción"
         [languages.es.params]
             description  = "Descripcion del sitio web"
-            footerText          = ""
+            # footerText   = ""
+
     [languages.de]
         languageName     = "Deutsch"
         languageCode     = "de"
@@ -75,6 +80,6 @@ theme                       = "introduction"
         weight           = 2
         title            = "Vorstellung"
         [languages.de.params]
-            description         = "Beschreibung der Webseite"
-            footerText          = ""
             dateForm     = "2. January 2006"
+            description  = "Beschreibung der Webseite"
+            # footerText   = ""

layouts/blog/list.html

@@ -3,10 +3,10 @@
         {{ .Content }}
     </div>
     <div class="container">
-        {{ if .Site.Params.showLatest }}
+        {{ if .Site.Params.home.showLatest | default true }}
         <h2 class="title is-2 top-pad">{{ i18n "index_blog_latestPosts" . }}</h2>
         {{ range first 1 .Pages.ByPublishDate.Reverse }}
-        <div class="summary">{{ .Date.Format (.Site.Params.dateForm | default "Jan 02, 2006") }}
+        <div class="summary">{{ .Date.Format (.Site.Params.dateFormat | default "Jan 02, 2006") }}
             <h3 class="title is-3 strong-post-title">
                 <a href="{{ .RelPermalink }}">
                     {{ .Title }}

layouts/blog/single.html

@@ -8,31 +8,31 @@
             <a href="{{ .Permalink }}">{{ .Title }}</a>
         </h2>
         <div class="post-data">
-            {{ .Date.Format (.Site.Params.dateForm | default "Jan 02, 2006") }} |
+            {{ .Date.Format (.Site.Params.dateFormat | default "Jan 02, 2006") }} |
             {{ i18n "blog_readingTime" .ReadingTime }}
         </div>
-        {{ if .Site.Params.shareButtons }}
+        {{ if or .Site.Params.share.twitter .Site.Params.share.facebook .Site.Params.share.pinterest .Site.Params.share.googlePlus }}
         <div class="blog-share">
             {{ i18n "blog_shareThis" . }}:
-            {{ if .Site.Params.shareTwitter }}
+            {{ if .Site.Params.share.twitter }}
             <a class="twitter-share-button" href="https://twitter.com/intent/tweet?text=Read%20{{ .Title }}%20{{ .Permalink }}" onclick="window.open(this.href, 'twitter-share', 'width=550,height=235');return false;">
                 <i class="fab fa-twitter"></i>
                 <span class="hidden">Twitter</span>
             </a>
             {{ end }}
-            {{ if .Site.Params.shareFacebook }}
+            {{ if .Site.Params.share.facebook }}
             <a class="icon-facebook" href="https://www.facebook.com/sharer/sharer.php?u={{ .Permalink }}"  onclick="window.open(this.href, 'facebook-share','width=580,height=296');return false;">
                 <i class="fab fa-facebook-f"></i>
                 <span class="hidden">Facebook</span>
             </a>
             {{ end }}
-            {{ if .Site.Params.sharePinterest }}
+            {{ if .Site.Params.share.pinterest }}
             <a class="icon-pinterest" href="http://pinterest.com/pin/create/button/?url={{ .Permalink }}{{ if .Params.pinterestMedia }}&amp;media={{ .Site.BaseURL }}{{ .Params.pinterestMedia }}{{ end }}&amp;description={{ .Title | safeHTML}}" onclick="window.open(this.href, 'pinterest-share','width=580,height=296');return false;">
                 <i class="fab fa-pinterest-p"></i>
                 <span class="hidden">Pinterest</span>
             </a>
             {{ end }}
-            {{ if .Site.Params.shareGooglePlus }}
+            {{ if .Site.Params.share.googlePlus }}
             <a class="icon-google-plus" href="https://plus.google.com/share?url={{ .Permalink }}" onclick="window.open(this.href, 'google-plus-share', 'width=490,height=530');return false;">
                 <i class="fab fa-google-plus-g"></i>
                 <span class="hidden">Google+</span>

layouts/index.html

@@ -10,7 +10,7 @@
     <body>
         <div id="top">
             {{ with .Site.GetPage "page" "home" }}
-            <div class="hero is-{{ .Site.Params.introHeight | default "fullheight" }}">
+            <div class="hero is-{{ .Site.Params.home.introHeight | default "large" }}">
                 <!-- Super sweet Hero body title -->
                 <div class="hero-body">
                     <div class="container has-text-centered">
@@ -83,12 +83,12 @@
                         <div class="markdown">
                             {{ .Content }}
                         </div>
-                        {{ if .Site.Params.localTime }}
+                        {{ if .Site.Params.home.localTime }}
                          <p>{{ i18n "index_currentTime" . }} <span id='time'></span>.</p>
                         {{ end }}
-                        {{ if .Site.Params.email }}
+                        {{ with .Site.Params.home.email }}
                         <h3 class="subtitle is-3 has-text-centered top-pad">
-                            <a href="mailto:{{ .Site.Params.email }}">{{ .Site.Params.email }}</a>
+                            <a href="mailto:{{ . }}">{{ . }}</a>
                         </h3>
                         {{ end }}
                         {{ partial "home/social.html" . }}
@@ -107,5 +107,14 @@
         <!-- End of fade in three section -->
         {{ partial "footer/scripts.html" . }}
         {{ partial "js/owlCarousel.html" . }}
+
+        {{ if .Site.Params.home.localTime }}
+        {{ $momentjs := resources.Get "vendor/momentjs/moment.min.js" }}
+        {{ $momentTimezone := resources.Get "vendor/momentjs/moment-timezone.min.js" }}
+        {{ $momentTimezoneWithData := resources.Get "vendor/momentjs/moment-timezone-with-data-2012-2022.min.js" }}
+        {{ $initMomentjs := resources.Get "js/initMoment.js" | resources.ExecuteAsTemplate "js/initMoment.tmp.js" . }}
+        {{ $bundleMoment := slice $momentjs $momentTimezone $momentTimezoneWithData $initMomentjs | resources.Concat "/js/bundleMoment.js" | fingerprint }}
+        <script src="{{ $bundleMoment.Permalink }}" integrity="{{ $bundleMoment.Data.Integrity }}"></script>
+        {{ end }}
     </body>
 </html>

layouts/partials/footer/scripts.html

@@ -3,13 +3,4 @@
 {{ $scripts := slice $jQuery $index | resources.Concat "/js/bundle.js" | fingerprint }}
 <script src="{{ $scripts.Permalink }}" integrity="{{ $scripts.Data.Integrity }}"></script>
 
-{{ if and .Site.Params.localTime .Page.IsHome }}
-{{ $momentjs := resources.Get "vendor/momentjs/moment.min.js" }}
-{{ $momentTimezone := resources.Get "vendor/momentjs/moment-timezone.min.js" }}
-{{ $momentTimezoneWithData := resources.Get "vendor/momentjs/moment-timezone-with-data-2012-2022.min.js" }}
-{{ $initMomentjs := resources.Get "js/initMoment.js" | resources.ExecuteAsTemplate "js/initMoment.tmp.js" . }}
-{{ $bundleMoment := slice $momentjs $momentTimezone $momentTimezoneWithData $initMomentjs | resources.Concat "/js/bundleMoment.js" | fingerprint }}
-<script src="{{ $bundleMoment.Permalink }}" integrity="{{ $bundleMoment.Data.Integrity }}"></script>
-{{ end }}
-
 {{ template "_internal/google_analytics_async.html" . }}

layouts/partials/head/favicons.html

@@ -1,2 +1,3 @@
-<!-- Icon -->
+{{ with .Site.Params.favicon }}
-<link rel="shortcut icon" href="{{ .Site.Params.faviconFile | default "img/favicon.ico" | relURL }}">
+<link rel="shortcut icon" href="{{ . | relURL }}">
+{{ end }}

layouts/partials/home/blog.html

@@ -2,10 +2,10 @@
 <div class="section" id="{{ .Title | urlize }}">
     <!-- Begin Blog container -->
     <div class="container">
-        {{ if .Site.Params.showLatest }}
+        {{ if .Site.Params.home.showLatest | default true }}
         <h2 class="title is-2 has-text-centered">{{ i18n "index_blog_latestPosts" . }}</h2>
             {{ range first 1 .Pages.ByPublishDate.Reverse }}
-            <div class="summary">{{ .Date.Format (.Site.Params.dateForm | default "Jan 02, 2006") }}
+            <div class="summary">{{ .Date.Format (.Site.Params.dateFormat | default "Jan 02, 2006") }}
                 <h3 class="title is-3 latest-post-title"><a href="{{ .RelPermalink }}">{{ .Title }}</a></h3>
                     <div class="markdown">
                     {{ .Summary }}
@@ -16,7 +16,7 @@
             </div>
             {{ end }}
         {{ end }}
-        {{ if .Site.Params.showAllPosts }}
+        {{ if .Site.Params.home.showAllPosts }}
         <h2 class="title is-2 has-text-centered top-pad">{{ i18n "index_blog_allPosts" . }}</h2>
             {{ partialCached "blog/li.html" . }}
         {{ else }}