From: Felix Dörre Date: Sun, 19 Jun 2016 17:10:00 +0000 (+0200) Subject: Merge "upd: Reduce Boilerplate in translated SprintfCommands" X-Git-Url: https://code.wpia.club/?p=gigi.git;a=commitdiff_plain;h=78aea4e2c6a8e99ba546c4189d7071d57c1aaf3b;hp=8d81c554173aadd24901c3b430850f4da0bd0c9a Merge "upd: Reduce Boilerplate in translated SprintfCommands" --- diff --git a/src/org/cacert/gigi/Gigi.templ b/src/org/cacert/gigi/Gigi.templ index 26ce9206..a163c7d5 100644 --- a/src/org/cacert/gigi/Gigi.templ +++ b/src/org/cacert/gigi/Gigi.templ @@ -8,14 +8,14 @@ - - + - + +

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/expert.js b/static/static/js/expert.js similarity index 100% rename from static/static/expert.js rename to static/static/js/expert.js diff --git a/static/static/js/localDate.js b/static/static/js/localDate.js new file mode 100644 index 00000000..09358101 --- /dev/null +++ b/static/static/js/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); + +})(); diff --git a/static/static/menu.js b/static/static/menu.js deleted file mode 100644 index bcaee0d8..00000000 --- a/static/static/menu.js +++ /dev/null @@ -1,36 +0,0 @@ -(function() { - function explodeMenu(e) { - if (e.className == 'menu hidden') { - e.className = 'menu'; - } else { - e.className = 'menu hidden'; - } - } - - function initMenu() { - var Nodes = document.getElementsByTagName('ul'); - var max = Nodes.length; - for (var i = 0; i < max; i++) { - var nodeObj = Nodes.item(i); - if (nodeObj.className.indexOf("menu") > -1 && nodeObj.id != "recom") { - nodeObj.previousSibling.previousSibling.onclick = (function(node) { - return function() { - explodeMenu(node); - }; - })(nodeObj); - } - } - } - - (function(oldLoad) { - if (oldLoad == undefined) { - window.onload = init; - } else { - window.onload = function() { - initMenu(); - oldLoad(); - } - } - })(window.onload); - -})();