[richfaces-svn-commits] JBoss Rich Faces SVN: r2140 - in trunk/ui/tabPanel/src/main: resources/org/richfaces/renderkit/html/scripts and 1 other directories.

[richfaces-svn-commits at lists.jboss.org]

Author: dbiatenia
Date: 2007-08-08 08:30:11 -0400 (Wed, 08 Aug 2007)
New Revision: 2140

Modified:
   trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/TabHeaderRendererBase.java
   trunk/ui/tabPanel/src/main/resources/org/richfaces/renderkit/html/scripts/tabPanel.js
   trunk/ui/tabPanel/src/main/templates/tabHeader.jspx
   trunk/ui/tabPanel/src/main/templates/tabPanel.jspx
Log:
wrapped tab labels bugfix

Modified: trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/TabHeaderRendererBase.java
===================================================================
--- trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/TabHeaderRendererBase.java	2007-08-08 12:25:47 UTC (rev 2139)
+++ trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/TabHeaderRendererBase.java	2007-08-08 12:30:11 UTC (rev 2140)
@@ -66,7 +66,8 @@
         String clientId = tab.getClientId(context);
 
         //String style = "position:relative; top:1px;" + (String) tab.getAttributes().get("style");
-        String style = (String) tab.getAttributes().get("style");
+        String defShift = tab.isActive() ? "position:relative; top:1px;" : "position:relative;";
+        String style = defShift + (String) tab.getAttributes().get("style");
 
         if (!disabled) {
             if (clientSide) {

Modified: trunk/ui/tabPanel/src/main/resources/org/richfaces/renderkit/html/scripts/tabPanel.js
===================================================================
--- trunk/ui/tabPanel/src/main/resources/org/richfaces/renderkit/html/scripts/tabPanel.js	2007-08-08 12:25:47 UTC (rev 2139)
+++ trunk/ui/tabPanel/src/main/resources/org/richfaces/renderkit/html/scripts/tabPanel.js	2007-08-08 12:30:11 UTC (rev 2140)
@@ -32,6 +32,7 @@
 RichFaces.switchTab = function(pane,tab,value){
 	var labelSuffix = "_lbl";
 	var cellSuffix = "_cell";
+	var shiftedTableSuffix = "_shifted";
 	var contentSuffix = "";
 	var tabs = RichFaces.panelTabs[pane];
 	var activeTab;
@@ -44,10 +45,12 @@
 			var tabElement = $(tabId + contentSuffix);
 			var tabLabelId = tabId +labelSuffix;
 			var tabLabel = $(tabLabelId);
-
+			
 			var tabCellId = tabId + cellSuffix;
 			var tabCell = $(tabCellId);
 
+			var shiftedTable = $(tabId + shiftedTableSuffix);
+
 			if (tabId == tab) {
 				if(tabElement) {
 					Element.show(tabElement);
@@ -61,6 +64,7 @@
 					if (tabCell) {
 						tabCell.className = tabi.cellActiveClass;
 					}
+					
 				}
 				
 			} else {
@@ -73,6 +77,9 @@
 				if (tabCell) {
 					tabCell.className = tabi.cellInactiveClass;
 				}
+				if(shiftedTable) {
+					shiftedTable.style.top = "0px";
+				}
 			}
 		}
 		
@@ -107,6 +114,9 @@
 
 	}
 	
+	//shift down active tab to cover bottom border
+	$(tab+'_shifted').style.top = "1px";
+		
 	// Set value field.
 	$(pane+"_input").value=value;
 }

Modified: trunk/ui/tabPanel/src/main/templates/tabHeader.jspx
===================================================================
--- trunk/ui/tabPanel/src/main/templates/tabHeader.jspx	2007-08-08 12:25:47 UTC (rev 2139)
+++ trunk/ui/tabPanel/src/main/templates/tabHeader.jspx	2007-08-08 12:30:11 UTC (rev 2140)
@@ -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">
 			<f:call name="encodeTabLabel" />
 
 			<tr>

Modified: trunk/ui/tabPanel/src/main/templates/tabPanel.jspx
===================================================================
--- trunk/ui/tabPanel/src/main/templates/tabPanel.jspx	2007-08-08 12:25:47 UTC (rev 2139)
+++ trunk/ui/tabPanel/src/main/templates/tabPanel.jspx	2007-08-08 12:30:11 UTC (rev 2140)
@@ -33,9 +33,10 @@
 
 		<tbody>
 			<tr>
-				<td align="#{component.attributes['headerAlignment']}">
+				<td align="#{component.attributes['headerAlignment']}" class="dr-bottom-line">
 					<f:call	name="utils.encodeBeginFormIfNessesary" />
-					<table  border="0" cellpadding="0" cellspacing="0" style="position:relative;top:1px">
+					<!--table  border="0" cellpadding="0" cellspacing="0" style="position:relative;top:1px"-->
+					<table  border="0" cellpadding="0" cellspacing="0">
 						<tr>
 							
 									
@@ -63,11 +64,9 @@
 					<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>
+				<td class="dr-bottom-line" width="100%"><img src="#{spacer}" width="1" height="1" alt="" border="0"/></td>
+			</tr-->
 			<tr>
 				<vcp:body>
 					<f:call name="renderChildren" />