Time metadata for updated pages and posts are now displayed where and when it is appropriate

2 files changed, 6 insertions, 4 deletions

diff --git a/.themes/classic/source/_includes/article.html b/.themes/classic/source/_includes/article.html
index b561fbc7..5cd6fda1 100644
--- a/.themes/classic/source/_includes/article.html
+++ b/.themes/classic/source/_includes/article.html
@@ -6,7 +6,7 @@
       <h1 class="entry-title">{{ page.title | titlecase }}</h1>
     {% endif %}
     {% unless page.meta == false %}
-      <p class="meta">{% include post/date.html %}</p>
+      <p class="meta">{% include post/date.html %}{{ time }}</p>
     {% endunless %}
   </header>
 {% endunless %}
diff --git a/.themes/classic/source/_includes/post/date.html b/.themes/classic/source/_includes/post/date.html
index bc493138..dbfa67ae 100644
--- a/.themes/classic/source/_includes/post/date.html
+++ b/.themes/classic/source/_includes/post/date.html
@@ -2,9 +2,11 @@
 {% capture has_date %}{{ date | size }}{% endcapture %}
 {% capture updated %}{{ page.updated }}{{ post.updated }}{% endcapture %}
 {% capture was_updated %}{{ updated | size }}{% endcapture %}
+
 {% if has_date != '0' %}
-<time datetime="{{ date | datetime | date_to_xmlschema }}" pubdate {% if updated %} data-updated="true" {% endif %}>{{ date | ordinalize }}</time>
+  {% capture time %}<time datetime="{{ date | datetime | date_to_xmlschema }}" pubdate {% if updated %} data-updated="true" {% endif %}>{{ date | ordinalize }}</time>{% endcapture %}
 {% endif %}
+
 {% if was_updated != '0' %}
-<time class="updated" datetime="{{ updated | datetime | date_to_xmlschema }}">{{ updated | ordinalize }}</time>
-{% endif %}
+  {% capture updated %}<time class="updated" datetime="{{ updated | datetime | date_to_xmlschema }}">Updated {{ updated | ordinalize }}</time>{% endcapture %}
+{% else %}{% assign updated = false %}{% endif %}