style enhancements (i-error related)

svn changeset:4541/svn branch:trunk

diff --git a/WebContent/ITMILL/themes/default/common/common.css b/WebContent/ITMILL/themes/default/common/common.css
index 2ffb82d6ce2951ef7a80e61ce9db811ccf1f51c0..99e386b8ae889c20a7d8119b4a5668e9fbb45526 100644 (file)
--- a/WebContent/ITMILL/themes/default/common/common.css
+++ b/WebContent/ITMILL/themes/default/common/common.css
@@ -26,6 +26,10 @@
        border-top:1px solid transparent;
 }
 
+.i-view:active, .i-view:focus { 
+       outline: none;
+}
+
 .i-app input, 
 .i-window input, 
 .i-app select, 
@@ -63,7 +67,8 @@ input.i-modified,
 .i-modified .i-select-select,\r
 .i-modified .i-select-twincol-selections,\r
 .i-modified .i-select-twincol-options,\r
-.i-modified .i-slider-base {\r
+.i-modified .i-slider-base {
+       background:transparent;\r
        background-color: #FFFFE0;\r
 }\r
 
@@ -77,6 +82,7 @@ input.i-error,
 .i-error .i-select-twincol-selections,\r
 .i-error .i-select-twincol-options,\r
 .i-error .i-slider-base {\r
+       background:transparent;
        background-color: #FFE0E0;\r
 }
 

diff --git a/WebContent/ITMILL/themes/default/datefield/datefield.css b/WebContent/ITMILL/themes/default/datefield/datefield.css
index c5a7b87ccc259772b67d2e68d59381897861c999..7ddf948f5ac3d7083f8cebba76520c1fe0da38d1 100644 (file)
--- a/WebContent/ITMILL/themes/default/datefield/datefield.css
+++ b/WebContent/ITMILL/themes/default/datefield/datefield.css
@@ -170,4 +170,8 @@
        font-size: 10px;\r
        padding: 0;\r
        margin: 0;\r
-}
\ No newline at end of file
+}
+
+.i-datefield-error .i-textfield {
+       background: #ff9999;
+}

diff --git a/WebContent/ITMILL/themes/default/styles.css b/WebContent/ITMILL/themes/default/styles.css
index 32e1f2dd98c819857e6c55215008c462363a77bc..398b7e82d798510d2af987b445ddd112625e3f55 100644 (file)
--- a/WebContent/ITMILL/themes/default/styles.css
+++ b/WebContent/ITMILL/themes/default/styles.css
@@ -104,6 +104,10 @@
        border-top:1px solid transparent;
 }
 
+.i-view:active, .i-view:focus { 
+       outline: none;
+}
+
 .i-app input, 
 .i-window input, 
 .i-app select, 
@@ -142,6 +146,7 @@ input.i-modified,
 .i-modified .i-select-twincol-selections,
 .i-modified .i-select-twincol-options,
 .i-modified .i-slider-base {
+       background:transparent;
        background-color: #FFFFE0;
 }
 
@@ -155,6 +160,7 @@ input.i-error,
 .i-error .i-select-twincol-selections,
 .i-error .i-select-twincol-options,
 .i-error .i-slider-base {
+       background:transparent;
        background-color: #FFE0E0;
 }
 
@@ -410,6 +416,10 @@ input.i-error,
        padding: 0;
        margin: 0;
 }
+
+.i-datefield-error .i-textfield {
+       background: #ff9999;
+}
 .i-expandlayout-lo-table {
        margin:0;
        padding:0;
@@ -1504,11 +1514,6 @@ input.i-error,
        border-color: #5daee8;
 }
 
-.i-textfield-error,
-.i-textarea-error {
-       background: #ff9999;
-}
-
 .i-textfield.i-readonly,
 .i-textarea.i-readonly {
        background: transparent;

diff --git a/WebContent/ITMILL/themes/default/textfield/textfield.css b/WebContent/ITMILL/themes/default/textfield/textfield.css
index 10aa9811f4ac196218068dc731e12fb5a7a8a76a..9f3191dc753820e0dc705fc23cb9211f687ffa7a 100644 (file)
--- a/WebContent/ITMILL/themes/default/textfield/textfield.css
+++ b/WebContent/ITMILL/themes/default/textfield/textfield.css
@@ -27,11 +27,6 @@
        border-color: #5daee8;
 }
 
-.i-textfield-error,
-.i-textarea-error {
-       background: #ff9999;
-}
-
 .i-textfield.i-readonly,
 .i-textarea.i-readonly {
        background: transparent;

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/ITextualDate.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/ITextualDate.java
index 29013f422feac50e5e15b8660818a30ff02a62b9..d4091e9cfb422233bf2d9394bd149b5cb1231098 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ITextualDate.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/ITextualDate.java
@@ -19,6 +19,8 @@ import com.itmill.toolkit.terminal.gwt.client.Util;
 public class ITextualDate extends IDateField implements Paintable, Field,\r
         ChangeListener, ContainerResizedListener, Focusable {\r
 \r
+    private static final String ERROR_CLASSNAME = CLASSNAME + "-error";\r
+\r
     private final ITextField text;\r
 \r
     private String formatStr;\r
@@ -37,8 +39,6 @@ public class ITextualDate extends IDateField implements Paintable, Field,
     }\r
 \r
     public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {\r
-        // remove possibly added invalid value indication\r
-        removeStyleName("i-error");\r
 \r
         int origRes = currentResolution;\r
         super.updateFromUIDL(uidl, client);\r
@@ -97,7 +97,7 @@ public class ITextualDate extends IDateField implements Paintable, Field,
      * \r
      */\r
     protected void buildDate() {\r
-        removeStyleName("i-error");\r
+        removeStyleName(ERROR_CLASSNAME);\r
         // Create the initial text for the textfield\r
         String dateText;\r
         if (date != null) {\r
@@ -124,10 +124,10 @@ public class ITextualDate extends IDateField implements Paintable, Field,
                     date = DateTimeFormat.getFormat(getFormatString()).parse(\r
                             text.getText());\r
                     // remove possibly added invalid value indication\r
-                    removeStyleName("i-error");\r
+                    removeStyleName(ERROR_CLASSNAME);\r
                 } catch (final Exception e) {\r
                     ApplicationConnection.getConsole().log(e.getMessage());\r
-                    addStyleName("i-error");\r
+                    addStyleName(ERROR_CLASSNAME);\r
                     client.updateVariable(id, "lastInvalidDateString", text\r
                             .getText(), false);\r
                     date = null;\r
@@ -135,7 +135,7 @@ public class ITextualDate extends IDateField implements Paintable, Field,
             } else {\r
                 date = null;\r
                 // remove possibly added invalid value indication\r
-                removeStyleName("i-error");\r
+                removeStyleName(ERROR_CLASSNAME);\r
             }\r
 \r
             // Update variables\r