[richfaces-svn-commits] JBoss Rich Faces SVN: r4423 - in trunk/ui/calendar/src/main: java/org/richfaces/component and 1 other directories.

[richfaces-svn-commits at lists.jboss.org]

Author: akushunin
Date: 2007-12-03 10:26:40 -0500 (Mon, 03 Dec 2007)
New Revision: 4423

Modified:
   trunk/ui/calendar/src/main/config/component/calendar.xml
   trunk/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java
   trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx
Log:
server side code for todayControlMode

Modified: trunk/ui/calendar/src/main/config/component/calendar.xml
===================================================================
--- trunk/ui/calendar/src/main/config/component/calendar.xml	2007-12-03 14:16:46 UTC (rev 4422)
+++ trunk/ui/calendar/src/main/config/component/calendar.xml	2007-12-03 15:26:40 UTC (rev 4423)
@@ -518,12 +518,12 @@
 			<defaultvalue>true</defaultvalue>
 		</property>
 		<property>
-			<name>showToday</name>
-			<classname>boolean</classname>
+			<name>todayControlMode</name>
+			<classname>java.lang.String</classname>
 			<description>
-				If false this bar should not be shown
+				Possible values are "scroll", "select", "hidden"
 			</description>
-			<defaultvalue>true</defaultvalue>
+			<defaultvalue>"select"</defaultvalue>
 	</property>
 	<property>
 			<name>showApplyButton</name>

Modified: trunk/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java
===================================================================
--- trunk/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java	2007-12-03 14:16:46 UTC (rev 4422)
+++ trunk/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java	2007-12-03 15:26:40 UTC (rev 4423)
@@ -191,9 +191,9 @@
 	
 	public abstract void setShowScrollerBar(boolean showScrollerBar);
 	
-	public abstract boolean isShowToday();
+	public abstract String getTodayControlMode();
 	
-	public abstract void setShowToday(boolean showToday);
+	public abstract void setTodayControlMode(String todayControlMode);
 	
 	public abstract boolean isShowApplyButton();
 	

Modified: trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx
===================================================================
--- trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx	2007-12-03 14:16:46 UTC (rev 4422)
+++ trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx	2007-12-03 15:26:40 UTC (rev 4423)
@@ -158,7 +158,7 @@
 				style:'z-index: #{component.attributes["zindex"]}; #{component.attributes["style"]}',
 				firstWeekDay: #{this:getFirstWeekDay(context, component)}, 
 				minDaysInFirstWeek: #{this:getMinDaysInFirstWeek(context, component)},
-				showToday:#{component.attributes['showToday']},
+				todayControlMode:'#{component.attributes["todayControlMode"]}',
 				showScrollerBar:#{component.attributes['showScrollerBar']},
 				showWeeksBar:#{component.attributes['showWeeksBar']},
 				showWeekDaysBar:#{component.attributes['showWeekDaysBar']},