From 4cc297a73f0e0532dfcd5fa7ac01480839dd7244 Mon Sep 17 00:00:00 2001 From: Jouni Koivuviita Date: Thu, 14 Jun 2007 15:24:37 +0000 Subject: [PATCH] CSS classnames refactored. svn changeset:1729/svn branch:trunk --- .../toolkit/terminal/gwt/client/ui/TkTextField.java | 13 ++++++++++--- .../component-themes/textfield/css/textfield.css | 4 ++-- 2 files changed, 12 insertions(+), 5 deletions(-) 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 d8d7101a21..3ee95dff3d 100644 --- 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 e7eaba60e1..2e51616487 100644 --- 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{ +.i-textfield{ font-family: helvetica, verdana, tahoma, arial, sans-serif; /* Copy from common.css */ font-size: 1.2em; color: #444; @@ -10,7 +10,7 @@ margin: 0; } -.itk-textfield-focus { +.i-textfield-focus { color: #111; border-color: #4376c3; border-bottom-color: #6696dd; -- 2.39.5