diff options
author | Pablo Martin Viva <pmviva@gmail.com> | 2018-03-30 00:25:46 +0300 |
---|---|---|
committer | Pablo Martin Viva <pmviva@gmail.com> | 2018-03-30 00:25:46 +0300 |
commit | 1c758e40b8a34064d01574026d52de46f5f034d2 (patch) | |
tree | 8e69d093439f10e21a2f9b7772526be613ba5bd7 /layouts | |
parent | d17e766208dfb3ad53f1558a72c84ac2b439ab96 (diff) |
Use absURL and relURL functions instead of BaseURL
Diffstat (limited to 'layouts')
-rw-r--r-- | layouts/_default/single.html | 4 | ||||
-rw-r--r-- | layouts/index.html | 14 | ||||
-rw-r--r-- | layouts/partials/header.html | 4 | ||||
-rw-r--r-- | layouts/partials/htmlhead.html | 6 | ||||
-rw-r--r-- | layouts/partials/nav.html | 6 | ||||
-rw-r--r-- | layouts/partials/posts/featured.html | 4 | ||||
-rw-r--r-- | layouts/partials/posts/list.html | 4 | ||||
-rw-r--r-- | layouts/partials/posts/pagination.html | 8 | ||||
-rw-r--r-- | layouts/partials/scripts/index.html | 14 |
9 files changed, 32 insertions, 32 deletions
diff --git a/layouts/_default/single.html b/layouts/_default/single.html index b41c550..942506e 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -20,7 +20,7 @@ <p>{{ .Description }}</p> </header> {{ if .Params.image }} - <div class="image main"><img src="{{ .Site.BaseURL }}{{ .Params.image }}" alt="" /></div> + <div class="image main"><img src="{{ .Params.image | relURL }}" alt="" /></div> {{ end }} {{ .Content }} @@ -39,4 +39,4 @@ </div> {{ partial "scripts/index" . }} </body> -</html>
\ No newline at end of file +</html> diff --git a/layouts/index.html b/layouts/index.html index 391451f..a4f6ccc 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -3,7 +3,7 @@ {{ $posts := where .Data.Pages "Type" .Site.Params.Posts.foldername }} {{ $firstPost := first 1 $posts }} - + {{ if eq .Site.Params.Posts.featuredpost "true" }} {{ .Scratch.Set "postsForPaging" (after 1 $posts) }} @@ -31,26 +31,26 @@ {{ partial "posts/featured.html" (dict "firstpost" $firstPost) }} {{ end }} {{ partial "posts/list.html" (dict "posts" $postsPaging) }} - + <!-- Footer --> {{ if gt $postsPaging.TotalPages 1 }} <footer> <div class="pagination"> {{ if $postsPaging.HasPrev }} - <a href="{{ .Site.BaseURL }}{{ $postsPaging.Prev.URL }}" class="previous">Prev</a> + <a href="{{ $postsPaging.Prev.URL | relURL }}" class="previous">Prev</a> {{ end }} {{ range $postsPaging.Pagers }} {{ if lt .PageNumber 10 }} - <a href="{{ $.Site.BaseURL }}{{ .URL }}" class="page{{ if eq .PageNumber $postsPaging.PageNumber }} active{{ end }}">{{ .PageNumber }}</a> + <a href="{{ .URL | relURL }}" class="page{{ if eq .PageNumber $postsPaging.PageNumber }} active{{ end }}">{{ .PageNumber }}</a> {{ end }} {{ end }} {{ if $postsPaging.HasNext }} - <a href="{{ .Site.BaseURL }}{{ $postsPaging.Next.URL }}" class="next">Next</a> + <a href="{{ $postsPaging.Next.URL | relURL }}" class="next">Next</a> {{ end }} </div> </footer> {{ end }} - + </div> {{ partial "footer/index" . }} @@ -60,4 +60,4 @@ {{ partial "scripts/index" . }} </body> -</html>
\ No newline at end of file +</html> diff --git a/layouts/partials/header.html b/layouts/partials/header.html index 94501fd..bf1376c 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -1,4 +1,4 @@ <!-- Header --> <header id="header"> - <a href="{{ .Site.BaseURL }}" class="logo">{{ .Site.Title }}</a> -</header>
\ No newline at end of file + <a href='{{ "/" | relURL }}' class="logo">{{ .Site.Title }}</a> +</header> diff --git a/layouts/partials/htmlhead.html b/layouts/partials/htmlhead.html index b8757f9..d8cc93f 100644 --- a/layouts/partials/htmlhead.html +++ b/layouts/partials/htmlhead.html @@ -10,6 +10,6 @@ <title>{{ .Title }}</title> <meta charset="utf-8" /> <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no" /> - <link rel="stylesheet" href="{{ .Site.BaseURL }}assets/css/main.css" /> - <noscript><link rel="stylesheet" href="{{ .Site.BaseURL }}assets/css/noscript.css" /></noscript> - </head>
\ No newline at end of file + <link rel="stylesheet" href='{{ "assets/css/main.css" | relURL }}' /> + <noscript><link rel="stylesheet" href='{{ "assets/css/noscript.css" | relURL }}' /></noscript> + </head> diff --git a/layouts/partials/nav.html b/layouts/partials/nav.html index 8057978..d6695f7 100644 --- a/layouts/partials/nav.html +++ b/layouts/partials/nav.html @@ -1,9 +1,9 @@ <!-- Nav --> <nav id="nav"> <ul class="links"> - <li class="active"><a href="{{ .Site.BaseURL }}">{{ .Site.Title }}</a></li> + <li class="active"><a href='{{ "/" | relURL }}'>{{ .Site.Title }}</a></li> {{ with .Site.Data.contactinfo }} - <li><a href="{{ .Site.BaseURL }}#footer">Contact</a></li> + <li><a href='{{ "#footer" | relURL }}'>Contact</a></li> {{ end }} </ul> {{ with .Site.Data.social }} @@ -37,4 +37,4 @@ {{ end }} </ul> {{ end }} -</nav>
\ No newline at end of file +</nav> diff --git a/layouts/partials/posts/featured.html b/layouts/partials/posts/featured.html index 99bd113..97e1a18 100644 --- a/layouts/partials/posts/featured.html +++ b/layouts/partials/posts/featured.html @@ -9,10 +9,10 @@ <p>{{ .Description }}</p> </header> {{ if .Params.image }} - <a href="{{ .Permalink }}" class="image main"><img src="{{ .Site.BaseURL }}{{ .Params.image }}" alt="" /></a> + <a href="{{ .Permalink }}" class="image main"><img src="{{ .Params.image | relURL }}" alt="" /></a> {{ end }} <ul class="actions"> <li><a href="{{ .Permalink }}" class="button big">{{ .Site.Data.post.linktext }}</a></li> </ul> </article> -{{ end }}
\ No newline at end of file +{{ end }} diff --git a/layouts/partials/posts/list.html b/layouts/partials/posts/list.html index eb7aa95..06602fa 100644 --- a/layouts/partials/posts/list.html +++ b/layouts/partials/posts/list.html @@ -9,7 +9,7 @@ <h2><a href="{{ .Permalink }}">{{ .Title }}</a></h2> </header> {{ if .Params.image }} - <a href="{{ .Permalink }}" class="image fit"><img src="{{ .Site.BaseURL }}{{ .Params.image }}" alt="" /></a> + <a href="{{ .Permalink }}" class="image fit"><img src="{{ .Params.image | relURL }}" alt="" /></a> {{ end }} <p>{{ .Description }}</p> <ul class="actions"> @@ -17,4 +17,4 @@ </ul> </article> {{ end }} -</section>
\ No newline at end of file +</section> diff --git a/layouts/partials/posts/pagination.html b/layouts/partials/posts/pagination.html index 8bbf9e4..801086f 100644 --- a/layouts/partials/posts/pagination.html +++ b/layouts/partials/posts/pagination.html @@ -3,16 +3,16 @@ <footer> <div class="pagination"> {{ if .paging.HasPrev }} - <a href="{{ .Site.BaseURL }}{{ .paging.Prev.URL }}" class="previous">Prev</a> + <a href="{{ .paging.Prev.URL | relURL }}" class="previous">Prev</a> {{ end }} {{ range .paging.Pagers }} {{ if lt .PageNumber 10 }} - <a href="{{ $.Site.BaseURL }}{{ .URL }}" class="page{{ if eq .PageNumber .paging.PageNumber }} active{{ end }}">{{ .PageNumber }}</a> + <a href="{{ .URL | relURL }}" class="page{{ if eq .PageNumber .paging.PageNumber }} active{{ end }}">{{ .PageNumber }}</a> {{ end }} {{ end }} {{ if .paging.HasNext }} - <a href="{{ .Site.BaseURL }}{{ .paging.Next.URL }}" class="next">Next</a> + <a href="{{ .paging.Next.URL | relURL }}" class="next">Next</a> {{ end }} </div> </footer> -{{ end }}
\ No newline at end of file +{{ end }} diff --git a/layouts/partials/scripts/index.html b/layouts/partials/scripts/index.html index f541a6a..92c8ed9 100644 --- a/layouts/partials/scripts/index.html +++ b/layouts/partials/scripts/index.html @@ -1,10 +1,10 @@ <!-- Scripts --> -<script src="{{ .Site.BaseURL }}assets/js/jquery.min.js"></script> -<script src="{{ .Site.BaseURL }}assets/js/jquery.scrollex.min.js"></script> -<script src="{{ .Site.BaseURL }}assets/js/jquery.scrolly.min.js"></script> -<script src="{{ .Site.BaseURL }}assets/js/skel.min.js"></script> -<script src="{{ .Site.BaseURL }}assets/js/util.js"></script> -<script src="{{ .Site.BaseURL }}assets/js/main.js"></script> +<script src='{{ "assets/js/jquery.min.js" | relURL }}'></script> +<script src='{{ "assets/js/jquery.scrollex.min.js" | relURL }}'></script> +<script src='{{ "assets/js/jquery.scrolly.min.js" | relURL }}'></script> +<script src='{{ "assets/js/skel.min.js" | relURL }}'></script> +<script src='{{ "assets/js/util.js" | relURL }}'></script> +<script src='{{ "assets/js/main.js" | relURL }}'></script> {{ partial "scripts/googleanalytics" . }} -{{ partial "scripts/disqus" . }}
\ No newline at end of file +{{ partial "scripts/disqus" . }} |