Merge pull request #228 from jackey8616/date_time_merge

[Optimization] Rewrite some code logic and method change for `post_meta.updated_at` option.

Author: ivan-nginx

_config.yml

@@ -261,11 +261,12 @@ auto_excerpt:
 post_meta:
   item_text: true
   created_at: true
-  updated_at: false
-  # Only show 'updated' if different from 'created'.
-  updated_diff: false
-  # If true, post's time format will be hexo config's date_format + ' ' + time_format.
-  date_time_merge: false
+  updated_at:
+    enabled: true
+    # If true, show updated date label only if `updated date` different from 'created date' (post edited in another day than was created).
+    # And if post will edited in same day as created, edited time will show in popup title under created time label.
+    # If false show anyway, but if post edited in same day, show only edited time.
+    another_day: true
   categories: true
 
 # Post wordcount display settings

languages/en.yml

@@ -22,15 +22,16 @@ sidebar:
   toc: Table of Contents
 
 post:
-  created: Post created
-  modified: Post modified
-  edit: Edit this post
-  sticky: Sticky
   posted: Posted on
+  edited: Edited on
+  created: Created
+  modified: Modified
+  edit: Edit this post
   in: In
   more: more
   read_more: Read more
   untitled: Untitled
+  sticky: Sticky
   toc_empty: This post does not have a Table of Contents
   views: Views
   comments_count: Comments
@@ -89,7 +90,7 @@ keep_on: Keep on posting.
 symbol:
   comma: ", "
   period: ". "
-  colon: ":"
+  colon: ": "
 
 reward:
   donate: Donate

layout/_macro/post.swig

@@ -73,11 +73,10 @@
 
         <div class="post-meta">
           <span class="post-time">
-            {% if theme.post_meta.date_time_merge %}
-                {% set datetime_format = config.date_format + ' ' + config.time_format %}
-            {% else %}
-                {% set datetime_format = config.date_format %}
-            {% endif %}
+
+            {% set date_diff = date(post.date) != date(post.updated) %}
+            {% set time_diff = time(post.date) != time(post.updated) %}
+            {% set datetime_diff = date_diff or time_diff %}
 
             {% if theme.post_meta.created_at %}
               <span class="post-meta-item-icon">
@@ -86,32 +85,40 @@
               {% if theme.post_meta.item_text %}
                 <span class="post-meta-item-text">{{ __('post.posted') }}</span>
               {% endif %}
-              <time title="{{ __('post.created') }}" itemprop="dateCreated datePublished" datetime="{{ moment(post.date).format() }}">{#
-              #}{{ date(post.date, datetime_format) }}{#
-            #}</time>
-            {% endif %}
 
-            {% set date_updated_diff = date(post.date, datetime_format) != date(post.updated, datetime_format) %}
-            {% if theme.post_meta.updated_at %}
-              {% if !theme.post_meta.updated_diff || theme.post_meta.updated_diff && date_updated_diff %}
-                {% set display_updated = true %}
+              {% if !date_diff && time_diff && theme.post_meta.updated_at.enabled && theme.post_meta.updated_at.another_day %}
+                {% set create_title = __('post.created') + __('symbol.colon') + full_date(post.date) + ' / ' + __('post.modified') + __('symbol.colon') + time(post.updated) %}
+              {% else %}
+                {% set create_title = __('post.created') + __('symbol.colon') + full_date(post.date) %}
               {% endif %}
+
+              <time title="{{ create_title }}" itemprop="dateCreated datePublished" datetime="{{ moment(post.date).format() }}">{#
+              #}{{ date(post.date) -}}
+              </time>
             {% endif %}
 
-            {% if display_updated or (!theme.post_meta.created_at and theme.post_meta.updated_at) %}
-              {% if theme.post_meta.created_at and theme.post_meta.updated_at %}
-              <span class="post-meta-divider">|</span>
-              {% endif %}
+            {% if theme.post_meta.updated_at.enabled && datetime_diff %}
+              {% set display_updated = !theme.post_meta.updated_at.another_day || theme.post_meta.updated_at.another_day && date_diff %}
 
-              <span class="post-meta-item-icon">
-                <i class="fa fa-calendar-check-o"></i>
-              </span>
-              {% if theme.post_meta.item_text %}
-                <span class="post-meta-item-text">{{ __('post.modified') + __('symbol.colon') }}</span>
+              {% if display_updated or !theme.post_meta.created_at %}
+                {% if theme.post_meta.created_at and theme.post_meta.updated_at.enabled %}
+                <span class="post-meta-divider">|</span>
+                {% endif %}
+
+                <span class="post-meta-item-icon">
+                  <i class="fa fa-calendar-check-o"></i>
+                </span>
+                {% if theme.post_meta.item_text %}
+                  <span class="post-meta-item-text">{{ __('post.edited') }}</span>
+                {% endif %}
+                <time title="{{ __('post.modified') + __('symbol.colon') + full_date(post.updated) }}" itemprop="dateModified" datetime="{{ moment(post.updated).format() }}">{#
+                #}{% if date_diff -%}
+                    {{- date(post.updated) -}}
+                  {%- else -%}
+                    {{- time(post.updated) -}}
+                  {%- endif -%}
+                </time>
               {% endif %}
-              <time title="{{ __('post.modified') }}" itemprop="dateModified" datetime="{{ moment(post.updated).format() }}">{#
-              #}{{ date(post.updated, datetime_format) }}{#
-            #}</time>
             {% endif %}
           </span>
 

source/css/_common/components/post/post-meta.styl

@@ -16,6 +16,11 @@
     font-size: 14px;
     margin-top: 2px;
   }
+
+  time {
+    border-bottom: 1px dashed $grey-dark;
+    cursor: help;
+  }
 }
 
 .post-symbolscount {