CSS classnames refactored.

svn changeset:1729/svn branch:trunk

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/TkTextField.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/TkTextField.java
index d8d7101a2181577c7268ae429d02b287ae31da21..3ee95dff3d82a37791477a56a7af7f531ce9e250 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/TkTextField.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/TkTextField.java
@@ -22,12 +22,12 @@ public class TkTextField extends TextBoxBase implements
        /**
         * The input node CSS classname.
         */
-       private static final String CLASSNAME = "itk-textfield";
+       private static final String CLASSNAME = "i-textfield";
        
        /**
         * This CSS classname is added to the input node on hover.
         */
-       private static final String CLASSNAME_FOCUS = "itk-textfield-focus";
+       private static final String CLASSNAME_FOCUS = "i-textfield-focus";
 
        private String id;
 
@@ -58,8 +58,15 @@ public class TkTextField extends TextBoxBase implements
                if(uidl.hasAttribute("cols"))
                        setWidth(uidl.getStringAttribute("cols")+"em");
                
-               setText(uidl.getStringVariable("text"));
+               // Disabled takes precedence over readonly
+               if(uidl.hasAttribute("disabled"))
+                       setEnabled(!uidl.getBooleanAttribute("disabled"));
+               else
+                       setEnabled(!uidl.getBooleanAttribute("readonly"));
+               
+               setVisible(!uidl.getBooleanAttribute("invisible"));
                
+               setText(uidl.getStringVariable("text"));
 
        }
 

diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/textfield/css/textfield.css b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/textfield/css/textfield.css
index e7eaba60e13786d0f8adb570b86e0aa0bd7e0029..2e51616487c64c6e69851d929efc18a0e9489d91 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/textfield/css/textfield.css
+++ b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/textfield/css/textfield.css
@@ -1,4 +1,4 @@
-.itk-textfield{\r
+.i-textfield{\r
        font-family: helvetica, verdana, tahoma, arial, sans-serif; /* Copy from common.css */\r
        font-size: 1.2em;\r
        color: #444;\r
@@ -10,7 +10,7 @@
        margin: 0;\r
 }\r
 \r
-.itk-textfield-focus {\r
+.i-textfield-focus {\r
        color: #111;\r
        border-color: #4376c3;\r
        border-bottom-color: #6696dd;\r