1 files changed, 22 insertions, 13 deletions
diff --git a/source/_includes/article.html b/source/_includes/article.html
index 92f06720..3481cf21 100644
--- a/source/_includes/article.html
+++ b/source/_includes/article.html
@@ -1,18 +1,27 @@
 <header>
-  <h1><a href="{{ page.url }}">{{ page.title }}</a></h1>
-  <p>
-    {% if site.author or site.author == page.author %}
-      <span class="byline author vcard">By <span class="fn">{{ site.author }}</span></span>
-    {% elsif page.author %}
-      <span class="byline author vcard">By <span class="fn">{{ page.author }}</span></span>
+  {% if index %}
+    <h1><a href="{{ page.url }}">{{ page.title }}</a></h1>
+  {% else %}
+    <h1>{{ page.title }}</h1>
+  {% endif %}
+  {% unless page.nometa %}
+    {% if page.author %}
+      {% assign author = page.author %}
+    {% else %}
+      {% assign author = site.author %}
     {% endif %}
-    {% if page.date %}
-      <time datetime="{{ page.date | datetime }}" pubdate>{{ page.date | ordinalize }}</time>
-    {% endif %}
-    {% if page.updated %}
-      <time class="updated" datetime="{{ page.updated | datetime }}" pubdate>Updated {{ page.updated | ordinalize }}</time>
-    {% endif %}
-  </p>
+    <p>
+      {% if author %}
+        <span class="byline author vcard">By <span class="fn">{{ author }}</span></span>
+      {% endif %}
+      {% if page.date %}
+        <time datetime="{{ page.date | datetime }}" pubdate>{{ page.date | ordinalize }}</time>
+      {% endif %}
+      {% if page.updated %}
+        <time class="updated" datetime="{{ page.updated | datetime }}" pubdate>Updated {{ page.updated | ordinalize }}</time>
+      {% endif %}
+    </p>
+  {% endunless %}
 </header>
 {% if index %}
 <div class="entry">{{ content | exerpt(content, page.url, 'Continue reading &raquo;') | smart_quotes }}</div>