From 4bafd9ae676075f94870e6f8295ae0fc2715b9ef Mon Sep 17 00:00:00 2001 From: Joonas Lehtinen Date: Thu, 3 Jul 2008 12:09:46 +0000 Subject: [PATCH] Fixes #1896 Error (!) mark missing from button and checkbox on IE svn changeset:5023/svn branch:trunk --- .../ITMILL/themes/default/button/button.css | 15 +++++++++++++++ WebContent/ITMILL/themes/tests-tickets/styles.css | 4 ++-- .../toolkit/terminal/gwt/client/ui/IButton.java | 6 ++++++ 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/WebContent/ITMILL/themes/default/button/button.css b/WebContent/ITMILL/themes/default/button/button.css index 963fd2247f..e7735257a3 100644 --- a/WebContent/ITMILL/themes/default/button/button.css +++ b/WebContent/ITMILL/themes/default/button/button.css @@ -33,6 +33,21 @@ width: expression(this.offsetWidth + "px"); } + +/* Error indicator on checkbox fix for IE6 */ +* html .i-checkbox * { display: block; float: left;} +* html .i-checkbox .i-errorindicator {padding-right:4px;} + +/* Error indicator on checkbox fix for IE7 */ +*+ html .i-checkbox * { display: block; float: left;} +*+ html .i-checkbox .i-errorindicator {padding-right:7px;} + +/* Error indicator on button fix for IE7 */ +*+ html button .i-errorindicator { display:inline; padding-right:5px; } + +/* Error indicator on button fix for IE6 */ +* html button .i-errorindicator { display:inline; padding-right:5px;} + /* Disabled by default .i-checkbox-error { diff --git a/WebContent/ITMILL/themes/tests-tickets/styles.css b/WebContent/ITMILL/themes/tests-tickets/styles.css index aea7d45b2d..7f558c42b8 100644 --- a/WebContent/ITMILL/themes/tests-tickets/styles.css +++ b/WebContent/ITMILL/themes/tests-tickets/styles.css @@ -16,8 +16,8 @@ .i-panel-content-layout-testing-panel { background-color: #eee; } - - + + /*****************************************************************************/ /* Ticket 1857 */ /*****************************************************************************/ diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IButton.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IButton.java index 6f1b3012c2..68d83f1a13 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IButton.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IButton.java @@ -11,6 +11,7 @@ import com.google.gwt.user.client.ui.Button; import com.google.gwt.user.client.ui.ClickListener; import com.google.gwt.user.client.ui.Widget; import com.itmill.toolkit.terminal.gwt.client.ApplicationConnection; +import com.itmill.toolkit.terminal.gwt.client.BrowserInfo; import com.itmill.toolkit.terminal.gwt.client.Paintable; import com.itmill.toolkit.terminal.gwt.client.Tooltip; import com.itmill.toolkit.terminal.gwt.client.UIDL; @@ -74,6 +75,11 @@ public class IButton extends Button implements Paintable { } DOM.insertChild(getElement(), errorIndicatorElement, 0); + // Fix for IE6, IE7 + if (BrowserInfo.get().isIE()) { + DOM.setInnerText(errorIndicatorElement, " "); + } + } else if (errorIndicatorElement != null) { DOM.removeChild(getElement(), errorIndicatorElement); errorIndicatorElement = null; -- 2.39.5