wip

32 files changed, 31 insertions, 25 deletions

diff --git a/layouts/index.html b/layouts/index.html
index d77b573..c020151 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -21,8 +21,8 @@
 
       {{ partial `footer.html`        . }}
       {{ partial `footer.bottom.html` . }}
-    </div> <!-- all -->
-    {{ partial `scripts.bottom.html`  . }}
+      {{ partial `scripts.bottom.html`  . }}
+    </div>
   </body>
   {{- partial `debug.html` . -}}
 </html>
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index 8ca1b93..a1fff41 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -48,7 +48,6 @@
     {{- end }} {{/* if isset */}}
     {{- end }} {{/* if recentPosts.enableFooter */}}
 
-
     {{- if or $.Site.Params.debug (findRE `\bhtml-comment\b` $.Site.Params.traceFlags) }}
       {{ `<!-- Site.Params.address  -->` | safeHTML }}
     {{- end}}
@@ -58,9 +57,9 @@
       <h4>{{ default `Contact` (i18n `contactTitle`) }}</h4>
       <div class="notranslate">{{- $.Site.Params.address | markdownify -}}</div><br/>
       {{ if $.Site.Param `footerContactButton` }}
-      {{ with ($.Site.GetPage `page` ($.Site.Param `footerContactButton`)) }}
-      <a href='{{ .Permalink | relURL }}{{ if $.Site.Params.uglyURLs }}{{$.Site.Params.uglyUrl}}{{ end }}' class='w3-button {{ default `w3-theme-l4` ($.Site.Param `colorFooterButton`)}} '>{{ default `contact` (i18n `contactGoTo`) }}</a></div> <!-- w3-col -->
-      {{end}}
+        {{ with ($.Site.GetPage `page` ($.Site.Param `footerContactButton`)) }}
+      <a href='{{ .Permalink | relURL }}{{ if $.Site.Params.uglyURLs }}{{$.Site.Params.uglyUrl}}{{ end }}' class='w3-button {{ default `w3-theme-l4` ($.Site.Param `colorFooterButton`)}} '>{{ default `contact` (i18n `contactGoTo`) }}</a>
+        {{end}}
       {{end}}
     </div>
     {{- end }}
diff --git a/layouts/partials/head.cookieconsent.html b/layouts/partials/head.cookieconsent.html
index 408df36..1eea071 100644
--- a/layouts/partials/head.cookieconsent.html
+++ b/layouts/partials/head.cookieconsent.html
@@ -8,6 +8,8 @@
   https://cookieconsent.insites.com/download/
   */}}
 
+{{- /* $assetBusting := not .Site.Params.disableCSSAssetsBusting }}{{ if $assetBusting }}?{{ now.Unix }}{{ end */}}
+
   <link rel="stylesheet" href="{{ `/vendor/insites/cookieconsent/cookieconsent.3.0.6.min.css` | relURL }}">
   <script src="{{                 `/vendor/insites/cookieconsent/cookieconsent.3.0.6.min.js`  | relURL }}"></script>
 
diff --git a/layouts/partials/head.favicon.html b/layouts/partials/head.favicon.html
index f475d7c..3ef3dae 100644
--- a/layouts/partials/head.favicon.html
+++ b/layouts/partials/head.favicon.html
@@ -5,7 +5,7 @@
 {{- if $.Site.Params.favicon.enable  }}
 {{- /*  <!-- Favicon and apple touch icons-->         */}}
 {{- /*  <!-- use https://realfavicongenerator.net to generate you files --> */}}
-{{- $myFaviconVersion := default `a_random_value`   $.Site.Params.favicon.version }}
+{{- $myFaviconVersion := default (string now.Unix) $.Site.Params.favicon.version }}
 {{- $myFaviconPath    := default `/images/favicons` $.Site.Params.favicon.path    }}
   <link rel="apple-touch-icon"      sizes="180x180" href='{{(printf `%s/%s?v=%s`   $myFaviconPath `apple-touch-icon.png`       $myFaviconVersion ) | relURL }}' />
   <link rel="icon" type="image/png" sizes="16x16"   href='{{(printf `%s/%s?v=%s`   $myFaviconPath `favicon-16x16.png`          $myFaviconVersion ) | relURL }}' />
diff --git a/layouts/partials/head.stylesheets.html b/layouts/partials/head.stylesheets.html
index c7389f5..90e67e3 100644
--- a/layouts/partials/head.stylesheets.html
+++ b/layouts/partials/head.stylesheets.html
@@ -1,24 +1,26 @@
 {{- if or $.Site.Params.debug (findRE `\bhtml-comment\b` $.Site.Params.traceFlags) }}
 {{ `<!-- partials/head.stylesheets.html -->` | safeHTML }}
 {{- end}}
-<link rel="stylesheet" href='{{ relURL `vendor/fontawesome/css/all.css`                                  }}' />
-<link rel="stylesheet" href='{{ relURL `vendor/daneden.github.io/animate.css/animate.min.css`            }}' />
-<link rel="stylesheet" href='{{ relURL `vendor/OwlCarousel2/owl.carousel.min.css`                        }}' />
-<link rel="stylesheet" href='{{ relURL `vendor/OwlCarousel2/owl.theme.default.min.css`                   }}' />
 
-<link rel="stylesheet" href='{{ relURL `vendor/w3css/4/w3.css`                                           }}' />
+{{- $assetBusting := not .Site.Params.disableCSSAssetsBusting }}
+<link rel="stylesheet" href='{{ relURL `vendor/fontawesome/5.1.0/css/all.css`                            }}' />
+<link rel="stylesheet" href='{{ relURL `vendor/daneden.github.io/animate.css/animate.min.css`            }}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}' />
+<link rel="stylesheet" href='{{ relURL `vendor/OwlCarousel2/owl.carousel.min.css`                        }}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}' />
+<link rel="stylesheet" href='{{ relURL `vendor/OwlCarousel2/owl.theme.default.min.css`                   }}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}' />
+
+<link rel="stylesheet" href='{{ relURL `vendor/w3css/4/4.10/w3.css`                                      }}' />
 {{- /* if and (isset $.Site.Params (lower `w3css_color_theme` )) $.Site.Params.w3css_color_theme */}}
 {{- if $.Site.Params.w3cssColorTheme }}
-<link rel="stylesheet" id="theme-colors" href='{{ relURL $.Site.Params.w3cssColorTheme }}' />
+<link rel="stylesheet" id="theme-colors" href='{{ relURL $.Site.Params.w3cssColorTheme }}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}' />
 {{- else }}
-  <link rel="stylesheet" id="theme-colors" href='{{ relURL `vendor/w3css/4/w3-theme-red.css` }}' />
+  <link rel="stylesheet" id="theme-colors" href='{{ relURL `vendor/w3css/4/w3-theme-red.css` }}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}' />
 {{- end }}
 
-<link rel="stylesheet" href='{{ relURL `css/syntax.min.css`       }}' />
-<link rel="stylesheet" href='{{ relURL `css/w3css-basic.min.css`  }}' />
-<link rel="stylesheet" href='{{ relURL `css/res-gallery.min.css`  }}' />
+<link rel="stylesheet" href='{{ relURL `css/syntax.min.css`       }}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}' />
+<link rel="stylesheet" href='{{ relURL `css/w3css-basic.min.css`  }}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}' />
+<link rel="stylesheet" href='{{ relURL `css/res-gallery.min.css`  }}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}' />
 
-<link rel="stylesheet" href='{{ relURL `css/custom.css`           }}' />
+<link rel="stylesheet" href='{{ relURL `css/custom.css`           }}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}' />
 {{- range .Site.Params.custom_css }}
-<link rel="stylesheet" href='{{ . | relURL                        }}' />
+<link rel="stylesheet" href='{{ . | relURL                        }}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}' />
 {{- end }}
diff --git a/layouts/partials/scripts.bottom.html b/layouts/partials/scripts.bottom.html
index 30cc6b8..cbda662 100644
--- a/layouts/partials/scripts.bottom.html
+++ b/layouts/partials/scripts.bottom.html
@@ -2,6 +2,8 @@
 {{ `<!-- partials/scripts.bottom.html -->` | safeHTML }}
 {{- end}}
 
+{{- $assetBusting := not .Site.Params.disableJSAssetsBusting }}
+
 <script src='{{ `/vendor/jquery/jquery-3.3.1.slim.min.js` | relURL }}'></script> <!-- used by owl.carousel, setStyleSheet  -->
 {{- if $.Site.Params.menutopbar.themeColorSelectorEnable }}
   <script>
@@ -16,8 +18,8 @@
 {{- end }}
 
 {{- if .IsHome }}
-<script src='{{ `/vendor/OwlCarousel2/owl.carousel.min.js` | relURL }}'></script>
-<script src='{{ `/js/front.min.js`                         | relURL }}'></script> <!-- patches owl.carousel  -->
+<script src='{{ `/vendor/OwlCarousel2/owl.carousel.min.js` | relURL }}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}'></script>
+<script src='{{ `/js/front.min.js`                         | relURL }}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}'></script> <!-- patches owl.carousel  -->
 {{- end }}
 
 {{- if isset $.Site.Params (lower `options` ) }}
@@ -25,7 +27,7 @@
 {{- end}}
 {{- end}}
 
-<script src='{{ `/js/custom.bottom.js`                     | relURL }}'></script>
+<script src='{{ `/js/custom.bottom.js`                     | relURL }}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}'></script>
 {{- range .Site.Params.custom_js_bottom }}
-<script src='{{ .                                          | absURL }}'></script>
+<script src='{{ .                                          | absURL }}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}'></script>
 {{- end }}
diff --git a/layouts/partials/scripts.top.html b/layouts/partials/scripts.top.html
index 9a43608..10fe198 100644
--- a/layouts/partials/scripts.top.html
+++ b/layouts/partials/scripts.top.html
@@ -3,7 +3,8 @@
 {{- end}}
 {{- if .IsHome }}
 {{- end }}
-<script src='{{ `js/custom.top.js`                         | relURL }}'></script>
+{{- $assetBusting := not .Site.Params.disableJSAssetsBusting }}
+<script src='{{ `js/custom.top.js`                         | relURL }}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}'></script>
 {{- range .Site.Params.custom_js_top }}
-<script src='{{ .                                          | relURL }}'></script>
+<script src='{{ .                                          | relURL }}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}'></script>
 {{- end }}
diff --git a/static/vendor/fontawesome/LICENSE.txt b/static/vendor/fontawesome/5.1.0/LICENSE.txt
index 28c1c4b..28c1c4b 100644
--- a/static/vendor/fontawesome/LICENSE.txt
+++ b/static/vendor/fontawesome/5.1.0/LICENSE.txt
diff --git a/static/vendor/fontawesome/css/all.css b/static/vendor/fontawesome/5.1.0/css/all.css
index 7fec2e3..7fec2e3 100644
--- a/static/vendor/fontawesome/css/all.css
+++ b/static/vendor/fontawesome/5.1.0/css/all.css
diff --git a/static/vendor/fontawesome/css/brands.css b/static/vendor/fontawesome/5.1.0/css/brands.css
index 2d9e4c6..2d9e4c6 100644
--- a/static/vendor/fontawesome/css/brands.css
+++ b/static/vendor/fontawesome/5.1.0/css/brands.css
diff --git a/static/vendor/fontawesome/css/fontawesome.css b/static/vendor/fontawesome/5.1.0/css/fontawesome.css
index 68b26ef..68b26ef 100644
--- a/static/vendor/fontawesome/css/fontawesome.css
+++ b/static/vendor/fontawesome/5.1.0/css/fontawesome.css
diff --git a/static/vendor/fontawesome/css/regular.css b/static/vendor/fontawesome/5.1.0/css/regular.css
index 02b22fa..02b22fa 100644
--- a/static/vendor/fontawesome/css/regular.css
+++ b/static/vendor/fontawesome/5.1.0/css/regular.css
diff --git a/static/vendor/fontawesome/css/solid.css b/static/vendor/fontawesome/5.1.0/css/solid.css
index aed56a2..aed56a2 100644
--- a/static/vendor/fontawesome/css/solid.css
+++ b/static/vendor/fontawesome/5.1.0/css/solid.css
diff --git a/static/vendor/fontawesome/css/svg-with-js.css b/static/vendor/fontawesome/5.1.0/css/svg-with-js.css
index 504203d..504203d 100644
--- a/static/vendor/fontawesome/css/svg-with-js.css
+++ b/static/vendor/fontawesome/5.1.0/css/svg-with-js.css
diff --git a/static/vendor/fontawesome/css/v4-shims.css b/static/vendor/fontawesome/5.1.0/css/v4-shims.css
index b10f655..b10f655 100644
--- a/static/vendor/fontawesome/css/v4-shims.css
+++ b/static/vendor/fontawesome/5.1.0/css/v4-shims.css
diff --git a/static/vendor/fontawesome/css/v4-shims.min.css b/static/vendor/fontawesome/5.1.0/css/v4-shims.min.css
index a47c8e2..a47c8e2 100644
--- a/static/vendor/fontawesome/css/v4-shims.min.css
+++ b/static/vendor/fontawesome/5.1.0/css/v4-shims.min.css
diff --git a/static/vendor/fontawesome/webfonts/fa-brands-400.eot b/static/vendor/fontawesome/5.1.0/webfonts/fa-brands-400.eot
index f8e4818..f8e4818 100644
--- a/static/vendor/fontawesome/webfonts/fa-brands-400.eot
+++ b/static/vendor/fontawesome/5.1.0/webfonts/fa-brands-400.eot
diff --git a/static/vendor/fontawesome/webfonts/fa-brands-400.svg b/static/vendor/fontawesome/5.1.0/webfonts/fa-brands-400.svg
index 68eb65a..68eb65a 100644
--- a/static/vendor/fontawesome/webfonts/fa-brands-400.svg
+++ b/static/vendor/fontawesome/5.1.0/webfonts/fa-brands-400.svg
diff --git a/static/vendor/fontawesome/webfonts/fa-brands-400.ttf b/static/vendor/fontawesome/5.1.0/webfonts/fa-brands-400.ttf
index 2b00dae..2b00dae 100644
--- a/static/vendor/fontawesome/webfonts/fa-brands-400.ttf
+++ b/static/vendor/fontawesome/5.1.0/webfonts/fa-brands-400.ttf
diff --git a/static/vendor/fontawesome/webfonts/fa-brands-400.woff b/static/vendor/fontawesome/5.1.0/webfonts/fa-brands-400.woff
index 9e4b7e1..9e4b7e1 100644
--- a/static/vendor/fontawesome/webfonts/fa-brands-400.woff
+++ b/static/vendor/fontawesome/5.1.0/webfonts/fa-brands-400.woff
diff --git a/static/vendor/fontawesome/webfonts/fa-brands-400.woff2 b/static/vendor/fontawesome/5.1.0/webfonts/fa-brands-400.woff2
index b9e58c5..b9e58c5 100644
--- a/static/vendor/fontawesome/webfonts/fa-brands-400.woff2
+++ b/static/vendor/fontawesome/5.1.0/webfonts/fa-brands-400.woff2
diff --git a/static/vendor/fontawesome/webfonts/fa-regular-400.eot b/static/vendor/fontawesome/5.1.0/webfonts/fa-regular-400.eot
index 5217c95..5217c95 100644
--- a/static/vendor/fontawesome/webfonts/fa-regular-400.eot
+++ b/static/vendor/fontawesome/5.1.0/webfonts/fa-regular-400.eot
diff --git a/static/vendor/fontawesome/webfonts/fa-regular-400.svg b/static/vendor/fontawesome/5.1.0/webfonts/fa-regular-400.svg
index 5f49543..5f49543 100644
--- a/static/vendor/fontawesome/webfonts/fa-regular-400.svg
+++ b/static/vendor/fontawesome/5.1.0/webfonts/fa-regular-400.svg
diff --git a/static/vendor/fontawesome/webfonts/fa-regular-400.ttf b/static/vendor/fontawesome/5.1.0/webfonts/fa-regular-400.ttf
index cefbd50..cefbd50 100644
--- a/static/vendor/fontawesome/webfonts/fa-regular-400.ttf
+++ b/static/vendor/fontawesome/5.1.0/webfonts/fa-regular-400.ttf
diff --git a/static/vendor/fontawesome/webfonts/fa-regular-400.woff b/static/vendor/fontawesome/5.1.0/webfonts/fa-regular-400.woff
index 954b059..954b059 100644
--- a/static/vendor/fontawesome/webfonts/fa-regular-400.woff
+++ b/static/vendor/fontawesome/5.1.0/webfonts/fa-regular-400.woff
diff --git a/static/vendor/fontawesome/webfonts/fa-regular-400.woff2 b/static/vendor/fontawesome/5.1.0/webfonts/fa-regular-400.woff2
index bd35950..bd35950 100644
--- a/static/vendor/fontawesome/webfonts/fa-regular-400.woff2
+++ b/static/vendor/fontawesome/5.1.0/webfonts/fa-regular-400.woff2
diff --git a/static/vendor/fontawesome/webfonts/fa-solid-900.eot b/static/vendor/fontawesome/5.1.0/webfonts/fa-solid-900.eot
index cc691d6..cc691d6 100644
--- a/static/vendor/fontawesome/webfonts/fa-solid-900.eot
+++ b/static/vendor/fontawesome/5.1.0/webfonts/fa-solid-900.eot
diff --git a/static/vendor/fontawesome/webfonts/fa-solid-900.svg b/static/vendor/fontawesome/5.1.0/webfonts/fa-solid-900.svg
index 1534b64..1534b64 100644
--- a/static/vendor/fontawesome/webfonts/fa-solid-900.svg
+++ b/static/vendor/fontawesome/5.1.0/webfonts/fa-solid-900.svg
diff --git a/static/vendor/fontawesome/webfonts/fa-solid-900.ttf b/static/vendor/fontawesome/5.1.0/webfonts/fa-solid-900.ttf
index 618136a..618136a 100644
--- a/static/vendor/fontawesome/webfonts/fa-solid-900.ttf
+++ b/static/vendor/fontawesome/5.1.0/webfonts/fa-solid-900.ttf
diff --git a/static/vendor/fontawesome/webfonts/fa-solid-900.woff b/static/vendor/fontawesome/5.1.0/webfonts/fa-solid-900.woff
index af47657..af47657 100644
--- a/static/vendor/fontawesome/webfonts/fa-solid-900.woff
+++ b/static/vendor/fontawesome/5.1.0/webfonts/fa-solid-900.woff
diff --git a/static/vendor/fontawesome/webfonts/fa-solid-900.woff2 b/static/vendor/fontawesome/5.1.0/webfonts/fa-solid-900.woff2
index 9ef566a..9ef566a 100644
--- a/static/vendor/fontawesome/webfonts/fa-solid-900.woff2
+++ b/static/vendor/fontawesome/5.1.0/webfonts/fa-solid-900.woff2
diff --git a/static/vendor/w3css/4/w3.css b/static/vendor/w3css/4/4.10/w3.css
index 51df4bd..51df4bd 100644
--- a/static/vendor/w3css/4/w3.css
+++ b/static/vendor/w3css/4/4.10/w3.css