diff options
| author | Curtis Timson <curt@live.co.uk> | 2018-02-12 22:44:41 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-12 22:44:41 +0300 |
| commit | 46cc519857c12be45cd2b8617683366dda8214f2 (patch) | |
| tree | a8cd845508d4649ddb9217bf5b89bbf5b8680641 | |
| parent | 61749e69489692e7ab2e4ff5648a76aa795aa15e (diff) | |
| parent | c69909b90f8a4bc435d0f3d85a15adda10656a25 (diff) | |
Merge pull request #27 from curttimson/feature/hide-blog
Feature/hide blog
| -rw-r--r-- | exampleSite/config.toml | 2 | ||||
| -rw-r--r-- | layouts/_default/list.html | 5 | ||||
| -rw-r--r-- | layouts/index.html | 8 | ||||
| -rw-r--r-- | layouts/partials/htmlhead.html | 1 | ||||
| -rw-r--r-- | layouts/partials/nav.html | 5 | ||||
| -rw-r--r-- | package.json | 2 |
6 files changed, 15 insertions, 8 deletions
diff --git a/exampleSite/config.toml b/exampleSite/config.toml index bcdd542..b54447a 100644 --- a/exampleSite/config.toml +++ b/exampleSite/config.toml @@ -42,7 +42,7 @@ theme = "../.." [params.blog] title = "The Blog" viewalltext = "View All" - postsperpage = "2" + postsperpage = "6" foldername = "blog" [params.social] diff --git a/layouts/_default/list.html b/layouts/_default/list.html index b6a7f64..1fc67b7 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -47,6 +47,9 @@ {{ 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> diff --git a/layouts/index.html b/layouts/index.html index dacaa70..8c247a4 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -35,12 +35,11 @@ </div> </div> + {{ $blogPaginator := .Paginate (where .Data.Pages "Type" .Site.Params.Blog.foldername) 2 }} + {{ if $blogPaginator.TotalNumberOfElements }} <div class="row"> <div class="12u"> - - {{ $paginator := .Paginate (where .Data.Pages "Type" .Site.Params.Blog.foldername) 2 }} - {{ partial "blog.html" (dict "title" .Site.Params.Blog.title "paginator" $paginator) }} - + {{ partial "blog.html" (dict "title" .Site.Params.Blog.title "paginator" $blogPaginator) }} </div> </div> <footer> @@ -48,6 +47,7 @@ <li><a href="{{ .Site.Params.Blog.foldername }}" class="button big">{{ .Site.Params.Blog.viewalltext }}</a></li> </ul> </footer> + {{ end }} </div> </div> diff --git a/layouts/partials/htmlhead.html b/layouts/partials/htmlhead.html index 5f40e09..8c93433 100644 --- a/layouts/partials/htmlhead.html +++ b/layouts/partials/htmlhead.html @@ -5,5 +5,6 @@ <!--[if lte IE 8]><script src="{{ .Site.BaseURL }}assets/js/ie/html5shiv.js"></script><![endif]--> <link rel="stylesheet" href="{{ .Site.BaseURL }}assets/css/main.css" /> <!--[if lte IE 8]><link rel="stylesheet" href="{{ .Site.BaseURL }}assets/css/ie8.css" /><![endif]--> + {{ .Hugo.Generator }} {{ partial "htmlheadcustom.html" . }} </head>
\ No newline at end of file diff --git a/layouts/partials/nav.html b/layouts/partials/nav.html index 260cc1c..bb524a7 100644 --- a/layouts/partials/nav.html +++ b/layouts/partials/nav.html @@ -5,14 +5,17 @@ <li> <a href="{{ .Site.BaseURL }}#portfolio">My Portfolio</a> </li> + {{ $blogPosts := first 5 (where .Site.Pages "Type" .Site.Params.Blog.foldername) }} + {{ if $blogPosts }} <li> <a href="{{ .Site.BaseURL }}{{ .Site.Params.Blog.foldername }}">{{ .Site.Params.Blog.title }}</a> <ul> - {{ range first 5 (where .Site.Pages "Type" .Site.Params.Blog.foldername) }} + {{ range $blogPosts }} <li><a href="{{ .Permalink }}">{{ .Title }}</a></li> {{ end }} </ul> </li> + {{ end }} <li><a href="{{ .Site.BaseURL }}#contact">Contact</a></li> </ul> </nav>
\ No newline at end of file diff --git a/package.json b/package.json index fb4ba81..008224d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hugo-theme-dopetrope", - "version": "2.0.1", + "version": "2.1.0", "description": "Hugo Theme Dopetrope", "main": "index.js", "scripts": { |