Author: knguyen
Date: Fri Oct 19 13:04:03 2007
New Revision: 18949
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18949&repname=
=3Djahia
Log:
JAHIA-2571: fix time select
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/d=
ate_field.jsp
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/sh=
ared/date_field.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/engines/shared/date_field.jsp&rev=3D18949=
&repname=3Djahia
=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/core/src/webapp/jsp/jahia/engines/shared/d=
ate_field.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/d=
ate_field.jsp Fri Oct 19 13:04:03 2007
@@ -15,14 +15,14 @@
See the License for the specific language governing permissions and =
limitations under the License.
--%><%@ page language=3D"java" %>
+<%@ page import=3D"org.jahia.engines.*"%>
<%@ page import=3D"org.jahia.data.fields.JahiaDateFieldUtil" %>
<%@ page import=3D"org.jahia.data.fields.JahiaField" %>
<%@ page import=3D"org.jahia.params.ParamBean" %>
<%@ page import=3D"org.jahia.services.metadata.FieldDefinition" %>
<%@ page import=3D"org.jahia.services.pages.ContentPage" %>
<%@ page import=3D"org.jahia.utils.JahiaTools" %>
-<%@ page import=3D"java.util.HashMap" %>
-<%@ page import=3D"java.util.TimeZone"%>
+<%@ page import=3D"java.util.*" %>
<%@ taglib uri=3D"JahiaLib" prefix=3D"jahia" %>
<%!
public String makeStringList(final String a[], final int offset, final=
int length) {
@@ -127,19 +127,41 @@
}
=
final String format =3D JahiaDateFieldUtil.getDateFormat(defValue, jPa=
rams.getLocale()).getPattern();
+
+ EngineLanguageHelper elh =3D (EngineLanguageHelper) engineMap.get(Jahi=
aEngine.ENGINE_LANGUAGE_HELPER);
+ if (elh =3D=3D null) {
+ elh =3D new EngineLanguageHelper(jParams.getLocale());
+ }
+
+ // Put here all languages we have tested
+ String calendarLocale =3D "en";
+ ArrayList supportedLocales =3D new ArrayList();
+ supportedLocales.add("en");
+ supportedLocales.add("fr");
+ supportedLocales.add("de");
+ supportedLocales.add("it");
+ supportedLocales.add("nl");
+ if ( supportedLocales.contains(elh.getCurrentLanguageCode()) ){
+ calendarLocale =3D elh.getCurrentLanguageCode();
+ } else if ( supportedLocales.contains(elh.getCurrentLocale().getLangua=
ge()) ){
+ calendarLocale =3D elh.getCurrentLocale().getLanguage();
+ }
+ =
%>
=
<link rel=3D"stylesheet" type=3D"text/css" media=3D"all"
- href=3D"<%=3DtheURL%>../javascript/jscalendar-1.0/calendar-win2k-col=
d-1.css" title=3D"win2k-cold-1"/>
-
+ href=3D"<jahia:serverHttpPath/>/jsp/jahia/javascript/jscalendar-1.0/=
skins/aqua/theme.css" title=3D"aqua"/>
<% Boolean alreadyIncluedCalendar =3D (Boolean) request.getAttribute("=
alreadyInclucedCalendar");
if (alreadyIncluedCalendar =3D=3D null) {
request.setAttribute("alreadyInclucedCalendar", Boolean.TRUE);
%>
-<script type=3D"text/javascript" src=3D"<%=3DtheURL%>../javascript/jscalen=
dar-1.0/calendar.js"></script>
-<script type=3D"text/javascript" src=3D"<%=3DtheURL%>../javascript/jscalen=
dar-1.0/lang/calendar-en.js"></script>
-<script type=3D"text/javascript" src=3D"<%=3DtheURL%>../javascript/jscalen=
dar-1.0/calendar-setup.js"></script>
-<script type=3D"text/javascript" src=3D"<%=3DtheURL%>../javascript/javascr=
ipt_toolbox/date_compacted.js"></script>
+<script type=3D"text/javascript"
+ src=3D"<jahia:serverHttpPath/>/jsp/jahia/javascript/jscalendar-1.0=
/calendar.js"></script>
+<script type=3D"text/javascript"
+ src=3D"<jahia:serverHttpPath/>/jsp/jahia/javascript/jscalendar-1.0=
/lang/calendar-<%=3DcalendarLocale%>.js"></script>
+<script type=3D"text/javascript"
+ src=3D"<jahia:serverHttpPath/>/jsp/jahia/javascript/jscalendar-1.0=
/calendar-setup.js"></script>
+<script type=3D"text/javascript" src=3D"<jahia:serverHttpPath/>/jsp/jahia/=
javascript/javascript_toolbox/date_compacted.js"></script>
<% } %>
=
<script type=3D"text/javascript">
@@ -176,6 +198,11 @@
}
}
=
+ function onUpdateTime<%=3DcontextId%>(calendar, date) {
+ calendar.dateClicked =3D true;
+ onSelect<%=3DcontextId%>(calendar, date);
+ }
+
function onSelect<%=3DcontextId%>(calendar, date) {
if (calendar.dateClicked) {
var input_field =3D document.mainForm.elements["_datebox<%=3Dt=
heField.getID()%>"];
@@ -227,6 +254,7 @@
button : "_datebox_trigger<%=3DtheField.getID()%>", =
// trigger for the calendar (button ID)
align : "TR", // alignment (defaults to "=
Bl")
singleClick : false,
+ onUpdateTime : onUpdateTime<%=3DcontextId%>,
//onUpdate : onCalendarUpdate<%=3DcontextId%>,
onSelect : onSelect<%=3DcontextId%>,
showsTime : true
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
