diff options
| author | Kristian Lyngstol <kristian@bohemians.org> | 2016-02-21 14:42:50 +0100 |
|---|---|---|
| committer | Kristian Lyngstol <kristian@bohemians.org> | 2016-02-21 14:42:50 +0100 |
| commit | 948d70113588e8e9609f8c36dc2c94e5a2a30615 (patch) | |
| tree | 9976d25ee8cc2d6d79a137fcffe5cac1c1af9b14 | |
| parent | 5c06217d27d96c0b244b9d2a2c8be147ab838683 (diff) | |
| parent | a727055d92b9d1ec32815f13518ec2b2849bc698 (diff) | |
Merge branch 'master' of github.com:tech-server/tgmanage
| -rw-r--r-- | web/nms.gathering.org/nms2/index.html | 2 | ||||
| -rw-r--r-- | web/nms.gathering.org/nms2/js/nms.js | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/web/nms.gathering.org/nms2/index.html b/web/nms.gathering.org/nms2/index.html index 81f68e5..111dd52 100644 --- a/web/nms.gathering.org/nms2/index.html +++ b/web/nms.gathering.org/nms2/index.html @@ -310,7 +310,7 @@ shortcuts. See the help menu for an overview of keyboard shortcuts.</p> <div class="input-group"> - <input type="text" class="form-control" placeholder="YYYY-MM-DD hh:mm:ss" id="nowPicker"> + <input type="text" class="form-control" placeholder="YYYY-MM-DDThh:mm:ss" id="nowPicker"> <span class="input-group-btn"> <button class="btn btn-default" onclick="changeNow();">Travel</button> </span> diff --git a/web/nms.gathering.org/nms2/js/nms.js b/web/nms.gathering.org/nms2/js/nms.js index 30d6ba8..27e4684 100644 --- a/web/nms.gathering.org/nms2/js/nms.js +++ b/web/nms.gathering.org/nms2/js/nms.js @@ -253,7 +253,7 @@ function checkNow(now) { if (Date.parse(now)) { var d = new Date(Date.parse(now)); - var str = d.getFullYear() + "-" + (parseInt(d.getMonth())+1) + "-" + d.getDate() + " "; + var str = d.getFullYear() + "-" + (parseInt(d.getMonth())+1) + "-" + d.getDate() + "T"; str += d.getHours() + ":" + d.getMinutes() + ":" + d.getSeconds(); return str; @@ -273,7 +273,7 @@ function checkNow(now) function stringToEpoch(t) { var foo = t.toString(); - foo = foo.replace('T',' '); +// foo = foo.replace('T',' '); var ret = new Date(Date.parse(foo)); return parseInt(parseInt(ret.valueOf()) / 1000); } |