@@ -1,5 +1,7 @@

 {% if post.author %}

   {% assign author = post.author %}

+{% elsif page.author %}

+  {% assign author = page.author %}

 {% else %}

   {% assign author = site.author %}

 {% endif %}

@@ -11,7 +11,11 @@ layout: default

   {{ content }}

   {% unless page.footer == false %}

     <footer>

-      {% if page.date %}<p class="meta">{% include post/date.html %}</p>{% endif %}

+      {% if page.date or page.author %}<p class="meta">

+        {% if page.author %}{% include post/author.html %}{% endif %}

+        {% include post/date.html %}

+        {% if page.categories %}{% include post/categories.html %}{% endif %}

+      </p>{% endif %}

       {% unless page.sharing == false %}

         {% include post/sharing.html %}

       {% endunless %}