fixes #2472, error indicators now works more consistently with checkbox

svn changeset:6681/svn branch:trunk

diff --git a/WebContent/ITMILL/themes/default/button/button.css b/WebContent/ITMILL/themes/default/button/button.css
index b1e20b0c0d99d576b562819650acb4b2f5b461f8..7db961b0fabbd11e31074b6c671f5a47e3b79a27 100644 (file)
--- a/WebContent/ITMILL/themes/default/button/button.css
+++ b/WebContent/ITMILL/themes/default/button/button.css
@@ -27,7 +27,19 @@
 }
 .i-button-link span {
        text-decoration: underline;
-}
+}\r
+\r
+.i-checkbox {\r
+       white-space: nowrap;    \r
+}\r
+       \r
+.i-checkbox .i-errorindicator {\r
+       float: none;\r
+       display:inline;\r
+       padding-left: 10px;\r
+       background-position:left;\r
+}\r
+
 
 /* fixes streched buttons in IE6 */
 * html .i-button {
@@ -46,11 +58,11 @@
 \r
 /* Error indicator on checkbox fix for IE6 */
 * html .i-checkbox * { display: block; float: left;}
-* html .i-checkbox .i-errorindicator {padding-right:4px;}
+* html .i-checkbox .i-errorindicator {background-position:right;display: block; float: left; padding-left: 0px; 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;}
+*+ html .i-checkbox .i-errorindicator {background-position:right;display: block; float: left; padding-left: 0px;;padding-right:7px;}
 
 /* Error indicator on button fix for IE7 */
 *+ html button .i-errorindicator { display:inline; padding-right:5px; }

diff --git a/WebContent/ITMILL/themes/default/styles.css b/WebContent/ITMILL/themes/default/styles.css
index a963d0f94e16307448d49871451024caf5a8a969..d1b43d4fe99facbaf8259f4df4a42e988b1316de 100644 (file)
--- a/WebContent/ITMILL/themes/default/styles.css
+++ b/WebContent/ITMILL/themes/default/styles.css
@@ -77,6 +77,18 @@
        text-decoration: underline;
 }
 
+.i-checkbox {
+       white-space: nowrap;    
+}
+       
+.i-checkbox .i-errorindicator {
+       float: none;
+       display:inline;
+       padding-left: 10px;
+       background-position:left;
+}
+
+
 /* fixes streched buttons in IE6 */
 * html .i-button {
        width: 1px;
@@ -94,11 +106,11 @@
 
 /* Error indicator on checkbox fix for IE6 */
 * html .i-checkbox * { display: block; float: left;}
-* html .i-checkbox .i-errorindicator {padding-right:4px;}
+* html .i-checkbox .i-errorindicator {background-position:right;display: block; float: left; padding-left: 0px; 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;}
+*+ html .i-checkbox .i-errorindicator {background-position:right;display: block; float: left; padding-left: 0px;;padding-right:7px;}
 
 /* Error indicator on button fix for IE7 */
 *+ html button .i-errorindicator { display:inline; padding-right:5px; }

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/ICheckBox.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/ICheckBox.java
index f5fb4842e1b099cb1168f8e53cf5e819e6057024..104399d5d375ca697de8ddd284544b8c36dc0ab0 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ICheckBox.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/ICheckBox.java
@@ -66,9 +66,12 @@ public class ICheckBox extends com.google.gwt.user.client.ui.CheckBox implements
         if (uidl.hasAttribute("error")) {
             if (errorIndicatorElement == null) {
                 errorIndicatorElement = DOM.createDiv();
+                errorIndicatorElement.setInnerHTML(" ");
                 DOM.setElementProperty(errorIndicatorElement, "className",
                         "i-errorindicator");
                 DOM.appendChild(getElement(), errorIndicatorElement);
+                DOM.sinkEvents(errorIndicatorElement, ITooltip.TOOLTIP_EVENTS
+                        | Event.ONCLICK);
             }
         } else if (errorIndicatorElement != null) {
             DOM.setStyleAttribute(errorIndicatorElement, "display", "none");