From 29832d529f38552a3b06659f19bded442d6abb7a Mon Sep 17 00:00:00 2001 From: John Alhroos Date: Mon, 17 May 2010 08:00:35 +0000 Subject: Fix for #4582 svn changeset:13200/svn branch:6.3 --- WebContent/VAADIN/themes/base/datefield/datefield.css | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'WebContent') diff --git a/WebContent/VAADIN/themes/base/datefield/datefield.css b/WebContent/VAADIN/themes/base/datefield/datefield.css index 0103be41da..263eb99820 100644 --- a/WebContent/VAADIN/themes/base/datefield/datefield.css +++ b/WebContent/VAADIN/themes/base/datefield/datefield.css @@ -8,7 +8,11 @@ .v-datefield-button { cursor: pointer; } -.v-readonly .v-datefield-button { +/* We need to limit the scope of the .v-readonly to the date field + * class so the Window:s readonly value is not inherited to the + * datefield button. See ticket #4582 for details. + */ +.v-datefield.v-readonly .v-datefield-button { display: none; } .v-datefield-calendarpanel table { -- cgit v1.2.3 From 691481ec446f2088f01d5d9de2d329bac6d65760 Mon Sep 17 00:00:00 2001 From: John Alhroos Date: Thu, 20 May 2010 08:18:34 +0000 Subject: Fixes IE6 problem with #4582 svn changeset:13264/svn branch:6.3 --- WebContent/VAADIN/themes/base/datefield/datefield.css | 6 +----- WebContent/VAADIN/themes/reindeer/datefield/datefield.css | 2 +- src/com/vaadin/terminal/gwt/client/ui/VPopupCalendar.java | 6 ++++++ 3 files changed, 8 insertions(+), 6 deletions(-) (limited to 'WebContent') diff --git a/WebContent/VAADIN/themes/base/datefield/datefield.css b/WebContent/VAADIN/themes/base/datefield/datefield.css index 263eb99820..e7a26a97fd 100644 --- a/WebContent/VAADIN/themes/base/datefield/datefield.css +++ b/WebContent/VAADIN/themes/base/datefield/datefield.css @@ -8,11 +8,7 @@ .v-datefield-button { cursor: pointer; } -/* We need to limit the scope of the .v-readonly to the date field - * class so the Window:s readonly value is not inherited to the - * datefield button. See ticket #4582 for details. - */ -.v-datefield.v-readonly .v-datefield-button { +.v-datefield .v-datefield-button-readonly { display: none; } .v-datefield-calendarpanel table { diff --git a/WebContent/VAADIN/themes/reindeer/datefield/datefield.css b/WebContent/VAADIN/themes/reindeer/datefield/datefield.css index 8529082ea5..2ae4cb59ee 100644 --- a/WebContent/VAADIN/themes/reindeer/datefield/datefield.css +++ b/WebContent/VAADIN/themes/reindeer/datefield/datefield.css @@ -252,7 +252,7 @@ td.v-datefield-calendarpanel-nextyear { -webkit-border-bottom-right-radius: 0; height: 14px; } -.v-readonly input.v-datefield-textfield { +.v-datefield.v-readonly input.v-datefield-textfield { border-right-width: 1px; border-radius: 3px; -moz-border-radius: 3px; diff --git a/src/com/vaadin/terminal/gwt/client/ui/VPopupCalendar.java b/src/com/vaadin/terminal/gwt/client/ui/VPopupCalendar.java index 547af27179..541b6e92d0 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VPopupCalendar.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VPopupCalendar.java @@ -71,6 +71,12 @@ public class VPopupCalendar extends VTextualDate implements Paintable, Field, updateWidth(); } + calendarToggle.setEnabled(true); + if (readonly) { + calendarToggle.addStyleName(CLASSNAME + "-button-readonly"); + } else { + calendarToggle.removeStyleName(CLASSNAME + "-button-readonly"); + } } @Override -- cgit v1.2.3 From 33f26d680bf8fd686cb2c47656fea6bc641a1565 Mon Sep 17 00:00:00 2001 From: John Alhroos Date: Thu, 20 May 2010 11:42:59 +0000 Subject: Fix for #4161 svn changeset:13271/svn branch:6.3 --- WebContent/VAADIN/themes/reindeer/select/select.css | 6 ++++++ WebContent/VAADIN/themes/runo/select/select.css | 6 ++++++ 2 files changed, 12 insertions(+) (limited to 'WebContent') diff --git a/WebContent/VAADIN/themes/reindeer/select/select.css b/WebContent/VAADIN/themes/reindeer/select/select.css index 94c364df1b..f8ae987b8a 100644 --- a/WebContent/VAADIN/themes/reindeer/select/select.css +++ b/WebContent/VAADIN/themes/reindeer/select/select.css @@ -270,4 +270,10 @@ .v-ie6 .v-select-twincol-buttons .v-button { padding-left: 12px; padding-right: 12px; +} + +/* IE6 needs some help identifying when the input is readonly */ +.v-ie6 .v-filterselect.v-readonly, +.v-ie6 .v-filterselect .v-filterselect-input-readonly { + background: transparent; } \ No newline at end of file diff --git a/WebContent/VAADIN/themes/runo/select/select.css b/WebContent/VAADIN/themes/runo/select/select.css index 2dc3917211..e00e033017 100644 --- a/WebContent/VAADIN/themes/runo/select/select.css +++ b/WebContent/VAADIN/themes/runo/select/select.css @@ -127,6 +127,12 @@ border-top: 1px solid #b6bbbc; } +/* IE6 needs some help identifying when the input is readonly */ +.v-ie6 .v-filterselect.v-readonly, +.v-ie6 .v-filterselect .v-filterselect-input-readonly { + background: transparent; +} + /* Error styles (disabled by default) ---------------------------------- -- cgit v1.2.3