svn commit: r478383 - in /myfaces/tobago/trunk: core/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlRendererUtil.java theme/speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/BoxRenderer.java

[bo...@apache.org]

Author: bommel
Date: Wed Nov 22 15:42:49 2006
New Revision: 478383

URL: http://svn.apache.org/viewvc?view=rev&rev=478383
Log:
(TOBAGO-182) tc:box new attribute "markup"

Modified:
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlRendererUtil.java
    myfaces/tobago/trunk/theme/speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/BoxRenderer.java

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlRendererUtil.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlRendererUtil.java?view=diff&rev=478383&r1=478382&r2=478383
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlRendererUtil.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlRendererUtil.java Wed Nov 22 15:42:49 2006
@@ -445,6 +445,22 @@
     return tobagoClass.append(cssClass).toString();
   }
 
+  public static void addMarkupClass(UIComponent component, String rendererName, String subComponent, StringBuilder tobagoClass) {
+
+    if (component instanceof SupportsMarkup) {
+      String markup = ComponentUtil.getStringAttribute(component, ATTR_MARKUP);
+      if (StringUtils.isNotEmpty(markup)) {
+        Theme theme = ClientProperties.getInstance(FacesContext.getCurrentInstance().getViewRoot()).getTheme();
+        if (theme.getRenderersConfig().isMarkupSupported(rendererName, markup)) {
+          tobagoClass.append(TOBAGO_CSS_CLASS_PREFIX).append(rendererName).append("-").append(subComponent)
+              .append("-markup-").append(markup).append(" ");
+        } else {
+          LOG.warn("Unknown markup='" + markup + "'");
+        }
+      }
+    }
+  }
+
   public static void addMarkupClass(UIComponent component, String rendererName, StringBuilder tobagoClass) {
 
     if (component instanceof SupportsMarkup) {

Modified: myfaces/tobago/trunk/theme/speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/BoxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/BoxRenderer.java?view=diff&rev=478383&r1=478382&r2=478383
==============================================================================
--- myfaces/tobago/trunk/theme/speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/BoxRenderer.java (original)
+++ myfaces/tobago/trunk/theme/speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/BoxRenderer.java Wed Nov 22 15:42:49 2006
@@ -95,10 +95,16 @@
 
 
     writer.startElement(HtmlConstants.DIV, component);
-    writer.writeClassAttribute("tobago-box-content");
+    StringBuilder contentClass = new StringBuilder("tobago-box-content ");
+    HtmlRendererUtil.addMarkupClass(component, "box", "content", contentClass);
+    writer.writeClassAttribute(contentClass.toString());
 //    writer.writeAttribute(HtmlAttributes.STYLE, null, TobagoConstants.ATTR_STYLE_BODY);
     writer.startElement(HtmlConstants.DIV, component);
-    writer.writeClassAttribute("tobago-box-content-inner");
+    StringBuilder contentInnerClass = new StringBuilder("tobago-box-content-inner ");
+
+    HtmlRendererUtil.addMarkupClass(component, "box" , "content-inner", contentInnerClass);
+
+    writer.writeClassAttribute(contentInnerClass.toString());
     writer.writeAttribute(HtmlAttributes.STYLE, null, ATTR_STYLE_INNER);
   }
 
@@ -107,7 +113,9 @@
       TobagoResponseWriter writer, UIComponent component) throws IOException {
 
     writer.startElement(HtmlConstants.DIV, component);
-    writer.writeClassAttribute("tobago-box-header");
+    StringBuilder headerClass = new StringBuilder("tobago-box-header ");
+    HtmlRendererUtil.addMarkupClass(component, "box" , "header", headerClass);
+    writer.writeClassAttribute(headerClass.toString());
     UIComponent label = component.getFacet(FACET_LABEL);
     writer.startElement(HtmlConstants.SPAN, null);
     writer.writeClassAttribute("tobago-box-header-label");