[richfaces-svn-commits] JBoss Rich Faces SVN: r21402 - in trunk/ui/output/ui/src/main: resources/META-INF/resources/org.richfaces and 1 other directory.

Wednesday, 2 February 2011


Author: nbelaevski
Date: 2011-02-02 14:54:54 -0500 (Wed, 02 Feb 2011)
New Revision: 21402

Modified:
   trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TabPanelRenderer.java
   trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TabRenderer.java
   trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/tabPanel.ecss
Log:
https://issues.jboss.org/browse/RF-10209

Modified:
trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TabPanelRenderer.java
===================================================================
---
trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TabPanelRenderer.java	2011-02-02
18:36:12 UTC (rev 21401)
+++
trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TabPanelRenderer.java	2011-02-02
19:54:54 UTC (rev 21402)
@@ -22,6 +22,28 @@
 
 package org.richfaces.renderkit.html;
 
+import static org.richfaces.component.AbstractTogglePanelTitledItem.HeaderStates.active;
+import static
org.richfaces.component.AbstractTogglePanelTitledItem.HeaderStates.disabled;
+import static
org.richfaces.component.AbstractTogglePanelTitledItem.HeaderStates.inactive;
+import static org.richfaces.renderkit.HtmlConstants.CLASS_ATTRIBUTE;
+import static org.richfaces.renderkit.HtmlConstants.DIV_ELEM;
+import static org.richfaces.renderkit.HtmlConstants.ID_ATTRIBUTE;
+import static org.richfaces.renderkit.HtmlConstants.SPAN_ELEM;
+import static org.richfaces.renderkit.HtmlConstants.STYLE_ATTRIBUTE;
+import static org.richfaces.renderkit.HtmlConstants.TBODY_ELEMENT;
+import static org.richfaces.renderkit.HtmlConstants.TD_ELEM;
+import static org.richfaces.renderkit.HtmlConstants.TR_ELEMENT;
+import static org.richfaces.renderkit.RenderKitUtils.renderPassThroughAttributes;
+
+import java.io.IOException;
+import java.util.Map;
+
+import javax.faces.application.ResourceDependencies;
+import javax.faces.application.ResourceDependency;
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.context.ResponseWriter;
+
 import org.ajax4jsf.javascript.JSObject;
 import org.richfaces.cdk.annotations.JsfRenderer;
 import org.richfaces.component.AbstractTabPanel;
@@ -32,18 +54,6 @@
 import org.richfaces.renderkit.HtmlConstants;
 import org.richfaces.renderkit.RenderKitUtils;
 
-import javax.faces.application.ResourceDependencies;
-import javax.faces.application.ResourceDependency;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.context.ResponseWriter;
-import java.io.IOException;
-import java.util.Map;
-
-import static org.richfaces.component.AbstractTogglePanelTitledItem.HeaderStates.*;
-import static org.richfaces.renderkit.HtmlConstants.*;
-import static org.richfaces.renderkit.RenderKitUtils.renderPassThroughAttributes;
-
 /**
  * @author akolonitsky
  * @since 2010-08-24
@@ -77,19 +87,21 @@
         super.doEncodeBegin(w, context, component);
 
         writeTabsLine(w, context, component);
-        writeTabsLineSeparator(w);
+        writeTabsLineSeparator(w, component);
     }
 
-    private void writeTabsLineSeparator(ResponseWriter writer) throws IOException {
-        writer.write("<div class='rf-tb-hdr_brd'></div>");
+    private void writeTabsLineSeparator(ResponseWriter writer, UIComponent component)
throws IOException {
+        writer.startElement(DIV, component);
+        writer.writeAttribute(CLASS_ATTRIBUTE, "rf-tab-hdr-brd", null);
+        writer.endElement(DIV);
     }
 
     private void writeTabsLine(ResponseWriter w, FacesContext context, UIComponent comp)
throws IOException {
         w.startElement(DIV, comp);
-        w.writeAttribute(CLASS, "rf-tb-hdr-tabline-vis", null);
+        w.writeAttribute(CLASS, "rf-tab-hdr-tabline-vis", null);
 
         w.startElement("table", comp);
-        w.writeAttribute(CLASS_ATTRIBUTE, "rf-tb-hdr-tabs", null);
+        w.writeAttribute(CLASS_ATTRIBUTE, "rf-tab-hdr-tabs", null);
         w.writeAttribute("cellspacing", "0", null);
         w.startElement(TBODY_ELEMENT, comp);
         w.startElement(TR_ELEMENT, comp);
@@ -108,9 +120,9 @@
         w.endElement(TBODY_ELEMENT);
         w.endElement("table");
 
-        writeTopTabsControl(w, comp, "rf-tb-hdr-scrl_l rf-tb-hdn",
"\u00AB");
-        writeTopTabsControl(w, comp, "rf-tb-hdr-tablst rf-tb-hdn",
"\u2193");
-        writeTopTabsControl(w, comp, "rf-tb-hdr-scrl_r rf-tb-hdn",
"\u00BB");
+        writeTopTabsControl(w, comp, "rf-tab-hdr-scrl-lft rf-tab-hdn",
"\u00AB");
+        writeTopTabsControl(w, comp, "rf-tab-hdr-tablst rf-tab-hdn",
"\u2193");
+        writeTopTabsControl(w, comp, "rf-tab-hdr-scrl-rgh rf-tab-hdn",
"\u00BB");
 
         w.endElement(DIV_ELEM);
     }
@@ -142,12 +154,12 @@
         writer.startElement(TD_ELEM, tab);
         writer.writeAttribute(ID_ATTRIBUTE, tab.getClientId(context) +
":header:" + state.toString(), null);
         renderPassThroughAttributes(context, tab, HEADER_ATTRIBUTES);
-        writer.writeAttribute(CLASS_ATTRIBUTE, concatClasses("rf-tb-hdr
rf-tb-hdr-" + state.abbreviation(),
+        writer.writeAttribute(CLASS_ATTRIBUTE, concatClasses("rf-tab-hdr
rf-tab-hdr-" + state.abbreviation(),
                 attributeAsString(tab, "headerClass"), attributeAsString(tab,
state.headerClass())), null);
         writer.writeAttribute(STYLE_ATTRIBUTE, concatStyles(isDisplay ? "" :
"display : none", attributeAsString(tab, "headerStyle")), null);
 
-        writer.startElement("span", tab);
-        writer.writeAttribute(CLASS_ATTRIBUTE, "rf-tb-lbl", null);
+        writer.startElement(SPAN_ELEM, tab);
+        writer.writeAttribute(CLASS_ATTRIBUTE, "rf-tab-lbl", null);
 
         UIComponent headerFacet = tab.getHeaderFacet(state);
         if (headerFacet != null && headerFacet.isRendered()) {
@@ -159,7 +171,7 @@
             }
         }
 
-        writer.endElement("span");
+        writer.endElement(SPAN_ELEM);
 
         writer.endElement(TD_ELEM);
     }
@@ -174,15 +186,15 @@
     }
 
     private void writeTopTabFirstSpacer(ResponseWriter w, UIComponent comp) throws
IOException {
-        writeTopTabSpacer(w, comp, "padding-left: 5px;",
"rf-tb-hdr-spcr");
+        writeTopTabSpacer(w, comp, "padding-left: 5px;",
"rf-tab-hdr-spcr");
     }
 
     private void writeTopTabSpacer(ResponseWriter w, UIComponent comp) throws IOException
{
-        writeTopTabSpacer(w, comp, "", "rf-tb-hdr-spcr
rf-tb-hortab-tabspcr_wdh");
+        writeTopTabSpacer(w, comp, "", "rf-tab-hdr-spcr
rf-tab-hortab-tabspcr-wdh");
     }
 
     private void writeTopTabLastSpacer(ResponseWriter w, UIComponent comp) throws
IOException {
-        writeTopTabSpacer(w, comp, "padding-right: 5px; width: 100%;",
"rf-tb-hdr-spcr");
+        writeTopTabSpacer(w, comp, "padding-right: 5px; width: 100%;",
"rf-tab-hdr-spcr");
     }
 
     private void writeTopTabSpacer(ResponseWriter w, UIComponent comp, String style,
String styleClass) throws IOException {

Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TabRenderer.java
===================================================================
---
trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TabRenderer.java	2011-02-02
18:36:12 UTC (rev 21401)
+++
trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TabRenderer.java	2011-02-02
19:54:54 UTC (rev 21402)
@@ -67,7 +67,7 @@
     
     @Override
     protected String getStyleClass(UIComponent component) {
-        return concatClasses("rf-tb", attributeAsString(component,
"styleClass"));
+        return concatClasses("rf-tab", attributeAsString(component,
"styleClass"));
     }
 
     @Override
@@ -104,7 +104,7 @@
 
     private void encodeContentBegin(FacesContext context, UIComponent component,
ResponseWriter writer) throws IOException {
         writer.startElement(DIV_ELEM, component);
-        writer.writeAttribute(CLASS_ATTRIBUTE, concatClasses("rf-tb-cnt",
attributeAsString(component, "contentClass")), null);
+        writer.writeAttribute(CLASS_ATTRIBUTE, concatClasses("rf-tab-cnt",
attributeAsString(component, "contentClass")), null);
         writer.writeAttribute(ID_ATTRIBUTE, component.getClientId(context) +
":content", null);
     }
 

Modified:
trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/tabPanel.ecss
===================================================================
---
trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/tabPanel.ecss	2011-02-02
18:36:12 UTC (rev 21401)
+++
trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/tabPanel.ecss	2011-02-02
19:54:54 UTC (rev 21402)
@@ -1,4 +1,4 @@
-.rf-tb-hdr { 
+.rf-tab-hdr { 
     white-space: nowrap;
     border: "1px solid #{richSkin.panelBorderColor}";
     cursor : pointer;
@@ -12,7 +12,7 @@
 }
 
 
-.rf-tb-hdr-act {
+.rf-tab-hdr-act {
     border-bottom: 0px;
     font-weight: bold;
     vertical-align: top;
@@ -23,15 +23,15 @@
     cursor: default;
 }
 
-.rf-tb-hdr-inact {
+.rf-tab-hdr-inact {
 }
 
-.rf-tb-hdr-dis {
+.rf-tab-hdr-dis {
     color: "#{richSkin.tabDisabledTextColor}";
     cursor: default;
 }
 
-.rf-tb-hdr-tabline-vis {
+.rf-tab-hdr-tabline-vis {
     background:url("#{resource['org.richfaces.images:tabLineBg.png']}")
repeat-x scroll center top;
     background-color: "#{richSkin.additionalBackgroundColor}";
 
@@ -48,31 +48,31 @@
     position: relative;
 }
 
-.rf-tb-hdr-tabs {
+.rf-tab-hdr-tabs {
     border: 0px;
     width: 100%;
     height: 100%;
 }
 
-.rf-tb-hdr-spcr {
+.rf-tab-hdr-spcr {
     border-bottom: "1px solid #{richSkin.panelBorderColor}";
 }
 
-.rf-tb-hortab-tabspcr_wdh {
+.rf-tab-hortab-tabspcr-wdh {
     padding-left: 1px;
 }
 
-.rf-tb-lbl {
+.rf-tab-lbl {
     white-space: nowrap;
     font-family: '#{richSkin.generalFamilyFont}';
     font-size: '#{richSkin.generalSizeFont}';
 }
 
-.rf-tb-hdn {
+.rf-tab-hdn {
     display: none
 }
 
-.rf-tb-hdr-scrl_l {
+.rf-tab-hdr-scrl-lft {
     background: "url(#{resource['org.richfaces.images:actTabBg.png']}) top
repeat-x #{richSkin.additionalBackgroundColor}";
     position: absolute;
     top: 1px;
@@ -87,7 +87,7 @@
     padding-top: 6px;
 }
 
-.rf-tb-hdr-scrl_r {
+.rf-tab-hdr-scrl-rgh {
     background: "url(#{resource['org.richfaces.images:actTabBg.png']}) top
repeat-x #{richSkin.additionalBackgroundColor}";
     position: absolute;
     top: 1px;
@@ -102,7 +102,7 @@
     padding-top: 6px;
 }
 
-.rf-tb-hdr-tablst {
+.rf-tab-hdr-tablst {
     background: "url(#{resource['org.richfaces.images:actTabBg.png']}) top
repeat-x #{richSkin.additionalBackgroundColor}";
     position: absolute;
     top: 1px;
@@ -117,14 +117,14 @@
     padding-top: 2px;
 }
 
-.rf-tb-hdr_brd {
+.rf-tab-hdr-brd {
     border: "1px solid #{richSkin.panelBorderColor}";
     border-top: 0px;
     height: 2px;
     background: '#{richSkin.tabBackgroundColor}';
 }
 
-.rf-tb-cnt {
+.rf-tab-cnt {
     border: "1px solid #{richSkin.panelBorderColor}";
     border-top: 0px;
     font-family: '#{richSkin.generalFamilyFont}';


    

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

[richfaces-svn-commits] JBoss Rich Faces SVN: r21402 - in trunk/ui/output/ui/src/main: resources/META-INF/resources/org.richfaces and 1 other directory.