From bfe1ac9416acb1ea43bbe44c8eace4e5f266aeff Mon Sep 17 00:00:00 2001
From: Brandon Mathis <brandon@imathis.com>
Date: Wed, 6 Jun 2012 01:04:36 -0500
Subject: [PATCH] updated to latest theme

---
 source/_includes/comments.html          |  7 +++++++
 source/_includes/custom/after_page.html |  1 +
 source/_includes/custom/after_post.html |  0
 source/_includes/custom/comments.html   |  3 +++
 source/_includes/custom/page_meta.html  |  1 +
 source/_includes/custom/post_meta.html  |  1 +
 source/_includes/post/meta.html         |  5 +++++
 source/_layouts/page.html               | 14 +++-----------
 source/_layouts/post.html               | 13 +++----------
 9 files changed, 24 insertions(+), 21 deletions(-)
 create mode 100644 source/_includes/comments.html
 create mode 100644 source/_includes/custom/after_page.html
 create mode 100644 source/_includes/custom/after_post.html
 create mode 100644 source/_includes/custom/comments.html
 create mode 100644 source/_includes/custom/page_meta.html
 create mode 100644 source/_includes/custom/post_meta.html
 create mode 100644 source/_includes/post/meta.html

diff --git a/source/_includes/comments.html b/source/_includes/comments.html
new file mode 100644
index 0000000..c910032
--- /dev/null
+++ b/source/_includes/comments.html
@@ -0,0 +1,7 @@
+<section>
+  <h1>Comments</h1>
+  {% include custom/comments.html %}
+  {% if site.disqus_short_name %}
+    <div id="disqus_thread" aria-live="polite">{% include post/disqus_thread.html %}</div>
+  {% endif %}
+</section>
diff --git a/source/_includes/custom/after_page.html b/source/_includes/custom/after_page.html
new file mode 100644
index 0000000..c537f59
--- /dev/null
+++ b/source/_includes/custom/after_page.html
@@ -0,0 +1 @@
+{% comment %} Add content at the bottom of every page {% endcomment %}
diff --git a/source/_includes/custom/after_post.html b/source/_includes/custom/after_post.html
new file mode 100644
index 0000000..e69de29
diff --git a/source/_includes/custom/comments.html b/source/_includes/custom/comments.html
new file mode 100644
index 0000000..c5202f3
--- /dev/null
+++ b/source/_includes/custom/comments.html
@@ -0,0 +1,3 @@
+{% comment %}
+To use a custom comment system, add the javascript to custom/after_footer.html then add the container for your comments here.
+{% endcomment %}
diff --git a/source/_includes/custom/page_meta.html b/source/_includes/custom/page_meta.html
new file mode 100644
index 0000000..a93e18e
--- /dev/null
+++ b/source/_includes/custom/page_meta.html
@@ -0,0 +1 @@
+{% comment %} Add content to the meta section after any page. {% endcomment %}
diff --git a/source/_includes/custom/post_meta.html b/source/_includes/custom/post_meta.html
new file mode 100644
index 0000000..9c8c85c
--- /dev/null
+++ b/source/_includes/custom/post_meta.html
@@ -0,0 +1 @@
+{% comment %} Add content to the meta section after any post. {% endcomment %}
diff --git a/source/_includes/post/meta.html b/source/_includes/post/meta.html
new file mode 100644
index 0000000..37e9cdf
--- /dev/null
+++ b/source/_includes/post/meta.html
@@ -0,0 +1,5 @@
+<p class="meta">
+{% include post/author.html %}
+{% include post/date.html %}{% if updated %}{{ updated }}{% else %}{{ time }}{% endif %}
+{% if page.categories %}{% include post/categories.html %}{% endif %}
+</p>
diff --git a/source/_layouts/page.html b/source/_layouts/page.html
index 8ba6ec9..2837a98 100644
--- a/source/_layouts/page.html
+++ b/source/_layouts/page.html
@@ -13,23 +13,15 @@ layout: default
   {{ content }}
   {% unless page.footer == false %}
     <footer>
-      {% if page.date or page.author %}<p class="meta">
-        {% if page.author %}{% include post/author.html %}{% endif %}
-        {% include post/date.html %}{% if updated %}{{ updated }}{% else %}{{ time }}{% endif %}
-        {% if page.categories %}{% include post/categories.html %}{% endif %}
-      </p>{% endif %}
+      <p class="meta">{% include post/meta.html %}{% include custom/page-meta.html %}</p>
       {% unless page.sharing == false %}
         {% include post/sharing.html %}
       {% endunless %}
     </footer>
   {% endunless %}
 </article>
-{% if site.disqus_short_name and page.comments == true %}
-  <section>
-    <h1>Comments</h1>
-    <div id="disqus_thread" aria-live="polite">{% include post/disqus_thread.html %}</div>
-  </section>
-{% endif %}
+{% include custom/after_page.html %}
+{% if page.comments == true %}{% include comments.html %}{% endif %}
 </div>
 {% unless page.sidebar == false %}
 <aside class="sidebar">
diff --git a/source/_layouts/post.html b/source/_layouts/post.html
index 2db2dc2..9c3375f 100644
--- a/source/_layouts/post.html
+++ b/source/_layouts/post.html
@@ -9,9 +9,8 @@ single: true
   {% include article.html %}
   <footer>
     <p class="meta">
-      {% include post/author.html %}
-      {% include post/date.html %}{% if updated %}{{ updated }}{% else %}{{ time }}{% endif %}
-      {% include post/categories.html %}
+      {% include post/meta.html %}
+      {% include custom/post_meta.html %}
     </p>
     {% unless page.sharing == false %}
       {% include post/sharing.html %}
@@ -26,12 +25,7 @@ single: true
     </p>
   </footer>
 </article>
-{% if site.disqus_short_name and page.comments == true %}
-  <section>
-    <h1>Comments</h1>
-    <div id="disqus_thread" aria-live="polite">{% include post/disqus_thread.html %}</div>
-  </section>
-{% endif %}
+{% if page.comments == true %}{% include comments.html %}{% endif %}
 </div>
 {% unless page.sidebar == false %}
 <aside class="sidebar">
@@ -42,4 +36,3 @@ single: true
   {% endif %}
 </aside>
 {% endunless %}
-