Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

UX: Use relative age instead of "Now"

This commit is contained in:
Robin Ward 2016-05-19 13:11:36 -04:00
parent 1c49c57494
commit 5901faa643
No known key found for this signature in database
GPG Key ID: 0E091E2B4ED1B83D
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/assets/javascripts/discourse/widgets/topic-timeline.js.es6
View File

@ -1,6 +1,6 @@
import { createWidget } from 'discourse/widgets/widget'; import { createWidget } from 'discourse/widgets/widget';
import { h } from 'virtual-dom'; import { h } from 'virtual-dom';
import { smartShortDate } from 'discourse/lib/formatter'; import { smartShortDate, relativeAge } from 'discourse/lib/formatter';
import { iconNode } from 'discourse/helpers/fa-icon'; import { iconNode } from 'discourse/helpers/fa-icon';
const SCROLLAREA_HEIGHT = 300; const SCROLLAREA_HEIGHT = 300;
@ -205,7 +205,6 @@ export default createWidget('topic-timeline', {
})); }));
} }
const result = [ h('div.timeline-controls', controls) ]; const result = [ h('div.timeline-controls', controls) ];
const stream = attrs.topic.get('postStream.stream'); const stream = attrs.topic.get('postStream.stream');
if (stream.length > 2) { if (stream.length > 2) {
@ -219,7 +218,7 @@ export default createWidget('topic-timeline', {
this.attach('link', { this.attach('link', {
className: 'now-date', className: 'now-date',
icon: 'dot-circle-o', icon: 'dot-circle-o',
label: 'topic.timeline.now', rawLabel: relativeAge(new Date(topic.last_posted_at)),
action: 'jumpBottom' action: 'jumpBottom'
}) })
]); ]);

2
app/assets/stylesheets/desktop/topic-timeline.scss
View File

@ -22,6 +22,7 @@
} }
.start-date { .start-date {
@include unselectable;
color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
} }
@ -77,6 +78,7 @@
} }
.now-date { .now-date {
@include unselectable;
display: inline-block; display: inline-block;
color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
margin-top: 0.5em; margin-top: 0.5em;

1
config/locales/client.en.yml
View File

@ -1290,7 +1290,6 @@ en:
auto_close_immediate: "The last post in the topic is already %{hours} hours old, so the topic will be closed immediately." auto_close_immediate: "The last post in the topic is already %{hours} hours old, so the topic will be closed immediately."
timeline: timeline:
now: "Now"
replies: "%{current} / %{total} replies" replies: "%{current} / %{total} replies"
progress: progress: