From a5467e842316daf6a8a4345740f05a9731167ce1 Mon Sep 17 00:00:00 2001
From: xue <>
Date: Sat, 23 Sep 2006 01:51:57 +0000
Subject: merge from 3.0 branch till 1435.

---
 framework/Web/Javascripts/datepicker/datepicker.js |  8 ++++---
 framework/Web/Javascripts/datepicker/default.css   | 26 +++++++++++-----------
 2 files changed, 18 insertions(+), 16 deletions(-)

(limited to 'framework/Web/Javascripts/datepicker')

diff --git a/framework/Web/Javascripts/datepicker/datepicker.js b/framework/Web/Javascripts/datepicker/datepicker.js
index 5fff5f0f..2f1e8261 100644
--- a/framework/Web/Javascripts/datepicker/datepicker.js
+++ b/framework/Web/Javascripts/datepicker/datepicker.js
@@ -53,7 +53,9 @@ Prado.WebUI.TDatePicker.prototype =
 
 	FirstDayOfWeek : 1, // 0 for sunday
 
-	ClassName : "TDatePicker",
+	ClassName : "",
+
+	CalendarStyle : "default",
 
 	FromYear : 2000, UpToYear: 2015,
 
@@ -97,7 +99,7 @@ Prado.WebUI.TDatePicker.prototype =
 
 		// Create the top-level div element
 		this._calDiv = document.createElement("div");
-		this._calDiv.className = this.ClassName;
+		this._calDiv.className = "TDatePicker_"+this.CalendarStyle+" "+this.ClassName;
 		this._calDiv.style.display = "none";
 		this._calDiv.style.position = "absolute"
 
@@ -581,7 +583,7 @@ Prado.WebUI.TDatePicker.prototype =
 		var within = false;
 		do
 		{
-			within = within || el.className == this.ClassName;
+			within = within || (el.className && Element.hasClassName(el, "TDatePicker_"+this.CalendarStyle));
 			within = within || el == this.trigger;
 			within = within || el == this.control;
 			if(within) break;
diff --git a/framework/Web/Javascripts/datepicker/default.css b/framework/Web/Javascripts/datepicker/default.css
index 7e920f1b..9532dad0 100644
--- a/framework/Web/Javascripts/datepicker/default.css
+++ b/framework/Web/Javascripts/datepicker/default.css
@@ -1,4 +1,4 @@
-.TDatePicker
+.TDatePicker_default
 {
 	border: 1px solid #919EA9;
 	background-color: White;
@@ -27,69 +27,69 @@
 	border-color: #ddd;
 }
 
-.TDatePicker select
+.TDatePicker_default select
 {
 	font-size: 11px;
 }
 
-.TDatePicker input.button
+.TDatePicker_default input.button
 {
 	font-size: 11px;
 	width: 32px;
 }
 
-.TDatePicker .date
+.TDatePicker_default .date
 {
 	padding: 4px 0;
 	border: 1px solid white;
 	text-align: center;
 }
-.TDatePicker .hover
+.TDatePicker_default .hover
 {
 	border: 1px solid blue;
 }
-.TDatePicker .selected 
+.TDatePicker_default .selected 
 {
 	background-color: blue;
 	border: 1px solid blue;
 	color: white;
 }
-.TDatePicker .today
+.TDatePicker_default .today
 {
 	font-weight: bold;
 }
 
-.TDatePicker td.empty
+.TDatePicker_default td.empty
 {
 	border: 1px solid white;
 	cursor: default;
 	height: 22px;
 }
 
-.TDatePicker th
+.TDatePicker_default th
 {
 	width: 28px;
 }
 
-.TDatePicker .calendarBody
+.TDatePicker_default .calendarBody
 {
 	text-align: center;
 	width: 210px;
 	margin: 3px 6px;
 }
 
-.TDatePicker .grid
+.TDatePicker_default .grid
 {
 	border-spacing: 0px;
 }
 
-.TDatePicker .calendarFooter
+.TDatePicker_default .calendarFooter
 {
 	margin: 2px;
 	border-top: 1px solid #919EA9;
 	padding-top: 2px;
 }
-.TDatePicker .todayButton
+.TDatePicker_default .todayButton
 {
 	font-size: 11px;
 	margin: 4px;
-- 
cgit v1.2.3