[richfaces-svn-commits] JBoss Rich Faces SVN: r2112 - in trunk/ui/tabPanel/src/main: resources/org/richfaces/renderkit/html/css and 1 other directories.
richfaces-svn-commits at lists.jboss.org
richfaces-svn-commits at lists.jboss.org
Tue Aug 7 12:44:11 EDT 2007
Author: dbiatenia
Date: 2007-08-07 12:44:11 -0400 (Tue, 07 Aug 2007)
New Revision: 2112
Modified:
trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/TabPanelRendererBase.java
trunk/ui/tabPanel/src/main/resources/org/richfaces/renderkit/html/css/tabPanel.xcss
trunk/ui/tabPanel/src/main/templates/tab.jspx
trunk/ui/tabPanel/src/main/templates/tabHeader.jspx
trunk/ui/tabPanel/src/main/templates/tabPanel.jspx
Log:
fixed wrapped labels
Modified: trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/TabPanelRendererBase.java
===================================================================
--- trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/TabPanelRendererBase.java 2007-08-07 16:37:39 UTC (rev 2111)
+++ trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/TabPanelRendererBase.java 2007-08-07 16:44:11 UTC (rev 2112)
@@ -51,8 +51,8 @@
public class TabPanelRendererBase extends org.ajax4jsf.renderkit.HeaderResourcesRendererBase {
public final static String ACTIVE_CELL_CLASSES = "dr-tbpnl-tbcell-act rich-tabhdr-cell-active";
- public final static String INACTIVE_CELL_CLASSES = "dr-tbpnl-tbcell-inact dr-bottom-line rich-tabhdr-cell-inactive";
- public final static String DISABLED_CELL_CLASSES = "dr-tbpnl-tbcell-dsbld dr-bottom-line rich-tabhdr-cell-disabled";
+ public final static String INACTIVE_CELL_CLASSES = "dr-tbpnl-tbcell-inact rich-tabhdr-cell-inactive";
+ public final static String DISABLED_CELL_CLASSES = "dr-tbpnl-tbcell-dsbld rich-tabhdr-cell-disabled";
protected Class getComponentClass() {
return UITabPanel.class;
Modified: trunk/ui/tabPanel/src/main/resources/org/richfaces/renderkit/html/css/tabPanel.xcss
===================================================================
--- trunk/ui/tabPanel/src/main/resources/org/richfaces/renderkit/html/css/tabPanel.xcss 2007-08-07 16:37:39 UTC (rev 2111)
+++ trunk/ui/tabPanel/src/main/resources/org/richfaces/renderkit/html/css/tabPanel.xcss 2007-08-07 16:44:11 UTC (rev 2112)
@@ -74,7 +74,7 @@
}
.dr-tbpnl-tb{
- padding : 2px 10px 0px 10px;
+ padding : 2px 10px 2px 10px;
text-align: center;
}
Modified: trunk/ui/tabPanel/src/main/templates/tab.jspx
===================================================================
--- trunk/ui/tabPanel/src/main/templates/tab.jspx 2007-08-07 16:37:39 UTC (rev 2111)
+++ trunk/ui/tabPanel/src/main/templates/tab.jspx 2007-08-07 16:44:11 UTC (rev 2112)
@@ -13,7 +13,7 @@
<f:clientid var="clientId"/>
- <td id="#{clientId}" style="position: relative; #{this:getTabDisplay(context, component)}"
+ <td id="#{clientId}" style="#{this:getTabDisplay(context, component)}"
height="100%">
<table border="0" cellpadding="10" cellspacing="0" width="100%" class="dr-tbpnl-cntnt-pstn rich-tabpanel-content-position" style="position : relative;">
Modified: trunk/ui/tabPanel/src/main/templates/tabHeader.jspx
===================================================================
--- trunk/ui/tabPanel/src/main/templates/tabHeader.jspx 2007-08-07 16:37:39 UTC (rev 2111)
+++ trunk/ui/tabPanel/src/main/templates/tabHeader.jspx 2007-08-07 16:44:11 UTC (rev 2112)
@@ -16,7 +16,7 @@
<td style="height: 100%; vertical-align: bottom;" id="#{clientId}_cell">
<f:call name="encodeCellClasses" />
- <table border="0" cellpadding="0" cellspacing="0" >
+ <table id="#{clientId}_shifted" border="0" cellpadding="0" cellspacing="0" style="position:relative;top:1px">
<f:call name="encodeTabLabel" />
<tr>
@@ -35,7 +35,7 @@
</table>
</td>
- <td class="dr-bottom-line"><img src="#{spacer}" height="1" alt="" border="0" style="#{this:encodeHeaderSpacing(context, component)}"/></td>
+ <td><img src="#{spacer}" height="1" alt="" border="0" style="#{this:encodeHeaderSpacing(context, component)}"/></td>
</f:root>
Modified: trunk/ui/tabPanel/src/main/templates/tabPanel.jspx
===================================================================
--- trunk/ui/tabPanel/src/main/templates/tabPanel.jspx 2007-08-07 16:37:39 UTC (rev 2111)
+++ trunk/ui/tabPanel/src/main/templates/tabPanel.jspx 2007-08-07 16:44:11 UTC (rev 2112)
@@ -33,41 +33,24 @@
<tbody>
<tr>
- <td>
+ <td align="#{component.attributes['headerAlignment']}">
<f:call name="utils.encodeBeginFormIfNessesary" />
-
- <table border="0" cellpadding="0" cellspacing="0">
- <jsp:scriptlet>
- <![CDATA[
- String alignment = (String) component.getAttributes().get("headerAlignment");
- if("left".equals(alignment)){
- ]]>
- </jsp:scriptlet>
- <colgroup/>
- <colgroup span="#{this:getTabsCount(context, component)}"></colgroup>
- <colgroup width="100%"/>
- <jsp:scriptlet>
- <![CDATA[
- } else {
- ]]>
- </jsp:scriptlet>
- <colgroup width="100%"/>
- <colgroup span="#{this:getTabsCount(context, component)}"></colgroup>
- <colgroup/>
- <jsp:scriptlet>
- <![CDATA[
- }
- ]]>
- </jsp:scriptlet>
-
- <tr>
- <td class="dr-bottom-line">
- <img src="#{spacer}" height="1" alt=""
- border="0" style="#{this:encodeHeaderSpacing(context, component)}" />
- </td>
- <f:call name="encodeTabs" />
- </tr>
- </table>
+ <table border="0" cellpadding="0" cellspacing="0" style="position:relative;top:1px">
+ <tr>
+
+
+ <td>
+ <img src="#{spacer}" height="1" alt=""
+ border="0" style="#{this:encodeHeaderSpacing(context, component)}" />
+ </td>
+
+ <f:call name="encodeTabs" />
+
+ </tr>
+
+ </table>
+
+
<div style="display: none;">
<c:if test="#{clientSide}">
<input type="hidden"
@@ -79,6 +62,11 @@
</div>
<f:call name="utils.encodeEndFormIfNessesary" />
</td>
+ </tr>
+ <tr>
+ <td class="dr-bottom-line" width="100%">
+ <img src="#{spacer}" height="1" alt="" border="0" style="#{this:encodeHeaderSpacing(context, component)}" />
+ </td>
</tr>
<tr>
<vcp:body>
More information about the richfaces-svn-commits
mailing list