From 64b23d9f34f140b8e544960070525343dfe1273b Mon Sep 17 00:00:00 2001 From: Brandon Mathis Date: Mon, 18 Jul 2011 16:59:59 -0400 Subject: [PATCH] Improved variable names for setting footer, sharing, sidebar and metadata diesplay from page configurations --- .themes/classic/source/_includes/article.html | 2 +- .themes/classic/source/_layouts/category_index.html | 2 +- .themes/classic/source/_layouts/default.html | 4 ++-- .themes/classic/source/_layouts/page.html | 6 +++--- .themes/classic/source/_layouts/post.html | 6 +++--- .themes/classic/source/blog/archives/index.html | 2 +- .themes/classic/source/index.html | 3 ++- 7 files changed, 13 insertions(+), 12 deletions(-) diff --git a/.themes/classic/source/_includes/article.html b/.themes/classic/source/_includes/article.html index fee7a19..69bb500 100644 --- a/.themes/classic/source/_includes/article.html +++ b/.themes/classic/source/_includes/article.html @@ -5,7 +5,7 @@ {% else %}

{{ page.title | titlecase }}

{% endif %} - {% unless page.no_meta %} + {% unless page.meta == false %}

{% include post/date.html %}

{% endunless %} diff --git a/.themes/classic/source/_layouts/category_index.html b/.themes/classic/source/_layouts/category_index.html index cce9777..85a6307 100644 --- a/.themes/classic/source/_layouts/category_index.html +++ b/.themes/classic/source/_layouts/category_index.html @@ -1,6 +1,6 @@ --- layout: page -no_footer: true +footer: false ---
diff --git a/.themes/classic/source/_layouts/default.html b/.themes/classic/source/_layouts/default.html index 15546bb..fdb60de 100644 --- a/.themes/classic/source/_layouts/default.html +++ b/.themes/classic/source/_layouts/default.html @@ -1,11 +1,11 @@ {% include head.html %} - +
{% include header.html %}
{{ content }} - {% unless page.sidebar == 'none' %} + {% unless page.sidebar == false %} {% endunless %}
diff --git a/.themes/classic/source/_layouts/page.html b/.themes/classic/source/_layouts/page.html index fb51816..48dff5c 100644 --- a/.themes/classic/source/_layouts/page.html +++ b/.themes/classic/source/_layouts/page.html @@ -6,17 +6,17 @@ layout: default

{{ page.title | titlecase }}

- {% unless page.no_meta or !index %}

{% include post/date.html %}

{% endunless %} + {% if page.meta == false or !page.date %}

{% include post/date.html %}

{% endif %}
{{ content | smart_quotes }} - {% unless page.no_footer %} + {% unless page.footer == false %}
{% if page.date %}

{% include post/date.html %}

{% endif %} - {% unless page.no_sharing %} + {% unless page.sharing == false %} {% include post/sharing.html %} {% endunless %}
diff --git a/.themes/classic/source/_layouts/post.html b/.themes/classic/source/_layouts/post.html index 2ec379c..414a368 100644 --- a/.themes/classic/source/_layouts/post.html +++ b/.themes/classic/source/_layouts/post.html @@ -12,12 +12,12 @@ single: true {% include post/date.html %} {% include post/categories.html %}

- {% unless page.no_sharing %} - {% include post/sharing.html %} + {% unless page.sharing == false %} + {% include post/sharing.html %} {% endunless %}
-{% if site.disqus_short_name and page.no_comments != true %} +{% if site.disqus_short_name and page.comments == true %}

Comments

{% include post/disqus_thread.html %}
diff --git a/.themes/classic/source/blog/archives/index.html b/.themes/classic/source/blog/archives/index.html index cdc5f17..f1d9cee 100644 --- a/.themes/classic/source/blog/archives/index.html +++ b/.themes/classic/source/blog/archives/index.html @@ -1,7 +1,7 @@ --- layout: page title: Blog Archive -no_footer: true +footer: false ---
diff --git a/.themes/classic/source/index.html b/.themes/classic/source/index.html index 0655c13..f1d97f9 100644 --- a/.themes/classic/source/index.html +++ b/.themes/classic/source/index.html @@ -1,6 +1,7 @@ --- layout: default -blog_index: true +meta: false +footer: false ---
{% assign index = true %}