Skip to content

Commit

Permalink
Make use of the base template
Browse files Browse the repository at this point in the history
  • Loading branch information
digitalcraftsman committed Sep 7, 2017
1 parent 50fec3e commit 82832c1
Show file tree
Hide file tree
Showing 5 changed files with 42 additions and 69 deletions.
16 changes: 4 additions & 12 deletions layouts/404.html
Original file line number Diff line number Diff line change
@@ -1,12 +1,4 @@
{{ partial "head.html" . }}
<body class="{{ .Site.Params.themeColor }}">

{{ partial "sidebar.html" . }}

<div class="content container">
<h1>404: Page not found</h1>
<p class="lead">Sorry, we've misplaced that URL or it's pointing to something that doesn't exist. <a href="{{ .Site.BaseURL }}">Head back home</a> to try finding it again.</p>
</div>

</body>
</html>
{{ define "main" -}}
<h1>404: Page not found</h1>
<p class="lead">Sorry, we've misplaced that URL or it's pointing to something that doesn't exist. <a href="{{ .Site.BaseURL }}">Head back home</a> to try finding it again.</p>
{{- end }}
8 changes: 8 additions & 0 deletions layouts/_default/baseof.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{{ partial "head.html" . }}
<body class="{{ .Site.Params.themeColor }} {{if .Site.Params.layoutReverse}}layout-reverse{{end}}">
{{ partial "sidebar.html" . }}
<div class="content container">
{{ block "main" . -}}{{- end }}
</div>
</body>
</html>
25 changes: 9 additions & 16 deletions layouts/_default/list.html
Original file line number Diff line number Diff line change
@@ -1,16 +1,9 @@
{{ partial "head.html" . }}
<body class="{{ .Site.Params.themeColor }} {{if .Site.Params.layoutReverse}}layout-reverse{{end}}">

{{ partial "sidebar.html" . }}

<div class="content container">
<ul class="posts">
{{ range .Data.Pages }}
<li>
<span><a href="{{ .Permalink }}">{{ .Title }}</a> <time class="pull-right post-list">{{ .Date.Format "Mon, Jan 2, 2006" }}</time></span>
</li>
{{ end }}
</ul>
</div>
</body>
</html>
{{ define "main" -}}
<ul class="posts">
{{ range .Data.Pages -}}
<li>
<span><a href="{{ .Permalink }}">{{ .Title }}</a> <time class="pull-right post-list">{{ .Date.Format "Mon, Jan 2, 2006" }}</time></span>
</li>
{{- end }}
</ul>
{{- end }}
29 changes: 11 additions & 18 deletions layouts/_default/single.html
Original file line number Diff line number Diff line change
@@ -1,19 +1,12 @@
{{ partial "head.html" . }}
<body class="{{ .Site.Params.themeColor }} {{if .Site.Params.layoutReverse}}layout-reverse{{end}}">
{{ partial "sidebar.html" . }}
{{ define "main" -}}
<div class="post">
<h1>{{ .Title }}</h1>
<span class="post-date">{{ .Date.Format "Mon, Jan 2, 2006" }}</span>
{{ .Content }}
</div>

<div class="content container">
<div class="post">
<h1>{{ .Title }}</h1>
<span class="post-date">{{ .Date.Format "Mon, Jan 2, 2006" }}</span>
{{ .Content }}
</div>

{{ if .Site.Params.disqusShortname }}
<h2>Comments</h2>
{{ partial "disqus" . }}
{{ end }}
</div>

</body>
</html>
{{ if .Site.Params.disqusShortname -}}
<h2>Comments</h2>
{{ partial "disqus" . }}
{{- end }}
{{- end }}
33 changes: 10 additions & 23 deletions layouts/index.html
Original file line number Diff line number Diff line change
@@ -1,26 +1,13 @@
{{ partial "head.html" . }}
<body class="{{ .Site.Params.themeColor }} {{if .Site.Params.layoutReverse}}layout-reverse{{end}}">

{{ partial "sidebar.html" . }}

<div class="content container">
{{ define "main" -}}
<div class="posts">

{{ range .Data.Pages }}
<div class="post">
<h1 class="post-title">
<a href="{{ .Permalink }}">
{{ .Title }}
</a>
</h1>

<span class="post-date">{{ .Date.Format "Mon, Jan 2, 2006" }}</span>

{{ .Content }}
</div>
{{ end }}
{{ range .Data.Pages -}}
<div class="post">
<h1 class="post-title">
<a href="{{ .Permalink }}">{{ .Title }}</a>
</h1>
<span class="post-date">{{ .Date.Format "Mon, Jan 2, 2006" }}</span>
{{ .Content }}
</div>
{{- end }}
</div>

</body>
</html>
{{- end }}

0 comments on commit 82832c1

Please sign in to comment.