Skip to content

Commit

Permalink
Merge 058a7e3 into d6562c8
Browse files Browse the repository at this point in the history
  • Loading branch information
scouttyg committed Dec 13, 2014
2 parents d6562c8 + 058a7e3 commit 1753776
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 9 deletions.
7 changes: 4 additions & 3 deletions app/assets/templates/activity_base.jst.eco
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<span class="posted_at">
<%= new Date(@activity.created_at).toRelativeTime(Kandan.options().now_threshold) %>
</span>
<% date = new Date(@activity.created_at) %>
<time class="posted_at" datetime="<%= date.toISOString() %>" title="<%= date.toLocaleString() %>">
<%= date.toRelativeTime(Kandan.options().now_threshold) %>
</time>
<img class="avatar" src="<%= @activity.avatarUrl %>"/>

<div class="readable">
Expand Down
7 changes: 4 additions & 3 deletions app/assets/templates/message.jst.eco
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<span class="posted_at">
<%= new Date(@activity.created_at).toRelativeTime(Kandan.options().now_threshold) %>
</span>
<% date = new Date(@activity.created_at) %>
<time class="posted_at" datetime="<%= date.toISOString() %>" title="<%= date.toLocaleString() %>">
<%= date.toRelativeTime(Kandan.options().now_threshold) %>
</time>
<img class="avatar" src="<%= @activity.avatarUrl %>"/>

<div class="readable">
Expand Down
7 changes: 4 additions & 3 deletions app/assets/templates/user_notification.jst.eco
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<span class="posted_at">
<%= new Date(@activity.created_at).toRelativeTime(Kandan.options().now_threshold) %>
</span>
<% date = new Date(@activity.created_at) %>
<time class="posted_at" datetime="<%= date.toISOString() %>" title="<%= date.toLocaleString() %>">
<%= date.toRelativeTime(Kandan.options().now_threshold) %>
</time>
<img class="avatar" src="<%= @activity.avatarUrl %>"/>

<div class="readable">
Expand Down

0 comments on commit 1753776

Please sign in to comment.