Merge pull request #824 from warpc/712-refactoring-css
[issue #795] The wrong time to be displayed on the page assembly jobs when user have incorect local time
This commit is contained in:
commit
e27c01a711
|
@ -1,5 +1,6 @@
|
||||||
-set_meta_tags :title => t('.title')
|
-set_meta_tags :title => t('.title')
|
||||||
|
|
||||||
|
= hidden_field_tag :servertime, Time.now.utc.to_i
|
||||||
%div.reloader
|
%div.reloader
|
||||||
= label_tag :autoreload do
|
= label_tag :autoreload do
|
||||||
= check_box_tag :autoreload, true, true
|
= check_box_tag :autoreload, true, true
|
||||||
|
@ -46,7 +47,7 @@
|
||||||
.replace("%d", formatNumber(minutes));
|
.replace("%d", formatNumber(minutes));
|
||||||
}
|
}
|
||||||
// TODO Very, very ugly method.
|
// TODO Very, very ugly method.
|
||||||
var now = (new Date).getTime();
|
var now = $('#servertime').val() * 1000;
|
||||||
$("time.js-relative-date").each(function() {
|
$("time.js-relative-date").each(function() {
|
||||||
var time = parseIso8601($(this).attr('datetime')).getTime();
|
var time = parseIso8601($(this).attr('datetime')).getTime();
|
||||||
$(this).text(strTimeBetween(time, now));
|
$(this).text(strTimeBetween(time, now));
|
||||||
|
|
Loading…
Reference in New Issue