From f63b8fe294a85a0e82c2bc67d2fef35cf7f6124b Mon Sep 17 00:00:00 2001 From: Michael Rose Date: Thu, 10 Mar 2016 21:13:01 -0500 Subject: [PATCH] Add file extensions back to non-helper _includes --- .../analytics-providers/{custom => custom.html} | 0 .../{google-universal => google-universal.html} | 0 .../analytics-providers/{google => google.html} | 0 _includes/{analytics => analytics.html} | 6 +++--- ...chive-list-single => archive-list-single.html} | 0 _includes/{author-profile => author-profile.html} | 0 _includes/{breadcrumbs => breadcrumbs.html} | 0 _includes/browser-upgrade | 1 - _includes/browser-upgrade.html | 3 +++ .../comments-providers/{custom => custom.html} | 0 .../comments-providers/{disqus => disqus.html} | 0 .../{facebook => facebook.html} | 0 .../{google-plus => google-plus.html} | 0 _includes/{comments => comments.html} | 0 _includes/{footer => footer.html} | 0 _includes/{head => head.html} | 2 +- _includes/{navigation => masthead.html} | 0 _includes/page__taxonomy.html | 15 +++++++++++++++ _includes/{pagination => pagination.html} | 0 _includes/{scripts => scripts.html} | 4 ++-- _includes/{seo => seo.html} | 0 _includes/{social-share => social-share.html} | 0 _layouts/default.html | 14 +++++++------- _layouts/single.html | 6 ++---- _pages/category-archive.html | 2 +- _pages/collection-archive.html | 2 +- _pages/page-archive.html | 2 +- _pages/portfolio-archive.html | 2 +- _pages/recipes-archive.html | 2 +- _pages/sitemap.md | 6 +++--- _pages/tag-archive.html | 2 +- _pages/year-archive.html | 2 +- index.html | 6 +++--- 33 files changed, 46 insertions(+), 31 deletions(-) rename _includes/analytics-providers/{custom => custom.html} (100%) rename _includes/analytics-providers/{google-universal => google-universal.html} (100%) rename _includes/analytics-providers/{google => google.html} (100%) rename _includes/{analytics => analytics.html} (55%) rename _includes/{archive-list-single => archive-list-single.html} (100%) rename _includes/{author-profile => author-profile.html} (100%) rename _includes/{breadcrumbs => breadcrumbs.html} (100%) delete mode 100644 _includes/browser-upgrade create mode 100644 _includes/browser-upgrade.html rename _includes/comments-providers/{custom => custom.html} (100%) rename _includes/comments-providers/{disqus => disqus.html} (100%) rename _includes/comments-providers/{facebook => facebook.html} (100%) rename _includes/comments-providers/{google-plus => google-plus.html} (100%) rename _includes/{comments => comments.html} (100%) rename _includes/{footer => footer.html} (100%) rename _includes/{head => head.html} (96%) rename _includes/{navigation => masthead.html} (100%) create mode 100644 _includes/page__taxonomy.html rename _includes/{pagination => pagination.html} (100%) rename _includes/{scripts => scripts.html} (82%) rename _includes/{seo => seo.html} (100%) rename _includes/{social-share => social-share.html} (100%) diff --git a/_includes/analytics-providers/custom b/_includes/analytics-providers/custom.html similarity index 100% rename from _includes/analytics-providers/custom rename to _includes/analytics-providers/custom.html diff --git a/_includes/analytics-providers/google-universal b/_includes/analytics-providers/google-universal.html similarity index 100% rename from _includes/analytics-providers/google-universal rename to _includes/analytics-providers/google-universal.html diff --git a/_includes/analytics-providers/google b/_includes/analytics-providers/google.html similarity index 100% rename from _includes/analytics-providers/google rename to _includes/analytics-providers/google.html diff --git a/_includes/analytics b/_includes/analytics.html similarity index 55% rename from _includes/analytics rename to _includes/analytics.html index 295516aa..64a3359a 100644 --- a/_includes/analytics +++ b/_includes/analytics.html @@ -2,11 +2,11 @@ {% case site.analytics.provider %} {% when "google" %} - {% include /analytics-providers/google %} + {% include /analytics-providers/google.html %} {% when "google-universal" %} - {% include /analytics-providers/google-universal %} + {% include /analytics-providers/google-universal.html %} {% when "custom" %} - {% include /analytics-providers/custom %} + {% include /analytics-providers/custom.html %} {% endcase %} {% endif %} \ No newline at end of file diff --git a/_includes/archive-list-single b/_includes/archive-list-single.html similarity index 100% rename from _includes/archive-list-single rename to _includes/archive-list-single.html diff --git a/_includes/author-profile b/_includes/author-profile.html similarity index 100% rename from _includes/author-profile rename to _includes/author-profile.html diff --git a/_includes/breadcrumbs b/_includes/breadcrumbs.html similarity index 100% rename from _includes/breadcrumbs rename to _includes/breadcrumbs.html diff --git a/_includes/browser-upgrade b/_includes/browser-upgrade deleted file mode 100644 index 99d9cbc2..00000000 --- a/_includes/browser-upgrade +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/_includes/browser-upgrade.html b/_includes/browser-upgrade.html new file mode 100644 index 00000000..f3ccb820 --- /dev/null +++ b/_includes/browser-upgrade.html @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/_includes/comments-providers/custom b/_includes/comments-providers/custom.html similarity index 100% rename from _includes/comments-providers/custom rename to _includes/comments-providers/custom.html diff --git a/_includes/comments-providers/disqus b/_includes/comments-providers/disqus.html similarity index 100% rename from _includes/comments-providers/disqus rename to _includes/comments-providers/disqus.html diff --git a/_includes/comments-providers/facebook b/_includes/comments-providers/facebook.html similarity index 100% rename from _includes/comments-providers/facebook rename to _includes/comments-providers/facebook.html diff --git a/_includes/comments-providers/google-plus b/_includes/comments-providers/google-plus.html similarity index 100% rename from _includes/comments-providers/google-plus rename to _includes/comments-providers/google-plus.html diff --git a/_includes/comments b/_includes/comments.html similarity index 100% rename from _includes/comments rename to _includes/comments.html diff --git a/_includes/footer b/_includes/footer.html similarity index 100% rename from _includes/footer rename to _includes/footer.html diff --git a/_includes/head b/_includes/head.html similarity index 96% rename from _includes/head rename to _includes/head.html index aae86334..1ef0fa01 100644 --- a/_includes/head +++ b/_includes/head.html @@ -1,6 +1,6 @@ -{% include seo %} +{% include seo.html %} diff --git a/_includes/navigation b/_includes/masthead.html similarity index 100% rename from _includes/navigation rename to _includes/masthead.html diff --git a/_includes/page__taxonomy.html b/_includes/page__taxonomy.html new file mode 100644 index 00000000..1538d5b9 --- /dev/null +++ b/_includes/page__taxonomy.html @@ -0,0 +1,15 @@ +{% comment %} + + +{% endcomment %} + +{% capture page_tags %}{% for tag in page.tags %}{{ tag | downcase }}#{{ tag }}{% unless forloop.last %},{% endunless %}{% endfor %}{% endcapture %} +{% assign tag_hashes = (page_tags | split: ',' | sort:0) %} + +Filed under: +{% for hash in tag_hashes %} + {% assign keyValue = hash | split: '#' %} + {% capture tag_word %}{{ keyValue[1] | strip_newlines }}{% endcapture %} + {% if forloop.last %} and{% endif %} {{ tag_word }}{% unless forloop.last %}, {% endunless %} +{% endfor %} + \ No newline at end of file diff --git a/_includes/pagination b/_includes/pagination.html similarity index 100% rename from _includes/pagination rename to _includes/pagination.html diff --git a/_includes/scripts b/_includes/scripts.html similarity index 82% rename from _includes/scripts rename to _includes/scripts.html index 6c185307..55feefae 100644 --- a/_includes/scripts +++ b/_includes/scripts.html @@ -2,5 +2,5 @@ -{% include analytics %} -{% include comments %} +{% include analytics.html %} +{% include comments.html %} diff --git a/_includes/seo b/_includes/seo.html similarity index 100% rename from _includes/seo rename to _includes/seo.html diff --git a/_includes/social-share b/_includes/social-share.html similarity index 100% rename from _includes/social-share rename to _includes/social-share.html diff --git a/_layouts/default.html b/_layouts/default.html index 3742f98d..4f36a104 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -7,13 +7,13 @@ layout: compress - {% include head %} + {% include head.html %} - {% include browser-upgrade %} - {% include navigation %} + {% include browser-upgrade.html %} + {% include masthead.html %} {% if page.header.image %}
@@ -31,12 +31,12 @@ layout: compress {% endif %} {% if site.breadcrumbs %} - {% include breadcrumbs %} + {% include breadcrumbs.html %} {% endif %}
- {% if page.author_profile %}{% include author-profile %}{% endif %} + {% if page.author_profile %}{% include author-profile.html %}{% endif %} {% if page.sidebar %} {% for s in page.sidebar %} {% if s.image %} @@ -59,11 +59,11 @@ layout: compress
- {% include footer %} + {% include footer.html %}
- {% include scripts %} + {% include scripts.html %} diff --git a/_layouts/single.html b/_layouts/single.html index ea3fbb89..2f24ae0b 100644 --- a/_layouts/single.html +++ b/_layouts/single.html @@ -19,10 +19,8 @@ layout: default {% if page.link %}
{{ site.data.ui-text[site.locale].ext_link_label }}
{% endif %} -
- -
- {% if site.share and page.share %}{% include social-share %}{% endif %} +
+ {% if site.share and page.share %}{% include social-share.html %}{% endif %} {% if page.modified %}

{{ site.data.ui-text[site.locale].date_label }} {{ page.modified | date: "%B %d, %Y" }}

{% elsif page.date %} diff --git a/_pages/category-archive.html b/_pages/category-archive.html index 8697d21f..f708e380 100644 --- a/_pages/category-archive.html +++ b/_pages/category-archive.html @@ -12,6 +12,6 @@ author_profile: false {% assign posts = group_items[forloop.index0] %}

{{ category }}

{% for post in posts %} - {% include archive-list-single %} + {% include archive-list-single.html %} {% endfor %} {% endfor %} \ No newline at end of file diff --git a/_pages/collection-archive.html b/_pages/collection-archive.html index df1f7cff..c28a422e 100644 --- a/_pages/collection-archive.html +++ b/_pages/collection-archive.html @@ -18,7 +18,7 @@ author_profile: false {% endunless %} {% for post in collection.docs %} {% unless collection.output == false or collection.label == 'posts' %} - {% include archive-list-single %} + {% include archive-list-single.html %} {% endunless %} {% endfor %} {% endfor %} \ No newline at end of file diff --git a/_pages/page-archive.html b/_pages/page-archive.html index f909548f..f79dcd3a 100644 --- a/_pages/page-archive.html +++ b/_pages/page-archive.html @@ -7,5 +7,5 @@ author_profile: false {% include base_path %} {% for post in site.pages %} - {% include archive-list-single %} + {% include archive-list-single.html %} {% endfor %} \ No newline at end of file diff --git a/_pages/portfolio-archive.html b/_pages/portfolio-archive.html index 2befa23c..f1909db5 100644 --- a/_pages/portfolio-archive.html +++ b/_pages/portfolio-archive.html @@ -11,6 +11,6 @@ permalink: /portfolio/ {% assign posts = group_items[forloop.index0] %}

{{ category }}

{% for post in posts %} - {% include archive-list-single %} + {% include archive-list-single.html %} {% endfor %} {% endfor %} \ No newline at end of file diff --git a/_pages/recipes-archive.html b/_pages/recipes-archive.html index 645ec5d3..7a26854d 100644 --- a/_pages/recipes-archive.html +++ b/_pages/recipes-archive.html @@ -12,6 +12,6 @@ author_profile: false {% assign posts = group_items[forloop.index0] %}

{{ category }}

{% for post in posts %} - {% include archive-list-single %} + {% include archive-list-single.html %} {% endfor %} {% endfor %} \ No newline at end of file diff --git a/_pages/sitemap.md b/_pages/sitemap.md index 0acf49f3..fb718bd4 100644 --- a/_pages/sitemap.md +++ b/_pages/sitemap.md @@ -11,12 +11,12 @@ A list of all the posts and pages found on the site. For you robots out there is

Pages

{% for post in site.pages %} - {% include archive-list-single %} + {% include archive-list-single.html %} {% endfor %}

Posts

{% for post in site.posts %} - {% include archive-list-single %} + {% include archive-list-single.html %} {% endfor %} {% capture written_label %}'None'{% endcapture %} @@ -31,7 +31,7 @@ A list of all the posts and pages found on the site. For you robots out there is {% endunless %} {% for post in collection.docs %} {% unless collection.output == false or collection.label == 'posts' %} - {% include archive-list-single %} + {% include archive-list-single.html %} {% endunless %} {% endfor %} {% endfor %} \ No newline at end of file diff --git a/_pages/tag-archive.html b/_pages/tag-archive.html index e3a628c8..f1469ab4 100644 --- a/_pages/tag-archive.html +++ b/_pages/tag-archive.html @@ -12,6 +12,6 @@ author_profile: false {% assign posts = group_items[forloop.index0] %}

{{ tag }}

{% for post in posts %} - {% include archive-list-single %} + {% include archive-list-single.html %} {% endfor %} {% endfor %} \ No newline at end of file diff --git a/_pages/year-archive.html b/_pages/year-archive.html index 8604074b..ad12c397 100644 --- a/_pages/year-archive.html +++ b/_pages/year-archive.html @@ -13,5 +13,5 @@ author_profile: false

{{ year }}

{% capture written_year %}{{ year }}{% endcapture %} {% endif %} - {% include archive-list-single %} + {% include archive-list-single.html %} {% endfor %} \ No newline at end of file diff --git a/index.html b/index.html index 81243d9c..a9c17b4f 100644 --- a/index.html +++ b/index.html @@ -8,10 +8,10 @@ header: {% include base_path %} -

Recent Posts

+

Recent Posts

{% for post in paginator.posts %} - {% include archive-list-single %} + {% include archive-list-single.html %} {% endfor %} -{% include pagination %} \ No newline at end of file +{% include pagination.html %} \ No newline at end of file