Author: jleroux
Date: Fri Mar 16 15:45:00 2018
New Revision: 1827000
URL: http://svn.apache.org/viewvc?rev=1827000&view=rev
Log:
Implemented:
Improved:
Documented:
Completed:
Reverted:
Fixed:
(OFBIZ-)
Explanation
Thanks:
Modified:
ofbiz/ofbiz-framework/branches/release17.12/ (props changed)
ofbiz/ofbiz-framework/branches/release17.12/themes/common/template/includes/ServerHour24HourFormatJs.ftl
Propchange: ofbiz/ofbiz-framework/branches/release17.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 16 15:45:00 2018
@@ -10,4 +10,4 @@
/ofbiz/branches/json-integration-refactoring:1634077-1635900
/ofbiz/branches/multitenant20100310:921280-927264
/ofbiz/branches/release13.07:1547657
-/ofbiz/ofbiz-framework/trunk:1819499,1819598,1819800,1819805,1819811,1820038,1820262,1820374-1820375,1820441,1820457,1820644,1820658,1820790,1820823,1820949,1820966,1821012,1821036,1821112,1821115,1821144,1821186,1821219,1821226,1821230,1821386,1821600,1821613,1821628,1821965,1822125,1822310,1822377,1822383,1822393,1822882,1823324,1823467,1823562,1823876,1824260,1824314,1824316,1824732,1824803,1824847,1824855,1825192,1825211,1825216,1825233,1825450,1826374,1826502,1826592,1826671,1826674,1826805,1826938
+/ofbiz/ofbiz-framework/trunk:1819499,1819598,1819800,1819805,1819811,1820038,1820262,1820374-1820375,1820441,1820457,1820644,1820658,1820790,1820823,1820949,1820966,1821012,1821036,1821112,1821115,1821144,1821186,1821219,1821226,1821230,1821386,1821600,1821613,1821628,1821965,1822125,1822310,1822377,1822383,1822393,1822882,1823324,1823467,1823562,1823876,1824260,1824314,1824316,1824732,1824803,1824847,1824855,1825192,1825211,1825216,1825233,1825450,1826374,1826502,1826592,1826671,1826674,1826805,1826938,1826997
Modified:
ofbiz/ofbiz-framework/branches/release17.12/themes/common/template/includes/ServerHour24HourFormatJs.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/themes/common/template/includes/ServerHour24HourFormatJs.ftl?rev=1827000&r1=1826999&r2=1827000&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/branches/release17.12/themes/common/template/includes/ServerHour24HourFormatJs.ftl
(original)
+++
ofbiz/ofbiz-framework/branches/release17.12/themes/common/template/includes/ServerHour24HourFormatJs.ftl
Fri Mar 16 15:45:00 2018
@@ -37,9 +37,7 @@ under the License.
date.setSeconds(date.getSeconds() + 1);
}
// dateFormat does not respect the timezone :/ Fortunately
toString is what we want :)
- //jQuery("#${clockField}
- ").text("${uiLabelMap.CommonServerHour}
- : " + dateFormat(date, "yyyy-mm-dd HH:MM:ss"));
+ //jQuery("#${clockField}").text("${uiLabelMap.CommonServerHour}: "
+ dateFormat(date, "yyyy-mm-dd HH:MM:ss"));
jQuery("#${clockField}").text("${uiLabelMap.CommonServerHour}: " +
date.toString());
}
})
