From 5d61b463580584755bc6a45ac3212b3b08409dda Mon Sep 17 00:00:00 2001
From: Brandon Mathis <brandon@imathis.com>
Date: Mon, 20 Jun 2011 16:44:04 -0400
Subject: 1. Updated readme 2. Improved blog typography 3. Improved support for
 Disqus 4. Removed unnecessary page layout

---
 themes/classic/source/_includes/article.html       | 26 +++++++++-------------
 .../source/_includes/asides/recent_posts.html      |  2 +-
 themes/classic/source/_includes/disqus_thread.html | 16 ++++++++-----
 themes/classic/source/_includes/post_meta.html     |  7 ------
 themes/classic/source/_layouts/page.html           | 12 ++--------
 themes/classic/source/_layouts/post.html           |  9 ++++++--
 themes/classic/source/archive.html                 |  2 +-
 themes/classic/source/index.html                   | 12 +++++++++-
 8 files changed, 44 insertions(+), 42 deletions(-)
 delete mode 100644 themes/classic/source/_includes/post_meta.html

(limited to 'themes/classic/source')

diff --git a/themes/classic/source/_includes/article.html b/themes/classic/source/_includes/article.html
index c0a9782f..7ed6430f 100644
--- a/themes/classic/source/_includes/article.html
+++ b/themes/classic/source/_includes/article.html
@@ -1,8 +1,3 @@
-{% if page.author %}
-  {% assign author = page.author %}
-{% else %}
-  {% assign author = site.author %}
-{% endif %}
 {% unless page.no_header %}
   <header>
     {% if index %}
@@ -10,19 +5,20 @@
     {% else %}
       <h1 class="entry-title">{{ page.title | titlecase }}</h1>
     {% endif %}
-    {% unless page.no_meta or !index %}<p class="meta">{% include post_meta.html %}</p>{% endunless %}
+    {% unless page.no_meta or !index %}<p class="meta">{% include post_date.html %}</p>{% endunless %}
   </header>
 {% endunless %}
 {% if index %}
-<div class="entry-content">{{ content | exerpt | smart_quotes }}</div>
-<footer>
-  <p>
-  {% if content contains "<!-- more -->" or content contains "<!--more-->" %}
-    <a rel="full-article" href="{{ page.url }}">Read more &hellip;</a>
-  {% endif %}
-  {% include post_meta.html %}
-  </p>
-</footer>
+  <div class="entry-content">{{ content | exerpt | smart_quotes }}</div>
+  <p><a rel="full-article" href="{{ page.url }}">Read on &rarr;</a></p>
+  <footer>
+    <p class="meta">
+      {% include post_author.html %}
+      {% include post_date.html %}
+      <span class="comments"><a rel="comments" href="{{ page.url }}#disqus_thread">Add a comment</a></span>
+      {% include sharing.html %}
+    </p>
+  </footer>
 {% else %}
 <div class="entry-content">{{ content | smart_quotes }}</div>
 {% endif %}
diff --git a/themes/classic/source/_includes/asides/recent_posts.html b/themes/classic/source/_includes/asides/recent_posts.html
index 7b40b76e..ad3c7cc0 100644
--- a/themes/classic/source/_includes/asides/recent_posts.html
+++ b/themes/classic/source/_includes/asides/recent_posts.html
@@ -8,5 +8,5 @@
       </li>
     {% endfor %}
   </ul>
-  </section>
+</section>
 {% endif %}
diff --git a/themes/classic/source/_includes/disqus_thread.html b/themes/classic/source/_includes/disqus_thread.html
index 036b9d7b..2b137792 100644
--- a/themes/classic/source/_includes/disqus_thread.html
+++ b/themes/classic/source/_includes/disqus_thread.html
@@ -1,7 +1,13 @@
+<div id="disqus_thread"></div>
 <script type="text/javascript">
-  var disqus_url = "{{ site.url }}{{ page.url }}";
+  var disqus_shortname = '{{ site.disqus_short_name }}';
+  var disqus_identifier = '{{ site.url }}{{ page.url }}';
+  var disqus_url = '{{ site.url }}{{ page.url }}';
+  var disqus_developer = 1;
+  (function() {
+    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+    dsq.src = 'http://' + disqus_shortname + '.disqus.com/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+  })();
 </script>
-<noscript>
-  <a href="http://{{ site.disqus_short_name }}.disqus.com/?url=ref">View the discussion thread</a>
-</noscript>
-<script type="text/javascript" src="http://disqus.com/forums/{{ site.disqus_short_name }}/embed.js"></script>
+<noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
diff --git a/themes/classic/source/_includes/post_meta.html b/themes/classic/source/_includes/post_meta.html
deleted file mode 100644
index 24768255..00000000
--- a/themes/classic/source/_includes/post_meta.html
+++ /dev/null
@@ -1,7 +0,0 @@
-{% if page.date %}
-<time datetime="{{ page.date | datetime }}" pubdate {% if page.updated %} updated {% endif %}>{{ page.date | ordinalize }}</time>
-{% endif %}
-{% if page.updated %}
-<time class="updated" datetime="{{ page.updated | datetime }}"></time>
-{% endif %}
-{% if author %}<span class="byline author vcard"><span class="fn">{{ author }}</span></span>{% endif %}
diff --git a/themes/classic/source/_layouts/page.html b/themes/classic/source/_layouts/page.html
index 88d6e13a..0c59c990 100644
--- a/themes/classic/source/_layouts/page.html
+++ b/themes/classic/source/_layouts/page.html
@@ -1,13 +1,5 @@
 ---
-layout: default
-no_title_link: true
-permalink: pretty
-single: true
+layout: post
 ---
 
-<article>
-  {% include article.html %}
-  {% if site.disqus_short_name %}
-    <div id="disqus_thread">{% include disqus_thread.html %}</div>
-  {% endif %}
-</article>
+<!-- if you want a page layout -->
diff --git a/themes/classic/source/_layouts/post.html b/themes/classic/source/_layouts/post.html
index 7407d1e3..196bb4dd 100644
--- a/themes/classic/source/_layouts/post.html
+++ b/themes/classic/source/_layouts/post.html
@@ -6,11 +6,16 @@ single: true
 <article class="hentry">
   {% include article.html %}
   <footer>
-    <p>
-      <a href="http://twitter.com/share" class="twitter-share-button" data-url="{{ site.url }}{{ page.url }}" data-via="{{ site.twitter_user }}" data-counturl="{{ site.url }}{{ page.url }}" >Tweet</a>
+    <p class="meta">
+      {% include post_author.html %}
+      {% include post_date.html %}
+      {% include sharing.html %}
     </p>
   </footer>
   {% if site.disqus_short_name %}
+  <section>
+    <h1>Comments</h1>
     <div id="disqus_thread">{% include disqus_thread.html %}</div>
+  </section>
   {% endif %}
 </article>
diff --git a/themes/classic/source/archive.html b/themes/classic/source/archive.html
index be373762..e49c6b67 100644
--- a/themes/classic/source/archive.html
+++ b/themes/classic/source/archive.html
@@ -1,5 +1,5 @@
 ---
-layout: page
+layout: post
 title: Blog Archive
 no_meta: true
 ---
diff --git a/themes/classic/source/index.html b/themes/classic/source/index.html
index f151e06e..2ef9f8cf 100644
--- a/themes/classic/source/index.html
+++ b/themes/classic/source/index.html
@@ -9,4 +9,14 @@ blog_index: true
     {% include article.html %}
   </article>
 {% endfor %}
-
+{% if site.disqus_short_name %}
+<script type="text/javascript">
+    var disqus_shortname = '{{ site.disqus_short_name }}';
+    (function () {
+      var s = document.createElement('script'); s.async = true;
+      s.type = 'text/javascript';
+      s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+      (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+    }());
+</script>
+{% endif %}
-- 
cgit v1.2.1