Merged fix and sample for #2855 - "Implement input prompt for DateField" from /branches/6.4-minor-features

svn changeset:13646/svn branch:6.4

6 files changed, 44 insertions, 6 deletions

diff --git a/WebContent/VAADIN/themes/base/datefield/datefield.css b/WebContent/VAADIN/themes/base/datefield/datefield.css
index e7a26a97fd..f1c38513e1 100644
--- a/WebContent/VAADIN/themes/base/datefield/datefield.css
+++ b/WebContent/VAADIN/themes/base/datefield/datefield.css
@@ -8,6 +8,10 @@
 .v-datefield-button {
 	cursor: pointer;
 }
+.v-datefield-prompt .v-datefield-textfield {
+	color: #999;
+	font-style: italic;
+}
 .v-datefield .v-datefield-button-readonly {
 	display: none;
 }
diff --git a/WebContent/VAADIN/themes/base/styles.css b/WebContent/VAADIN/themes/base/styles.css
index fd3522e312..f445cb2500 100644
--- a/WebContent/VAADIN/themes/base/styles.css
+++ b/WebContent/VAADIN/themes/base/styles.css
@@ -1,5 +1,5 @@
-.v-theme-version:after {content:"9_9_9_INTERNAL-DEBUG-BUILD";}
-.v-theme-version-9_9_9_INTERNAL-DEBUG-BUILD {display: none;}
+.v-theme-version:after {content:"6_4_0_dev-20100607";}
+.v-theme-version-6_4_0_dev-20100607 {display: none;}
 /* Automatically compiled css file from subdirectories. */
 
 .v-absolutelayout-wrapper {
@@ -493,6 +493,10 @@ div.v-app-loading {
 .v-datefield-button {
 	cursor: pointer;
 }
+.v-datefield-prompt .v-datefield-textfield {
+	color: #999;
+	font-style: italic;
+}
 .v-datefield .v-datefield-button-readonly {
 	display: none;
 }
diff --git a/WebContent/VAADIN/themes/reindeer/datefield/datefield.css b/WebContent/VAADIN/themes/reindeer/datefield/datefield.css
index 2ae4cb59ee..3601b38e84 100644
--- a/WebContent/VAADIN/themes/reindeer/datefield/datefield.css
+++ b/WebContent/VAADIN/themes/reindeer/datefield/datefield.css
@@ -258,6 +258,10 @@ td.v-datefield-calendarpanel-nextyear {
 	-moz-border-radius: 3px;
 	-webkit-border-radius: 3px;
 }
+.v-datefield-prompt .v-datefield-textfield {
+	color: #999;
+	font-style: normal;
+}
 .v-datefield-popupcalendar .v-datefield-button {
 	width: 24px;
 	height: 23px;
@@ -361,4 +365,7 @@ td.v-datefield-calendarpanel-nextyear {
 }
 .black .v-datefield-calendarpanel .v-last {
 	background-image: url(img/weekday-last-black.png); /** sprite-ref: black-verticals; sprite-alignment: right */
+}
+.black .v-datefield-prompt .v-datefield-textfield {
+	color: #5f6366;
 }
\ No newline at end of file
diff --git a/WebContent/VAADIN/themes/reindeer/styles.css b/WebContent/VAADIN/themes/reindeer/styles.css
index 7252230469..740423593f 100644
--- a/WebContent/VAADIN/themes/reindeer/styles.css
+++ b/WebContent/VAADIN/themes/reindeer/styles.css
@@ -1,5 +1,5 @@
-.v-theme-version:after {content:"9_9_9_INTERNAL-DEBUG-BUILD";}
-.v-theme-version-9_9_9_INTERNAL-DEBUG-BUILD {display: none;}
+.v-theme-version:after {content:"6_4_0_dev-20100607";}
+.v-theme-version-6_4_0_dev-20100607 {display: none;}
 /* Automatically compiled css file from subdirectories. */
 
 .v-absolutelayout-wrapper {
@@ -493,6 +493,10 @@ div.v-app-loading {
 .v-datefield-button {
 	cursor: pointer;
 }
+.v-datefield-prompt .v-datefield-textfield {
+	color: #999;
+	font-style: italic;
+}
 .v-datefield .v-datefield-button-readonly {
 	display: none;
 }
@@ -3056,6 +3060,10 @@ td.v-datefield-calendarpanel-nextyear {
 	-moz-border-radius: 3px;
 	-webkit-border-radius: 3px;
 }
+.v-datefield-prompt .v-datefield-textfield {
+	color: #999;
+	font-style: normal;
+}
 .v-datefield-popupcalendar .v-datefield-button {
 	width: 24px;
 	height: 23px;
@@ -3194,6 +3202,9 @@ td.v-datefield-calendarpanel-nextyear {
   -background-image: url(common/img/black-vertical-sprites-ie6.png);
   background-position: right -294px;
 }
+.black .v-datefield-prompt .v-datefield-textfield {
+	color: #5f6366;
+}
 
 .v-formlayout-errorcell {
 	width: 13px;
diff --git a/WebContent/VAADIN/themes/runo/datefield/datefield.css b/WebContent/VAADIN/themes/runo/datefield/datefield.css
index 290784d97d..0b65fd9054 100644
--- a/WebContent/VAADIN/themes/runo/datefield/datefield.css
+++ b/WebContent/VAADIN/themes/runo/datefield/datefield.css
@@ -139,6 +139,10 @@ td.v-datefield-calendarpanel-month {
 .v-datefield-rendererror .v-textfield {
 	background: #ff9999;
 }
+.v-datefield-prompt .v-datefield-textfield {
+	color: #999;
+	font-style: normal;
+}
 /* IE specific styles */
 .v-ie7 .v-datefield-button {
 	background-position: right 1px;
diff --git a/WebContent/VAADIN/themes/runo/styles.css b/WebContent/VAADIN/themes/runo/styles.css
index 1b248f22d8..a8f3fd26f9 100644
--- a/WebContent/VAADIN/themes/runo/styles.css
+++ b/WebContent/VAADIN/themes/runo/styles.css
@@ -1,5 +1,5 @@
-.v-theme-version:after {content:"9_9_9_INTERNAL-DEBUG-BUILD";}
-.v-theme-version-9_9_9_INTERNAL-DEBUG-BUILD {display: none;}
+.v-theme-version:after {content:"6_4_0_dev-20100607";}
+.v-theme-version-6_4_0_dev-20100607 {display: none;}
 /* Automatically compiled css file from subdirectories. */
 
 .v-absolutelayout-wrapper {
@@ -493,6 +493,10 @@ div.v-app-loading {
 .v-datefield-button {
 	cursor: pointer;
 }
+.v-datefield-prompt .v-datefield-textfield {
+	color: #999;
+	font-style: italic;
+}
 .v-datefield .v-datefield-button-readonly {
 	display: none;
 }
@@ -2654,6 +2658,10 @@ td.v-datefield-calendarpanel-month {
 .v-datefield-rendererror .v-textfield {
 	background: #ff9999;
 }
+.v-datefield-prompt .v-datefield-textfield {
+	color: #999;
+	font-style: normal;
+}
 /* IE specific styles */
 .v-ie7 .v-datefield-button {
 	background-position: right 1px;