Author: bpapez
Date: Thu Aug 16 17:10:48 2007
New Revision: 760
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D760&repname=
=3Dcorporate_portal_templates_v2
Log:
Allow JEXL for defaulting date fields and use thread-safe FastDateFormatter
Modified:
branches/JAHIA-5-0-SP-BRANCH/src/jsp/advsearch/calendar.jsp
branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/definitions.inc
branches/JAHIA-5-0-SP-BRANCH/src/jsp/common/declarations.inc
branches/JAHIA-5-0-SP-BRANCH/src/jsp/testFields.jsp
Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/advsearch/calendar.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/jsp/advsearch/calendar.jsp&rev=3D760&repname=3Dcorporate_portal=
_templates_v2
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/src/jsp/advsearch/calendar.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/advsearch/calendar.jsp Thu Aug 16 =
17:10:48 2007
@@ -87,7 +87,7 @@
onmouseover=3D"this.style.background=3D'red';" onmouseout=3D"this.sty=
le.background=3D''">
<script type=3D"text/javascript">
=
- var dateFormat =3D "<%=3DcalHandler.getSimpleDateFormat().toPattern()%=
>";
+ var dateFormat =3D "<%=3DcalHandler.getDateFormatter().getPattern()%>";
//dateFormat =3D dateFormat.replace(/d{2,}/g,"%d"); // full
Day
//dateFormat =3D dateFormat.replace(/[^%]d{1,1}/g,"%e"); // abreaviate=
Day
dateFormat =3D dateFormat.replace(/d{2,}/g, "FULLDAY"); // ful=
l Day
Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/definitions.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/jsp/blogs/definitions.inc&rev=3D760&repname=3Dcorporate_portal_=
templates_v2
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/definitions.inc (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/definitions.inc Thu Aug 16 1=
7:10:48 2007
@@ -26,8 +26,8 @@
<content:declareField name=3D"blogAttachement" title=3D"Attachment ass=
ociated" type=3D"File"
titleKey=3D"blog.attachement" bundleKey=3D"<%=3DresBundleID%>"/>
<content:declareField name=3D"blogDate" title=3D"Date" type=3D"Date"
- value=3D"<jahia_calendar[dd.MM.yyyy / hh:mm]>"
- titleKey=3D"news.date" bundleKey=3D"<%=3DresBundleID%>"/>
+ value=3D"<jahia_calendar[dd.MM.yyyy / hh:mm]>now"
+ titleKey=3D"blog.date" bundleKey=3D"<%=3DresBundleID%>"/>
<content:declareField name=3D"blogAuthor" title=3D"Author" type=3D"Sha=
redSmallText" titleKey=3D"blog.author" bundleKey=3D"<%=3DresBundleID%>"/>
<content:declareField name=3D"blogExcerpt"
title=3D"The Excerpt of this post" type=3D"BigText"
Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/common/declarations.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/jsp/common/declarations.inc&rev=3D760&repname=3Dcorporate_porta=
l_templates_v2
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/src/jsp/common/declarations.inc (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/common/declarations.inc Thu Aug 16=
17:10:48 2007
@@ -18,7 +18,7 @@
java.io.InputStream,
java.lang.*,
java.security.Principal,
- java.text.SimpleDateFormat,
+ java.text.*,
java.util.*,
javax.servlet.*,
org.compass.core.CompassHighlighter,
Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/testFields.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/jsp/testFields.jsp&rev=3D760&repname=3Dcorporate_portal_templat=
es_v2
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/src/jsp/testFields.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/testFields.jsp Thu Aug 16 17:10:48=
2007
@@ -191,7 +191,7 @@
jahiaObjectManager.getJahiaObjectDelegate(testContentContainer=
.getObjectKey());
=
Long dateLong =3D new Long(0);
- SimpleDateFormat formater =3D JahiaDateFieldUtil.getSimpleDateForm=
at("dd MMMM yyyy HH:mm","dd MMMM yyyy HH:mm",jParams.getLocale());
+ Format formater =3D JahiaDateFieldUtil.getDateFormat("dd MMMM yyyy=
HH:mm", jParams.getLocale());
dateLong =3D jahiaObjectDelegate.getValidFromDate();
long clientTimeZoneDiff =3D 0;
if ( dateLong !=3D null && dateLong.longValue() !=3D 0 ){
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
