5:31 a.m.
Author: akushunin
Date: 2007-08-25 06:31:25 -0400 (Sat, 25 Aug 2007)
New Revision: 2494
Modified:
trunk/ui/calendar/design/calendar-js/calendar-prototype.js
trunk/ui/calendar/design/calendar-js/calendar-xhtml.html
trunk/ui/calendar/design/calendar/calendar_div.html
trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/css/calendar.xcss
trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js
trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx
Log:
RF-698, renaming calendar style classes
Modified: trunk/ui/calendar/design/calendar/calendar_div.html
===================================================================
--- trunk/ui/calendar/design/calendar/calendar_div.html 2007-08-25 01:40:38 UTC (rev
2493)
+++ trunk/ui/calendar/design/calendar/calendar_div.html 2007-08-25 10:31:25 UTC (rev
2494)
@@ -4,13 +4,13 @@
<head>
<title>calendar</title>
<style>
-.calendar_exterior{
+.rich-calendar-exterior{
border : 1px solid #c0c0c0; /*panelBorderColor*/
}
-.calendar_btn{
+.rich-calendar-btn{
cursor : pointer;
}
-.calendar_header{
+.rich-calendar-header{
border-bottom : 1px solid #c0c0c0; /*panelBorderColor*/
background : #C7D7EC; /*additionalBackgroundColor*/
font-size : 11px; /*generalSizeFont*/
@@ -19,12 +19,12 @@
height : 22px;
}
-.cell_size{
+.rich-cell-size{
width : 25px;
height : 22px;
}
-.calendar_cell{
+.rich-calendar-cell{
background-color : #FFFFFF; /*generalBackgroundColor*/
border-bottom : 1px solid #c0c0c0; /*panelBorderColor*/
border-right : 1px solid #c0c0c0; /*panelBorderColor*/
@@ -35,7 +35,7 @@
text-align : center;
}
-.calendar_tool{
+.rich-calendar-tool{
border-bottom : 1px solid #c0c0c0; /*panelBorderColor*/
background-color : #224986; /*headerBackgroundColor*/
font-size : 11px; /*headerSizeFont*/
@@ -48,7 +48,7 @@
height : 22px;
}
-.calendar_month{
+.rich-calendar-month{
border-bottom : 1px solid #c0c0c0; /*panelBorderColor*/
background-color : #224986; /*headerBackgroundColor*/
font-size : 11px; /*headerSizeFont*/
@@ -59,7 +59,7 @@
text-align : center;
}
-.calendar_days{
+.rich-calendar-days{
border-bottom : 1px solid #c0c0c0; /*panelBorderColor*/
border-right : 0px solid #c0c0c0; /*panelBorderColor*/
background : #C7D7EC; /*additionalBackgroundColor*/
@@ -70,7 +70,7 @@
height : 22px;
}
-.calendar_week{
+.rich-calendar-week{
border-bottom : 1px solid #c0c0c0; /*panelBorderColor*/
border-right : 1px solid #c0c0c0; /*panelBorderColor*/
font-size : 11px; /*generalSizeFont*/
@@ -81,37 +81,37 @@
width : 25px;
}
-.calendar_holly{
+.rich-calendar-holly{
background-color : #ffebda; /*unknown parameter - need to add*/
color : #ff7800; /*unknown parameter - need to add*/
}
-.calendar_current{
+.rich-calendar-current{
background-color : #ff7800; /*unknown parameter - need to add*/
color : #ffebda; /*unknown parameter - need to add*/
font-weight : bold;
}
-.calendar_spec{
+.rich-calendar-spec{
background-color : #e4f5e2; /*unknown parameter - need to add*/
}
-.calendar_select{
+.rich-calendar-select{
background-color : #224986; /*headerBackgroundColor*/
color : #FFFFFF; /*headerTextColor*/
font-weight : bold;
}
-.right_cell{
+.rich-right-cell{
border-right : 0px;
}
-.bottom_cell{
+.rich-bottom-cell{
border-bottom : 0px;
}
-.calendar_toolfooter{
+.rich-calendar-toolfooter{
border-top : 1px solid #c0c0c0; /*panelBorderColor*/
border-right : 0px solid #c0c0c0; /*panelBorderColor*/
background : #C7D7EC; /*additionalBackgroundColor*/
@@ -121,7 +121,7 @@
height : 22px;
}
-.calendar_footer{
+.rich-calendar-footer{
border-top : 1px solid #c0c0c0; /*panelBorderColor*/
border-right : 0px solid #c0c0c0; /*panelBorderColor*/
background : #C7D7EC; /*additionalBackgroundColor*/
@@ -141,9 +141,9 @@
<div>
-<table border="0" cellpadding="0" cellspacing="0"
class="calendar_exterior">
+<table border="0" cellpadding="0" cellspacing="0"
class="rich-calendar-exterior">
<tr>
- <td class="calendar_header" colspan="8">
+ <td class="rich-calendar-header" colspan="8">
Optional Header
</td>
</tr>
@@ -152,19 +152,19 @@
<td colspan="8">
<table border="0" cellpadding="0" cellspacing="0"
width="100%">
<tr>
- <td class="calendar_tool calendar_btn">
+ <td class="rich-calendar-tool rich-calendar-btn">
««
</td>
- <td class="calendar_tool calendar_btn">
+ <td class="rich-calendar-tool rich-calendar-btn">
«
</td>
- <td class="calendar_month calendar_btn">
+ <td class="rich-calendar-month rich-calendar-btn">
June, 2007
</td>
- <td class="calendar_tool calendar_btn">
+ <td class="rich-calendar-tool rich-calendar-btn">
»
</td>
- <td class="calendar_tool calendar_btn">
+ <td class="rich-calendar-tool rich-calendar-btn">
»»
</td>
</tr>
@@ -172,163 +172,163 @@
</td>
</tr>
<tr>
- <td class="calendar_days">
+ <td class="rich-calendar-days">
<br>
</td>
- <td class="calendar_days">
+ <td class="rich-calendar-days">
Sun
</td>
- <td class="calendar_days">
+ <td class="rich-calendar-days">
Mon
</td>
- <td class="calendar_days">
+ <td class="rich-calendar-days">
Tue
</td>
- <td class="calendar_days">
+ <td class="rich-calendar-days">
Wed
</td>
- <td class="calendar_days">
+ <td class="rich-calendar-days">
Thu
</td>
- <td class="calendar_days">
+ <td class="rich-calendar-days">
Fri
</td>
- <td class="calendar_days right_cell">
+ <td class="rich-calendar-days rich-right-cell">
Sat
</td>
</tr>
<tr>
- <td class="calendar_week">
+ <td class="rich-calendar-week">
1
</td>
- <td class="cell_size calendar_cell calendar_holly">
+ <td class="rich-cell-size rich-calendar-cell rich-calendar-holly">
<br>
</td>
- <td class="cell_size calendar_cell calendar_cell">
+ <td class="rich-cell-size rich-calendar-cell rich-calendar-cell">
<br>
</td>
- <td class="cell_size calendar_cell calendar_btn">
+ <td class="rich-cell-size rich-calendar-cell rich-calendar-btn">
1<br>
</td>
- <td class="cell_size calendar_cell calendar_btn">
+ <td class="rich-cell-size rich-calendar-cell rich-calendar-btn">
2<br>
</td>
- <td class="cell_size calendar_cell calendar_btn">
+ <td class="rich-cell-size rich-calendar-cell rich-calendar-btn">
3<br>
</td>
- <td class="cell_size calendar_cell calendar_btn">
+ <td class="rich-cell-size rich-calendar-cell rich-calendar-btn">
4<br>
</td>
- <td class="cell_size calendar_cell calendar_holly right_cell
calendar_btn">
+ <td class="rich-cell-size rich-calendar-cell rich-calendar-holly
rich-right-cell rich-calendar-btn">
5<br>
</td>
</tr>
<tr>
- <td class="calendar_week">
+ <td class="rich-calendar-week">
2
</td>
- <td class="cell_size calendar_cell calendar_holly calendar_btn">
+ <td class="rich-cell-size rich-calendar-cell rich-calendar-holly
rich-calendar-btn">
6<br>
</td>
- <td class="cell_size calendar_cell calendar_btn">
+ <td class="rich-cell-size rich-calendar-cell rich-calendar-btn">
7<br>
</td>
- <td class="cell_size calendar_cell calendar_current calendar_btn">
+ <td class="rich-cell-size rich-calendar-cell rich-calendar-current
rich-calendar-btn">
8<br>
</td>
- <td class="cell_size calendar_cell calendar_btn">
+ <td class="rich-cell-size rich-calendar-cell rich-calendar-btn">
9<br>
</td>
- <td class="cell_size calendar_cell calendar_spec calendar_btn">
+ <td class="rich-cell-size rich-calendar-cell rich-calendar-spec
rich-calendar-btn">
10<br>
</td>
- <td class="cell_size calendar_cell calendar_spec calendar_btn">
+ <td class="rich-cell-size rich-calendar-cell rich-calendar-spec
rich-calendar-btn">
11<br>
</td>
- <td class="cell_size calendar_cell calendar_holly right_cell
calendar_btn">
+ <td class="rich-cell-size rich-calendar-cell rich-calendar-holly
rich-right-cell rich-calendar-btn">
12<br>
</td>
</tr>
<tr>
- <td class="calendar_week">
+ <td class="rich-calendar-week">
3
</td>
- <td class="cell_size calendar_cell calendar_holly calendar_btn">
+ <td class="rich-cell-size rich-calendar-cell rich-calendar-holly
rich-calendar-btn">
13<br>
</td>
- <td class="cell_size calendar_cell calendar_btn">
+ <td class="rich-cell-size rich-calendar-cell rich-calendar-btn">
14<br>
</td>
- <td class="cell_size calendar_cell calendar_btn">
+ <td class="rich-cell-size rich-calendar-cell rich-calendar-btn">
15<br>
</td>
- <td class="cell_size calendar_cell calendar_spec calendar_btn">
+ <td class="rich-cell-size rich-calendar-cell rich-calendar-spec
rich-calendar-btn">
16<br>
</td>
- <td class="cell_size calendar_cell calendar_btn">
+ <td class="rich-cell-size rich-calendar-cell rich-calendar-btn">
17<br>
</td>
- <td class="cell_size calendar_cell calendar_btn">
+ <td class="rich-cell-size rich-calendar-cell rich-calendar-btn">
18<br>
</td>
- <td class="cell_size calendar_cell calendar_holly right_cell
calendar_btn">
+ <td class="rich-cell-size rich-calendar-cell rich-calendar-holly
rich-right-cell rich-calendar-btn">
19<br>
</td>
</tr>
<tr>
- <td class="calendar_week">
+ <td class="rich-calendar-week">
4
</td>
- <td class="cell_size calendar_cell calendar_holly calendar_btn">
+ <td class="rich-cell-size rich-calendar-cell rich-calendar-holly
rich-calendar-btn">
20<br>
</td>
- <td class="cell_size calendar_cell calendar_btn">
+ <td class="rich-cell-size rich-calendar-cell rich-calendar-btn">
21<br>
</td>
- <td class="cell_size calendar_cell calendar_btn">
+ <td class="rich-cell-size rich-calendar-cell rich-calendar-btn">
22<br>
</td>
- <td class="cell_size calendar_cell calendar_btn">
+ <td class="rich-cell-size rich-calendar-cell rich-calendar-btn">
23<br>
</td>
- <td class="cell_size calendar_cell calendar_select calendar_btn">
+ <td class="rich-cell-size rich-calendar-cell rich-calendar-select
rich-calendar-btn">
24<br>
</td>
- <td class="cell_size calendar_cell calendar_btn">
+ <td class="rich-cell-size rich-calendar-cell rich-calendar-btn">
25<br>
</td>
- <td class="cell_size calendar_cell calendar_holly right_cell
calendar_btn">
+ <td class="rich-cell-size rich-calendar-cell rich-calendar-holly
rich-right-cell rich-calendar-btn">
26<br>
</td>
</tr>
<tr>
- <td class="calendar_week bottom_cell calendar_btn">
+ <td class="rich-calendar-week rich-bottom-cell rich-calendar-btn">
5
</td>
- <td class="cell_size calendar_cell calendar_holly bottom_cell
calendar_btn">
+ <td class="rich-cell-size rich-calendar-cell rich-calendar-holly
rich-bottom-cell rich-calendar-btn">
27<br>
</td>
- <td class="cell_size calendar_cell bottom_cell calendar_btn">
+ <td class="rich-cell-size rich-calendar-cell rich-bottom-cell
rich-calendar-btn">
28<br>
</td>
- <td class="cell_size calendar_cell calendar_spec bottom_cell
calendar_btn">
+ <td class="rich-cell-size rich-calendar-cell rich-calendar-spec
rich-bottom-cell rich-calendar-btn">
29<br>
</td>
- <td class="cell_size calendar_cell calendar_spec bottom_cell
calendar_btn">
+ <td class="rich-cell-size rich-calendar-cell rich-calendar-spec
rich-bottom-cell rich-calendar-btn">
30<br>
</td>
- <td class="cell_size calendar_cell bottom_cell">
+ <td class="rich-cell-size rich-calendar-cell rich-bottom-cell">
<br>
</td>
- <td class="cell_size calendar_cell bottom_cell">
+ <td class="rich-cell-size rich-calendar-cell rich-bottom-cell">
<br>
</td>
- <td class="cell_size calendar_cell calendar_holly right_cell
bottom_cell">
+ <td class="rich-cell-size rich-calendar-cell rich-calendar-holly
rich-right-cell rich-bottom-cell">
<br>
</td>
</tr>
@@ -336,13 +336,13 @@
<td colspan="8">
<table border="0" cellpadding="0" cellspacing="0"
width="100%">
<tr>
- <td class="calendar_toolfooter calendar_btn">
+ <td class="rich-calendar-toolfooter rich-calendar-btn">
07/08/2007
</td>
- <td class="calendar_toolfooter" width="100%">
+ <td class="rich-calendar-toolfooter" width="100%">
<br>
</td>
- <td class="calendar_toolfooter calendar_btn"
align="right">
+ <td class="rich-calendar-toolfooter rich-calendar-btn"
align="right">
Today
</td>
</tr>
@@ -351,7 +351,7 @@
</tr>
<tr>
- <td class="calendar_footer" colspan="8">
+ <td class="rich-calendar-footer" colspan="8">
Optional Footer
</td>
</tr>
Modified: trunk/ui/calendar/design/calendar-js/calendar-prototype.js
===================================================================
--- trunk/ui/calendar/design/calendar-js/calendar-prototype.js 2007-08-25 01:40:38 UTC
(rev 2493)
+++ trunk/ui/calendar/design/calendar-js/calendar-prototype.js 2007-08-25 10:31:25 UTC
(rev 2494)
@@ -129,7 +129,7 @@
var weekDayHtml = this.params.weekDayMarkup( {weekDay:
this.params.weekDayLabels[weekDayCounter]} );
if (weekDayCounter==6) weekDayCounter=0; else weekDayCounter++;
- htmlTextWeekDayBar+='<td id="'+this.params.weekDayBarId+i+'"
class="'+(i==this.firstWeekendDayNumber || i==this.secondWeekendDayNumber ?
"Weekendclass" :
"Dayclass")+'">'+weekDayHtml+'</td>';
+ htmlTextWeekDayBar+='<td id="'+this.params.weekDayBarId+i+'"
class="'+(i==this.firstWeekendDayNumber || i==this.secondWeekendDayNumber ?
"rich-Weekendclass" :
"rich-Dayclass")+'">'+weekDayHtml+'</td>';
}
htmlTextWeekDayBar+='</tr>\n';
@@ -189,9 +189,9 @@
{
this.selectedDate=new Date(this.currentDate);
this.selectedDate.setDate(obj.data);
- if (this.selectedDateElement) Element.removeClassName(this.selectedDateElement,
"Selecteddayclass");
+ if (this.selectedDateElement) Element.removeClassName(this.selectedDateElement,
"rich-Selectedrich-Dayclass");
this.selectedDateElement = obj;
- Element.addClassName(obj, "Selecteddayclass");
+ Element.addClassName(obj, "rich-Selectedrich-Dayclass");
$('div_'+this.params.dayListTableId+'_selected_date').innerHTML=obj.data+"/"+(this.currentDate.getMonth()+1)+"/"+this.currentDate.getFullYear();
} else {
@@ -280,7 +280,7 @@
this.days = [];
var dayCounter = previousMonthDays - wd + 1;
// previuos month days
- if (wd>0) while (dayCounter<=previousMonthDays) {this.days.push({day:dayCounter,
_isWeekend: this.isWeekend(p), _month:-1, _className:"Disableddayclass"});
dayCounter++; p++; }
+ if (wd>0) while (dayCounter<=previousMonthDays) {this.days.push({day:dayCounter,
_isWeekend: this.isWeekend(p), _month:-1,
_className:"rich-Disabledrich-Dayclass"}); dayCounter++; p++; }
dayCounter = 1;
// current month days
@@ -291,9 +291,9 @@
while (dayCounter<firstDay)
{
if (this.isWeekend(p%7))
- this.days.push({day:dayCounter, _isWeekend: true, _month:0,
_className:"Weekenddayclass", _hoverClassName:"Hoveredweekclass"});
+ this.days.push({day:dayCounter, _isWeekend: true, _month:0,
_className:"rich-Weekendrich-Dayclass",
_hoverClassName:"rich-Hoveredweekclass"});
else
- this.days.push({day:dayCounter, _isWeekend: false, _month:0,
_className:"Commondayclass", _hoverClassName:"Hovereddayclass"});
+ this.days.push({day:dayCounter, _isWeekend: false, _month:0,
_className:"rich-Commonrich-Dayclass",
_hoverClassName:"rich-Hoveredrich-Dayclass"});
dayCounter++;
p++;
@@ -308,8 +308,8 @@
obj = this.daysData.days[idx];
obj._isWeekend = flag;
obj._month = 0;
- if (flag) {obj._className = "Weekenddayclass"; obj._hoverClassName =
"Hoveredweekclass";}
- else {obj._className = "Commondayclass"; obj._hoverClassName =
"Hovereddayclass";}
+ if (flag) {obj._className = "rich-Weekendrich-Dayclass";
obj._hoverClassName = "rich-Hoveredweekclass";}
+ else {obj._className = "rich-Commonrich-Dayclass"; obj._hoverClassName =
"rich-Hoveredrich-Dayclass";}
this.days.push(obj);
idx++;
dayCounter++;
@@ -319,9 +319,9 @@
while (dayCounter<=currentMonthDays)
{
if (this.isWeekend(p%7))
- this.days.push({day:dayCounter, _isWeekend: true, _month:0,
_className:"Weekenddayclass", _hoverClassName:"Hoveredweekclass"});
+ this.days.push({day:dayCounter, _isWeekend: true, _month:0,
_className:"rich-Weekendrich-Dayclass",
_hoverClassName:"rich-Hoveredweekclass"});
else
- this.days.push({day:dayCounter, _isWeekend: false, _month:0,
_className:"Commondayclass", _hoverClassName:"Hovereddayclass"});
+ this.days.push({day:dayCounter, _isWeekend: false, _month:0,
_className:"rich-Commonrich-Dayclass",
_hoverClassName:"rich-Hoveredrich-Dayclass"});
dayCounter++;
p++;
}
@@ -329,7 +329,7 @@
// next month days
var ld = 7-p%7;
- if (ld!=7) while (dayCounter<=ld) { this.days.push({day:dayCounter++, _isWeekend:
this.isWeekend(p%7), _month:1, _className:"Disableddayclass"}); }
+ if (ld!=7) while (dayCounter<=ld) { this.days.push({day:dayCounter++, _isWeekend:
this.isWeekend(p%7), _month:1, _className:"rich-Disabledrich-Dayclass"}); }
// render
p=0;
@@ -361,8 +361,8 @@
if (dataobj) {
element.data=dataobj.day;
element.innerHTML = this.params.dayListMarkupArray[p]( dataobj );
- element.className = dataobj._className + (todayflag /*&& dataobj._month==0
*/&& dataobj.day==todaydate ? " Todayclass" : "");
- if (selectedflag && dataobj._month==0 && dataobj.day==selecteddate)
{ this.selectedDateElement = element; element.className+=" Selecteddayclass"; }
+ element.className = dataobj._className + (todayflag /*&& dataobj._month==0
*/&& dataobj.day==todaydate ? " rich-Torich-Dayclass" : "");
+ if (selectedflag && dataobj._month==0 && dataobj.day==selecteddate)
{ this.selectedDateElement = element; element.className+="
rich-Selectedrich-Dayclass"; }
this.setCellEvents(element);
p++;
} else {
Modified: trunk/ui/calendar/design/calendar-js/calendar-xhtml.html
===================================================================
--- trunk/ui/calendar/design/calendar-js/calendar-xhtml.html 2007-08-25 01:40:38 UTC (rev
2493)
+++ trunk/ui/calendar/design/calendar-js/calendar-xhtml.html 2007-08-25 10:31:25 UTC (rev
2494)
@@ -8,33 +8,33 @@
<meta http-equiv="Content-Type" content="text/xhtml" />
<style type="text/css">
-.Dayclass {
+.rich-Dayclass {
color: #000000;
font-weight:bold;
}
-.Weekendclass {
+.rich-Weekendclass {
color:#800000;
font-weight:bold;
}
-.Commondayclass {
+.rich-Commonrich-Dayclass {
color: #000080;
}
-.Hovereddayclass {
+.rich-Hoveredrich-Dayclass {
color:red;
}
-.Weekenddayclass {
+.rich-Weekendrich-Dayclass {
color:#800000;
}
-.Hoveredweekclass {
+.rich-Hoveredweekclass {
color:red;
}
-.Disableddayclass {
+.rich-Disabledrich-Dayclass {
color:gray;
}
-.Todayclass {
+.rich-Torich-Dayclass {
background-color: #f0f0f0;
}
-.Selecteddayclass {
+.rich-Selectedrich-Dayclass {
background-color: #f08080;
}
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-25
01:40:38 UTC (rev 2493)
+++
trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/css/calendar.xcss 2007-08-25
10:31:25 UTC (rev 2494)
@@ -3,29 +3,29 @@
xmlns:u='http:/jsf.exadel.com/template/util'
xmlns="http://www.w3.org/1999/xhtml" >
<f:verbatim><![CDATA[
-.calendar_exterior{
+.rich-calendar-exterior{
border : 1px solid;
}
-.calendar_btn{
+.rich-calendar-btn{
cursor : pointer;
}
-.calendar_header_optional{
+.rich-calendar-header-optional{
border-bottom : 1px solid;
padding : 7px;
height : 22px;
}
-.calendar_header{
+.rich-calendar-header{
border-right : 0px solid;
border-bottom : 1px solid;
}
-.cell_size{
+.rich-cell-size{
width : 25px;
height : 22px;
}
-.calendar_cell{
+.rich-calendar-cell{
border-bottom : 1px solid;
border-right : 1px solid;
padding : 0px;
@@ -33,19 +33,19 @@
text-align : center;
}
-.calendar_tool{
+.rich-calendar-tool{
vertical-align : middle;
text-align : center;
width : 25px;
height : 22px;
}
-.calendar_month{
+.rich-calendar-month{
vertical-align : middle;
text-align : center;
}
-.calendar_days{
+.rich-calendar-days{
border-bottom : 1px solid;
border-right : 0px solid;
vertical-align : middle;
@@ -53,7 +53,7 @@
height : 22px;
}
-.calendar_week{
+.rich-calendar-week{
border-bottom : 1px solid;
border-right : 1px solid;
/* background-color : #f5f5f5; /*unknown parameter - need to add*/ */
@@ -62,67 +62,67 @@
width : 25px;
}
-/*.calendar_holly{
+/*.rich-calendar-holly{
background-color : #ffebda; /*unknown parameter - need to add*/
color : #ff7800; /*unknown parameter - need to add*/
}*/
-/*.calendar_current{
+/*.rich-calendar-current{
background-color : #ff7800; /*unknown parameter - need to add*/
color : #ffebda; /*unknown parameter - need to add*/
font-weight : bold;
}*/
-.calendar_spec{
+.rich-calendar-spec{
background-color : #e4f5e2; /*unknown parameter - need to add*/
}
-.right_cell{
+.rich-right-cell{
border-right : 0px;
}
-.bottom_cell{
+.rich-bottom-cell{
border-bottom : 0px;
}
-.calendar_toolfooter{
+.rich-calendar-toolfooter{
padding : 0px 7px 0px 7px;
height : 22px;
}
-.calendar_footer_optional{
+.rich-calendar-footer-optional{
border-top : 1px solid;
border-right : 0px solid;
padding : 7px;
height : 22px;
}
-.calendar_footer{
+.rich-calendar-footer{
border-top : 1px solid;
border-right : 0px solid;
}
]]>
</f:verbatim>
- <u:selector name=".calendar_exterior">
+ <u:selector name=".rich-calendar-exterior">
<u:style name="border-color" skin="panelBorderColor"/>
</u:selector>
- <u:selector name=".calendar_header_optional">
+ <u:selector name=".rich-calendar-header-optional">
<u:style name="border-bottom-color"
skin="panelBorderColor"/>
<u:style name="background-color"
skin="additionalBackgroundColor"/>
<u:style name="font-size" skin="generalSizeFont"/>
<u:style name="font-family" skin="generalFamilyFont"/>
</u:selector>
- <u:selector name=".calendar_header">
+ <u:selector name=".rich-calendar-header">
<u:style name="border-bottom-color"
skin="panelBorderColor"/>
<u:style name="background-color"
skin="additionalBackgroundColor"/>
<u:style name="font-size" skin="generalSizeFont"/>
<u:style name="font-family" skin="generalFamilyFont"/>
</u:selector>
- <u:selector name=".calendar_cell">
+ <u:selector name=".rich-calendar-cell">
<u:style name="border-bottom-color"
skin="panelBorderColor"/>
<u:style name="border-right-color" skin="panelBorderColor"/>
<u:style name="background-color"
skin="generalBackgroundColor"/>
@@ -130,7 +130,7 @@
<u:style name="font-family" skin="generalFamilyFont"/>
</u:selector>
- <u:selector name=".calendar_tool">
+ <u:selector name=".rich-calendar-tool">
<u:style name="background-color"
skin="headerBackgroundColor"/>
<u:style name="font-size" skin="headerSizeFont"/>
<u:style name="font-family" skin="headerFamilyFont"/>
@@ -138,7 +138,7 @@
<u:style name="color" skin="headerTextColor"/>
</u:selector>
- <u:selector name=".calendar_month">
+ <u:selector name=".rich-calendar-month">
<u:style name="background-color"
skin="headerBackgroundColor"/>
<u:style name="font-size" skin="headerSizeFont"/>
<u:style name="font-family" skin="headerFamilyFont"/>
@@ -146,7 +146,7 @@
<u:style name="color" skin="headerTextColor"/>
</u:selector>
- <u:selector name=".calendar_days">
+ <u:selector name=".rich-calendar-days">
<u:style name="border-bottom-color"
skin="panelBorderColor"/>
<u:style name="border-right-color" skin="panelBorderColor"/>
<u:style name="background"
skin="additionalBackgroundColor"/>
@@ -154,12 +154,12 @@
<u:style name="font-family" skin="generalFamilyFont"/>
</u:selector>
- <u:selector name=".Weekendclass">
+ <u:selector name=".rich-Weekendclass">
<u:style name="color" value="red"/>
</u:selector>
/* background-color : #f5f5f5; unknown parameter - need to add*/
- <u:selector name=".calendar_week">
+ <u:selector name=".rich-calendar-week">
<u:style name="background"
skin="additionalBackgroundColor"/>
<u:style name="border-bottom-color"
skin="panelBorderColor"/>
<u:style name="border-right-color" skin="panelBorderColor"/>
@@ -168,54 +168,54 @@
</u:selector>
- <u:selector name=".calendar_holly">
+ <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:selector>
/*
-.calendar_current{
+.rich-calendar-current{
background-color : #ff7800; /*unknown parameter - need to add
color : #ffebda; /*unknown parameter - need to add
font-weight : bold;
}
*/
/*
-.calendar_spec{
+.rich-calendar-spec{
background-color : #e4f5e2; /*unknown parameter - need to add
}
*/
- <u:selector name=".calendar_boundary_dates">
+ <u:selector name=".rich-calendar-boundary-dates">
<u:style name="color" value="#a0a0a0"/> /*unknown parameter -
need to add*/
</u:selector>
- <u:selector name=".calendar_current">
+ <u:selector name=".rich-calendar-current">
<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="font-weight" value="bold"/>
</u:selector>
- <u:selector name=".calendar_select">
+ <u:selector name=".rich-calendar-select">
<u:style name="background-color"
skin="headerBackgroundColor"/>
<u:style name="color" skin="headerTextColor"/>
<u:style name="font-weight" skin="headerWeightFont"/>
</u:selector>
- <u:selector name=".calendar_hover">
+ <u:selector name=".rich-calendar-hover">
<u:style name="background-color" value="#f3f3f3"/> /*unknown
parameter - need to add*/
</u:selector>
- <u:selector name=".calendar_current.calendar_hover">
+ <u:selector name=".rich-calendar-current.rich-calendar-hover">
<u:style name="color" value="#ff7800"/> /*unknown parameter -
need to add*/
</u:selector>
- <u:selector name=".calendar_toolfooter">
+ <u:selector name=".rich-calendar-toolfooter">
<u:style name="background"
skin="additionalBackgroundColor"/>
<u:style name="font-size" skin="generalSizeFont"/>
<u:style name="font-family" skin="generalFamilyFont"/>
</u:selector>
- <u:selector name=".calendar_footer_optional">
+ <u:selector name=".rich-calendar-footer-optional">
<u:style name="border-top-color" skin="panelBorderColor"/>
<u:style name="border-right-color" skin="panelBorderColor"/>
<u:style name="background"
skin="additionalBackgroundColor"/>
@@ -223,7 +223,7 @@
<u:style name="font-family" skin="generalFamilyFont"/>
</u:selector>
- <u:selector name=".calendar_footer">
+ <u:selector name=".rich-calendar-footer">
<u:style name="border-top-color" skin="panelBorderColor"/>
<u:style name="border-right-color" skin="panelBorderColor"/>
<u:style name="background"
skin="additionalBackgroundColor"/>
@@ -231,7 +231,7 @@
<u:style name="font-family" skin="generalFamilyFont"/>
</u:selector>
- <u:selector name=".calendar_popupicon">
+ <u:selector name=".rich-calendar-popupicon">
<u:style name="cursor" value="pointer"/>
<u:style name="vertical-align" value="middle"/>
</u:selector>
Modified:
trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js
===================================================================
---
trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js 2007-08-25
01:40:38 UTC (rev 2493)
+++
trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js 2007-08-25
10:31:25 UTC (rev 2494)
@@ -450,12 +450,12 @@
var htmlTextHeader = (!this.params.popup ? '<input
id="'+this.INPUT_DATE_ID+'"
name="'+this.INPUT_DATE_ID+'" type="hidden"
style="display:none"
value="'+this.getSelectedDateString(this.params.datePattern)+'"/>\n'
: '') +
'<input id="'+this.id+'InputCurrentDate"
name="'+this.id+'InputCurrentDate" type="hidden"
style="display:none"
value="'+this.getCurrentDate().format("MM/y")+'"/>\n'
+
- '<table border="0" cellpadding="0"
cellspacing="0" class="calendar_exterior"><tbody>\n';
+ '<table border="0" cellpadding="0"
cellspacing="0"
class="rich-calendar-exterior"><tbody>\n';
var colspan = (this.params.showWeeksBar ? "8" : "7");
- var htmlHeaderOptional = (this.params.headerOptionalMarkup) ? '<tr><td
class="calendar_header_optional" colspan="'+colspan+'"
id="'+this.id+'HeaderOptional"></td></tr>' :
'';
- var htmlFooterOptional = (this.params.footerOptionalMarkup) ? '<tr><td
class="calendar_footer_optional" colspan="'+colspan+'"
id="'+this.id+'FooterOptional"></td></tr>' :
'';
- var htmlControlsHeader = '<tr><td class="calendar_header"
colspan="'+colspan+'"
id="'+this.id+'Header"></td></tr>';
- var htmlControlsFooter = '<tr><td class="calendar_footer"
colspan="'+colspan+'"
id="'+this.id+'Footer"></td></tr>';
+ var htmlHeaderOptional = (this.params.headerOptionalMarkup) ? '<tr><td
class="rich-calendar-header-optional" colspan="'+colspan+'"
id="'+this.id+'HeaderOptional"></td></tr>' :
'';
+ var htmlFooterOptional = (this.params.footerOptionalMarkup) ? '<tr><td
class="rich-calendar-footer-optional" colspan="'+colspan+'"
id="'+this.id+'FooterOptional"></td></tr>' :
'';
+ var htmlControlsHeader = '<tr><td class="rich-calendar-header"
colspan="'+colspan+'"
id="'+this.id+'Header"></td></tr>';
+ var htmlControlsFooter = '<tr><td class="rich-calendar-footer"
colspan="'+colspan+'"
id="'+this.id+'Footer"></td></tr>';
var htmlTextFooter = '</tbody></table>\n'
var htmlTextIFrame = '';
@@ -484,17 +484,17 @@
if (this.params.showWeekDaysBar)
{
var htmlTextWeekDayBar = '<tr
id="'+this.params.weekDayBarId+'">';
- if (this.params.showWeeksBar) htmlTextWeekDayBar+='<td
class="calendar_days"><br/></td>';
+ if (this.params.showWeeksBar) htmlTextWeekDayBar+='<td
class="rich-calendar-days"><br/></td>';
var weekDayCounter = this.params.firstWeekDay;
for (var i=0;i<7;i++)
{
var weekDayHtml = this.evaluateMarkup(this.params.weekDayMarkup, {weekDayLabel:
this.params.weekDayLabelsShort[weekDayCounter], weekDayNumber:weekDayCounter,
componentId:this.getWeekDayComponentId(i)} );
if (weekDayCounter==6) weekDayCounter=0; else weekDayCounter++;
- styleClass = "calendar_days";
- if (i==this.firstWeekendDayNumber || i==this.secondWeekendDayNumber) styleClass +=
" Weekendclass";
+ styleClass = "rich-calendar-days";
+ if (i==this.firstWeekendDayNumber || i==this.secondWeekendDayNumber) styleClass +=
" rich-Weekendclass";
- if (i==6) styleClass += " right_cell";
+ if (i==6) styleClass += " rich-right-cell";
htmlTextWeekDayBar+='<td
class="'+styleClass+'">'+weekDayHtml+'</td>';
}
htmlTextWeekDayBar+='</tr>\n';
@@ -506,20 +506,20 @@
for (k=1;k<7;k++)
{
- bottomStyleClass = (k==6 ? "bottom_cell " : "");
+ bottomStyleClass = (k==6 ? "rich-bottom-cell " : "");
htmlTextWeek+='<tr
id="'+this.params.weekNumberBarId+k+'">';
if (this.params.showWeeksBar)
{
var weekNumberHtml = this.evaluateMarkup(this.params.weekNumberMarkup, {weekNumber:
k, componentId:this.getWeekNumberComponentId(k-1)} );
- htmlTextWeek+='<td class="calendar_week
'+bottomStyleClass+'">'+weekNumberHtml+'</td>';
+ htmlTextWeek+='<td class="rich-calendar-week
'+bottomStyleClass+'">'+weekNumberHtml+'</td>';
}
// day cells creation
for (var i=0;i<7;i++)
{
- styleClass = bottomStyleClass+"cell_size calendar_cell";
- if (i==this.firstWeekendDayNumber || i==this.secondWeekendDayNumber)
styleClass+=" calendar_holly";
- if (i==6) styleClass+=" right_cell";
+ styleClass = bottomStyleClass+"rich-cell-size rich-calendar-cell";
+ if (i==this.firstWeekendDayNumber || i==this.secondWeekendDayNumber)
styleClass+=" rich-calendar-holly";
+ if (i==6) styleClass+=" rich-right-cell";
htmlTextWeek+='<td class="'+styleClass+'"
id="'+this.DATE_ELEMENT_ID+p+'"></td>';
p++;
@@ -733,9 +733,9 @@
{
this.selectedDate=new Date(this.currentDate);
this.selectedDate.setDate(obj.data);
- if (this.selectedDateElement) Element.removeClassName(this.selectedDateElement,
"Selecteddayclass");
+ if (this.selectedDateElement) Element.removeClassName(this.selectedDateElement,
"rich-Selectedrich-Dayclass");
this.selectedDateElement = obj;
- Element.addClassName(obj, "Selecteddayclass");
+ Element.addClassName(obj, "rich-Selectedrich-Dayclass");
$(this.INPUT_DATE_ID).value=this.getSelectedDateString(this.params.datePattern);
this.renderHeader();
@@ -763,7 +763,7 @@
if (obj)
{
var daydata = this.days[parseInt(obj.id.substr(this.DATE_ELEMENT_ID.length),10)];
- if (daydata._month==0) Element.addClassName(obj,'calendar_hover');
+ if (daydata._month==0) Element.addClassName(obj,'rich-calendar-hover');
}
},
@@ -772,7 +772,7 @@
if (obj)
{
var daydata = this.days[parseInt(obj.id.substr(this.DATE_ELEMENT_ID.length),10)];
- if (daydata._month==0) Element.removeClassName(obj,'calendar_hover');
+ if (daydata._month==0) Element.removeClassName(obj,'rich-calendar-hover');
}
},
@@ -920,7 +920,7 @@
//var _d=new Date();
if (this.selectedDateElement) {
- Element.classNames(this.selectedDateElement).remove("Selecteddayclass");
+ Element.classNames(this.selectedDateElement).remove("rich-Selectedrich-Dayclass");
this.selectedDateElement = null;
}
@@ -949,7 +949,7 @@
while (element)
{
- // TODO calendar_spec class not implemented
+ // TODO rich-calendar-spec class not implemented
// TODO fix start/stop event's calls
this.stopCellEvents(element);
@@ -959,28 +959,28 @@
// class styles
e = Element.classNames(element);
- if (dataobj._month!=0) { e.add('calendar_boundary_dates'); if
(boundaryDatesModeFlag) e.add('calendar_btn'); else
e.remove('calendar_btn');}
+ if (dataobj._month!=0) { e.add('rich-calendar-boundary-dates'); if
(boundaryDatesModeFlag) e.add('rich-calendar-btn'); else
e.remove('rich-calendar-btn');}
else
{
- e.remove('calendar_boundary_dates');
- e.add('calendar_btn');
+ e.remove('rich-calendar-boundary-dates');
+ e.add('rich-calendar-btn');
}
- // TODO make some optimization with calendar_current class
+ // TODO make some optimization with rich-calendar-current class
if (todayflag && dataobj._month==0 && dataobj.day==todaydate)
{
this.todayCellId = element.id;
this.todayCellColor = Element.getStyle(element,
'background-color').parseColor();
- e.add("calendar_current");
+ e.add("rich-calendar-current");
}
else
{
- e.remove("calendar_current");
+ e.remove("rich-calendar-current");
}
if (selectedflag && dataobj._month==0 && dataobj.day==selecteddate)
{
this.selectedDateElement = element;
- e.add("Selecteddayclass");
+ e.add("rich-Selectedrich-Dayclass");
}
this.setCellEvents(element);
@@ -1133,7 +1133,7 @@
}
else
{
- if (this.selectedDateElement) Element.removeClassName(this.selectedDateElement,
"Selecteddayclass");
+ if (this.selectedDateElement) Element.removeClassName(this.selectedDateElement,
"rich-Selectedrich-Dayclass");
if (oldSelectedDate!=null) if (noUpdate) this.render(); else this.onUpdate();
this.today(noUpdate);
}
@@ -1163,7 +1163,7 @@
CalendarView.getControl = function(text, functionName) {
var attr = {
onclick: (functionName ?
"Richfaces.invokeOnComponent('richfaces:calendar',this,'"+functionName+"');"
: "")+"return false;",
- className: "calendar_btn"
+ className: "rich-calendar-btn"
};
return new E('div',attr,[new T(text)]);
@@ -1172,7 +1172,7 @@
CalendarView.getSelectedDateControl = function(text, functionName) {
var attr = {
onclick:
"Richfaces.invokeOnComponent('richfaces:calendar',this,'selectDate');
return false;",
- className: "calendar_btn"
+ className: "rich-calendar-btn"
};
var a = [new T(text)];
@@ -1201,23 +1201,23 @@
[
new E('tr',{},
[
- new E('td',{'class': 'calendar_tool'},
+ new E('td',{'class': 'rich-calendar-tool'},
[
new ET(function (context) { return
Richfaces.evalMacro("previousYearControl", context)})
]),
- new E('td',{'class': 'calendar_tool'},
+ new E('td',{'class': 'rich-calendar-tool'},
[
new ET(function (context) { return
Richfaces.evalMacro("previousMonthControl", context)})
]),
- new E('td',{'class': 'calendar_month'},
+ new E('td',{'class': 'rich-calendar-month'},
[
new ET(function (context) { return
Richfaces.evalMacro("currentMonthControl", context)})
]),
- new E('td',{'class': 'calendar_tool'},
+ new E('td',{'class': 'rich-calendar-tool'},
[
new ET(function (context) { return
Richfaces.evalMacro("nextMonthControl", context)})
]),
- new E('td',{'class': 'calendar_tool'},
+ new E('td',{'class': 'rich-calendar-tool'},
[
new ET(function (context) { return Richfaces.evalMacro("nextYearControl",
context)})
])
@@ -1233,15 +1233,15 @@
[
new E('tr',{},
[
- /*new E('td',{'class': 'calendar_toolfooter'},
+ /*new E('td',{'class': 'rich-calendar-toolfooter'},
[
new ET(function (context) { return
Richfaces.evalMacro("resetSelectedDateControl", context)})
]),*/
- new E('td',{'class': 'calendar_toolfooter', 'style':
'white-space:nowrap'},
+ new E('td',{'class': 'rich-calendar-toolfooter',
'style': 'white-space:nowrap'},
[
new ET(function (context) { return
Richfaces.evalMacro("selectedDateControl", context)})
]),
- new E('td',{'class': 'calendar_toolfooter', 'align':
'right'},
+ new E('td',{'class': 'rich-calendar-toolfooter',
'align': 'right'},
[
new ET(function (context) { return Richfaces.evalMacro("todayControl",
context)})
])
Modified: trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx
===================================================================
--- trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx 2007-08-25
01:40:38 UTC (rev 2493)
+++ trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx 2007-08-25
10:31:25 UTC (rev 2494)
@@ -136,7 +136,7 @@
onclick="#{onclick}">
</input>
<img id="#{clientId}PopupButton"
- class="calendar_popupicon"
+ class="rich-calendar-popupicon"
src="#{icon}"
accesskey="#{component.attributes['accesskey']}"
name="#{clientId}"