diff options
| author | Curtis Timson <curt@live.co.uk> | 2018-02-28 16:01:09 +0300 |
|---|---|---|
| committer | Curtis Timson <curt@live.co.uk> | 2018-02-28 16:01:09 +0300 |
| commit | 46b04f97f4df67411419266f304cd24279e74594 (patch) | |
| tree | 927fe6ca943cd42c4110bcbbb124cd8ec776e4c8 | |
| parent | ee975eec952a679e906428986e90e5e3bbcf3951 (diff) | |
:sparkles: Implement baseof template on list & single
| -rw-r--r-- | layouts/_default/list.html | 85 | ||||
| -rw-r--r-- | layouts/_default/single.html | 78 |
2 files changed, 71 insertions, 92 deletions
diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 1fc67b7..cd2b313 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -1,55 +1,44 @@ +{{ define "main" }} + <div id="page-wrapper"> + + <!-- Header --> + <div id="header-wrapper"> + <div id="header"> + + {{ partial "logo.html" . }} + {{ partial "nav.html" . }} -<!DOCTYPE HTML> -<!-- - Dopetrope by HTML5 UP - html5up.net | @ajlkn - Free for personal and commercial use under the CCA 3.0 license (html5up.net/license) ---> -<html> - {{ partial "htmlhead.html" . }} - <body class="homepage"> - <div id="page-wrapper"> - - <!-- Header --> - <div id="header-wrapper"> - <div id="header"> - - {{ partial "logo.html" . }} - {{ partial "nav.html" . }} - - </div> </div> + </div> + + <!-- Main --> + <div id="main-wrapper"> + <div class="container"> + + {{ $paginator := .Paginate (where .Data.Pages "Type" .Site.Params.Blog.foldername) .Site.Params.Blog.postsperpage }} + {{ partial "blog.html" (dict "title" .Site.Params.Blog.title "paginator" $paginator) }} + + <footer> + <ul class="actions" style="text-align: center"> + {{ if $paginator.HasPrev }} + <li><a href="{{ .Site.BaseURL }}{{ $paginator.Prev.URL }}" class="button big">Prev</a></li> + {{ end }} + {{ if $paginator.HasNext }} + <li><a href="{{ .Site.BaseURL }}{{ $paginator.Next.URL }}" class="button alt big">Next</a></li> + {{ end }} + </ul> + </footer> - <!-- Main --> - <div id="main-wrapper"> - <div class="container"> - - {{ $paginator := .Paginate (where .Data.Pages "Type" .Site.Params.Blog.foldername) .Site.Params.Blog.postsperpage }} - {{ partial "blog.html" (dict "title" .Site.Params.Blog.title "paginator" $paginator) }} - - <footer> - <ul class="actions" style="text-align: center"> - {{ if $paginator.HasPrev }} - <li><a href="{{ .Site.BaseURL }}{{ $paginator.Prev.URL }}" class="button big">Prev</a></li> - {{ end }} - {{ if $paginator.HasNext }} - <li><a href="{{ .Site.BaseURL }}{{ $paginator.Next.URL }}" class="button alt big">Next</a></li> - {{ end }} - </ul> - </footer> - - </div> </div> + </div> + + {{ partial "footer/index.html" . }} - {{ partial "footer/index.html" . }} - - </div> - + </div> - {{ partial "scripts/index.html" . }} - {{ if .Site.Params.Settings.disqus }} - <script id="dsq-count-scr" src="//{{ .Site.Params.Settings.disqus }}.disqus.com/count.js" async></script> - {{ end }} + {{ partial "scripts/index.html" . }} + {{ if .Site.Params.Settings.disqus }} + <script id="dsq-count-scr" src="//{{ .Site.Params.Settings.disqus }}.disqus.com/count.js" async></script> + {{ end }} - </body> -</html> +{{ end }}
\ No newline at end of file diff --git a/layouts/_default/single.html b/layouts/_default/single.html index cc16d29..18708b3 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -1,55 +1,45 @@ +{{ define "main" }} + <div id="page-wrapper"> -<!DOCTYPE HTML> -<!-- - Dopetrope by HTML5 UP - html5up.net | @ajlkn - Free for personal and commercial use under the CCA 3.0 license (html5up.net/license) ---> -<html> - {{ partial "htmlhead.html" . }} - <body class="homepage"> - <div id="page-wrapper"> + <!-- Header --> + <div id="header-wrapper"> + <div id="header"> - <!-- Header --> - <div id="header-wrapper"> - <div id="header"> + {{ partial "logo.html" . }} + {{ partial "nav.html" . }} - {{ partial "logo.html" . }} - {{ partial "nav.html" . }} - - </div> </div> - - <!-- Main --> - <div id="main-wrapper"> - <div class="container"> - {{ if and (or (eq .Site.Data.sidebar.content.position "left") (eq .Site.Data.sidebar.content.position "right")) (not (eq .Params.hidesidebar true)) }} - <div class="row"> - {{ if eq .Site.Data.sidebar.content.position "left" }} - <div class="4u 12u(mobile)"> - {{ partial "post/sidebar" . }} - </div> - {{ end }} - <div class="8u 12u(mobile)"> - {{ partial "post/content.html" . }} - </div> - {{ if eq .Site.Data.sidebar.content.position "right" }} - <div class="4u 12u(mobile)"> - {{ partial "post/sidebar" . }} - </div> - {{ end }} + </div> + + <!-- Main --> + <div id="main-wrapper"> + <div class="container"> + {{ if and (or (eq .Site.Data.sidebar.content.position "left") (eq .Site.Data.sidebar.content.position "right")) (not (eq .Params.hidesidebar true)) }} + <div class="row"> + {{ if eq .Site.Data.sidebar.content.position "left" }} + <div class="4u 12u(mobile)"> + {{ partial "post/sidebar" . }} + </div> + {{ end }} + <div class="8u 12u(mobile)"> + {{ partial "post/content.html" . }} + </div> + {{ if eq .Site.Data.sidebar.content.position "right" }} + <div class="4u 12u(mobile)"> + {{ partial "post/sidebar" . }} </div> - {{ else }} - {{ partial "post/content.html" . }} {{ end }} </div> + {{ else }} + {{ partial "post/content.html" . }} + {{ end }} </div> + </div> + + {{ partial "footer/index.html" . }} - {{ partial "footer/index.html" . }} - - </div> + </div> - {{ partial "scripts/index.html" . }} + {{ partial "scripts/index.html" . }} - </body> -</html> +{{ end }}
\ No newline at end of file |