Author: amarkhel
Date: 2010-10-27 05:56:19 -0400 (Wed, 27 Oct 2010)
New Revision: 19681
Modified:
sandbox/trunk/ui/calendar/ui/src/main/java/org/richfaces/component/AbstractCalendar.java
sandbox/trunk/ui/calendar/ui/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java
sandbox/trunk/ui/calendar/ui/src/main/java/org/richfaces/renderkit/html/images/CalendarIcon.java
sandbox/trunk/ui/calendar/ui/src/main/java/org/richfaces/renderkit/html/images/CalendarSeparator.java
sandbox/trunk/ui/calendar/ui/src/main/resources/META-INF/resources/org.richfaces/calendar.ecss
sandbox/trunk/ui/calendar/ui/src/main/resources/META-INF/richfaces/resource-mappings.properties
sandbox/trunk/ui/calendar/ui/src/main/templates/calendar.template.xml
Log:
component skinning, fix template renderers
Modified:
sandbox/trunk/ui/calendar/ui/src/main/java/org/richfaces/component/AbstractCalendar.java
===================================================================
---
sandbox/trunk/ui/calendar/ui/src/main/java/org/richfaces/component/AbstractCalendar.java 2010-10-27
04:25:38 UTC (rev 19680)
+++
sandbox/trunk/ui/calendar/ui/src/main/java/org/richfaces/component/AbstractCalendar.java 2010-10-27
09:56:19 UTC (rev 19681)
@@ -126,10 +126,10 @@
@Attribute(defaultValue="false")
public abstract boolean isResetTimeOnDateSelect();
- @Attribute(defaultValue="bottom-left")
+ @Attribute(defaultValue="AA")
public abstract String getJointPoint();
- @Attribute(defaultValue="bottom-right")
+ @Attribute(defaultValue="AA")
public abstract String getDirection();
@Attribute(defaultValue="inactive")
Modified:
sandbox/trunk/ui/calendar/ui/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java
===================================================================
---
sandbox/trunk/ui/calendar/ui/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java 2010-10-27
04:25:38 UTC (rev 19680)
+++
sandbox/trunk/ui/calendar/ui/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java 2010-10-27
09:56:19 UTC (rev 19681)
@@ -46,7 +46,6 @@
import org.ajax4jsf.javascript.JSFunction;
import org.ajax4jsf.javascript.JSReference;
import org.richfaces.component.AbstractCalendar;
-import org.richfaces.component.util.ComponentUtil;
import org.richfaces.component.util.HtmlUtil;
import org.richfaces.component.util.MessageUtil;
import org.richfaces.component.util.SelectUtils;
@@ -338,7 +337,7 @@
break;
}
}
- getUtils().addToScriptHash(labels, name, label);
+ RenderKitUtils.addToScriptHash(labels, name, label);
}
}
return labels;
@@ -423,34 +422,34 @@
int monthMax = calendar.getActualMaximum(Calendar.MONTH);
int monthMin = calendar.getActualMinimum(Calendar.MONTH);
- String [] weekDayLabels =
ComponentUtil.asArray(calendarComponent.getWeekDayLabels());
+ String [] weekDayLabels =
RenderKitUtils.asArray(calendarComponent.getWeekDayLabels());
if(weekDayLabels == null) {
weekDayLabels = dateFormat.getWeekdays();
weekDayLabels = shiftDates(minimum, maximum, weekDayLabels);
}
- getUtils().addToScriptHash(map, WEEK_DAY_LABELS, weekDayLabels);
+ RenderKitUtils.addToScriptHash(map, WEEK_DAY_LABELS, weekDayLabels);
- String [] weekDayLabelsShort =
ComponentUtil.asArray(calendarComponent.getWeekDayLabelsShort());
+ String [] weekDayLabelsShort =
RenderKitUtils.asArray(calendarComponent.getWeekDayLabelsShort());
if(weekDayLabelsShort == null) {
weekDayLabelsShort = dateFormat.getShortWeekdays();
weekDayLabelsShort = shiftDates(minimum, maximum, weekDayLabelsShort);
}
- getUtils().addToScriptHash(map, WEEK_DAY_LABELS_SHORT, weekDayLabelsShort);
+ RenderKitUtils.addToScriptHash(map, WEEK_DAY_LABELS_SHORT, weekDayLabelsShort);
- String [] monthLabels =
ComponentUtil.asArray(calendarComponent.getMonthLabels());
+ String [] monthLabels =
RenderKitUtils.asArray(calendarComponent.getMonthLabels());
if(monthLabels == null) {
monthLabels = dateFormat.getMonths();
monthLabels = shiftDates(monthMin, monthMax, monthLabels);
}
- getUtils().addToScriptHash(map, MONTH_LABELS, monthLabels);
+ RenderKitUtils.addToScriptHash(map, MONTH_LABELS, monthLabels);
- String [] monthLabelsShort =
ComponentUtil.asArray(calendarComponent.getMonthLabelsShort());
+ String [] monthLabelsShort =
RenderKitUtils.asArray(calendarComponent.getMonthLabelsShort());
if(monthLabelsShort == null) {
monthLabelsShort = dateFormat.getShortMonths();
monthLabelsShort = shiftDates(monthMin, monthMax, monthLabelsShort);
}
- getUtils().addToScriptHash(map, MONTH_LABELS_SHORT, monthLabelsShort);
+ RenderKitUtils.addToScriptHash(map, MONTH_LABELS_SHORT, monthLabelsShort);
int minDaysInFirstWeek = calendarComponent.getMinDaysInFirstWeek();
if(minDaysInFirstWeek == Integer.MIN_VALUE) {
@@ -458,7 +457,7 @@
}
if (0 <= minDaysInFirstWeek && minDaysInFirstWeek <= 7) {
- getUtils().addToScriptHash(map, MIN_DAYS_IN_FIRST_WEEK, minDaysInFirstWeek);
+ RenderKitUtils.addToScriptHash(map, MIN_DAYS_IN_FIRST_WEEK,
minDaysInFirstWeek);
}
int day = calendarComponent.getFirstWeekDay();
@@ -468,7 +467,7 @@
}
if (0 <= day && day <= 6) {
- getUtils().addToScriptHash(map, FIRST_DAY_WEEK, day);
+ RenderKitUtils.addToScriptHash(map, FIRST_DAY_WEEK, day);
} else if (day != Integer.MIN_VALUE) {
facesContext.getExternalContext().log(day + " value of firstWeekDay
attribute is not a legal one for component: " + MessageUtil.getLabel(facesContext,
calendarComponent) + ". Default value was applied.");
}
Modified:
sandbox/trunk/ui/calendar/ui/src/main/java/org/richfaces/renderkit/html/images/CalendarIcon.java
===================================================================
---
sandbox/trunk/ui/calendar/ui/src/main/java/org/richfaces/renderkit/html/images/CalendarIcon.java 2010-10-27
04:25:38 UTC (rev 19680)
+++
sandbox/trunk/ui/calendar/ui/src/main/java/org/richfaces/renderkit/html/images/CalendarIcon.java 2010-10-27
09:56:19 UTC (rev 19681)
@@ -73,7 +73,7 @@
}
public ImageType getImageType() {
- return ImageType.GIF;
+ return ImageType.PNG;
}
public Dimension getDimension() {
Modified:
sandbox/trunk/ui/calendar/ui/src/main/java/org/richfaces/renderkit/html/images/CalendarSeparator.java
===================================================================
---
sandbox/trunk/ui/calendar/ui/src/main/java/org/richfaces/renderkit/html/images/CalendarSeparator.java 2010-10-27
04:25:38 UTC (rev 19680)
+++
sandbox/trunk/ui/calendar/ui/src/main/java/org/richfaces/renderkit/html/images/CalendarSeparator.java 2010-10-27
09:56:19 UTC (rev 19681)
@@ -58,7 +58,7 @@
}
public ImageType getImageType() {
- return ImageType.GIF;
+ return ImageType.PNG;
}
public Dimension getDimension() {
Modified:
sandbox/trunk/ui/calendar/ui/src/main/resources/META-INF/resources/org.richfaces/calendar.ecss
===================================================================
---
sandbox/trunk/ui/calendar/ui/src/main/resources/META-INF/resources/org.richfaces/calendar.ecss 2010-10-27
04:25:38 UTC (rev 19680)
+++
sandbox/trunk/ui/calendar/ui/src/main/resources/META-INF/resources/org.richfaces/calendar.ecss 2010-10-27
09:56:19 UTC (rev 19681)
@@ -0,0 +1,402 @@
+.rich-calendar-exterior{
+ border : 1px solid;
+ border-color: '#{richSkin.panelBorderColor}';
+}
+.rich-calendar-btn{
+ cursor : pointer;
+}
+.rich-calendar-header-optional{
+ border-bottom : 1px solid;
+ border-bottom-color : '#{richSkin.panelBorderColor}';
+ background-color : '#{richSkin.additionalBackgroundColor}';
+ font-size : '#{richSkin.generalSizeFont}';
+ font-family : '#{richSkin.generalFamilyFont}';
+ padding : 7px;
+ height : 22px;
+ font-weight: bold;
+}
+
+.rich-calendar-header{
+ border-right : 0px solid;
+ border-bottom : 1px solid;
+ border-bottom-color : '#{richSkin.panelBorderColor}';
+ background-color : '#{richSkin.additionalBackgroundColor}';
+ font-size : '#{richSkin.generalSizeFont}';
+ font-family : '#{richSkin.generalFamilyFont}';
+}
+
+.rich-calendar-cell-size{
+ width : 25px;
+ height : 22px;
+}
+
+.rich-calendar-cell-div{
+ overflow: hidden;
+}
+
+.rich-calendar-cell{
+ border-bottom : 1px solid;
+ border-right : 1px solid;
+ padding : 0px;
+ vertical-align : middle;
+ text-align : center;
+ border-bottom-color : '#{richSkin.panelBorderColor}';
+ border-right-color : '#{richSkin.panelBorderColor}';
+ background-color : '#{richSkin.tableBackgroundColor}';
+ font-size : '#{richSkin.generalSizeFont}';
+ font-family : '#{richSkin.generalFamilyFont}';
+}
+
+.rich-calendar-month{
+ vertical-align : middle;
+ text-align : center;
+ height : 22px;
+ white-space: nowrap;
+ background-color : '#{richSkin.headerBackgroundColor}';
+ font-size : '#{richSkin.headerSizeFont}';
+ font-family : '#{richSkin.headerFamilyFont}';
+ font-weight : '#{richSkin.headerWeightFont}';
+ color : '#{richSkin.headerTextColor}';
+}
+
+.rich-calendar-days{
+ border-bottom : 1px solid;
+ border-right : 0px solid;
+ vertical-align : middle;
+ text-align : center;
+ height : 22px;
+ border-bottom-color : '#{richSkin.panelBorderColor}';
+ border-right-color : '#{richSkin.panelBorderColor}';
+ background-color : '#{richSkin.additionalBackgroundColor}';
+ font-size : '#{richSkin.generalSizeFont}';
+ font-family : '#{richSkin.generalFamilyFont}';
+}
+
+.rich-calendar-week{
+ border-bottom : 1px solid;
+ border-right : 1px solid;
+ vertical-align : middle;
+ text-align : center;
+ width : 25px;
+ color: red;
+ border-bottom-color : '#{richSkin.panelBorderColor}';
+ background-color : '#{richSkin.calendarWeekBackgroundColor}';
+ border-right-color : '#{richSkin.panelBorderColor}';
+ font-size : '#{richSkin.generalSizeFont}';
+ font-family : '#{richSkin.generalFamilyFont}';
+}
+
+.rich-right-cell{
+ border-right : 0px;
+}
+
+.rich-bottom-cell{
+ border-bottom : 0px;
+}
+
+.rich-calendar-toolfooter{
+ height : 22px;
+ padding : 1px 2px 1px 1px;
+ background: '#{richSkin.additionalBackgroundColor}';
+ font-size: '#{richSkin.generalSizeFont}';
+ font-family: '#{richSkin.generalFamilyFont}';
+ background-image:
"url(#{resource['org.richfaces.images:calendarSeparator.png']})";
+ background-repeat: no-repeat;
+ background-position: right center;
+}
+
+.rich-calendar-footer-optional{
+ border-top : 1px solid;
+ border-right : 0px solid;
+ padding : 7px;
+ height : 22px;
+ font-weight: bold;
+ border-top-color: '#{richSkin.panelBorderColor}';
+ border-right-color: '#{richSkin.panelBorderColor}';
+ background: '#{richSkin.additionalBackgroundColor}';
+ font-size: '#{richSkin.generalSizeFont}';
+ font-family: '#{richSkin.generalFamilyFont}';
+}
+
+.rich-calendar-footer{
+ border-top: 1px solid;
+ border-right: 0px solid;
+ font-size: '#{richSkin.generalSizeFont}';
+ font-family: '#{richSkin.generalFamilyFont}';
+ background: '#{richSkin.additionalBackgroundColor}';
+ border-top-color: '#{richSkin.panelBorderColor}';
+ border-right-color: '#{richSkin.panelBorderColor}';
+}
+
+.rich-calendar-spinner-input {
+ border: 0px;
+ padding: 0px 0px 0px 3px;
+ background: none transparent scroll repeat 0% 0%;
+ font-size: '#{richSkin.buttonSizeFont}';
+ font-family: '#{richSkin.buttonFamilyFont}';
+ width: 18px;
+}
+
+.rich-calendar-spinner-input-container {
+ background-position: left top;
+ background-repeat: repeat-x;
+ border: 1px solid;
+ background-image:
url("#{resource['org.richfaces.renderkit.html.images.InputBackgroundImage']}");
+ background-color: '#{richSkin.controlBackgroundColor}';
+ border-color: '#{richSkin.panelBorderColor}';
+ border-bottom-color: '#{richSkin.subBorderColor}';
+ border-right-color: '#{richSkin.subBorderColor}';
+}
+
+.rich-calendar-spinner-buttons {
+ border-width: 1px;
+ border-style: solid;
+ background-position: left top;
+ background-repeat: repeat-x;
+ font-size: 0px;
+ background-color: '#{richSkin.headerBackgroundColor}';
+ border-color: '#{richSkin.headerBackgroundColor}';
+ background-image:
"url(#{resource['org.richfaces.renderkit.html.images.ButtonBackgroundImage']})";
+}
+
+
+.rich-calendar-spec {
+ background-color: '#{richSkin.calendarSpecBackgroundColor}';
+}
+
+.calendarSpecBackgroundColo {
+ color: red;
+}
+
+.rich-calendar-holly {
+ background-color: '#{richSkin.calendarHolidaysBackgroundColor}';
+ color: '#{richSkin.calendarHolidaysTextColor}';
+}
+
+.rich-calendar-boundary-dates {
+ color: #A0A0A0;
+
+}
+
+.rich-calendar-today {
+ background-color: '#{richSkin.calendarCurrentBackgroundColor}';
+ color: '#{richSkin.calendarCurrentTextColor}';
+ font-weight: bold;
+}
+
+.rich-calendar-today {
+ background-color: '#{richSkin.calendarCurrentBackgroundColor}';
+ color: '#{richSkin.calendarCurrentTextColor}';
+ font-weight: bold;
+}
+
+.rich-calendar-select {
+ background-color: '#{richSkin.headerBackgroundColor}';
+ color: '#{richSkin.headerTextColor}';
+ font-weight: '#{richSkin.headerWeightFont}';
+}
+
+.rich-calendar-hover {
+ background-color: '#{richSkin.calendarSpecBackgroundColor}';
+ background-color: '#{richSkin.calendarSpecTextColor}';
+}
+
+.rich-calendar-tool-btn {
+ cursor: pointer;
+ padding: 2px 3px 2px 3px;
+ white-space: nowrap;
+}
+
+.rich-calendar-tool-btn-disabled {
+ cursor: pointer;
+ padding: 2px 3px 2px 3px;
+}
+
+.rich-calendar-tool-btn-hover {
+ background-color: '#{richSkin.calendarWeekBackgroundColor}';
+ color: '#{richSkin.generalTextColor}';
+ border: 1px solid;
+ border-color: '#{richSkin.tableBackgroundColor}';
+ border-right-color: '#{richSkin.panelBorderColor}';
+ border-bottom-color: '#{richSkin.panelBorderColor}';
+ padding: 1px 2px 1px 2px;
+}
+
+.rich-calendar-tool-btn-press {
+ border-color: '#{richSkin.panelBorderColor}';
+ border-right-color: '#{richSkin.tableBackgroundColor}';
+ border-bottom-color: '#{richSkin.tableBackgroundColor}';
+}
+
+.rich-calendar-tool-close {
+ padding: 2px 2px 2px 4px;
+ background-image:
"url(#{resource['org.richfaces.images:calendarSeparator.png']})";
+ background-repeat: no-repeat;
+ background-position: left center;
+}
+
+.rich-calendar-button {
+ cursor: pointer;
+ vertical-align: middle;
+}
+
+.rich-calendar-editor-shadow {
+ background: '#{richSkin.tableBackgroundColor}';
+ opacity: 0.5;
+ filter: alpha(opacity=50);
+}
+
+.rich-calendar-time-layout {
+ background: '#{richSkin.additionalBackgroundColor}';
+ border: 1px solid;
+ border-color: '#{richSkin.panelBorderColor}';
+ position: relative;
+}
+
+.rich-calendar-date-layout {
+ background: '#{richSkin.tableBackgroundColor}';
+ border: 1px solid;
+ border-color: '#{richSkin.panelBorderColor}';
+ position: relative;
+}
+
+.rich-calendar-editor-container {
+}
+
+.rich-calendar-time-layout, .rich-calendar-date-layout, .rich-calendar-time-layout input
{
+ font-size: '#{richSkin.generalSizeFont}';
+ font-family: '#{richSkin.generalFamilyFont}';
+}
+
+.rich-calendar-time-layout-fields {
+ padding: 7px 7px 5px 7px;
+ white-space: nowrap;
+}
+
+.rich-calendar-time-layout-cancel {
+ padding: 0px 7px 7px 1px;
+}
+
+
+.rich-calendar-time-layout-ok {
+ padding: 0px 1px 7px 7px;
+}
+
+.rich-calendar-date-layout-cancel {
+ background: '#{richSkin.additionalBackgroundColor}';
+ border-top: 1px solid;
+ border-top-color: '#{richSkin.panelBorderColor}';
+ padding: 5px 5px 5px 1px;
+}
+
+rich-calendar-date-layout-ok {
+ background: '#{richSkin.additionalBackgroundColor}';
+ border-top: 1px solid;
+ border-top-color: '#{richSkin.panelBorderColor}';
+ padding: 5px 1px 5px 5px;
+}
+
+.rich-calendar-date-layout-split {
+ border-right: 1px solid;
+ border-right-color: '#{richSkin.panelBorderColor}';
+}
+
+.rich-calendar-time-btn {
+ width: 45px;
+ border: 1px solid;
+ border-color: '#{richSkin.tableBackgroundColor}';
+ border-right-color: '#{richSkin.panelBorderColor}';
+ border-bottom-color: '#{richSkin.panelBorderColor}';
+ background: '#{richSkin.additionalBackgroundColor}';
+ text-align: center;
+ padding: 2px;
+ white-space: nowrap;
+ text-align: center;
+ cursor: pointer;
+}
+
+.rich-calendar-time-btn-press {
+ border: 1px solid;
+ border-color: '#{richSkin.panelBorderColor}';
+ border-right-color: '#{richSkin.tableBackgroundColor}';
+ border-bottom-color: '#{richSkin.panelBorderColor}';
+ background-color: '#{richSkin.calendarWeekBackgroundColor}';
+}
+
+.rich-calendar-time-input {
+ width: 22px;
+ margin: 0px 2px;
+}
+
+.rich-calendar-spinner-up {
+ background-image: "url(#{resource['StandardButtonBgImage']})";
+ height: 7px;
+ width: 14px;
+ margin: 0px 1px 1px 0px;
+}
+
+.rich-calendar-spinner-down {
+ background-image:
"url(#{resource['org.richfaces.renderkit.html.images.StandardButtonPressedBgImage']})";
+ height: 7px;
+ width: 14px;
+ margin: 0px 1px 1px 0px;
+}
+
+.rich-calendar-spinner-pressed {
+ margin: 1px 0px 0px 1px;
+}
+
+.rich-calendar-spinner-buttons {
+ background-color: '#{richSkin.headerBackgroundColor}';
+ border-color: '#{richSkin.headerBackgroundColor}';
+ background-image:
"url(#{resource['org.richfaces.renderkit.html.images.ButtonBackgroundImage']})";
+}
+
+.rich-calendar-editor-layout-shadow {
+ background-color: '#{richSkin.shadowBackgroundColor}';
+ opacity: 0.3;
+ filter: alpha(opacity=30);
+ position: absolute;
+}
+
+.rich-calendar-editor-btn {
+ width: 36px;
+ padding: 2px;
+ margin: 2px;
+ text-align: center;
+ cursor: pointer;
+}
+
+.rich-calendar-editor-btn-over {
+ padding: 1px;
+ border: 1px solid;
+ border-color: '#{richSkin.panelBorderColor}';
+ background: '#{richSkin.calendarSpecBackgroundColor}';
+}
+
+.rich-calendar-editor-btn-selected {
+ background-color: '#{richSkin.calendarCurrentBackgroundColor}';
+ padding: 2px;
+ border: 0px;
+ color: '#{richSkin.calendarCurrentTextColor}';
+ font-weight: bold;
+ cursor: default;
+}
+
+.rich-calendar-editor-tool-over {
+ padding: 1px;
+ border: 1px solid;
+ background: '#{richSkin.additionalBackgroundColor}';
+ border-color: '#{richSkin.tableBackgroundColor}';
+ border-right-color: '#{richSkin.panelBorderColor}';
+ border-bottom-color: '#{richSkin.panelBorderColor}';
+}
+
+.rich-calendar-editor-tool-press {
+ padding: 1px;
+ border: 1px solid;
+ background: '#{richSkin.additionalBackgroundColor}';
+ border-color: '#{richSkin.panelBorderColor}';
+ border-right-color: '#{richSkin.tableBackgroundColor}';
+ border-bottom-color: '#{richSkin.tableBackgroundColor}';
+}
\ No newline at end of file
Modified:
sandbox/trunk/ui/calendar/ui/src/main/resources/META-INF/richfaces/resource-mappings.properties
===================================================================
---
sandbox/trunk/ui/calendar/ui/src/main/resources/META-INF/richfaces/resource-mappings.properties 2010-10-27
04:25:38 UTC (rev 19680)
+++
sandbox/trunk/ui/calendar/ui/src/main/resources/META-INF/richfaces/resource-mappings.properties 2010-10-27
09:56:19 UTC (rev 19681)
@@ -0,0 +1,8 @@
+org.richfaces.images\:calendarSeparator.png=org.richfaces.renderkit.html.iconimages.CalendarSeparator
+org.richfaces.images\:calendarIcon.png=org.richfaces.renderkit.html.iconimages.CalendarIcon
+org.richfaces.images\:disabledCalendarIcon.png=org.richfaces.renderkit.html.iconimages.DisabledCalendarIcon
+org.richfaces.images\:calendarButtonUp.png=org.richfaces.renderkit.html.BaseGradient\
+ {width=8, height=18, baseColorParam=generalBackgroundColor,
gradientColorParam=tabBackgroundColor}
+org.richfaces.images\:calendarButtonDown.png=org.richfaces.renderkit.html.BaseGradient\
+ {width=8, height=18, baseColorParam=generalBackgroundColor,
gradientColorParam=tabBackgroundColor}
+
\ No newline at end of file
Modified: sandbox/trunk/ui/calendar/ui/src/main/templates/calendar.template.xml
===================================================================
--- sandbox/trunk/ui/calendar/ui/src/main/templates/calendar.template.xml 2010-10-27
04:25:38 UTC (rev 19680)
+++ sandbox/trunk/ui/calendar/ui/src/main/templates/calendar.template.xml 2010-10-27
09:56:19 UTC (rev 19681)
@@ -1,91 +1,74 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc. and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site:
http://www.fsf.org.
- */
--->
-<cdk:root
xmlns="http://jboss.org/schema/richfaces/cdk/xhtml-el"
xmlns:cdk="http://jboss.org/schema/richfaces/cdk/core"
-
xmlns:cc="http://jboss.org/schema/richfaces/cdk/jsf/composite"
xmlns:c="http://jboss.org/schema/richfaces/cdk/jstl/core"
-
xmlns:xi="http://www.w3.org/2001/XInclude">
+<!-- /* * JBoss, Home of Professional Open Source * Copyright 2010, Red Hat,
+ Inc. and individual contributors * by the @authors tag. See the copyright.txt
+ in the distribution for a * full listing of individual contributors. * *
+ This is free software; you can redistribute it and/or modify it * under the
+ terms of the GNU Lesser General Public License as * published by the Free
+ Software Foundation; either version 2.1 of * the License, or (at your option)
+ any later version. * * This software is distributed in the hope that it will
+ be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty
+ of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser
+ General Public License for more details. * * You should have received a copy
+ of the GNU Lesser General Public * License along with this software; if not,
+ write to the Free * Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ Boston, MA * 02110-1301 USA, or see the FSF site:
http://www.fsf.org. */ -->
+<cdk:root
xmlns="http://jboss.org/schema/richfaces/cdk/xhtml-el"
+
xmlns:cdk="http://jboss.org/schema/richfaces/cdk/core"
xmlns:cc="http://jboss.org/schema/richfaces/cdk/jsf/composite"
+
xmlns:c="http://jboss.org/schema/richfaces/cdk/jstl/core"
xmlns:xi="http://www.w3.org/2001/XInclude">
<cc:interface>
<cdk:class>org.richfaces.renderkit.html.CalendarRenderer</cdk:class>
- <cdk:superclass>org.richfaces.renderkit.CalendarRendererBase</cdk:superclass>
+ <cdk:superclass>org.richfaces.renderkit.CalendarRendererBase
+ </cdk:superclass>
<cdk:renderer-type>org.richfaces.CalendarRenderer</cdk:renderer-type>
</cc:interface>
<cc:implementation>
- <span id="#{clientId}" class="rf-ca
#{component.attributes['styleClass']}" cdk:passThroughWithExclusions="id
class">
- <span id="#{clientId}Popup"
style="#{component.attributes['popup'] ? '' : 'display:
none'}">
- <c:choose>
- <c:when test="#{!component.attributes['popup']}" >
- <input id="#{clientId}InputDate" autocomplete="off"
style="display:none" name="#{clientId}InputDate"
- value="#{this:getInputValue(facesContext,component)}"
type="hidden" />
- </c:when>
- <c:otherwise>
- <input id="#{clientId}InputDate"
- name="#{clientId}InputDate"
- value="#{this:getInputValue(facesContext,component)}"
- type="#{component.attributes['showInput'] ? 'text' :
'hidden'}"
- disabled="#{component.attributes['disabled']}"
- accesskey="#{component.attributes['accesskey']}"
- maxlength="#{component.attributes['maxlength']}"
- size="#{component.attributes['inputSize']}"
- style="vertical-align: middle;
#{component.attributes['inputStyle']}"
- class="rich-calendar-input
#{component.attributes['inputClass']}"
- tabindex="#{component.attributes['tabindex']}"
- readonly="#{(!component.attributes['enableManualInput'] ||
component.attributes['readonly']) ? 'readonly' : ''}">
- <cdk:call expression="renderInputHandlers(facesContext,
component);"/>
- </input>
- <c:choose>
- <c:when test="#{isUseIcons(facesContext, component)}">
- <img id="#{clientId}PopupButton" alt=""
+ <span id="#{clientId}Popup"
+ style="#{component.attributes['popup'] ? '' : 'display:
none'}">
+ <c:choose>
+ <c:when test="#{!component.attributes['popup']}">
+ <input id="#{clientId}InputDate" autocomplete="off"
style="display:none"
+ name="#{clientId}InputDate"
value="#{this:getInputValue(facesContext,component)}"
+ type="hidden" />
+ </c:when>
+ <c:otherwise>
+ <input id="#{clientId}InputDate" name="#{clientId}InputDate"
+ value="#{this:getInputValue(facesContext,component)}"
type="#{component.attributes['showInput'] ? 'text' :
'hidden'}"
+ disabled="#{component.attributes['disabled']}"
accesskey="#{component.attributes['accesskey']}"
+ maxlength="#{component.attributes['maxlength']}"
size="#{component.attributes['inputSize']}"
+ style="vertical-align: middle;
#{component.attributes['inputStyle']}"
+ class="rich-calendar-input
#{component.attributes['inputClass']}"
+ tabindex="#{component.attributes['tabindex']}"
+ readonly="#{(!component.attributes['enableManualInput'] ||
component.attributes['readonly']) ? 'readonly' : ''}">
+ <cdk:call expression="renderInputHandlers(facesContext, component);"
/>
+ </input>
+ <c:choose>
+ <c:when test="#{isUseIcons(facesContext, component)}">
+ <img id="#{clientId}PopupButton" alt=""
class="rich-calendar-button
#{component.attributes['buttonClass']}"
- accesskey="#{component.attributes['accesskey']}"
+ accesskey="#{component.attributes['accesskey']}"
style="vertical-align: middle"
+ tabindex="#{component.attributes['tabindex']}"
src="#{getButtonIcon(facesContext, component)}" />
+ </c:when>
+ <c:otherwise>
+ <button type="button" id="#{clientId}PopupButton"
name="#{clientId}PopupButton"
style="vertical-align: middle"
- tabindex="#{component.attributes['tabindex']}"
src="#{getButtonIcon(facesContext, component)}"/>
- </c:when>
- <c:otherwise>
- <button type="button"
- id="#{clientId}PopupButton"
- name="#{clientId}PopupButton"
- style="vertical-align: middle"
- class="rich-calendar-button
#{component.attributes['buttonClass']}"
- tabindex="#{component.attributes['tabindex']}"
disabled="#{component.attributes['disabled']}">
+ class="rich-calendar-button
#{component.attributes['buttonClass']}"
+ tabindex="#{component.attributes['tabindex']}"
disabled="#{component.attributes['disabled']}">
#{component.attributes['buttonLabel']}
</button>
- </c:otherwise>
- </c:choose>
- </c:otherwise>
- </c:choose>
- <input id="#{clientId}InputCurrentDate"
- style="display:none"
- autocomplete="off"
- name="#{clientId}InputCurrentDate"
- value="#{component.attributes['currentDate']}"
type="hidden" />
- </span>
- <div style="display: none;" id="#{clientId}"></div>
+ </c:otherwise>
+ </c:choose>
+ </c:otherwise>
+ </c:choose>
+ <input type="hidden" id="#{clientId}InputCurrentDate"
style="display:none" autocomplete="off"
name="#{clientId}InputCurrentDate"
value="#{component.attributes['currentDate']}" />
+ </span>
+ <div style="display: none;" id="#{clientId}"></div>
+ <div style="display: none;" id="#{clientId}Script">
<script type="text/javascript">
- <cdk:call expression="buildLocaleScript(responseWriter, facesContext,
component);" />
+ <cdk:call
+ expression="buildLocaleScript(responseWriter, facesContext, component);"
/>
<cdk:call expression="buildScript(responseWriter, facesContext,
component);" />
</script>
- </span>
+ </div>
</cc:implementation>
</cdk:root>