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 2015/10/07 14:13:18 UTC
svn commit: r1707271 - in /myfaces/tobago/branches/tobago-3.0.x:
tobago-example/tobago-example-demo/src/main/webapp/content/04-tab/00-client/
tobago-example/tobago-example-demo/src/main/webapp/content/04-tab/01-ajax/
tobago-example/tobago-example-demo/...
Author: lofwyr
Date: Wed Oct 7 12:13:17 2015
New Revision: 1707271
URL: http://svn.apache.org/viewvc?rev=1707271&view=rev
Log:
TOBAGO-1496: Adapt the tc:tabGroup and tc:tab to Bootstrap
Modified:
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/04-tab/00-client/tab-client.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/04-tab/01-ajax/tab-ajax.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/04-tab/02-server/tab-server.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/tobago.css
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-speyside/src/main/less/org/apache/myfaces/tobago/renderkit/html/speyside/standard/style/tobago.less
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TabGroupRenderer.java
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TabRenderer.java
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/style/tobago.css
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/04-tab/00-client/tab-client.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/04-tab/00-client/tab-client.xhtml?rev=1707271&r1=1707270&r2=1707271&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/04-tab/00-client/tab-client.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/04-tab/00-client/tab-client.xhtml Wed Oct 7 12:13:17 2015
@@ -25,22 +25,16 @@
<ui:param name="title" value="#{overviewBundle.tabSwitchTypeClient}"/>
<tc:panel>
- <f:facet name="layout">
- <tc:gridLayout rows="*;auto"/>
- </f:facet>
<tc:tabGroup id="tabMarsOuterForm" selectedIndex="#{demo.tabState1}">
<tc:tab label="#{overviewBundle.tabPlanet}">
- <f:facet name="layout"><tc:gridLayout rows="1*;auto;auto;1*"/></f:facet>
<tc:image value="image/feather-leaf.png"/>
<tc:in value="#{demo.solar.planets[0].diameter}" required="true"
label="#{overviewBundle.solarPlanetDiameter}"/>
<tc:in value="#{demo.solar.planets[0].mass}"
label="#{overviewBundle.solarPlanetMass}"/>
- <tc:panel/>
</tc:tab>
<tc:tab label="#{overviewBundle.tabInsolar}">
- <f:facet name="layout"><tc:gridLayout rows="1*;auto;auto;1*"/></f:facet>
<tc:image value="image/feather-leaf.png"/>
<tc:in value="#{demo.solar.planets[0].sunDistance}"
label="#{overviewBundle.solarPlanetSunDistance}"/>
@@ -49,7 +43,6 @@
<tc:panel/>
</tc:tab>
<tc:tab label="#{overviewBundle.tabMoons}">
- <f:facet name="layout"><tc:gridLayout/></f:facet>
<tc:sheet value="#{demo.solar.planets[0].moons}"
columns="2*;1*;2*;2*" var="moon">
<tc:column label="#{overviewBundle.solarArrayName}" id="name" sortable="true">
@@ -68,14 +61,11 @@
</tc:tab>
</tc:tabGroup>
- <tc:panel>
- <f:facet name="layout">
- <tc:gridLayout columns="*;auto"/>
- </f:facet>
+ <tc:flowLayout>
+ <tc:style textAlign="right"/>
- <tc:panel/>
<tc:button label="OK"/>
- </tc:panel>
+ </tc:flowLayout>
</tc:panel>
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/04-tab/01-ajax/tab-ajax.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/04-tab/01-ajax/tab-ajax.xhtml?rev=1707271&r1=1707270&r2=1707271&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/04-tab/01-ajax/tab-ajax.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/04-tab/01-ajax/tab-ajax.xhtml Wed Oct 7 12:13:17 2015
@@ -21,12 +21,10 @@
xmlns:tc="http://myfaces.apache.org/tobago/component"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:f="http://java.sun.com/jsf/core">
+
<ui:param name="title" value="#{overviewBundle.tabSwitchTypeReloadTag}"/>
<tc:panel>
- <f:facet name="layout">
- <tc:gridLayout rows="*;auto"/>
- </f:facet>
<tc:tabGroup id="tabMarsOuterForm2" switchType="reloadTab" selectedIndex="#{demo.tabState2}" immediate="true"
renderedPartially="@this :page:header:headerInfo">
@@ -36,15 +34,11 @@
<tc:tab image="image/feather-leaf.png"
label="#{overviewBundle.tabPlanet}">
- <f:facet name="layout">
- <tc:gridLayout rows="1*;auto;auto;1*"/>
- </f:facet>
<tc:image value="image/feather-leaf.png"/>
<tc:in value="#{demo.solar.planets[0].diameter}" required="true"
label="#{overviewBundle.solarPlanetDiameter}"/>
<tc:in value="#{demo.solar.planets[0].mass}"
label="#{overviewBundle.solarPlanetMass}"/>
- <tc:panel/>
</tc:tab>
<tc:tab image="image/feather.png"
label="#{overviewBundle.tabInsolar}"
@@ -66,7 +60,6 @@
<tc:panel/>
</tc:tab>
<tc:tab image="image/feather-open.png">
- <f:facet name="layout"><tc:gridLayout/></f:facet>
<tc:sheet value="#{demo.solar.planets[0].moons}"
columns="2*;1*;2*;2*" var="moon">
<tc:column label="#{overviewBundle.solarArrayName}" id="name" sortable="true">
@@ -85,14 +78,11 @@
</tc:tab>
</tc:tabGroup>
- <tc:panel>
- <f:facet name="layout">
- <tc:gridLayout columns="*;auto"/>
- </f:facet>
+ <tc:flowLayout>
+ <tc:style textAlign="right"/>
- <tc:panel/>
<tc:button label="OK"/>
- </tc:panel>
+ </tc:flowLayout>
</tc:panel>
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/04-tab/02-server/tab-server.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/04-tab/02-server/tab-server.xhtml?rev=1707271&r1=1707270&r2=1707271&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/04-tab/02-server/tab-server.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/04-tab/02-server/tab-server.xhtml Wed Oct 7 12:13:17 2015
@@ -24,9 +24,6 @@
<ui:param name="title" value="#{overviewBundle.tabSwitchTypeReloadPage}"/>
<tc:panel>
- <f:facet name="layout">
- <tc:gridLayout rows="*;auto"/>
- </f:facet>
<tc:tabGroup id="tabMarsOuterForm3" switchType="reloadPage" selectedIndex="#{demo.tabState3}" immediate="true">
@@ -34,25 +31,18 @@
binding="#{demo.tabChangeListener}"/>
<tc:tab label="#{overviewBundle.tabPlanet}">
- <f:facet name="layout"><tc:gridLayout rows="1*;auto;auto;1*"/></f:facet>
- <tc:panel/>
<tc:in value="#{demo.solar.planets[0].diameter}" required="true"
label="#{overviewBundle.solarPlanetDiameter}"/>
<tc:in value="#{demo.solar.planets[0].mass}"
label="#{overviewBundle.solarPlanetMass}"/>
- <tc:panel/>
</tc:tab>
<tc:tab label="#{overviewBundle.tabInsolar}">
- <f:facet name="layout"><tc:gridLayout rows="1*;auto;auto;1*"/></f:facet>
- <tc:panel/>
<tc:in value="#{demo.solar.planets[0].sunDistance}"
label="#{overviewBundle.solarPlanetSunDistance}"/>
<tc:in value="#{demo.solar.planets[0].timeOfCirculation}"
label="#{overviewBundle.solarPlanetTimeOfCirculation}"/>
- <tc:panel/>
</tc:tab>
<tc:tab label="#{overviewBundle.tabMoons}">
- <f:facet name="layout"><tc:gridLayout/></f:facet>
<tc:sheet value="#{demo.solar.planets[0].moons}"
columns="2*;1*;2*;2*" var="moon">
<tc:column label="#{overviewBundle.solarArrayName}" id="name" sortable="true">
@@ -71,14 +61,11 @@
</tc:tab>
</tc:tabGroup>
- <tc:panel>
- <f:facet name="layout">
- <tc:gridLayout columns="*;auto"/>
- </f:facet>
+ <tc:flowLayout>
+ <tc:style textAlign="right"/>
- <tc:panel/>
<tc:button label="OK"/>
- </tc:panel>
+ </tc:flowLayout>
</tc:panel>
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/tobago.css
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/tobago.css?rev=1707271&r1=1707270&r2=1707271&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/tobago.css (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/tobago.css Wed Oct 7 12:13:17 2015
@@ -1221,7 +1221,6 @@ a:active.tobago-sheet-pagingLink {
.tobago-tab-content {
/*position: relative;XXX TOBAGO3*/
border-color: #ddeeff #778899 #778899 #ddeeff;
- border-width: 0 1px 1px 1px;
border-style: solid;
/*overflow: hidden;XXX TOBAGO3*/
}
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-speyside/src/main/less/org/apache/myfaces/tobago/renderkit/html/speyside/standard/style/tobago.less
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-speyside/src/main/less/org/apache/myfaces/tobago/renderkit/html/speyside/standard/style/tobago.less?rev=1707271&r1=1707270&r2=1707271&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-speyside/src/main/less/org/apache/myfaces/tobago/renderkit/html/speyside/standard/style/tobago.less (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-speyside/src/main/less/org/apache/myfaces/tobago/renderkit/html/speyside/standard/style/tobago.less Wed Oct 7 12:13:17 2015
@@ -702,7 +702,6 @@ hr.tobago-separator, .tobago-separator-s
.tobago-tab-content {
border: 1px solid darken(@borderColor, 10%);
- border-top: 0 solid transparent;
background: #FAFAFA;
}
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TabGroupRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TabGroupRenderer.java?rev=1707271&r1=1707270&r2=1707271&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TabGroupRenderer.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TabGroupRenderer.java Wed Oct 7 12:13:17 2015
@@ -360,7 +360,7 @@ public class TabGroupRenderer extends Re
}
writer.startElement(HtmlElements.DIV, null);
- writer.writeClassAttribute(Classes.create(tab, "content"));
+ writer.writeClassAttribute(Classes.create(tab, "content"), BootstrapClass.PANEL_BODY);
writer.writeIdAttribute(tab.getClientId(facesContext) + ComponentUtils.SUB_SEPARATOR + "content");
writer.writeAttribute(HtmlAttributes.TABGROUPINDEX, index);
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TabRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TabRenderer.java?rev=1707271&r1=1707270&r2=1707271&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TabRenderer.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TabRenderer.java Wed Oct 7 12:13:17 2015
@@ -19,14 +19,10 @@
package org.apache.myfaces.tobago.renderkit.html.standard.standard.tag;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.renderkit.RendererBase;
public class TabRenderer extends RendererBase {
- private static final Logger LOG = LoggerFactory.getLogger(TabRenderer.class);
-
@Override
public boolean getRendersChildren() {
return true;
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/style/tobago.css
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/style/tobago.css?rev=1707271&r1=1707270&r2=1707271&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/style/tobago.css (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/style/tobago.css Wed Oct 7 12:13:17 2015
@@ -357,7 +357,6 @@ table.tobago-sheet-bodyTable>tbody>tr>td
.tobago-tab-content {
display: none;
border: 1px solid #cccccc;
- border-top-width: 0;
padding: 5px;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;