localize 404 page; allow Markdown at more places; clickable feature i…

…cons (devcows#184) * allow Markdown in clients (sub)title * localize 404 page * add Markdown support for recent posts title * allow Markdown in see_more section strings * allow Markdown in features names * make feature icons clickable (hyperlinks) * allow Markdown in credits strings; better bootstrapious link * make see_more section more flexible: avoid Hugo error(s) when `params.see_more.link_url` or `params.see_more.link_text` aren't defined * rename `link` key into `url` to be consistent: - since in the client YAML files the respective key is names `url`, I guess I should stick to that. - besides I've removed the one `#` I've specified as the URL in `data/features/webdesign.yaml`; originally that was intended as a "visual" hint that now it is easily possible to make the features clickable. but I guess that's not really necessary, if not even irritating. * layouts: remove double logo from 404 the changes in this commit are identical with timmn's commit 33ad328 * rename string to * translate remaining Catalan 404 strings * improve documentation of feature YAML files
NineFX · Nov 8, 2019 · 2c95159 · 2c95159
1 parent 768e197
commit 2c95159
Show file tree

Hide file tree

Showing 26 changed files with 173 additions and 34 deletions.
diff --git a/README.md b/README.md
@@ -261,7 +261,7 @@ Once the carousel is configured, it must be explicitly enabled in the `config.to
 
 #### Features
 
-Features are also defined in the `data` directory just like the carousel.
+Features are also defined in the `data` directory just like the carousel:
 
 ```
 data
@@ -274,16 +274,25 @@ data
     └── webdesign.yaml
 ```
 
-A feature file looks like this.
+The content of the `consulting.yaml` example feature file looks like this:
 
 ```yaml
 weight: 4
 name: "Consulting"
-icon: "fas fa-lightbulb-o"
+icon: "fas fa-lightbulb"
+url: ""
 description: "Fifth abundantly made Give sixth hath. Cattle creature i be don't them behold green moved fowl Moved life us beast good yielding. Have bring."
 ```
 
-The `icon` field is the CSS class of an icon. In this example we have used icons powered by [FontAwesome](http://fontawesome.io/icons/).
+The meaning of the individual YAML keys is as follows:
+
+| Key | Description |
+| --- | ----------- |
+| `weight` | A means to set the order of multiple features; features with a lower `weight` are displayed first (left to right, top to bottom) |
+| `name` | The title text below the feature icon; Markdown is supported |
+| `icon` | The CSS class of the feature icon; in this example we have used icons powered by [FontAwesome](http://fontawesome.io/icons/) |
+| `url` | An optional URL the feature icon should point to; if specified, the icon will become a clickable hyperlink |
+| `description` | A short text below the title text to describe the feature; Markdown is supported |
 
 Once you have completed your features, enable them in the `config.toml` file.
 

diff --git a/exampleSite/data/features/consulting.yaml b/exampleSite/data/features/consulting.yaml
@@ -1,4 +1,5 @@
 weight: 4
 name: "Consulting"
 icon: "fas fa-lightbulb"
+url: ""
 description: "Fifth abundantly made Give sixth hath. Cattle creature i be don't them behold green moved fowl Moved life us beast good yielding. Have bring."
diff --git a/exampleSite/data/features/email.yaml b/exampleSite/data/features/email.yaml
@@ -1,4 +1,5 @@
 weight: 5
 name: "Email Marketing"
 icon: "far fa-envelope"
+url: ""
 description: "Advantage old had otherwise sincerity dependent additions. It in adapted natural hastily is justice. Six draw you him full not mean evil."
diff --git a/exampleSite/data/features/print.yaml b/exampleSite/data/features/print.yaml
@@ -1,4 +1,5 @@
 weight: 2
 name: "Print"
 icon: "fas fa-print"
+url: ""
 description: "Advantage old had otherwise sincerity dependent additions. It in adapted natural hastily is justice. Six draw you him full not mean evil."
diff --git a/exampleSite/data/features/seo.yaml b/exampleSite/data/features/seo.yaml
@@ -1,4 +1,5 @@
 weight: 3
 name: "SEO and SEM"
 icon: "fas fa-globe"
+url: ""
 description: "Am terminated it excellence invitation projection as. She graceful shy believed distance use nay. Lively is people so basket ladies window expect."
diff --git a/exampleSite/data/features/uiux.yaml b/exampleSite/data/features/uiux.yaml
@@ -1,4 +1,5 @@
 weight: 6
 name: "UI/UX"
 icon: "fas fa-user"
+url: ""
 description: "Am terminated it excellence invitation projection as. She graceful shy believed distance use nay. Lively is people so basket ladies window expect."
diff --git a/exampleSite/data/features/webdesign.yaml b/exampleSite/data/features/webdesign.yaml
@@ -1,4 +1,5 @@
 weight: 1
 name: "Webdesign"
 icon: "fas fa-desktop"
+url: ""
 description: "Fifth abundantly made Give sixth hath. Cattle creature i be don't them behold green moved fowl Moved life us beast good yielding. Have bring."
diff --git a/i18n/ca.yaml b/i18n/ca.yaml
@@ -69,3 +69,12 @@
 
 - id: publishedOn
   translation: "el"
+
+- id: 404Error
+  translation: "Error 404: Pàgina no trobada"
+
+- id: 404Message
+  translation: "Ho sentim – aquesta pàgina no es pot trobar en aquest lloc"
+
+- id: 404NavHome
+  translation: "Anar a l'inici"
diff --git a/i18n/de.yaml b/i18n/de.yaml
@@ -69,3 +69,12 @@
 
 - id: publishedOn
   translation: "am"
+
+- id: 404Error
+  translation: "Fehler 404: Seite nicht gefunden"
+
+- id: 404Message
+  translation: "Tut uns leid – diese Seite scheint nicht mehr hier zu sein"
+
+- id: 404NavHome
+  translation: "Zur Startseite gehen"
diff --git a/i18n/en.yaml b/i18n/en.yaml
@@ -69,3 +69,12 @@
 
 - id: publishedOn
   translation: "on"
+
+- id: 404Error
+  translation: "Error 404: Page not found"
+
+- id: 404Message
+  translation: "We are sorry – this page is not here anymore"
+
+- id: 404NavHome
+  translation: "Go to homepage"
diff --git a/i18n/es.yaml b/i18n/es.yaml
@@ -69,3 +69,12 @@
 
 - id: publishedOn
   translation: "el"
+
+- id: 404Error
+  translation: "Error 404: Página no encontrada"
+
+- id: 404Message
+  translation: "Lo sentimos – esta página ya no está aquí"
+
+- id: 404NavHome
+  translation: "Ir a la página de inicio"
diff --git a/i18n/fr.yaml b/i18n/fr.yaml
@@ -69,3 +69,12 @@
 
 - id: publishedOn
   translation: "le"
+
+- id: 404Error
+  translation: "Erreur 404: Page introuvable"
+
+- id: 404Message
+  translation: "Nous sommes désolés – cette page n'est plus là"
+
+- id: 404NavHome
+  translation: "Aller à l'accueil"
diff --git a/i18n/id.yaml b/i18n/id.yaml
@@ -69,3 +69,12 @@
 
 - id: publishedOn
   translation: "pada"
+
+- id: 404Error
+  translation: "Error 404: Page not found"
+
+- id: 404Message
+  translation: "We are sorry – this page is not here anymore"
+
+- id: 404NavHome
+  translation: "Ke laman utama"
diff --git a/i18n/it.yaml b/i18n/it.yaml
@@ -69,3 +69,12 @@
 
 - id: publishedOn
   translation: "il"
+
+- id: 404Error
+  translation: "Errore 404: Pagina non trovata"
+
+- id: 404Message
+  translation: "Siamo spiacenti – questa pagina non è più qui"
+
+- id: 404NavHome
+  translation: "Vai alla homepage"
diff --git a/i18n/ja.yaml b/i18n/ja.yaml
@@ -69,3 +69,12 @@
 
 - id: publishedOn
   translation: "日付"
+
+- id: 404Error
+  translation: "Error 404: Page not found"
+
+- id: 404Message
+  translation: "We are sorry – this page is not here anymore"
+
+- id: 404NavHome
+  translation: "ホームへ戻る"
diff --git a/i18n/nl.yaml b/i18n/nl.yaml
@@ -69,3 +69,12 @@
 
 - id: publishedOn
   translation: "op"
+
+- id: 404Error
+  translation: "Fout 404: Pagina niet gevonden"
+
+- id: 404Message
+  translation: "Het spijt ons – deze pagina is er niet meer"
+
+- id: 404NavHome
+  translation: "Ga naar de homepage"
diff --git a/i18n/pt-br.yaml b/i18n/pt-br.yaml
@@ -69,3 +69,12 @@
 
 - id: publishedOn
   translation: "em"
+
+- id: 404Error
+  translation: "Error 404: Page not found"
+
+- id: 404Message
+  translation: "We are sorry – this page is not here anymore"
+
+- id: 404NavHome
+  translation: "Vá à página inicial"
diff --git a/i18n/ru.yaml b/i18n/ru.yaml
@@ -69,3 +69,12 @@
 
 - id: publishedOn
   translation: "на"
+
+- id: 404Error
+  translation: "Error 404: Page not found"
+
+- id: 404Message
+  translation: "We are sorry – this page is not here anymore"
+
+- id: 404NavHome
+  translation: "Перейти на главную"
diff --git a/i18n/sv.yaml b/i18n/sv.yaml
@@ -69,3 +69,12 @@
 
 - id: publishedOn
   translation: "på"
+
+- id: 404Error
+  translation: "Error 404: Page not found"
+
+- id: 404Message
+  translation: "We are sorry – this page is not here anymore"
+
+- id: 404NavHome
+  translation: "Gå till startsidan"
diff --git a/i18n/zh.yaml b/i18n/zh.yaml
@@ -69,3 +69,12 @@
 
 - id: publishedOn
   translation: "在"
+
+- id: 404Error
+  translation: "Error 404: Page not found"
+
+- id: 404Message
+  translation: "We are sorry – this page is not here anymore"
+
+- id: 404NavHome
+  translation: "跳到主页"
diff --git a/layouts/404.html b/layouts/404.html
@@ -20,16 +20,10 @@
 
                     <div class="box">
 
-                        <p class="text-center">
-                            <a href="{{ .Site.BaseURL }}">
-                                <img src="{{ .Site.Params.logo }}" alt="{{ .Title }} logo">
-                            </a>
-                        </p>
-
-                        <h3>We are sorry - this page is not here anymore</h3>
-                        <h4 class="text-muted">Error 404 - Page not found</h4>
+                        <h3>{{ i18n "404Message" | markdownify }}</h3>
+                        <h4 class="text-muted">{{ i18n "404Error" | markdownify }}</h4>
 
-                        <p class="buttons"><a href="{{ .Site.BaseURL }}" class="btn btn-template-main"><i class="fas fa-home"></i> Go to Homepage</a>
+                        <p class="buttons"><a href="{{ .Site.BaseURL }}" class="btn btn-template-main"><i class="fas fa-home"></i> {{ i18n "404NavHome" | markdownify }}</a>
                         </p>
                     </div>
 

diff --git a/layouts/partials/clients.html b/layouts/partials/clients.html
@@ -6,11 +6,11 @@
         <div class="row">
             <div class="col-md-12">
                 <div class="heading text-center">
-                    <h2>{{ .Site.Params.clients.title }}</h2>
+                    <h2>{{ .Site.Params.clients.title | markdownify }}</h2>
                 </div>
 
                 <p class="lead">
-                  {{ .Site.Params.clients.subtitle }}
+                  {{ .Site.Params.clients.subtitle | markdownify }}
                 </p>
 
                 <ul class="owl-carousel customers">

diff --git a/layouts/partials/features.html b/layouts/partials/features.html
@@ -4,23 +4,29 @@
 <section class="bar background-white">
     <div class="container">
         {{ range $index, $element := sort .Site.Data.features "weight" }}
-		{{ if eq (mod $index 3) 0 }}
-		<div class="col-md-12">
+        {{ if eq (mod $index 3) 0 }}
+        <div class="col-md-12">
             <div class="row">
-		{{ end }}
-				<div class="col-md-4">
+        {{ end }}
+                <div class="col-md-4">
                     <div class="box-simple">
-                        <div class="icon">
-                            <i class="{{ .icon }}"></i>
-                        </div>
-                        <h3>{{ $element.name }}</h3>
+                        {{ with $element.url }}
+                        <a href="{{ $element.url }}">
+                        {{ end }}
+                            <div class="icon">
+                                <i class="{{ .icon }}"></i>
+                            </div>
+                        {{ with $element.url }}
+                        </a>
+                        {{ end }}
+                        <h3>{{ $element.name | markdownify }}</h3>
                         <p>{{ $element.description | markdownify }}</p>
                     </div>
                 </div>
-		{{ if or (eq (mod $index 3) 2) (eq $index (sub (len $.Site.Data.features) 1 )) }}
-			</div>
-		</div>
-		{{ end }}
+        {{ if or (eq (mod $index 3) 2) (eq $index (sub (len $.Site.Data.features) 1 )) }}
+            </div>
+        </div>
+        {{ end }}
         {{ end }}
     </div>
 </section>

diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
@@ -76,10 +76,10 @@ <h4>{{ i18n "contactTitle" }}</h4>
             <p class="pull-left">{{ .Site.Params.copyright | safeHTML }}</p>
             {{ end }}
             <p class="pull-right">
-              {{ i18n "templateBy" }} <a href="http://bootstrapious.com/free-templates">Bootstrapious</a>.
+              {{ i18n "templateBy" | markdownify }} <a href="https://bootstrapious.com/p/universal-business-e-commerce-template">Bootstrapious</a>.
               <!-- Not removing this link is part of the licence conditions of the template. Thanks for understanding :) -->
 
-              {{ i18n "portedBy" }} <a href="https://github.com/devcows/hugo-universal-theme">DevCows</a>
+              {{ i18n "portedBy" | markdownify }} <a href="https://github.com/devcows/hugo-universal-theme">DevCows</a>.
             </p>
         </div>
     </div>

diff --git a/layouts/partials/recent_posts.html b/layouts/partials/recent_posts.html
@@ -5,7 +5,7 @@
 
         <div class="col-md-12">
             <div class="heading text-center">
-                <h2>{{ .Site.Params.recent_posts.title }}</h2>
+                <h2>{{ .Site.Params.recent_posts.title | markdownify }}</h2>
             </div>
 
             <p class="lead">

diff --git a/layouts/partials/see_more.html b/layouts/partials/see_more.html
@@ -7,13 +7,20 @@
             <div class="col-md-12">
                 <div class="icon icon-lg"><i class="{{ .Site.Params.see_more.icon }}"></i>
                 </div>
-                <h3 class="text-uppercase">{{ .Site.Params.see_more.title }}</h3>
-                <p class="lead">{{ .Site.Params.see_more.subtitle }}</p>
+                <h3 class="text-uppercase">{{ .Site.Params.see_more.title | markdownify }}</h3>
+                <p class="lead">{{ .Site.Params.see_more.subtitle | markdownify }}</p>
                 <p class="text-center">
-                    <a href="{{ .Site.Params.see_more.link_url }}" class="btn btn-template-transparent-black btn-lg">{{ .Site.Params.see_more.link_text }}</a>
+                    {{ with .Site.Params.see_more.link_url }}
+                    <a href="{{ . }}" class="btn btn-template-transparent-black btn-lg">
+                    {{ end }}
+                        {{ with .Site.Params.see_more.link_text }}
+                        {{ . | markdownify }}
+                        {{ end }}
+                    {{ with .Site.Params.see_more.link_url }}
+                    </a>
+                    {{ end }}
                 </p>
             </div>
-
         </div>
     </div>
 </section>