forked from apache/ofbiz
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
I wanted to have the server hour on the webtools job list, not a bid …
…deal, hé? As ever, turns it's always more complicated than thought. For instance jQuery, even with $.datepicker.formatDate, is not able to format a date + time correctly :/ So I added a new js script: date.format-1.2.3.js. It's only 4kb, I tried to compress it online, did not work, gave up. This is pretty basic, enough for the needs and can be easily extended when more is needed git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1426848 13f79535-47bb-0310-9956-ffa450edef68
- Loading branch information
1 parent
ad0dcad
commit 200ba16
Showing
8 changed files
with
178 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
26 changes: 26 additions & 0 deletions
26
framework/common/webcommon/includes/WindowSetIntervalJs.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| <#-- | ||
| Licensed to the Apache Software Foundation (ASF) under one | ||
| or more contributor license agreements. See the NOTICE file | ||
| distributed with this work for additional information | ||
| regarding copyright ownership. The ASF licenses this file | ||
| to you under the Apache License, Version 2.0 (the | ||
| "License"); you may not use this file except in compliance | ||
| with the License. You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, | ||
| software distributed under the License is distributed on an | ||
| "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| KIND, either express or implied. See the License for the | ||
| specific language governing permissions and limitations | ||
| under the License. | ||
| --> | ||
| <script type="text/javascript"> | ||
| jQuery(document).ready(function() { | ||
| window.setInterval(function(){clock()}, 1000); | ||
| function clock() { | ||
| jQuery("#${clockField}").text("${uiLabelMap.CommonServerHour}: " + new Date().format("yyyy-mm-dd HH:MM:ss")); | ||
| } | ||
| }) | ||
| </script> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,126 @@ | ||
| /* | ||
| * Date Format 1.2.3 | ||
| * (c) 2007-2009 Steven Levithan <stevenlevithan.com> | ||
| * MIT license | ||
| * | ||
| * Includes enhancements by Scott Trenda <scott.trenda.net> | ||
| * and Kris Kowal <cixar.com/~kris.kowal/> | ||
| * | ||
| * Accepts a date, a mask, or a date and a mask. | ||
| * Returns a formatted version of the given date. | ||
| * The date defaults to the current date/time. | ||
| * The mask defaults to dateFormat.masks.default. | ||
| */ | ||
|
|
||
| var dateFormat = function () { | ||
| var token = /d{1,4}|m{1,4}|yy(?:yy)?|([HhMsTt])\1?|[LloSZ]|"[^"]*"|'[^']*'/g, | ||
| timezone = /\b(?:[PMCEA][SDP]T|(?:Pacific|Mountain|Central|Eastern|Atlantic) (?:Standard|Daylight|Prevailing) Time|(?:GMT|UTC)(?:[-+]\d{4})?)\b/g, | ||
| timezoneClip = /[^-+\dA-Z]/g, | ||
| pad = function (val, len) { | ||
| val = String(val); | ||
| len = len || 2; | ||
| while (val.length < len) val = "0" + val; | ||
| return val; | ||
| }; | ||
|
|
||
| // Regexes and supporting functions are cached through closure | ||
| return function (date, mask, utc) { | ||
| var dF = dateFormat; | ||
|
|
||
| // You can't provide utc if you skip other args (use the "UTC:" mask prefix) | ||
| if (arguments.length == 1 && Object.prototype.toString.call(date) == "[object String]" && !/\d/.test(date)) { | ||
| mask = date; | ||
| date = undefined; | ||
| } | ||
|
|
||
| // Passing date through Date applies Date.parse, if necessary | ||
| date = date ? new Date(date) : new Date; | ||
| if (isNaN(date)) throw SyntaxError("invalid date"); | ||
|
|
||
| mask = String(dF.masks[mask] || mask || dF.masks["default"]); | ||
|
|
||
| // Allow setting the utc argument via the mask | ||
| if (mask.slice(0, 4) == "UTC:") { | ||
| mask = mask.slice(4); | ||
| utc = true; | ||
| } | ||
|
|
||
| var _ = utc ? "getUTC" : "get", | ||
| d = date[_ + "Date"](), | ||
| D = date[_ + "Day"](), | ||
| m = date[_ + "Month"](), | ||
| y = date[_ + "FullYear"](), | ||
| H = date[_ + "Hours"](), | ||
| M = date[_ + "Minutes"](), | ||
| s = date[_ + "Seconds"](), | ||
| L = date[_ + "Milliseconds"](), | ||
| o = utc ? 0 : date.getTimezoneOffset(), | ||
| flags = { | ||
| d: d, | ||
| dd: pad(d), | ||
| ddd: dF.i18n.dayNames[D], | ||
| dddd: dF.i18n.dayNames[D + 7], | ||
| m: m + 1, | ||
| mm: pad(m + 1), | ||
| mmm: dF.i18n.monthNames[m], | ||
| mmmm: dF.i18n.monthNames[m + 12], | ||
| yy: String(y).slice(2), | ||
| yyyy: y, | ||
| h: H % 12 || 12, | ||
| hh: pad(H % 12 || 12), | ||
| H: H, | ||
| HH: pad(H), | ||
| M: M, | ||
| MM: pad(M), | ||
| s: s, | ||
| ss: pad(s), | ||
| l: pad(L, 3), | ||
| L: pad(L > 99 ? Math.round(L / 10) : L), | ||
| t: H < 12 ? "a" : "p", | ||
| tt: H < 12 ? "am" : "pm", | ||
| T: H < 12 ? "A" : "P", | ||
| TT: H < 12 ? "AM" : "PM", | ||
| Z: utc ? "UTC" : (String(date).match(timezone) || [""]).pop().replace(timezoneClip, ""), | ||
| o: (o > 0 ? "-" : "+") + pad(Math.floor(Math.abs(o) / 60) * 100 + Math.abs(o) % 60, 4), | ||
| S: ["th", "st", "nd", "rd"][d % 10 > 3 ? 0 : (d % 100 - d % 10 != 10) * d % 10] | ||
| }; | ||
|
|
||
| return mask.replace(token, function ($0) { | ||
| return $0 in flags ? flags[$0] : $0.slice(1, $0.length - 1); | ||
| }); | ||
| }; | ||
| }(); | ||
|
|
||
| // Some common format strings | ||
| dateFormat.masks = { | ||
| "default": "ddd mmm dd yyyy HH:MM:ss", | ||
| shortDate: "m/d/yy", | ||
| mediumDate: "mmm d, yyyy", | ||
| longDate: "mmmm d, yyyy", | ||
| fullDate: "dddd, mmmm d, yyyy", | ||
| shortTime: "h:MM TT", | ||
| mediumTime: "h:MM:ss TT", | ||
| longTime: "h:MM:ss TT Z", | ||
| isoDate: "yyyy-mm-dd", | ||
| isoTime: "HH:MM:ss", | ||
| isoDateTime: "yyyy-mm-dd'T'HH:MM:ss", | ||
| isoUtcDateTime: "UTC:yyyy-mm-dd'T'HH:MM:ss'Z'" | ||
| }; | ||
|
|
||
| // Internationalization strings | ||
| dateFormat.i18n = { | ||
| dayNames: [ | ||
| "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", | ||
| "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday" | ||
| ], | ||
| monthNames: [ | ||
| "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec", | ||
| "January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December" | ||
| ] | ||
| }; | ||
|
|
||
| // For convenience... | ||
| Date.prototype.format = function (mask, utc) { | ||
| return dateFormat(this, mask, utc); | ||
| }; | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters