diff --git a/themes/shijin4/layouts/partials/breadcrumbs.html b/themes/shijin4/layouts/_partials/breadcrumbs.html similarity index 100% rename from themes/shijin4/layouts/partials/breadcrumbs.html rename to themes/shijin4/layouts/_partials/breadcrumbs.html diff --git a/themes/shijin4/layouts/partials/discourse.html b/themes/shijin4/layouts/_partials/discourse.html similarity index 100% rename from themes/shijin4/layouts/partials/discourse.html rename to themes/shijin4/layouts/_partials/discourse.html diff --git a/themes/shijin4/layouts/partials/footer.copyright.html b/themes/shijin4/layouts/_partials/footer.copyright.html similarity index 100% rename from themes/shijin4/layouts/partials/footer.copyright.html rename to themes/shijin4/layouts/_partials/footer.copyright.html diff --git a/themes/shijin4/layouts/partials/footer.html b/themes/shijin4/layouts/_partials/footer.html similarity index 100% rename from themes/shijin4/layouts/partials/footer.html rename to themes/shijin4/layouts/_partials/footer.html diff --git a/themes/shijin4/layouts/partials/fundraising.html b/themes/shijin4/layouts/_partials/fundraising.html similarity index 100% rename from themes/shijin4/layouts/partials/fundraising.html rename to themes/shijin4/layouts/_partials/fundraising.html diff --git a/themes/shijin4/layouts/partials/header.html b/themes/shijin4/layouts/_partials/header.html similarity index 90% rename from themes/shijin4/layouts/partials/header.html rename to themes/shijin4/layouts/_partials/header.html index 3710f22f5..a034dbfed 100644 --- a/themes/shijin4/layouts/partials/header.html +++ b/themes/shijin4/layouts/_partials/header.html @@ -5,7 +5,7 @@ {{ .Title }} | {{ .Site.Title }} - {{ partial "header.includes.html" . }} + {{ partial "header_includes.html" . }} {{ if (.OutputFormats.Get "RSS") }}{{ end }} diff --git a/themes/shijin4/layouts/partials/header.includes.html b/themes/shijin4/layouts/_partials/header_includes.html similarity index 100% rename from themes/shijin4/layouts/partials/header.includes.html rename to themes/shijin4/layouts/_partials/header_includes.html diff --git a/themes/shijin4/layouts/partials/home.html b/themes/shijin4/layouts/_partials/home.html similarity index 100% rename from themes/shijin4/layouts/partials/home.html rename to themes/shijin4/layouts/_partials/home.html diff --git a/themes/shijin4/layouts/partials/item.xml b/themes/shijin4/layouts/_partials/item.xml similarity index 100% rename from themes/shijin4/layouts/partials/item.xml rename to themes/shijin4/layouts/_partials/item.xml diff --git a/themes/shijin4/layouts/partials/meta.html b/themes/shijin4/layouts/_partials/meta.html similarity index 100% rename from themes/shijin4/layouts/partials/meta.html rename to themes/shijin4/layouts/_partials/meta.html diff --git a/themes/shijin4/layouts/partials/navbar.html b/themes/shijin4/layouts/_partials/navbar.html similarity index 100% rename from themes/shijin4/layouts/partials/navbar.html rename to themes/shijin4/layouts/_partials/navbar.html diff --git a/themes/shijin4/layouts/partials/pagination.html b/themes/shijin4/layouts/_partials/pagination.html similarity index 100% rename from themes/shijin4/layouts/partials/pagination.html rename to themes/shijin4/layouts/_partials/pagination.html diff --git a/themes/shijin4/layouts/partials/sidebar_articles.html b/themes/shijin4/layouts/_partials/sidebar_articles.html similarity index 100% rename from themes/shijin4/layouts/partials/sidebar_articles.html rename to themes/shijin4/layouts/_partials/sidebar_articles.html diff --git a/themes/shijin4/layouts/partials/sidebar_blog.html b/themes/shijin4/layouts/_partials/sidebar_blog.html similarity index 100% rename from themes/shijin4/layouts/partials/sidebar_blog.html rename to themes/shijin4/layouts/_partials/sidebar_blog.html diff --git a/themes/shijin4/layouts/partials/sidebar_blogosphere.html b/themes/shijin4/layouts/_partials/sidebar_blogosphere.html similarity index 100% rename from themes/shijin4/layouts/partials/sidebar_blogosphere.html rename to themes/shijin4/layouts/_partials/sidebar_blogosphere.html diff --git a/themes/shijin4/layouts/partials/sidebar_events.html b/themes/shijin4/layouts/_partials/sidebar_events.html similarity index 100% rename from themes/shijin4/layouts/partials/sidebar_events.html rename to themes/shijin4/layouts/_partials/sidebar_events.html diff --git a/themes/shijin4/layouts/partials/sidebar_menu.html b/themes/shijin4/layouts/_partials/sidebar_menu.html similarity index 100% rename from themes/shijin4/layouts/partials/sidebar_menu.html rename to themes/shijin4/layouts/_partials/sidebar_menu.html diff --git a/themes/shijin4/layouts/partials/sidebar_news.html b/themes/shijin4/layouts/_partials/sidebar_news.html similarity index 100% rename from themes/shijin4/layouts/partials/sidebar_news.html rename to themes/shijin4/layouts/_partials/sidebar_news.html diff --git a/themes/shijin4/layouts/partials/single_generic.html b/themes/shijin4/layouts/_partials/single_generic.html similarity index 100% rename from themes/shijin4/layouts/partials/single_generic.html rename to themes/shijin4/layouts/_partials/single_generic.html diff --git a/themes/shijin4/layouts/shortcodes/alert-danger.html b/themes/shijin4/layouts/_shortcodes/alert-danger.html similarity index 100% rename from themes/shijin4/layouts/shortcodes/alert-danger.html rename to themes/shijin4/layouts/_shortcodes/alert-danger.html diff --git a/themes/shijin4/layouts/shortcodes/alert-donate.html b/themes/shijin4/layouts/_shortcodes/alert-donate.html similarity index 100% rename from themes/shijin4/layouts/shortcodes/alert-donate.html rename to themes/shijin4/layouts/_shortcodes/alert-donate.html diff --git a/themes/shijin4/layouts/shortcodes/alert-info.html b/themes/shijin4/layouts/_shortcodes/alert-info.html similarity index 100% rename from themes/shijin4/layouts/shortcodes/alert-info.html rename to themes/shijin4/layouts/_shortcodes/alert-info.html diff --git a/themes/shijin4/layouts/shortcodes/alert-warning.html b/themes/shijin4/layouts/_shortcodes/alert-warning.html similarity index 100% rename from themes/shijin4/layouts/shortcodes/alert-warning.html rename to themes/shijin4/layouts/_shortcodes/alert-warning.html diff --git a/themes/shijin4/layouts/shortcodes/html-escape.html b/themes/shijin4/layouts/_shortcodes/html-escape.html similarity index 100% rename from themes/shijin4/layouts/shortcodes/html-escape.html rename to themes/shijin4/layouts/_shortcodes/html-escape.html diff --git a/themes/shijin4/layouts/shortcodes/keyboard.html b/themes/shijin4/layouts/_shortcodes/keyboard.html similarity index 100% rename from themes/shijin4/layouts/shortcodes/keyboard.html rename to themes/shijin4/layouts/_shortcodes/keyboard.html diff --git a/themes/shijin4/layouts/blog_index/_index.html b/themes/shijin4/layouts/blog_index/_index.html new file mode 100644 index 000000000..9bdbd751b --- /dev/null +++ b/themes/shijin4/layouts/blog_index/_index.html @@ -0,0 +1,21 @@ +
+

{{ .Title }}

+
+ {{ if (isset .Params "author") }} + Blog post by {{ .Params.author }} on {{ .Date.Format "Mon, 2006-01-02 15:04" }} + {{ else }} + News posted on {{ .Date.Format "Mon, 2006-01-02 15:04" }} + {{ end }} +
+ {{ range $i, $e := .Params.tags }}{{if $i}}, {{end}} + {{ end }} +
+
+

{{ .Summary }}

+
+ {{ if (isset .Params "author") }} + {{ .Parent.Params.title }} + {{ end }} + Read More +
+
diff --git a/themes/shijin4/layouts/blog_index/li.html b/themes/shijin4/layouts/blog_index/li.html new file mode 100644 index 000000000..c47a921f6 --- /dev/null +++ b/themes/shijin4/layouts/blog_index/li.html @@ -0,0 +1,4 @@ +
  • +
    {{ .Title}}
    + posted on {{ .Date.Format "Mon, 2006-01-02 15:04" }}
    +
    • diff --git a/themes/shijin4/layouts/blog_index/list.html b/themes/shijin4/layouts/blog_index/list.html new file mode 100644 index 000000000..0fc126c27 --- /dev/null +++ b/themes/shijin4/layouts/blog_index/list.html @@ -0,0 +1,30 @@ +{{ partial "header.html" . }} +
    +{{ partial "navbar.html" . }} +
    + +
    + {{ partial "sidebar_blogosphere.html" . }} +
    + +
    + {{- if (isset .Params "author") -}} + {{ $paginator := .Paginate .RegularPages }} + + {{- range $paginator.Pages -}} + {{ .Render "summary" }} + {{- end -}} + {{ partial "pagination.html" . }} + {{ else }} + {{ $paginator := .Paginate (where (where .Site.RegularPages.ByDate.Reverse "Type" "blog") ".Params.date" "!=" nil) }} + + {{- range $paginator.Pages -}} + {{ .Render "summary" }} + {{- end -}} + {{ partial "pagination.html" . }} + {{- end -}} +
    +
    +{{ partial "footer.copyright.html" . }} +
    +{{ partial "footer.html" . }} diff --git a/themes/shijin4/layouts/blog_index/rss.xml b/themes/shijin4/layouts/blog_index/rss.xml new file mode 100644 index 000000000..edcee42bd --- /dev/null +++ b/themes/shijin4/layouts/blog_index/rss.xml @@ -0,0 +1,13 @@ + + + Recent blog posts on {{ .Site.Title }} + {{ .Permalink }} + en-US + Haiku, Inc. + (C) 2001-{{ now.Format "2006" }} Haiku, Inc. All rights reserved. + {{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" }} + {{- range first 15 (where (where .Site.RegularPages.ByDate.Reverse "Type" "blog") ".Params.date" "!=" nil) -}} + {{ partial "item.xml" . }} + {{- end -}} + + diff --git a/themes/shijin4/layouts/blog_index/single.html b/themes/shijin4/layouts/blog_index/single.html new file mode 100644 index 000000000..317613c77 --- /dev/null +++ b/themes/shijin4/layouts/blog_index/single.html @@ -0,0 +1,30 @@ +{{ partial "header.html" . }} +
    +{{ partial "navbar.html" . }} +
    +
    +
    +

    {{ .Title }}

    +
    + Blog post by {{ .Params.author }} on {{ .Date.Format "Mon, 2006-01-02 15:04" }} + {{ if .Params.tags }} +
    + {{ range $i, $e := .Params.tags }}{{if $i}}, {{end}} + {{ end }} +
    + {{ end }} +
    +

    {{ .Content }}

    +
    +
    + {{ partial "discourse.html" . }} +
    + + +
    + {{ partial "sidebar_blog.html" . }} +
    +
    +{{ partial "footer.copyright.html" . }} +
    +{{ partial "footer.html" . }} diff --git a/themes/shijin4/layouts/blog_index/summary.html b/themes/shijin4/layouts/blog_index/summary.html new file mode 100644 index 000000000..9bdbd751b --- /dev/null +++ b/themes/shijin4/layouts/blog_index/summary.html @@ -0,0 +1,21 @@ +
    +

    {{ .Title }}

    +
    + {{ if (isset .Params "author") }} + Blog post by {{ .Params.author }} on {{ .Date.Format "Mon, 2006-01-02 15:04" }} + {{ else }} + News posted on {{ .Date.Format "Mon, 2006-01-02 15:04" }} + {{ end }} +
    + {{ range $i, $e := .Params.tags }}{{if $i}}, {{end}} + {{ end }} +
    +
    +

    {{ .Summary }}

    +
    + {{ if (isset .Params "author") }} + {{ .Parent.Params.title }} + {{ end }} + Read More +
    +
    diff --git a/themes/shijin4/layouts/index.html b/themes/shijin4/layouts/home.html similarity index 98% rename from themes/shijin4/layouts/index.html rename to themes/shijin4/layouts/home.html index cb45f139a..6ee0ab4d4 100644 --- a/themes/shijin4/layouts/index.html +++ b/themes/shijin4/layouts/home.html @@ -7,7 +7,7 @@ Home | {{ .Site.Title }} - {{ partial "header.includes.html" . }} + {{ partial "header_includes.html" . }} {{ if (.OutputFormats.Get "RSS") }}{{ end }} diff --git a/themes/shijin4/layouts/taxonomy/article.terms.html b/themes/shijin4/layouts/taxonomy.html similarity index 100% rename from themes/shijin4/layouts/taxonomy/article.terms.html rename to themes/shijin4/layouts/taxonomy.html diff --git a/themes/shijin4/layouts/taxonomy/tag.html b/themes/shijin4/layouts/term.html similarity index 100% rename from themes/shijin4/layouts/taxonomy/tag.html rename to themes/shijin4/layouts/term.html