Fixes #1896 Error (!) mark missing from button and checkbox on IE

svn changeset:5023/svn branch:trunk

diff --git a/WebContent/ITMILL/themes/default/button/button.css b/WebContent/ITMILL/themes/default/button/button.css
index 963fd2247f6266ced386e4b7d1dfdcccc4002b80..e7735257a3b8275094bd6ba1b612a8a35ce92c1a 100644 (file)
--- 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 aea7d45b2d2bfa2a70a6405d053fcb49b923c53a..7f558c42b839ef62729ed7bb8a3c3f9d7993f8a9 100644 (file)
--- 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 6f1b3012c27bec9f63de8305561f4d3f84a24c84..68d83f1a13732644f4409176aba29fdd34903357 100644 (file)
--- 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;