Fixes #2142: IPopupCalendar's button contains "..." (some layouts break in IE6).

svn changeset:5632/svn branch:trunk

diff --git a/WebContent/ITMILL/themes/default/datefield/datefield.css b/WebContent/ITMILL/themes/default/datefield/datefield.css
index 7bdc5262e6f1e4c7980ec6a7349fa0ba20a3678b..f541f17b4b2b4d65434d0b41b9456191ec2afb11 100644 (file)
--- a/WebContent/ITMILL/themes/default/datefield/datefield.css
+++ b/WebContent/ITMILL/themes/default/datefield/datefield.css
@@ -1,12 +1,16 @@
+.i-datefield-textfield {
+       vertical-align: top;
+}
+
 .i-datefield-button {
        font-size:13px;\r
        width: 22px;\r
-       height: 25px;\r
+       height: 24px;\r
        padding: 0;\r
        overflow: hidden;\r
        border: none;\r
-       background: transparent url(img/open-button.png) no-repeat right 1px;\r
-       text-indent: -90000px;\r
+       background: transparent url(img/open-button.png) no-repeat right 0;
+       vertical-align: top;\r
 }\r
 \r
 .i-datefield-popup {\r
@@ -193,6 +197,17 @@
        background: #ff9999;
 }
 
+
+
+
+/* IE specific styles */
+
+*+html .i-datefield-button {
+       background-position: right 1px;
+       height: 25px;
+       margin: 0;
+}
+
 /* IE somehow loses generic i-disabled alpha. See #1960 */
 * html .i-disabled .i-datefield-button,
 * html .i-disabled .i-datefield-textfield {

diff --git a/WebContent/ITMILL/themes/default/styles.css b/WebContent/ITMILL/themes/default/styles.css
index e03e9ce45d825d5fb3c6e56f1e64a9d06921c97a..cfe883c08073cb4420d1bf5cd01a9a3d7e638c25 100644 (file)
--- a/WebContent/ITMILL/themes/default/styles.css
+++ b/WebContent/ITMILL/themes/default/styles.css
@@ -412,15 +412,19 @@ input.i-modified,
        margin-bottom: 0px;
        margin-left: 0px;
 }
+.i-datefield-textfield {
+       vertical-align: top;
+}
+
 .i-datefield-button {
        font-size:13px;
        width: 22px;
-       height: 25px;
+       height: 24px;
        padding: 0;
        overflow: hidden;
        border: none;
-       background: transparent url(datefield/img/open-button.png) no-repeat right 1px;
-       text-indent: -90000px;
+       background: transparent url(datefield/img/open-button.png) no-repeat right 0;
+       vertical-align: top;
 }
 
 .i-datefield-popup {
@@ -607,6 +611,17 @@ input.i-modified,
        background: #ff9999;
 }
 
+
+
+
+/* IE specific styles */
+
+*+html .i-datefield-button {
+       background-position: right 1px;
+       height: 25px;
+       margin: 0;
+}
+
 /* IE somehow loses generic i-disabled alpha. See #1960 */
 * html .i-disabled .i-datefield-button,
 * html .i-disabled .i-datefield-textfield {

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IPopupCalendar.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IPopupCalendar.java
index 6b46eb88d0d835fe5f68a0010b4d38f75c0dfd57..fc79272ba3fa89f4435aac8e1859525fd74c8935 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IPopupCalendar.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IPopupCalendar.java
@@ -32,7 +32,7 @@ public class IPopupCalendar extends ITextualDate implements Paintable, Field,
 \r
         calendarToggle = new Button();\r
         calendarToggle.setStyleName(CLASSNAME + "-button");\r
-        calendarToggle.setText("...");\r
+        calendarToggle.setText("");\r
         calendarToggle.addClickListener(this);\r
         add(calendarToggle);\r
 \r