From c2aac6af370415f4884c9aacf4ce0882475f319a Mon Sep 17 00:00:00 2001 From: David Taylor Date: Fri, 22 May 2015 21:27:44 +0100 Subject: [PATCH] Template changes --- RIGS/templates/RIGS/activity_stream.html | 27 ++++++++++++++++++------ 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/RIGS/templates/RIGS/activity_stream.html b/RIGS/templates/RIGS/activity_stream.html index 99c07dab..fe61f6a5 100644 --- a/RIGS/templates/RIGS/activity_stream.html +++ b/RIGS/templates/RIGS/activity_stream.html @@ -11,13 +11,24 @@ $(function () { $('[data-toggle="popover"]').popover(); - $(function () { - $('.date').each(function (index, dateElem) { + // This keeps timeago values correct, but uses an insane amount of resources + // $(function () { + // setInterval(function() { + // $('.date').each(function (index, dateElem) { + // var $dateElem = $(dateElem); + // var formatted = moment($dateElem.attr('data-date')).fromNow(); + // $dateElem.text(formatted); + // }) + // }); + // }, 10000); + + + $('.date').each(function (index, dateElem) { var $dateElem = $(dateElem); - var formatted = moment($dateElem.text()).fromNow(); + var formatted = moment($dateElem.attr('data-date')).fromNow(); $dateElem.text(formatted); - }) - }); + }); + }) @@ -25,6 +36,8 @@ {% endblock %} {% block content %} +{% comment "table view" %} +

Rigboard Activity Stream


@@ -94,7 +107,7 @@
- +{% endcomment %}

Stream View

{% for version in object_list %} @@ -144,7 +157,7 @@ '>{{ key }} {% endfor %} - in ({{ version.revision.date_created|date:"Y-m-d H:i:s" }}) + in ({{ version.revision.date_created|date:"Y-m-d H:i:s" }})
{% endfor %}