diff options
author | Hanzei <hanzei@mailbox.org> | 2018-07-20 18:27:32 +0300 |
---|---|---|
committer | Hanzei <hanzei@mailbox.org> | 2018-07-20 18:27:32 +0300 |
commit | 8c258bbd0700e62be2feb5e516a4e6efe47e5776 (patch) | |
tree | 4692598ec2dec0439e63c9bff4e207dcc3b0c478 /layouts | |
parent | ef5feab3ef4a66a03ccc89416303cfb6d5293a3a (diff) |
Use abs URL every time
Diffstat (limited to 'layouts')
-rw-r--r-- | layouts/_default/list.html | 5 | ||||
-rw-r--r-- | layouts/_default/taxonomy.html | 4 | ||||
-rw-r--r-- | layouts/_default/terms.html | 2 | ||||
-rw-r--r-- | layouts/blog/list.html | 4 | ||||
-rw-r--r-- | layouts/index.html | 2 | ||||
-rw-r--r-- | layouts/partials/blog/li.html | 2 | ||||
-rw-r--r-- | layouts/partials/head/css.html | 2 | ||||
-rw-r--r-- | layouts/partials/head/favicons.html | 2 | ||||
-rw-r--r-- | layouts/partials/head/openGraph.html | 4 | ||||
-rw-r--r-- | layouts/partials/home/blog.html | 6 | ||||
-rw-r--r-- | layouts/partials/home/projects.html | 5 | ||||
-rw-r--r-- | layouts/partials/nav.html | 10 | ||||
-rw-r--r-- | layouts/projects/list.html | 2 | ||||
-rw-r--r-- | layouts/projects/single.html | 2 |
14 files changed, 26 insertions, 26 deletions
diff --git a/layouts/_default/list.html b/layouts/_default/list.html index f102ef5..d7d6065 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -2,12 +2,11 @@ <div class="container markdown top-pad"> {{ .Content }} </div> - <!-- Begin container --> <div class="container"> <ul> - {{ range .Pages.ByPublishDate }} + {{ range .Pages.ByPublishDate.Reverse }} <li> - <a href="{{.Permalink}}">{{.Date.Format (.Site.Params.dateform | default "Jan 02, 2006") }} | {{.Title}}</a> + <a href="{{ .Permalink }}">{{ .Date.Format (.Site.Params.dateFormat | default "Jan 02, 2006") }} | {{ .Title }}</a> </li> {{ end }} </ul> diff --git a/layouts/_default/taxonomy.html b/layouts/_default/taxonomy.html index 786676b..cf9409a 100644 --- a/layouts/_default/taxonomy.html +++ b/layouts/_default/taxonomy.html @@ -8,9 +8,9 @@ {{ .Content }} </article> <ul> - {{ range .Pages.ByPublishDate }} + {{ range .Pages.ByPublishDate.Reverse }} <li> - <a href="{{.Permalink}}">{{.Date.Format (.Site.Params.dateform | default "Jan 02, 2006") }} | {{.Title}}</a> + <a href="{{ .Permalink }}">{{ .Date.Format (.Site.Params.dateFormat | default "Jan 02, 2006") }} | {{ .Title }}</a> </li> {{ end }} </ul> diff --git a/layouts/_default/terms.html b/layouts/_default/terms.html index 9a9a796..29815df 100644 --- a/layouts/_default/terms.html +++ b/layouts/_default/terms.html @@ -5,7 +5,7 @@ </article> <div class="section tags-list"> {{ range $name, $taxonomy := .Site.Taxonomies.tags }} - <a class="tag-cloud" href="{{"tags/" | relLangURL }}{{ $name | urlize }}">{{ lower $name }} ({{ len $taxonomy }})</a> + <a class="tag-cloud" href="{{"tags/" | absLangURL }}{{ $name | urlize }}">{{ lower $name }} ({{ len $taxonomy }})</a> {{ end }} </div> </div> diff --git a/layouts/blog/list.html b/layouts/blog/list.html index e1d1b66..c2c6583 100644 --- a/layouts/blog/list.html +++ b/layouts/blog/list.html @@ -8,14 +8,14 @@ {{ range first 1 .Pages.ByPublishDate.Reverse }} <div class="summary">{{ .Date.Format (.Site.Params.dateFormat | default "Jan 02, 2006") }} <h3 class="title is-3 strong-post-title"> - <a href="{{ .RelPermalink }}"> + <a href="{{ .Permalink }}"> {{ .Title }} </a> </h3> <div class="markdown"> {{ .Summary }} {{ if .Truncated }} - <a href="{{ .RelPermalink }}">{{ i18n "index_blog_readMore" . }}</a> + <a href="{{ .Permalink }}">{{ i18n "index_blog_readMore" . }}</a> {{ end }} </div> </div> diff --git a/layouts/index.html b/layouts/index.html index 281b366..4e96a96 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -51,7 +51,7 @@ <div class="column is-one-third has-text-centered"> {{ with $home.Resources.GetMatch .Params.Image }} {{ with .Resize "320x" }} - <img class="img-responsive avatar" src="{{ .RelPermalink }}" alt="{{ .Name }}"> + <img class="img-responsive avatar" src="{{ .Permalink }}" alt="{{ .Name }}"> {{ end }} {{ end }} </div> diff --git a/layouts/partials/blog/li.html b/layouts/partials/blog/li.html index 9a79283..1f13118 100644 --- a/layouts/partials/blog/li.html +++ b/layouts/partials/blog/li.html @@ -1,5 +1,5 @@ {{ range .Pages.ByPublishDate.Reverse }} <li class="post-item"> - <span><a href="{{ .Permalink }}">{{ .Title }}</a></span> - <span>{{ .Date.Format (.Site.Params.dateform | default "Jan 02, 2006") }}</span> + <span><a href="{{ .Permalink }}">{{ .Title }}</a></span> - <span>{{ .Date.Format (.Site.Params.dateFormat | default "Jan 02, 2006") }}</span> </li> {{ end }} diff --git a/layouts/partials/head/css.html b/layouts/partials/head/css.html index ee8046a..53753a7 100644 --- a/layouts/partials/head/css.html +++ b/layouts/partials/head/css.html @@ -12,5 +12,5 @@ <!-- Custom css --> {{ range .Site.Params.customCSS -}} - <link rel="stylesheet" href="{{ . | relURL }}"> + <link rel="stylesheet" href="{{ . | absURL }}"> {{- end }} diff --git a/layouts/partials/head/favicons.html b/layouts/partials/head/favicons.html index e1c93d0..2e77ade 100644 --- a/layouts/partials/head/favicons.html +++ b/layouts/partials/head/favicons.html @@ -1,3 +1,3 @@ {{ with .Site.Params.favicon }} -<link rel="shortcut icon" href="{{ . | relURL }}"> +<link rel="shortcut icon" href="{{ . | absURL }}"> {{ end }} diff --git a/layouts/partials/head/openGraph.html b/layouts/partials/head/openGraph.html index 6765eec..366ab92 100644 --- a/layouts/partials/head/openGraph.html +++ b/layouts/partials/head/openGraph.html @@ -6,12 +6,12 @@ {{ with .Resources.ByType "image" }} {{ range first 5 (sort . "Params.weight") }} -<meta property="og:image" content="{{ .RelPermalink }}"/> +<meta property="og:image" content="{{ .Permalink }}"/> {{ end }} {{ else }} {{ with .Site.GetPage "page" "home" }} {{ range first 5 (.Resources.ByType "image") }} -<meta property="og:image" content="{{ .RelPermalink }}"/> +<meta property="og:image" content="{{ .Permalink }}"/> {{ end }} {{ end }} {{ end }} diff --git a/layouts/partials/home/blog.html b/layouts/partials/home/blog.html index f038e04..fb9a62a 100644 --- a/layouts/partials/home/blog.html +++ b/layouts/partials/home/blog.html @@ -6,11 +6,11 @@ <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.dateFormat | default "Jan 02, 2006") }} - <h3 class="title is-3 latest-post-title"><a href="{{ .RelPermalink }}">{{ .Title }}</a></h3> + <h3 class="title is-3 latest-post-title"><a href="{{ .Permalink }}">{{ .Title }}</a></h3> <div class="markdown"> {{ .Summary }} {{ if .Truncated }} - <a href="{{ .RelPermalink }}">{{ i18n "index_blog_readMore" . }}</a> + <a href="{{ .Permalink }}">{{ i18n "index_blog_readMore" . }}</a> {{ end }} </div> </div> @@ -21,7 +21,7 @@ {{ partialCached "blog/li.html" . }} {{ else }} <div class="container has-text-centered top-pad"> - <a href="{{ .RelPermalink }}">{{ i18n "index_blog_allPosts" . }}</a> + <a href="{{ .Permalink }}">{{ i18n "index_blog_allPosts" . }}</a> </div> {{ end }} </div> diff --git a/layouts/partials/home/projects.html b/layouts/partials/home/projects.html index f0e5a6c..c4a637e 100644 --- a/layouts/partials/home/projects.html +++ b/layouts/partials/home/projects.html @@ -30,6 +30,7 @@ </div> <div class="card-content has-text-centered top-pad"> <a {{ if .Params.external_link }} href="{{ .Params.external_link }}" {{ end }}> + {{ .Params.external_link }} {{ .Title }} </a> </div> @@ -40,7 +41,7 @@ </div> {{ if lt $numberOfProjectsToShow $totalProjects }} <div class="container has-text-centered top-pad"> - <a href="{{ .RelPermalink }}">{{ i18n "index_projects_allProjects" . }}</a> + <a href="{{ .Permalink }}">{{ i18n "index_projects_allProjects" . }}</a> </div> {{ end }} </div> @@ -67,7 +68,7 @@ {{ if $moreThenOneImage }} <div class="item owl-height"> {{ end }} - <img src="{{ $image.RelPermalink }}" class="img-responsive" alt="{{ $image.Name }}"> + <img src="{{ $image.Permalink }}" class="img-responsive" alt="{{ $image.Name }}"> {{ if $moreThenOneImage }} </div> {{ end }} diff --git a/layouts/partials/nav.html b/layouts/partials/nav.html index 3caa861..b38c7fc 100644 --- a/layouts/partials/nav.html +++ b/layouts/partials/nav.html @@ -37,13 +37,13 @@ {{ else }} <!-- use default menu --> {{ if not $isHome }} - <a class="navbar-item" href="{{ "/" | relLangURL }}">{{ i18n "nav_main" . }}</a> + <a class="navbar-item" href="{{ "/" | absLangURL }}">{{ i18n "nav_main" . }}</a> {{ end }} {{ with .Site.GetPage "page" "home" }} {{ range sort (.Resources.ByType "page") "Params.weight" }} {{ if ne .Name "contact.md" }} - <a class="navbar-item" href="{{ if $isHome }}#{{ .File.TranslationBaseName }}{{ else }}{{ printf "/#%s" .File.TranslationBaseName | relLangURL }}{{ end }}">{{ .Title }}</a> + <a class="navbar-item" href="{{ if $isHome }}#{{ .File.TranslationBaseName }}{{ else }}{{ printf "/#%s" .File.TranslationBaseName | absLangURL }}{{ end }}">{{ .Title }}</a> {{ end }} {{ end }} {{ end }} @@ -54,7 +54,7 @@ {{ if $isHome }} <a class="navbar-item" href="#{{ .Title | urlize }}">{{ .Title }}</a> {{ else }} - <a class="navbar-item" href="{{ .RelPermalink }}"> + <a class="navbar-item" href="{{ .Permalink }}"> {{ if $pageIsInProjects }} {{ i18n "nav_backToSection" . }} {{ else }} @@ -71,7 +71,7 @@ {{ if $isHome }} <a class="navbar-item" href="#{{ .Title | urlize }}">{{ .Title }}</a> {{ else }} - <a class="navbar-item" href="{{ .RelPermalink }}"> + <a class="navbar-item" href="{{ .Permalink }}"> {{ if $pageIsInBlog }} Back to {{ .Title | singularize}} {{ else }} @@ -84,7 +84,7 @@ {{ with .Site.GetPage "page" "home" }} {{ with .Resources.GetMatch "contact.md" }} - <a class="navbar-item" href="{{ if $isHome }}#{{ .File.TranslationBaseName }}{{ else }}{{ printf "/#%s" .File.TranslationBaseName | relLangURL }}{{ end }}">{{ .Title }}</a> + <a class="navbar-item" href="{{ if $isHome }}#{{ .File.TranslationBaseName }}{{ else }}{{ printf "/#%s" .File.TranslationBaseName | absLangURL }}{{ end }}">{{ .Title }}</a> {{ end }} {{ end }} diff --git a/layouts/projects/list.html b/layouts/projects/list.html index 619253e..f2becc8 100644 --- a/layouts/projects/list.html +++ b/layouts/projects/list.html @@ -26,7 +26,7 @@ </figure> </div> <div class="card-content has-text-centered top-pad"> - <a href="{{ if .Params.external_link }}{{ .Params.external_link }}{{ else }}{{.Permalink}}{{ end }}"> + <a href="{{ if .Params.external_link }}{{ .Params.external_link }}{{ else }}{{ .Permalink }}{{ end }}"> {{ .Title }} </a> </div> diff --git a/layouts/projects/single.html b/layouts/projects/single.html index 500a087..788cccd 100644 --- a/layouts/projects/single.html +++ b/layouts/projects/single.html @@ -11,7 +11,7 @@ {{ if $moreThenOneImage }} <div class="item owl-height"> {{ end }} - <img src="{{ $image.RelPermalink }}" class="img-responsive" alt="{{ $image.Name }}"> + <img src="{{ $image.Permalink }}" class="img-responsive" alt="{{ $image.Name }}"> {{ if $moreThenOneImage }} </div> {{ end }} |