ziver/hal
1
1
Fork 0
Code Pull requests Releases Activity

Small changes to detail pages and change tellstick plugin to write in UTF-8

Browse source 
Former-commit-id: 90320b2bd13c134c0e3ec447759443af3303de42
This commit is contained in:
Ziver Koc 2016-01-25 16:20:16 +01:00
parent b1464d9508
commit ff9709b6d2
4 changed files with 23 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
web-resource/js/hal.js
View file

@ -34,7 +34,9 @@ $.fn.relTimestamp = function() {
var timestampNow = Date.now();
var timeDiff = timestampNow - timestamp;
if(timeDiff < 24 * 60 * 60 * 1000) // less than 24 hours
if(timeDiff < 10 * 60 * 1000) // less than 10 min
$(this).text(moment(timestamp).fromNow());
else if(timeDiff < 24 * 60 * 60 * 1000) // less than 24 hours
$(this).text(moment(timestamp).fromNow() + " ("+moment(timestamp).format("HH:mm")+")");
else
$(this).text(moment(timestamp).format("YYYY-MM-DD HH:mm"));