diff options
| author | Dragos Plesca <dragos.plesca@gmail.com> | 2018-10-15 11:51:26 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-15 11:51:26 +0300 |
| commit | d6e7e2ea4c3a426223e2313b1c72440a8ae023dd (patch) | |
| tree | aaf5af0ac86ea64d3b307238e98fe5c0c2cdfc2f | |
| parent | 8e8cd01b9eba8e70bcc2d2c8b586ed0f4303e8be (diff) | |
| parent | e4fa2a1e85783ffff94807e7ed9f8471aacfdefb (diff) | |
Merge pull request #26 from 0xazure/normalize-site-paths
Normalize baseUrl paths
| -rw-r--r-- | layouts/_default/list.html | 5 | ||||
| -rw-r--r-- | layouts/_default/single.html | 5 | ||||
| -rw-r--r-- | layouts/index.html | 3 | ||||
| -rw-r--r-- | layouts/partials/footer.html | 2 | ||||
| -rw-r--r-- | layouts/partials/header.html | 4 | ||||
| -rw-r--r-- | layouts/partials/sidebar.html | 2 |
6 files changed, 11 insertions, 10 deletions
diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 75da59c..8e152de 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -20,8 +20,9 @@ {{ end }} {{ if isset .Params "categories" }} under - {{ $baseUrl := .Site.BaseURL }} - {{ range .Params.categories }}<a class="post-category post-category-{{ . }}" href="{{ $baseUrl }}/categories/{{ . | urlize }}">{{ . }}</a>{{ end }} + {{ range .Params.categories }} + <a class="post-category post-category-{{ . }}" href='{{ ( printf "categories/%s" . ) | absURL }}'>{{ . }}</a> + {{ end }} {{ end }} </p> </header> diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 478af49..5196361 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -19,8 +19,9 @@ {{ end }} {{ if isset .Params "categories" }} under - {{ $baseUrl := .Site.BaseURL }} - {{ range .Params.categories }}<a class="post-category post-category-{{ . }}" href="{{ $baseUrl }}/categories/{{ . | urlize }}">{{ . }}</a>{{ end }} + {{ range .Params.categories }} + <a class="post-category post-category-{{ . }}" href='{{ ( printf "categories/%s" . ) | absURL }}'>{{ . }}</a> + {{ end }} {{ end }} </p> </header> diff --git a/layouts/index.html b/layouts/index.html index 5407bb8..89fb9f4 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -20,8 +20,7 @@ {{ end }} {{ if isset .Params "categories" }} under - {{ $baseUrl := .Site.BaseURL }} - {{ range .Params.categories }}<a class="post-category post-category-{{ . }}" href="{{ $baseUrl }}/categories/{{ . | urlize }}">{{ . }}</a>{{ end }} + {{ range .Params.categories }}<a class="post-category post-category-{{ . }}" href='{{ ( printf "categories/%s" . ) | absURL }}'>{{ . }}</a>{{ end }} {{ end }} </p> </header> diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index 8776558..62b2183 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -5,4 +5,4 @@ </ul> </div> </div> -<script src="{{ .Site.BaseURL }}/js/all.min.js"></script> +<script src='{{ "js/all.min.js" | absURL }}'></script> diff --git a/layouts/partials/header.html b/layouts/partials/header.html index 429fd04..f640b94 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -21,9 +21,9 @@ <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/pure/0.6.0/pure-min.css"> <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/pure/0.6.0/grids-responsive-min.css"> - <link rel="stylesheet" href="{{ .Site.BaseURL }}/css/all.min.css"> + <link rel="stylesheet" href='{{ "css/all.min.css" | absURL }}'> <link href="//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet"> - <link rel="alternate" type="application/rss+xml" title="{{ .Site.Title }}" href="{{ .Site.BaseURL }}/index.xml" /> + <link rel="alternate" type="application/rss+xml" title="{{ .Site.Title }}" href='{{ "index.xml" | absURL }}' /> </head> <body> diff --git a/layouts/partials/sidebar.html b/layouts/partials/sidebar.html index 35a71f5..c675ab8 100644 --- a/layouts/partials/sidebar.html +++ b/layouts/partials/sidebar.html @@ -36,7 +36,7 @@ </li> {{ end }} <li class="nav-item"> - <a class="pure-button" href="{{ .Site.BaseURL }}/index.xml"> + <a class="pure-button" href='{{ "index.xml" | absURL }}'> <i class="fa fa-rss"></i>{{ if not .Site.Params.hideSidebarIconText }} rss{{ end }} </a> </li> |