Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ivan-nginx merged 12 commits into from
Apr 15, 2018
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
c485862
[Optimization] Rewrite some code logic and method change
jackey8616 Apr 12, 2018
4aaa015
Add missed method replacement and under line of time
jackey8616 Apr 12, 2018
f8fad53
Lower digits in meta titile
jackey8616 Apr 13, 2018
495738a
Add missing updated_at field check
jackey8616 Apr 13, 2018
a595e78
Merge branch 'master' into date_time_merge
jackey8616 Apr 13, 2018
44d6307
Adjust time tag's border style
jackey8616 Apr 13, 2018
f296b27
Added support for hexo-symbols-count-time v0.4.0
ivan-nginx Apr 14, 2018
a482a37
Add missed judgment in if statement
jackey8616 Apr 15, 2018
67881ee
Refactored `date_updated` optimization.
ivan-nginx Apr 15, 2018
9513a11
Fixed bug and replaced `only_diff` by `another_day` option.
ivan-nginx Apr 15, 2018
9f4f014
Final optimization for `another_day` option.
ivan-nginx Apr 15, 2018
a9ad0d7
Merge branch 'master' into date_time_merge
ivan-nginx Apr 15, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions _config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 6 additions & 5 deletions languages/en.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Collaborator

@sli1989 sli1989 Apr 16, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I recommend for its display like Creation time: 2018-4-16 18:25:03 in popup annotation.

+  created: Creation time
+  modified: Modification time

Copy link
Member

@ivan-nginx ivan-nginx Apr 16, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think no need long labels here. When user move mouse under the date, he understand what he see date/time of post creation/modification.
So, Created: 2018-04-14 12:51:10 / Modified: 23:00:00 — look's fine i think.

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
Expand Down Expand Up @@ -89,7 +90,7 @@ keep_on: Keep on posting.
symbol:
comma: ", "
period: ". "
colon: ":"
colon: ": "

reward:
donate: Donate
Expand Down
57 changes: 32 additions & 25 deletions layout/_macro/post.swig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand All @@ -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>

Expand Down
5 changes: 5 additions & 0 deletions source/css/_common/components/post/post-meta.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,11 @@
font-size: 14px;
margin-top: 2px;
}

time {
border-bottom: 1px dashed $grey-dark;
cursor: help;
}
}

.post-symbolscount {
Expand Down