Skip to content

Commit

Permalink
Merge pull request #1382 from bolt/users-page-uses-relative-date
Browse files Browse the repository at this point in the history
Users page uses abbr relative date
  • Loading branch information
bobdenotter committed May 18, 2020
2 parents 40017cd + 0c27aa1 commit 2dfe2ba
Showing 1 changed file with 15 additions and 3 deletions.
18 changes: 15 additions & 3 deletions templates/users/listing.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,11 @@
<td>{{ iteratedUser.username }} / {{ iteratedUser.email }}</td>
<td><code>{{ iteratedUser.roles|join('</code>, <code>')|raw }}</code></td>
{% if iteratedUser.lastseenAt %}
<td class="datetime-relative">{{ iteratedUser.lastseenAt|date("c") }}</td>
<td>
<abbr class="datetime-relative" title="{{ iteratedUser.lastseenAt|localedatetime('%A %B %e, %Y - %k:%M%p') }}">
{{- iteratedUser.lastseenAt|date("c") -}}
</abbr>
</td>
{% else %}
<td>-</td>
{% endif %}
Expand Down Expand Up @@ -78,8 +82,16 @@
<tr>
<td class="text-nowrap">{{ iteratedUser.id }}</td>
<td class="text-nowrap">{{ iteratedUser.username }}</td>
<td class="text-nowrap datetime-relative">{{ iteratedUser.lastseenAt|date("c") }}</td>
<td class="datetime-relative">{{ authtoken.validity|date("c") }}</td>
<td>
<abbr class="datetime-relative" title="{{ iteratedUser.lastseenAt|localedatetime('%A %B %e, %Y - %k:%M%p') }}">
{{- iteratedUser.lastseenAt|date("c") -}}
</abbr>
</td>
<td>
<abbr class="datetime-relative" title="{{ authtoken.validity|localedatetime('%A %B %e, %Y - %k:%M%p') }}">
{{- authtoken.validity|date("c") -}}
</abbr>
</td>
<td class="text-nowrap"><code>{{ iteratedUser.lastIp|default('-') }}</code></td>
<td>{{ authtoken.useragent|default('-') }}</td>
</tr>
Expand Down

0 comments on commit 2dfe2ba

Please sign in to comment.