From 8a3034e96ebd1e6143515af58c5e674304f5ab65 Mon Sep 17 00:00:00 2001
From: Jouni Koivuviita <jouni.koivuviita@itmill.com>
Date: Mon, 13 Oct 2008 09:04:57 +0000
Subject: [PATCH] Fixes #2142: IPopupCalendar's button contains "..." (some
 layouts break in IE6).

svn changeset:5632/svn branch:trunk
---
 .../themes/default/datefield/datefield.css    | 21 ++++++++++++++++---
 WebContent/ITMILL/themes/default/styles.css   | 21 ++++++++++++++++---
 .../gwt/client/ui/IPopupCalendar.java         |  2 +-
 3 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/WebContent/ITMILL/themes/default/datefield/datefield.css b/WebContent/ITMILL/themes/default/datefield/datefield.css
index 7bdc5262e6..f541f17b4b 100644
--- 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;
 	width: 22px;
-	height: 25px;
+	height: 24px;
 	padding: 0;
 	overflow: hidden;
 	border: none;
-	background: transparent url(img/open-button.png) no-repeat right 1px;
-	text-indent: -90000px;
+	background: transparent url(img/open-button.png) no-repeat right 0;
+	vertical-align: top;
 }
 
 .i-datefield-popup {
@@ -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 e03e9ce45d..cfe883c080 100644
--- 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 6b46eb88d0..fc79272ba3 100644
--- 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,
 
         calendarToggle = new Button();
         calendarToggle.setStyleName(CLASSNAME + "-button");
-        calendarToggle.setText("...");
+        calendarToggle.setText("");
         calendarToggle.addClickListener(this);
         add(calendarToggle);
 
-- 
2.39.5