Docker/documize
Docker/documize
1
0
Fork 0
mirror of https://github.com/documize/community.git synced 2025-07-25 08:09:43 +02:00
Code Releases Activity

view activity date formatting

Browse source
This commit is contained in:
Harvey Kandola 2017-12-11 12:34:54 +00:00
parent cce1b5ef50
commit 66bc874d95
5 changed files with 12 additions and 4303 deletions
Download patch file Download diff file Expand all files Collapse all files

1
gui/app/components/document/view-activity.js
View file

@ -10,7 +10,6 @@
// https://documize.com
import { inject as service } from '@ember/service';
import Component from '@ember/component';
export default Component.extend({

5
gui/app/helpers/formatted-date.js
View file

@ -13,7 +13,10 @@ import { helper } from '@ember/component/helper';
import dateUtil from '../utils/date';
export function formattedDate(params) {
return dateUtil.toIsoDate(params[0], params[1]);
let format = params[1];
if (is.undefined(format)) format = 'Do MMMM YYYY, HH:mm';
return moment(params[0]).format(format);
}
export default helper(formattedDate);

7
gui/app/styles/view/document/view-activity.scss
View file

@ -7,7 +7,7 @@
> .item {
margin: 0;
padding: 20px 0;
padding: 15px 0;
width: 100%;
> .avatar-box {
@ -24,6 +24,7 @@
font-weight: bold;
background-color: $color-gray;
color: $color-white;
vertical-align: middle;
margin: 0 20px 0 0;
}
@ -32,14 +33,14 @@
display: inline-block;
> .name {
display: block;
display: inline-block;
font-size: 1.2rem;
color: $color-off-black;
font-weight: bold;
}
> .detail {
display: block;
display: inline-block;
font-size: 1rem;
color: $color-gray;

4
gui/app/templates/components/document/view-activity.hbs
View file

@ -4,8 +4,8 @@
<li class="item">
<div class="avatar-box">{{user-initials a.firstname a.lastname}}</div>
<div class="activity">
<div class="name">{{a.firstname}} {{a.lastname}}</div>
<div class="detail {{a.activityColor}}">{{a.activityLabel}}, {{time-ago a.created}}</div>
<div class="name">{{a.firstname}} {{a.lastname}}&nbsp;&nbsp;</div>
<div class="detail {{a.activityColor}}">{{a.activityLabel}} on {{formatted-date a.created}}</div>
</div>
</li>
{{/each}}