From 2e2a2b842beac5c70b53ae379e97c8a1e688e12f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Felix=20D=C3=B6rre?= Date: Fri, 17 Jun 2016 16:30:30 +0200 Subject: [PATCH] Suggestion to display datetimes in local format Change-Id: I3092504a8aceef27540b3d878f0e92eb8302783d --- src/org/cacert/gigi/Gigi.templ | 1 + .../cacert/gigi/output/template/Template.java | 8 +++-- static/static/localDate.js | 29 +++++++++++++++++++ 3 files changed, 35 insertions(+), 3 deletions(-) create mode 100644 static/static/localDate.js diff --git a/src/org/cacert/gigi/Gigi.templ b/src/org/cacert/gigi/Gigi.templ index 26ce9206..0bb64c04 100644 --- a/src/org/cacert/gigi/Gigi.templ +++ b/src/org/cacert/gigi/Gigi.templ @@ -16,6 +16,7 @@ +

diff --git a/src/org/cacert/gigi/output/template/Template.java b/src/org/cacert/gigi/output/template/Template.java index cc56baf8..15f3408d 100644 --- a/src/org/cacert/gigi/output/template/Template.java +++ b/src/org/cacert/gigi/output/template/Template.java @@ -213,9 +213,11 @@ public class Template implements Outputable { } else if (s instanceof DayDate) { out.print(DateSelector.getDateFormat().format(((DayDate) s).toDate())); } else if (s instanceof Date) { - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - out.print(sdf.format(s)); - out.print(" UTC"); + SimpleDateFormat sdfUI = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'"); + out.print(""); + out.print(sdfUI.format(s)); + out.print(" UTC"); } else { out.print(s == null ? "null" : (unescaped ? s.toString() : HTMLEncoder.encodeHTML(s.toString()))); } diff --git a/static/static/localDate.js b/static/static/localDate.js new file mode 100644 index 00000000..09358101 --- /dev/null +++ b/static/static/localDate.js @@ -0,0 +1,29 @@ +(function() { + function init(){ + var elems = document.getElementsByTagName("time"); + for(var i = 0; i < elems.length; i++){ + elems[i].setAttribute("title", elems[i].textContent); + elems[i].removeChild(elems[i].firstChild); + var t = elems[i].getAttribute("datetime"); + elems[i].appendChild(document.createTextNode(new Date(t).toLocaleString(undefined, {timeZoneName: "short", + year: "numeric", + month: "2-digit", + day: "2-digit", + hour: "2-digit", + minute: "2-digit", + second: "2-digit"}) + )); + } + } + (function(oldLoad) { + if (oldLoad == undefined) { + window.onload = init; + } else { + window.onload = function() { + init(); + oldLoad(); + } + } + })(window.onload); + +})(); -- 2.39.2