logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: bb194ddb3c65394c256c381834ba3bce4d2988cc
parent: a38b34c37a7c87c205f3d0b327649166c9f4f3f8
Author: Yamagishi Kazutoshi <ykzts@desire.sh>
Date:   Wed,  5 Jul 2017 21:51:28 +0900

Format datetime of subscriptions on admin UI (#4078)


Diffstat:

Mapp/views/admin/subscriptions/_subscription.html.haml8+++++---
1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/views/admin/subscriptions/_subscription.html.haml b/app/views/admin/subscriptions/_subscription.html.haml @@ -7,10 +7,12 @@ - if subscription.confirmed? %i.fa.fa-check %td{ style: "color: #{subscription.expired? ? 'red' : 'inherit'};" } - = precede subscription.expired? ? '-' : '' do - = time_ago_in_words(subscription.expires_at) + %time.time-ago{ datetime: subscription.expires_at.iso8601, title: l(subscription.expires_at) } + = precede subscription.expired? ? '-' : '' do + = time_ago_in_words(subscription.expires_at) %td - if subscription.last_successful_delivery_at? - = l subscription.last_successful_delivery_at + %time.formatted{ datetime: subscription.last_successful_delivery_at.iso8601, title: l(subscription.last_successful_delivery_at) } + = l subscription.last_successful_delivery_at - else %i.fa.fa-times