Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

localize 404 page; allow Markdown at more places; clickable feature icons #184

Merged
merged 17 commits into from Nov 8, 2019
Merged
Show file tree
Hide file tree
Changes from 16 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions exampleSite/data/features/consulting.yaml
@@ -1,4 +1,5 @@
weight: 4
name: "Consulting"
icon: "fas fa-lightbulb"
url: ""
salim-b marked this conversation as resolved.
Show resolved Hide resolved
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."
1 change: 1 addition & 0 deletions 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."
1 change: 1 addition & 0 deletions 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."
1 change: 1 addition & 0 deletions 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."
1 change: 1 addition & 0 deletions 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."
1 change: 1 addition & 0 deletions 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."
9 changes: 9 additions & 0 deletions i18n/ca.yaml
Expand Up @@ -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"
9 changes: 9 additions & 0 deletions i18n/de.yaml
Expand Up @@ -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"
9 changes: 9 additions & 0 deletions i18n/en.yaml
Expand Up @@ -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"
9 changes: 9 additions & 0 deletions i18n/es.yaml
Expand Up @@ -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"
9 changes: 9 additions & 0 deletions i18n/fr.yaml
Expand Up @@ -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"
9 changes: 9 additions & 0 deletions i18n/id.yaml
Expand Up @@ -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"
9 changes: 9 additions & 0 deletions i18n/it.yaml
Expand Up @@ -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"
9 changes: 9 additions & 0 deletions i18n/ja.yaml
Expand Up @@ -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: "ホームへ戻る"
9 changes: 9 additions & 0 deletions i18n/nl.yaml
Expand Up @@ -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"
9 changes: 9 additions & 0 deletions i18n/pt-br.yaml
Expand Up @@ -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"
9 changes: 9 additions & 0 deletions i18n/ru.yaml
Expand Up @@ -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: "Перейти на главную"
9 changes: 9 additions & 0 deletions i18n/sv.yaml
Expand Up @@ -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"
9 changes: 9 additions & 0 deletions i18n/zh.yaml
Expand Up @@ -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: "跳到主页"
12 changes: 3 additions & 9 deletions layouts/404.html
Expand Up @@ -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>

Expand Down
4 changes: 2 additions & 2 deletions layouts/partials/clients.html
Expand Up @@ -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">
Expand Down
30 changes: 18 additions & 12 deletions layouts/partials/features.html
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions layouts/partials/footer.html
Expand Up @@ -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>.
salim-b marked this conversation as resolved.
Show resolved Hide resolved
<!-- 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>
Expand Down
2 changes: 1 addition & 1 deletion layouts/partials/recent_posts.html
Expand Up @@ -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">
Expand Down
15 changes: 11 additions & 4 deletions layouts/partials/see_more.html
Expand Up @@ -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>
Expand Down