Merge remote-tracking branch 'twatzl/add-on-fix' into remove-cdn

pacollins · Aug 26, 2019 · e94a830 · e94a830
2 parents b055367 + 7973044
commit e94a830
Show file tree

Hide file tree

Showing 13 changed files with 80 additions and 70 deletions.
diff --git a/README.md b/README.md
@@ -169,6 +169,12 @@ _false_ will turn a feature **off**. It is structured as follows:
 └── .Social  // Controls Links to Social Media
 ```
 
+### Custom JavaScript and CSS
+
+You can adapt this theme according to your preferences using your own JS or CSS code.
+To do this your can add your custom scripts to the `cssFiles` and `jsFiles`
+parameters in *config.toml*.
+
 ### Hugo's Built-In Server
 
 To see a live version of your site locally, use the following command:

diff --git a/archetypes/blog.md b/archetypes/blog.md
@@ -3,9 +3,7 @@ author = ""
 categories = [""]
 date = ""
 description = ""
-featured = ""
-featuredalt = ""
-featuredpath = ""
+images = [""]
 linktitle = ""
 title = ""
 type = "post"

diff --git a/archetypes/default.md b/archetypes/default.md
@@ -3,8 +3,6 @@ author = ""
 categories = []
 description = ""
 linktitle = ""
-featured = ""
-featuredpath = ""
-featuredalt = ""
+images = [""]
 
 +++
diff --git a/archetypes/itemized.md b/archetypes/itemized.md
diff --git a/exampleSite/config.toml b/exampleSite/config.toml
@@ -110,32 +110,37 @@ disableLanguages        = [""]
   # Identifier prepends a Font Awesome icon to the menu item
   [[menu.main]]
     name              = "Home"
+    identifier        = "home"
     url               = "/"
-    identifier        = "fas fa-home"
+    pre               = "<i class='fa fa-home'></i>"
     weight            = 1
 
   [[menu.main]]
     name              = "About"
+    identifier        = "about"
     url               = "/about/"
-    identifier        = "far fa-id-card"
+    pre               = "<i class='far fa-id-card'></i>"
     weight            = 2
 
   [[menu.main]]
     name              = "Blog"
+    identifier        = "blog"
     url               = "/blog/"
-    identifier        = "far fa-newspaper"
+    pre               = "<i class='far fa-newspaper'></i>"
     weight            = 3
 
   [[menu.main]]
     name              = "Categories"
+    identifier        = "categories"
     url               = "/categories/"
-    identifier        = "fas fa-sitemap"
+    pre               = "<i class='fas fa-sitemap'></i>"
     weight            = 5
 
   [[menu.main]]
     name              = "Contact"
+    identifier        = "contact"
     url               = "/contact/"
-    identifier        = "far fa-envelope"
+    pre               = "<i class='far fa-envelope'></i>"
     weight            = 6
 
 [Languages]
@@ -154,32 +159,37 @@ disableLanguages        = [""]
 
     [[Languages.de.menu.main]]
       name              = "Startseite"
+      identifier        = "home"
       url               = "/"
-      identifier        = "fas fa-home"
+      pre               = "<i class='fas fa-home'></i>"
       weight            = 1
 
     [[Languages.de.menu.main]]
       name              = "Über mich"
+      identifier        = "about"
       url               = "/about/"
-      identifier        = "far fa-id-card"
+      pre               = "<i class='far fa-id-card'></i>"
       weight            = 2
 
     [[Languages.de.menu.main]]
       name              = "Blog"
+      identifier        = "blog"
       url               = "/blog/"
-      identifier        = "far fa-newspaper"
+      pre               = "<i class='far fa-newspaper'></i>"
       weight            = 3
 
     [[Languages.de.menu.main]]
       name              = "Kategorien"
+      identifier        = "categories"
       url               = "/categories/"
-      identifier        = "fas fa-sitemap"
+      pre               = "<i class='fas fa-sitemap'></i>"
       weight            = 5
 
     [[Languages.de.menu.main]]
       name              = "Kontakt"
+      identifier        = "contact"
       url               = "/contact/"
-      identifier        = "far fa-envelope"
+      pre               = "<i class='far fa-envelope'></i>"
       weight            = 6
 
   [Languages.fr]
@@ -191,32 +201,37 @@ disableLanguages        = [""]
 
     [[Languages.fr.menu.main]]
       name              = "Accueil"
+      identifier        = "home"
       url               = "/"
-      identifier        = "fas fa-home"
+      pre               = "<i class='fas fa-home'></i>"
       weight            = 1
 
     [[Languages.fr.menu.main]]
       name              = "About"
+      identifier        = "about"
       url               = "/about/"
-      identifier        = "far fa-id-card"
+      pre               = "<i class='far fa-id-card'></i>"
       weight            = 2
 
     [[Languages.fr.menu.main]]
       name              = "Blog"
+      identifier        = "blog"
       url               = "/blog/"
-      identifier        = "far fa-newspaper"
+      pre               = "<i class='far fa-newspaper'></i>"
       weight            = 3
 
     [[Languages.fr.menu.main]]
       name              = "Catégories"
+      identifier        = "categories"
       url               = "/categories/"
-      identifier        = "fas fa-sitemap"
+      pre               = "<i class='fas fa-sitemap'></i>"
       weight            = 5
 
     [[Languages.fr.menu.main]]
       name              = "Contact"
+      identifier        = "contact"
       url               = "/contact/"
-      identifier        = "far fa-envelope"
+      pre               = "<i class='far fa-envelope'></i>"
       weight            = 6
 
   [Languages.pl]
@@ -228,32 +243,37 @@ disableLanguages        = [""]
 
     [[Languages.pl.menu.main]]
       name              = "Home"
+      identifier        = "home"
       url               = "/"
-      identifier        = "fas fa-home"
+      pre               = "<i class='fas fa-home'></i>"
       weight            = 1
 
     [[Languages.pl.menu.main]]
       name              = "O mnie"
+      identifier        = "about"
       url               = "/about/"
-      identifier        = "far fa-id-card"
+      pre               = "<i class='far fa-id-card'></i>"
       weight            = 2
 
     [[Languages.pl.menu.main]]
       name              = "Blog"
+      identifier        = "blog"
       url               = "/blog/"
-      identifier        = "far fa-newspaper"
+      pre               = "<i class='far fa-newspaper'></i>"
       weight            = 3
 
     [[Languages.pl.menu.main]]
       name              = "Kategorie"
+      identifier        = "categories"
       url               = "/categories/"
-      identifier        = "fas fa-sitemap"
+      pre               = "<i class='fas fa-sitemap'></i>"
       weight            = 5
 
     [[Languages.pl.menu.main]]
       name              = "Kontakt"
+      identifier        = "contact"
       url               = "/contact/"
-      identifier        = "far fa-envelope"
+      pre               = "<i class='far fa-envelope'></i>"
       weight            = 6
 
   [Languages.pt]
@@ -265,32 +285,37 @@ disableLanguages        = [""]
 
     [[Languages.pt.menu.main]]
       name              = "Início"
+      identifier        = "home"
       url               = "/"
-      identifier        = "fas fa-home"
+      pre               = "<i class='fas fa-home'></i>"
       weight            = 1
 
     [[Languages.pt.menu.main]]
       name              = "Sobre"
+      identifier        = "about"
       url               = "/about/"
-      identifier        = "far fa-id-card"
+      pre               = "<i class='far fa-id-card'></i>"
       weight            = 2
 
     [[Languages.pt.menu.main]]
       name              = "Blog"
+      identifier        = "blog"
       url               = "/blog/"
-      identifier        = "far fa-newspaper"
+      pre               = "<i class='far fa-newspaper'></i>"
       weight            = 3
 
     [[Languages.pt.menu.main]]
       name              = "Categorias"
+      identifier        = "categories"
       url               = "/categories/"
-      identifier        = "fas fa-sitemap"
+      pre               = "<i class='fas fa-sitemap'></i>"
       weight            = 5
 
     [[Languages.pt.menu.main]]
       name              = "Contato"
+      identifier        = "contact"
       url               = "/contact/"
-      identifier        = "far fa-envelope"
+      pre               = "<i class='far fa-envelope'></i>"
       weight            = 6
 
 # Sets Social Media icons to appear and link to your account. Value should be your

diff --git a/exampleSite/static/css/add-on.css b/exampleSite/static/css/add-on.css
diff --git a/exampleSite/static/js/add-on.js b/exampleSite/static/js/add-on.js
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
@@ -18,7 +18,6 @@
         {{ $mainCSSOptions := (dict "targetPath" "css/main.min.css" "outputStyle" "compressed") }}
         {{ $main := resources.Get "scss/main.scss" | resources.ToCSS $mainCSSOptions | resources.Fingerprint }}
         <link rel="stylesheet" href="{{ $main.RelPermalink }}" integrity="{{ $main.Data.Integrity }}">
-        <link rel="stylesheet" href="{{ "css/add-on.css" | relURL }}">
       {{ else }}
         <link rel="stylesheet" href="{{ . | relURL }}">
       {{ end }}
@@ -35,7 +34,6 @@
         {{ end }}
         {{ $css := $cssSlice | resources.Concat "css/bundle.css" | resources.Minify | resources.Fingerprint }}
         <link rel="stylesheet" href="{{ $css.RelPermalink }}" integrity="{{ $css.Data.Integrity }}">
-        <link rel="stylesheet" href="{{ "css/add-on.css" | relURL }}">
       {{ else }}
         <link rel="stylesheet" href="{{ . | relURL }}">
       {{ end }}

diff --git a/layouts/partials/meta.html b/layouts/partials/meta.html
@@ -1,6 +1,5 @@
 <meta charset="utf-8">
 <title>{{ .Title }}{{ if ne .Title .Site.Title }} - {{ .Site.Title }}{{ end }}</title>
-<meta name="description" content="{{ with .Description }}{{ . }}{{ else }}{{ with .Site.Params.meta.description }}{{ . }}{{ end }}{{ end }}">
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <!-- TODO: Do we want to add rel=author? -->
 {{ if .Site.Params.meta.favicon }}

diff --git a/layouts/partials/scripts.html b/layouts/partials/scripts.html
@@ -16,7 +16,6 @@
       {{ end }}
       {{ $js := $jsSlice | resources.Concat "js/localbundle.js" | resources.Minify | resources.Fingerprint }}
     <script src="{{ $js.RelPermalink }}" integrity="{{ $js.Data.Integrity }}">
-    <script src="{{ "js/add-on.js" | relURL }}"></script>
     {{ else }}
       <script src="{{ . | relURL }}"></script>
     {{ end }}
@@ -39,8 +38,7 @@
         }
       {{ end }}
       {{ $js := $jsSlice | resources.Concat "js/bundle.js" | resources.Minify | resources.Fingerprint }}
-    <script src="{{ $js.RelPermalink }}" integrity="{{ $js.Data.Integrity }}"></script>
-    <script src="{{ "js/add-on.js" | relURL }}"></script>
+      <script src="{{ $js.RelPermalink }}" integrity="{{ $js.Data.Integrity }}"></script>
     {{ else }}
       <script src="{{ . | relURL }}"></script>
     {{ end }}

diff --git a/layouts/partials/site-header.html b/layouts/partials/site-header.html
@@ -20,7 +20,17 @@ <h1 class="nav-title">
     </h1>
     <menu id="site-nav-menu" class="flyout-menu">
       {{ range .Site.Menus.main }}
-        <a href="{{ .URL | relLangURL }}" class="link"><i class="{{ .Identifier }}">&nbsp;</i>{{ .Name }}</a>
+        {{ if and (gt (len (findRE "fa[rsb]( fa-([a-z-]+))+" .Identifier)) 0) (not .Pre) }}
+          {{/* Old syntax: use '.Identifier' for icon rendering */}}
+          <a href="{{ .URL | relLangURL }}" class="link"><i class="{{ .Identifier }}">&nbsp;</i>{{ .Name }}</a>
+        {{ else }}
+          {{/* New syntax: use '.Pre' for icon rendering */}}
+          {{ if .Pre }}
+            <a href="{{ .URL | relLangURL }}" class="link">{{ .Pre }} {{ .Name }}</a>
+          {{ else }}
+            <a href="{{ .URL | relLangURL }}" class="link">{{ .Name }}</a>
+          {{ end }}
+        {{ end }}
       {{ end }}
       {{ if .Site.Params.header.shareMenu }}<a href="#share-menu" class="share-toggle"><i class="fas fa-share-alt">&nbsp;</i>Share</a>{{ end }}
       {{ if .Site.Params.header.searchMenu }}{{ partial "search-menu" . }}{{ end }}

diff --git a/layouts/partials/site-intro.html b/layouts/partials/site-intro.html
@@ -14,5 +14,4 @@
       </ul>
     </footer>
   {{ end }}
-  <p>{{ .Site.Languages }}</p>
 </section>
diff --git a/layouts/post/featured.html b/layouts/post/featured.html
@@ -1,5 +1,11 @@
-{{ if .Params.featured }}
-<a href="{{ .RelPermalink }}" class="image featured">
-  <img src="{{ (path.Join "img" (cond (eq .Params.featuredpath "date") (.Page.Date.Format "2006/01") (.Params.featuredpath)) .Params.featured) | relURL }}" alt="{{ .Params.featuredalt }}">
-</a>
+{{ if .Params.images }}
+  <a href="{{ .RelPermalink }}" class="image featured">
+    {{ range first 1 .Params.images }}
+      <img src="{{ . | relURL }}" alt="">
+    {{ end }}
+  </a>
+{{ else if .Params.featured }}
+  <a href="{{ .RelPermalink }}" class="image featured">
+    <img src="{{ (path.Join "img" (cond (eq .Params.featuredpath "date") (.Page.Date.Format "2006/01") (.Params.featuredpath)) .Params.featured) | relURL }}" alt="{{ .Params.featuredalt }}">
+  </a>
 {{ end }}