[richfaces-svn-commits] JBoss Rich Faces SVN: r2603 - in trunk: samples/calendar-sample/src/main/java/org/richfaces and 4 other directories.
richfaces-svn-commits at lists.jboss.org
richfaces-svn-commits at lists.jboss.org
Thu Aug 30 07:45:30 EDT 2007
Author: akushunin
Date: 2007-08-30 07:45:30 -0400 (Thu, 30 Aug 2007)
New Revision: 2603
Modified:
trunk/framework/impl/src/main/resources/META-INF/skins/DEFAULT.skin.properties
trunk/framework/impl/src/main/resources/META-INF/skins/blueSky.skin.properties
trunk/framework/impl/src/main/resources/META-INF/skins/classic.skin.properties
trunk/framework/impl/src/main/resources/META-INF/skins/deepMarine.skin.properties
trunk/framework/impl/src/main/resources/META-INF/skins/emeraldTown.skin.properties
trunk/framework/impl/src/main/resources/META-INF/skins/japanCherry.skin.properties
trunk/framework/impl/src/main/resources/META-INF/skins/plain.skin.properties
trunk/framework/impl/src/main/resources/META-INF/skins/ruby.skin.properties
trunk/framework/impl/src/main/resources/META-INF/skins/wine.skin.properties
trunk/samples/calendar-sample/src/main/java/org/richfaces/CalendarBean.java
trunk/samples/calendar-sample/src/main/webapp/pages/Calendar.jsp
trunk/samples/richfaces-demo/src/main/webapp/META-INF/MANIFEST.MF
trunk/ui/calendar/src/main/config/component/calendar.xml
trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/css/calendar.xcss
Log:
added new colors to calendar
Modified: trunk/framework/impl/src/main/resources/META-INF/skins/DEFAULT.skin.properties
===================================================================
--- trunk/framework/impl/src/main/resources/META-INF/skins/DEFAULT.skin.properties 2007-08-30 10:17:15 UTC (rev 2602)
+++ trunk/framework/impl/src/main/resources/META-INF/skins/DEFAULT.skin.properties 2007-08-30 11:45:30 UTC (rev 2603)
@@ -49,3 +49,16 @@
tableSubfooterBackgroundColor=#f1f1f1
tableBorderColor=#C4C0C9
tableBorderWidth=1px
+
+
+#Calendar colors
+calendarwWeekBackgroundColor=#F1EEE9
+
+calendarHolidaysBackgroundColor=#FFEBDA
+calendarHolidaysTextColor=#FF7800
+
+calendarCurrentBackgroundColor=#FF7800
+calendarCurrentTextColor=#FFEBDA
+
+calendarSpecBackgroundColor=#F1EEE9
+calendarSpecTextColor=#000000
Modified: trunk/framework/impl/src/main/resources/META-INF/skins/blueSky.skin.properties
===================================================================
--- trunk/framework/impl/src/main/resources/META-INF/skins/blueSky.skin.properties 2007-08-30 10:17:15 UTC (rev 2602)
+++ trunk/framework/impl/src/main/resources/META-INF/skins/blueSky.skin.properties 2007-08-30 11:45:30 UTC (rev 2603)
@@ -44,8 +44,22 @@
buttonSizeFont=11
buttonFamilyFont=Arial, Verdana, sans-serif
+
tableBackgroundColor=#FFFFFF
tableFooterBackgroundColor=#cccccc
tableSubfooterBackgroundColor=#f1f1f1
tableBorderColor=#C0C0C0
tableBorderWidth=1px
+
+
+#Calendar colors
+calendarwWeekBackgroundColor=#F5F5F5
+
+calendarHolidaysBackgroundColor=#FFEBDA
+calendarHolidaysTextColor=#FF7800
+
+calendarCurrentBackgroundColor=#FF7800
+calendarCurrentTextColor=#FFEBDA
+
+calendarSpecBackgroundColor=#E4F5E2
+calendarSpecTextColor=#000000
Modified: trunk/framework/impl/src/main/resources/META-INF/skins/classic.skin.properties
===================================================================
--- trunk/framework/impl/src/main/resources/META-INF/skins/classic.skin.properties 2007-08-30 10:17:15 UTC (rev 2602)
+++ trunk/framework/impl/src/main/resources/META-INF/skins/classic.skin.properties 2007-08-30 11:45:30 UTC (rev 2603)
@@ -49,3 +49,16 @@
tableSubfooterBackgroundColor=#f1f1f1
tableBorderColor=#C0C0C0
tableBorderWidth=1px
+
+
+#Calendar colors
+calendarwWeekBackgroundColor=#F5F5F5
+
+calendarHolidaysBackgroundColor=#FFEBDA
+calendarHolidaysTextColor=#FF7800
+
+calendarCurrentBackgroundColor=#FF7800
+calendarCurrentTextColor=#FFEBDA
+
+calendarSpecBackgroundColor=#E4F5E2
+calendarSpecTextColor=#000000
Modified: trunk/framework/impl/src/main/resources/META-INF/skins/deepMarine.skin.properties
===================================================================
--- trunk/framework/impl/src/main/resources/META-INF/skins/deepMarine.skin.properties 2007-08-30 10:17:15 UTC (rev 2602)
+++ trunk/framework/impl/src/main/resources/META-INF/skins/deepMarine.skin.properties 2007-08-30 11:45:30 UTC (rev 2603)
@@ -49,3 +49,16 @@
tableSubfooterBackgroundColor=#f1f1f1
tableBorderColor=#C0C0C0
tableBorderWidth=1px
+
+#Calendar colors
+calendarwWeekBackgroundColor=#F5F5F5
+
+calendarHolidaysBackgroundColor=#FFEBDA
+calendarHolidaysTextColor=#FF7800
+
+calendarCurrentBackgroundColor=#FF7800
+calendarCurrentTextColor=#FFEBDA
+
+calendarSpecBackgroundColor=#DFF8F8
+calendarSpecTextColor=#000000
+
Modified: trunk/framework/impl/src/main/resources/META-INF/skins/emeraldTown.skin.properties
===================================================================
--- trunk/framework/impl/src/main/resources/META-INF/skins/emeraldTown.skin.properties 2007-08-30 10:17:15 UTC (rev 2602)
+++ trunk/framework/impl/src/main/resources/META-INF/skins/emeraldTown.skin.properties 2007-08-30 11:45:30 UTC (rev 2603)
@@ -49,3 +49,16 @@
tableSubfooterBackgroundColor=#f1f1f1
tableBorderColor=#C0C0C0
tableBorderWidth=1px
+
+#Calendar colors
+calendarwWeekBackgroundColor=#f5f5f5
+
+calendarHolidaysBackgroundColor=#FFEBDA
+calendarHolidaysTextColor=#FF7800
+
+calendarCurrentBackgroundColor=#FF7800
+calendarCurrentTextColor=#FFEBDA
+
+calendarSpecBackgroundColor=#E2F6E2
+calendarSpecTextColor=#000000
+
Modified: trunk/framework/impl/src/main/resources/META-INF/skins/japanCherry.skin.properties
===================================================================
--- trunk/framework/impl/src/main/resources/META-INF/skins/japanCherry.skin.properties 2007-08-30 10:17:15 UTC (rev 2602)
+++ trunk/framework/impl/src/main/resources/META-INF/skins/japanCherry.skin.properties 2007-08-30 11:45:30 UTC (rev 2603)
@@ -49,3 +49,17 @@
tableSubfooterBackgroundColor=#f1f1f1
tableBorderColor=#DFA5A5
tableBorderWidth=1px
+
+
+#Calendar colors
+calendarwWeekBackgroundColor=#f5f5f5
+
+calendarHolidaysBackgroundColor=#FFEBEB
+calendarHolidaysTextColor=#980808
+
+calendarCurrentBackgroundColor=#980808
+calendarCurrentTextColor=#ffffff
+
+calendarSpecBackgroundColor=#f1f1f1
+calendarSpecTextColor=#000000
+
Modified: trunk/framework/impl/src/main/resources/META-INF/skins/plain.skin.properties
===================================================================
--- trunk/framework/impl/src/main/resources/META-INF/skins/plain.skin.properties 2007-08-30 10:17:15 UTC (rev 2602)
+++ trunk/framework/impl/src/main/resources/META-INF/skins/plain.skin.properties 2007-08-30 11:45:30 UTC (rev 2603)
@@ -49,3 +49,15 @@
tableSubfooterBackgroundColor=#{null}
tableBorderColor=#{null}
tableBorderWidth=0px
+
+#Calendar colors
+calendarwWeekBackgroundColor=#{null}
+
+calendarHolidaysBackgroundColor=#{null}
+calendarHolidaysTextColor=#{null}
+
+calendarCurrentBackgroundColor=#{null}
+calendarCurrentTextColor=#{null}
+
+calendarSpecBackgroundColor=#{null}
+calendarSpecTextColor=#{null}
\ No newline at end of file
Modified: trunk/framework/impl/src/main/resources/META-INF/skins/ruby.skin.properties
===================================================================
--- trunk/framework/impl/src/main/resources/META-INF/skins/ruby.skin.properties 2007-08-30 10:17:15 UTC (rev 2602)
+++ trunk/framework/impl/src/main/resources/META-INF/skins/ruby.skin.properties 2007-08-30 11:45:30 UTC (rev 2603)
@@ -49,3 +49,17 @@
tableSubfooterBackgroundColor=#f1f1f1
tableBorderColor=#C0C0C0
tableBorderWidth=1px
+
+
+#Calendar colors
+calendarwWeekBackgroundColor=#f5f5f5
+
+calendarHolidaysBackgroundColor=#FFF1F1
+calendarHolidaysTextColor=#980808
+
+calendarCurrentBackgroundColor=#808080
+calendarCurrentTextColor=#ffffff
+
+calendarSpecBackgroundColor=#f1f1f1
+calendarSpecTextColor=#000000
+
Modified: trunk/framework/impl/src/main/resources/META-INF/skins/wine.skin.properties
===================================================================
--- trunk/framework/impl/src/main/resources/META-INF/skins/wine.skin.properties 2007-08-30 10:17:15 UTC (rev 2602)
+++ trunk/framework/impl/src/main/resources/META-INF/skins/wine.skin.properties 2007-08-30 11:45:30 UTC (rev 2603)
@@ -50,3 +50,17 @@
tableSubfooterBackgroundColor=#f1f1f1
tableBorderColor=#B6AD84
tableBorderWidth=1px
+
+#Calendar colors
+calendarwWeekBackgroundColor=#f5f5f5
+
+calendarHolidaysBackgroundColor=#FFF4D8
+calendarHolidaysTextColor=#B38919
+
+calendarCurrentBackgroundColor=#B38919
+calendarCurrentTextColor=#ffffff
+
+calendarSpecBackgroundColor=#F0FCE2
+calendarSpecTextColor=#000000
+
+
Modified: trunk/samples/calendar-sample/src/main/java/org/richfaces/CalendarBean.java
===================================================================
--- trunk/samples/calendar-sample/src/main/java/org/richfaces/CalendarBean.java 2007-08-30 10:17:15 UTC (rev 2602)
+++ trunk/samples/calendar-sample/src/main/java/org/richfaces/CalendarBean.java 2007-08-30 11:45:30 UTC (rev 2603)
@@ -27,6 +27,8 @@
import javax.faces.event.ValueChangeEvent;
+import org.richfaces.event.CurrentDateChangeEvent;
+
/**
* 20/07/2007
*
@@ -206,5 +208,15 @@
public void setBoundary(String boundary) {
this.boundary = boundary;
}
+ public void dcl(CurrentDateChangeEvent event){
+ System.out.println(event.getCurrentDateString());
+ System.out.println("ajvhckndskncs");
+ }
+ public void ddd(ValueChangeEvent event){
+ System.out.println(event.getOldValue());
+ System.out.println(event.getNewValue());
+
+ }
+
}
\ No newline at end of file
Modified: trunk/samples/calendar-sample/src/main/webapp/pages/Calendar.jsp
===================================================================
--- trunk/samples/calendar-sample/src/main/webapp/pages/Calendar.jsp 2007-08-30 10:17:15 UTC (rev 2602)
+++ trunk/samples/calendar-sample/src/main/webapp/pages/Calendar.jsp 2007-08-30 11:45:30 UTC (rev 2603)
@@ -49,7 +49,9 @@
buttonLabel="PopUp"
enableManualInput="#{calendarBean.enableManualInput}"
showInput="#{calendarBean.showInput}"
- boundaryDatesMode="#{calendarBean.boundary}">
+ boundaryDatesMode="#{calendarBean.boundary}"
+ currentDateChangeListener="#{calendarBean.dcl}"
+ valueChangeListener="#{calendarBean.ddd}">
<f:facet name="optionalHeader">
<h:outputText value="optionalHeader Facet" />
</f:facet>
Modified: trunk/samples/richfaces-demo/src/main/webapp/META-INF/MANIFEST.MF
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/META-INF/MANIFEST.MF 2007-08-30 10:17:15 UTC (rev 2602)
+++ trunk/samples/richfaces-demo/src/main/webapp/META-INF/MANIFEST.MF 2007-08-30 11:45:30 UTC (rev 2603)
@@ -1,3 +1,2 @@
Manifest-Version: 1.0
-Class-Path:
Modified: trunk/ui/calendar/src/main/config/component/calendar.xml
===================================================================
--- trunk/ui/calendar/src/main/config/component/calendar.xml 2007-08-30 10:17:15 UTC (rev 2602)
+++ trunk/ui/calendar/src/main/config/component/calendar.xml 2007-08-30 11:45:30 UTC (rev 2603)
@@ -115,11 +115,11 @@
java.util.Calendar.getInstance(getTimeZone()).getTime()
</defaultvalue>
</property>
- <!--property>
+ <property>
<name>currentDateChangeListener</name>
<classname>javax.faces.el.MethodBinding</classname>
<description>MethodBinding representing an action listener method that will be notified after date selection</description>
- </property -->
+ </property>
<property>
<name>datePattern</name>
<classname>java.lang.String</classname>
Modified: trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/css/calendar.xcss
===================================================================
--- trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/css/calendar.xcss 2007-08-30 10:17:15 UTC (rev 2602)
+++ trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/css/calendar.xcss 2007-08-30 11:45:30 UTC (rev 2603)
@@ -56,27 +56,11 @@
.rich-calendar-week{
border-bottom : 1px solid;
border-right : 1px solid;
- /* background-color : #f5f5f5; /*unknown parameter - need to add*/ */
vertical-align : middle;
text-align : center;
width : 25px;
}
-/*.rich-calendar-holly{
- background-color : #ffebda; /*unknown parameter - need to add*/
- color : #ff7800; /*unknown parameter - need to add*/
-}*/
-
-/*.rich-calendar-today{
- background-color : #ff7800; /*unknown parameter - need to add*/
- color : #ffebda; /*unknown parameter - need to add*/
- font-weight : bold;
-}*/
-
-.rich-calendar-spec{
- background-color : #e4f5e2; /*unknown parameter - need to add*/
-}
-
.rich-right-cell{
border-right : 0px;
}
@@ -115,6 +99,10 @@
<u:style name="font-family" skin="generalFamilyFont"/>
</u:selector>
+ <u:selector name=".rich-calendar-spec">
+ <u:style name="background-color" skin="calendarSpecBackgroundColo"/>
+ </u:selector>
+
<u:selector name=".rich-calendar-header">
<u:style name="border-bottom-color" skin="panelBorderColor"/>
<u:style name="background-color" skin="additionalBackgroundColor"/>
@@ -154,14 +142,14 @@
<u:style name="font-family" skin="generalFamilyFont"/>
</u:selector>
- <u:selector name=".rich-calendar-weekend">
+ <u:selector name=".rich-calendar-weekends">
<u:style name="color" value="red"/>
</u:selector>
-/* background-color : #f5f5f5; unknown parameter - need to add*/
<u:selector name=".rich-calendar-week">
<u:style name="background" skin="additionalBackgroundColor"/>
<u:style name="border-bottom-color" skin="panelBorderColor"/>
+ <u:style name="background-color" skin="calendarwWeekBackgroundColor"/>
<u:style name="border-right-color" skin="panelBorderColor"/>
<u:style name="font-size" skin="generalSizeFont"/>
<u:style name="font-family" skin="generalFamilyFont"/>
@@ -169,29 +157,17 @@
<u:selector name=".rich-calendar-holly">
- <u:style name="background-color" value="#ffebda"/> /*unknown parameter - need to add*/
- <u:style name="color" value="#ff7800"/> /*unknown parameter - need to add*/
+ <u:style name="background-color" value="calendarHolidaysBackgroundColor"/>
+ <u:style name="color" value="calendarHolidaysTextColor"/>
</u:selector>
-/*
-.rich-calendar-today{
- background-color : #ff7800; /*unknown parameter - need to add
- color : #ffebda; /*unknown parameter - need to add
- font-weight : bold;
-}
-*/
-/*
-.rich-calendar-spec{
- background-color : #e4f5e2; /*unknown parameter - need to add
-}
-*/
<u:selector name=".rich-calendar-boundary-dates">
<u:style name="color" value="#a0a0a0"/> /*unknown parameter - need to add*/
</u:selector>
<u:selector name=".rich-calendar-today">
- <u:style name="background-color" value="#ff7800"/> /*unknown parameter - need to add*/
- <u:style name="color" value="#ffebda"/> /*unknown parameter - need to add*/
+ <u:style name="background-color" value="calendarCurrentBackgroundColor"/>
+ <u:style name="color" value="calendarCurrentTextColor"/>
<u:style name="font-weight" value="bold"/>
</u:selector>
@@ -206,7 +182,7 @@
</u:selector>
<u:selector name=".rich-calendar-today.rich-calendar-hover">
- <u:style name="color" value="#ff7800"/> /*unknown parameter - need to add*/
+ <u:style name="color" value="calendarCurrentBackgroundColor"/>
</u:selector>
<u:selector name=".rich-calendar-toolfooter">
More information about the richfaces-svn-commits
mailing list