You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2009/11/06 14:10:54 UTC

svn commit: r833383 - in /myfaces/tobago/trunk: core/src/main/java/org/apache/myfaces/tobago/taglib/decl/ example/test/src/main/webapp/tc/selectBooleanCheckbox/ example/test/src/main/webapp/tc/selectOneRadio/ theme/scarborough/src/main/java/org/apache/...

Author: lofwyr
Date: Fri Nov  6 13:10:53 2009
New Revision: 833383

URL: http://svn.apache.org/viewvc?rev=833383&view=rev
Log:
TOBAGO-818: Make SelectOneRadio work with new LayoutManager

Added:
    myfaces/tobago/trunk/example/test/src/main/webapp/tc/selectOneRadio/
    myfaces/tobago/trunk/example/test/src/main/webapp/tc/selectOneRadio/selectOneRadio.xhtml
Modified:
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/IsInline.java
    myfaces/tobago/trunk/example/test/src/main/webapp/tc/selectBooleanCheckbox/selectBooleanCheckbox.xhtml
    myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectBooleanCheckboxRenderer.java
    myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectOneRadioRenderer.java
    myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/property/tobago-theme-config.properties
    myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/style.css
    myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/property/tobago-theme-config.properties
    myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/style/style.css

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/IsInline.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/IsInline.java?rev=833383&r1=833382&r2=833383&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/IsInline.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/IsInline.java Fri Nov  6 13:10:53 2009
@@ -20,16 +20,11 @@
 import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
 import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
 
-/*
- * Created: Apr 9, 2005 2:48:07 PM
- * User: bommel
- * $Id$
- */
 public interface IsInline {
   /**
    * Flag indicating this component should rendered as an inline element.
    */
   @TagAttribute
-  @UIComponentTagAttribute(type = "java.lang.Boolean")
+  @UIComponentTagAttribute(type = "boolean", defaultValue = "false")
   void setInline(String inline);
 }

Modified: myfaces/tobago/trunk/example/test/src/main/webapp/tc/selectBooleanCheckbox/selectBooleanCheckbox.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/test/src/main/webapp/tc/selectBooleanCheckbox/selectBooleanCheckbox.xhtml?rev=833383&r1=833382&r2=833383&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/test/src/main/webapp/tc/selectBooleanCheckbox/selectBooleanCheckbox.xhtml (original)
+++ myfaces/tobago/trunk/example/test/src/main/webapp/tc/selectBooleanCheckbox/selectBooleanCheckbox.xhtml Fri Nov  6 13:10:53 2009
@@ -34,9 +34,9 @@
     <tx:selectBooleanCheckbox value="true" label="disabled" disabled="true"/>
     <tx:selectBooleanCheckbox value="true" label="disabled" disabled="true" itemLabel="item label"/>
 
-    <tc:selectBooleanCheckbox value="false" label="title" tip="title"/>
-    <tx:selectBooleanCheckbox value="false" label="title" tip="title"/>
-    <tx:selectBooleanCheckbox value="false" label="title" tip="title" itemLabel="item label"/>
+    <tc:selectBooleanCheckbox value="false" label="tip" tip="tip"/>
+    <tx:selectBooleanCheckbox value="false" label="tip" tip="tip"/>
+    <tx:selectBooleanCheckbox value="false" label="tip" tip="tip" itemLabel="item label"/>
 
     <tc:selectBooleanCheckbox value="true" label="escape &lt;hr/>"/>
     <tx:selectBooleanCheckbox value="true" label="escape &lt;hr/>"/>

Added: myfaces/tobago/trunk/example/test/src/main/webapp/tc/selectOneRadio/selectOneRadio.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/test/src/main/webapp/tc/selectOneRadio/selectOneRadio.xhtml?rev=833383&view=auto
==============================================================================
--- myfaces/tobago/trunk/example/test/src/main/webapp/tc/selectOneRadio/selectOneRadio.xhtml (added)
+++ myfaces/tobago/trunk/example/test/src/main/webapp/tc/selectOneRadio/selectOneRadio.xhtml Fri Nov  6 13:10:53 2009
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<f:view
+    xmlns:jsp="http://java.sun.com/JSP/Page"
+    xmlns:tc="http://myfaces.apache.org/tobago/component"
+    xmlns:tx="http://myfaces.apache.org/tobago/extension"
+    xmlns:ui="http://java.sun.com/jsf/facelets"
+    xmlns:f="http://java.sun.com/jsf/core">
+
+  <tc:page>
+    <tc:gridLayoutConstraint width="700px" height="600px"/>
+    <f:facet name="layout">
+      <!-- fixme: rows="20px" -->
+      <tc:gridLayout columns="*;2*" rows="auto;20px" columnSpacing="30px"/>
+    </f:facet>
+
+    <tc:messages>
+      <tc:gridLayoutConstraint columnSpan="2"/>
+    </tc:messages>
+    
+    <tc:label value="tc"/>
+    <tc:label value="tx"/>
+    
+    <tc:selectOneRadio value="a">
+      <tc:selectItem itemValue="a" itemLabel="A Value"/>
+      <tc:selectItem itemValue="b" itemLabel="An Alternative"/>
+    </tc:selectOneRadio>
+    <tx:selectOneRadio value="b" label="normal">
+      <tc:selectItem itemValue="a" itemLabel="A Value"/>
+      <tc:selectItem itemValue="b" itemLabel="An Alternative"/>
+    </tx:selectOneRadio>
+
+    <tc:selectOneRadio value="a" readonly="true">
+      <tc:selectItem itemValue="a" itemLabel="A Value"/>
+      <tc:selectItem itemValue="b" itemLabel="An Alternative"/>
+    </tc:selectOneRadio>
+    <tx:selectOneRadio value="b" readonly="true" label="readonly">
+      <tc:selectItem itemValue="a" itemLabel="A Value"/>
+      <tc:selectItem itemValue="b" itemLabel="An Alternative"/>
+    </tx:selectOneRadio>
+
+    <tc:selectOneRadio value="a" disabled="true">
+      <tc:selectItem itemValue="a" itemLabel="A Value"/>
+      <tc:selectItem itemValue="b" itemLabel="An Alternative"/>
+    </tc:selectOneRadio>
+    <tx:selectOneRadio value="b" disabled="true" label="disabled">
+      <tc:selectItem itemValue="a" itemLabel="A Value"/>
+      <tc:selectItem itemValue="b" itemLabel="An Alternative"/>
+    </tx:selectOneRadio>
+
+    <tc:selectOneRadio value="a" tip="tip">
+      <tc:selectItem itemValue="a" itemLabel="A Value"/>
+      <tc:selectItem itemValue="b" itemLabel="An Alternative"/>
+    </tc:selectOneRadio>
+    <tx:selectOneRadio value="b" tip="tip" label="tip">
+      <tc:selectItem itemValue="a" itemLabel="A Value"/>
+      <tc:selectItem itemValue="b" itemLabel="An Alternative"/>
+    </tx:selectOneRadio>
+
+    <tc:selectOneRadio value="a" inline="true">
+      <tc:selectItem itemValue="a" itemLabel="A Value"/>
+      <tc:selectItem itemValue="b" itemLabel="An Alternative"/>
+    </tc:selectOneRadio>
+    <tx:selectOneRadio value="b" inline="true" label="inline">
+      <tc:selectItem itemValue="a" itemLabel="A Value"/>
+      <tc:selectItem itemValue="b" itemLabel="An Alternative"/>
+    </tx:selectOneRadio>
+
+    <tc:selectOneRadio required="true">
+      <tc:selectItem itemValue="a" itemLabel="A Value"/>
+      <tc:selectItem itemValue="b" itemLabel="An Alternative"/>
+    </tc:selectOneRadio>
+    <tx:selectOneRadio required="true" label="required">
+      <tc:selectItem itemValue="a" itemLabel="A Value"/>
+      <tc:selectItem itemValue="b" itemLabel="An Alternative"/>
+    </tx:selectOneRadio>
+
+    
+    <tc:button label="submit"/>
+    
+  </tc:page>
+</f:view>

Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectBooleanCheckboxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectBooleanCheckboxRenderer.java?rev=833383&r1=833382&r2=833383&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectBooleanCheckboxRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectBooleanCheckboxRenderer.java Fri Nov  6 13:10:53 2009
@@ -82,10 +82,10 @@
     String currentValue = getCurrentValue(facesContext, checkbox);
     boolean checked = "true".equals(currentValue);
     String clientId = checkbox.getClientId(facesContext);
+    String title = HtmlRendererUtils.getTitleFromTipAndMessages(facesContext, checkbox);
 
     writer.startElement(HtmlConstants.DIV, checkbox);
     writer.writeStyleAttribute(new Style(facesContext, checkbox));
-    String title = HtmlRendererUtils.getTitleFromTipAndMessages(facesContext, checkbox);
     if (title != null) {
       writer.writeAttribute(HtmlAttributes.TITLE, title, true);
     }

Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectOneRadioRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectOneRadioRenderer.java?rev=833383&r1=833382&r2=833383&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectOneRadioRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectOneRadioRenderer.java Fri Nov  6 13:10:53 2009
@@ -27,11 +27,11 @@
 import org.apache.myfaces.tobago.component.Attributes;
 import org.apache.myfaces.tobago.component.UISelectOneRadio;
 import org.apache.myfaces.tobago.context.TobagoFacesContext;
+import org.apache.myfaces.tobago.layout.Measure;
 import org.apache.myfaces.tobago.renderkit.SelectOneRendererBase;
 import org.apache.myfaces.tobago.renderkit.css.Style;
 import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
 import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
-import org.apache.myfaces.tobago.renderkit.html.StyleClasses;
 import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtils;
 import org.apache.myfaces.tobago.renderkit.util.RenderUtil;
 import org.apache.myfaces.tobago.util.ComponentUtils;
@@ -39,7 +39,7 @@
 
 import javax.faces.component.NamingContainer;
 import javax.faces.component.UIComponent;
-import javax.faces.component.UISelectItems;
+import javax.faces.component.UISelectOne;
 import javax.faces.context.FacesContext;
 import javax.faces.model.SelectItem;
 import java.io.IOException;
@@ -61,101 +61,67 @@
 
   public void encodeEnd(FacesContext facesContext, UIComponent component) throws IOException {
     if (!(component instanceof UISelectOneRadio)) {
-      LOG.error("Wrong type: Need " + UISelectOneRadio.class.getName() + ", but was " + component.getClass().getName());
+      LOG.error("Wrong type: Need " + UISelectOneRadio.class.getName()
+          + ", but was " + component.getClass().getName());
       return;
     }
 
-    UISelectOneRadio selectOne = (UISelectOneRadio) component;
-    String clientId = selectOne.getClientId(facesContext);
-
-    if (LOG.isDebugEnabled()) {
-      for (Object o : selectOne.getChildren()) {
-        LOG.debug("ITEMS " + o);
-        if (o instanceof UISelectItems) {
-          UISelectItems uiitems = (UISelectItems) o;
-          Object v = uiitems.getValue();
-          LOG.debug("VALUE " + v);
-          if (v != null) {
-            LOG.debug("VALUE " + v.getClass().getName());
-          }
-        }
-      }
-    }
-
-    List<SelectItem> items = RenderUtil.getItemsToRender(selectOne);
-
-    boolean inline = ComponentUtils.getBooleanAttribute(selectOne, Attributes.INLINE);
-    String title = HtmlRendererUtils.getTitleFromTipAndMessages(facesContext, selectOne);
+    UISelectOneRadio radio = (UISelectOneRadio) component;
     TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
 
-    if (!inline) {
-      writer.startElement(HtmlConstants.TABLE, selectOne);
-      // TODO writer.writeComponentClass();
-      writer.writeAttribute(HtmlAttributes.BORDER, 0);
-      writer.writeAttribute(HtmlAttributes.CELLSPACING, 0);
-      writer.writeAttribute(HtmlAttributes.CELLPADDING, 0);
-      writer.writeAttribute(HtmlAttributes.SUMMARY, "", false);
-      Style style = new Style(facesContext, selectOne);
-      writer.writeStyleAttribute(style);
-      if (title != null) {
-        writer.writeAttribute(HtmlAttributes.TITLE, title, true);
-      }
+    String clientId = radio.getClientId(facesContext);
+    List<SelectItem> items = RenderUtil.getItemsToRender(radio);
+    boolean inline = radio.isInline();
+    String title = HtmlRendererUtils.getTitleFromTipAndMessages(facesContext, radio);
+    boolean disabled = ComponentUtils.getBooleanAttribute(radio, Attributes.DISABLED);
+    boolean readonly = ComponentUtils.getBooleanAttribute(radio, Attributes.READONLY);
+    Style style = new Style(facesContext, radio);
+    boolean required = radio.isRequired();
+
+    writer.startElement(HtmlConstants.DIV, radio);
+    writer.writeStyleAttribute(style);
+    if (title != null) {
+      writer.writeAttribute(HtmlAttributes.TITLE, title, true);
     }
 
-    boolean disabled = ComponentUtils.getBooleanAttribute(selectOne, Attributes.DISABLED);
-    boolean readonly = ComponentUtils.getBooleanAttribute(selectOne, Attributes.READONLY);
-    Object value = selectOne.getValue();
+    Object value = radio.getValue();
     List<String> clientIds = new ArrayList<String>();
     for (SelectItem item : items) {
-      if (!inline) {
-        writer.startElement(HtmlConstants.TR, null);
-        writer.startElement(HtmlConstants.TD, null);
-      }
-
       String id = clientId + NamingContainer.SEPARATOR_CHAR
           + NamingContainer.SEPARATOR_CHAR + item.getValue().toString();
       clientIds.add(id);
-      writer.startElement(HtmlConstants.INPUT, selectOne);
+      writer.startElement(HtmlConstants.INPUT, radio);
       writer.writeAttribute(HtmlAttributes.TYPE, "radio", false);
       writer.writeClassAttribute();
       boolean checked = item.getValue().equals(value);
       if (checked) {
         writer.writeAttribute(HtmlAttributes.CHECKED, "checked", false);
       }
-
       writer.writeNameAttribute(clientId);
-
       writer.writeIdAttribute(id);
-      String formattedValue = RenderUtil.getFormattedValue(facesContext, selectOne, item.getValue());
+      String formattedValue = RenderUtil.getFormattedValue(facesContext, radio, item.getValue());
       writer.writeAttribute(HtmlAttributes.VALUE, formattedValue, true);
       writer.writeAttribute(HtmlAttributes.DISABLED, item.isDisabled() || disabled);
-      if (readonly) {
-        writer.writeAttribute(HtmlAttributes.READONLY, true);
-      }
-      Integer tabIndex = selectOne.getTabIndex();
+      writer.writeAttribute(HtmlAttributes.READONLY, readonly);
+      Integer tabIndex = radio.getTabIndex();
       if (tabIndex != null) {
         writer.writeAttribute(HtmlAttributes.TABINDEX, tabIndex);
       }
-      HtmlRendererUtils.renderTip(selectOne, writer);
-      if (!ComponentUtils.getBooleanAttribute(selectOne, Attributes.REQUIRED) || readonly) {
+      HtmlRendererUtils.renderTip(radio, writer);
+      if (!required || readonly) {
         writer.writeAttribute(HtmlAttributes.ONCLICK,
-            "Tobago.selectOneRadioClick(this, '" + clientId + "',"
-                + ComponentUtils.getBooleanAttribute(selectOne, Attributes.REQUIRED) + " , " + readonly + ")", false);
+            "Tobago.selectOneRadioClick(this, '" + clientId + "'," + required + " , " + readonly + ")", false);
       }
       writer.endElement(HtmlConstants.INPUT);
-
-      if (item.getLabel() != null) {
-
+/*
         if (!inline) {
-          writer.endElement(HtmlConstants.TD);
-          writer.startElement(HtmlConstants.TD, null);
           writer.writeStyleAttribute("width: 100%;"); // todo: make more nice with a layout-manager!
         }
-
-        // FIXME: use created UIOutput Label
-        // FIXME: see outcommented part
-        writer.startElement(HtmlConstants.LABEL, null);
-        // todo: use label component with a "light" markup
+*/
+      String label = item.getLabel();
+      if (label != null) {
+        writer.startElement(HtmlConstants.LABEL, radio);
+/*
         StyleClasses styleClasses = new StyleClasses();
         styleClasses.addAspectClass("label", StyleClasses.Aspect.DEFAULT);
         if (item.isDisabled() || disabled) {
@@ -165,30 +131,32 @@
           styleClasses.addAspectClass("label", StyleClasses.Aspect.READONLY);
         }
         writer.writeClassAttribute(styleClasses);
+*/
+        writer.writeClassAttribute();
         writer.writeAttribute(HtmlAttributes.FOR, id, false);
-        writer.writeText(item.getLabel());
+        writer.writeText(label);
         writer.endElement(HtmlConstants.LABEL);
-//        Application application = tobagoContext.getApplication();
-//        UIOutput label = (UIOutput)
-//            application.createComponent(TobagoConstants.COMPONENT_TYPE_OUTPUT);
-//        label.getAttributes().put(Attributes.FOR, itemId);
-//        label.setValue( item.getLabel() );
-//        label.setRendererType("Label");
-//        label.setRendered(true);
-//
-//        RenderUtil.encode(label);
-
       }
       if (!inline) {
-        writer.endElement(HtmlConstants.TD);
-        writer.endElement(HtmlConstants.TR);
+        writer.startElement(HtmlConstants.BR, null);
+        writer.endElement(HtmlConstants.BR);
       }
     }
-    if (!inline) {
-      writer.endElement(HtmlConstants.TABLE);
-    }
-    HtmlRendererUtils.renderFocusId(facesContext, selectOne);
-    HtmlRendererUtils.checkForCommandFacet(selectOne, clientIds, facesContext, writer);
+    writer.endElement(HtmlConstants.DIV);
 
+    HtmlRendererUtils.renderFocusId(facesContext, radio);
+    HtmlRendererUtils.checkForCommandFacet(radio, clientIds, facesContext, writer);
+  }
+
+  @Override
+  public Measure getHeight(FacesContext facesContext, UIComponent component) {
+    UISelectOneRadio radio = (UISelectOneRadio) component;
+    Measure heightOfOne = super.getHeight(facesContext, component);
+    if (radio.isInline()) {
+      return heightOfOne;
+    } else {
+      List<SelectItem> items = RenderUtil.getItemsToRender((UISelectOne) component);
+      return heightOfOne.multiply(items.size());
+    }
   }
 }

Modified: myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/property/tobago-theme-config.properties
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/property/tobago-theme-config.properties?rev=833383&r1=833382&r2=833383&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/property/tobago-theme-config.properties (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/property/tobago-theme-config.properties Fri Nov  6 13:10:53 2009
@@ -124,7 +124,7 @@
 
 SelectOneChoice.preferredHeight=25
 
-SelectOneRadio.fixedHeight=20
+SelectOneRadio.height=20
 
 Separator.preferredHeight=14
 

Modified: myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/style.css
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/style.css?rev=833383&r1=833382&r2=833383&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/style.css (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/style.css Fri Nov  6 13:10:53 2009
@@ -541,6 +541,14 @@
   background: transparent;
 }
 
+.tobago-selectOneRadio-disabled  {
+  color: #778899;
+}
+
+.tobago-selectOneRadio-error  {
+  border: 1px solid #FF0000;
+}
+
 /* richTextEditor ---------------------------------------------------------- */
 
 .tobago-richTextEditor-default {

Modified: myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/property/tobago-theme-config.properties
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/property/tobago-theme-config.properties?rev=833383&r1=833382&r2=833383&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/property/tobago-theme-config.properties (original)
+++ myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/property/tobago-theme-config.properties Fri Nov  6 13:10:53 2009
@@ -71,8 +71,6 @@
 
 SelectBooleanCheckbox.height=19
 
-SelectOneChoice.preferredHeight=20
-
 Separator.preferredHeight=14
 
 Sheet.ascendingMarkerWidth=15

Modified: myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/style/style.css
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/style/style.css?rev=833383&r1=833382&r2=833383&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/style/style.css (original)
+++ myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/style/style.css Fri Nov  6 13:10:53 2009
@@ -578,11 +578,10 @@
   color: #000000;
 }
 
-.tobago-selectOneRadio-error  {
-  border: 1px solid #FF0000;
+.tobago-selectOneRadio-disabled  {
+  color: #808080;
 }
 
-
 /* selectManyListbox ------------------------------------------------------- */
 
 .tobago-selectManyListbox-default  {