You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by we...@apache.org on 2014/04/26 21:52:06 UTC
svn commit: r1590289 - in
/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main:
java/org/apache/myfaces/tobago/example/demo/ webapp/content/04-tab/01-ajax/
webapp/tobago-resource/html/standard/standard/property/
Author: weber
Date: Sat Apr 26 19:52:05 2014
New Revision: 1590289
URL: http://svn.apache.org/r1590289
Log:
Example usage: [Merged from trunk revision 1590288]
TOBAGO-1386 - ToolbarButtons in TabLabels
TOBAGO-1391 - TabGroup should allow a icon in front of tab label
Modified:
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TobagoDemoController.java (contents, props changed)
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/04-tab/01-ajax/tab-ajax.xhtml (contents, props changed)
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview.properties.xml (contents, props changed)
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview_de.properties.xml (contents, props changed)
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TobagoDemoController.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TobagoDemoController.java?rev=1590289&r1=1590288&r2=1590289&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TobagoDemoController.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TobagoDemoController.java Sat Apr 26 19:52:05 2014
@@ -508,4 +508,8 @@ public class TobagoDemoController implem
public SolarObject getCurrentSolarObject() {
return currentSolarObject;
}
+
+ public void hideTab2(ActionEvent actionEvent) {
+ FacesContext.getCurrentInstance().getExternalContext().getRequestMap().put("hideTab2", Boolean.TRUE);
+ }
}
Propchange: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TobagoDemoController.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sat Apr 26 19:52:05 2014
@@ -0,0 +1,3 @@
+/myfaces/tobago/branches/tobago-1.5.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TobagoDemoController.java:1356585,1357124
+/myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TobagoDemoController.java:1226794-1341423
+/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TobagoDemoController.java:1571193,1571804,1571816,1571941,1571945,1571962,1571966,1576730,1589960,1590288
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=1590289&r1=1590288&r2=1590289&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 Sat Apr 26 19:52:05 2014
@@ -34,7 +34,8 @@
<tc:tabChangeListener type="org.apache.myfaces.tobago.example.demo.actionlistener.SimpleTabChangeListener"
binding="#{demo.tabChangeListener}"/>
- <tc:tab label="#{overviewBundle.tabPlanet}">
+ <tc:tab image="image/feather-leaf.png"
+ label="#{overviewBundle.tabPlanet}">
<f:facet name="layout">
<tc:gridLayout rows="1*;auto;auto;1*"/>
</f:facet>
@@ -45,7 +46,18 @@
label="#{overviewBundle.solarPlanetMass}"/>
<tc:panel/>
</tc:tab>
- <tc:tab label="#{overviewBundle.tabInsolar}">
+ <tc:tab image="image/feather.png"
+ label="#{overviewBundle.tabInsolar}"
+ rendered="#{!hideTab2}">
+ <f:facet name="toolBar">
+ <tc:toolBar>
+ <tc:toolBarCommand actionListener="#{demo.hideTab2}"
+ tip="#{overviewBundle.closeButtonTip}"
+ image="image/remove.gif">
+ <tc:attribute name="renderedPartially" value=":page:tabMarsOuterForm2"/>
+ </tc:toolBarCommand>
+ </tc:toolBar>
+ </f:facet>
<f:facet name="layout"><tc:gridLayout rows="1*;auto;auto;1*"/></f:facet>
<tc:image value="image/feather-leaf.png"/>
<tx:in value="#{demo.solar.planets[0].sunDistance}"
@@ -54,7 +66,7 @@
label="#{overviewBundle.solarPlanetTimeOfCirculation}"/>
<tc:panel/>
</tc:tab>
- <tc:tab label="#{overviewBundle.tabMoons}">
+ <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">
Propchange: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/04-tab/01-ajax/tab-ajax.xhtml
------------------------------------------------------------------------------
Merged /myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/04-tab/01-ajax/tab-ajax.xhtml:r1590288
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview.properties.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview.properties.xml?rev=1590289&r1=1590288&r2=1590289&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview.properties.xml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview.properties.xml Sat Apr 26 19:52:05 2014
@@ -187,6 +187,7 @@
<entry key="tabSwitchTypeReloadPage">Server side tabbing (Full Reload)</entry>
<entry key="tabPlanet">Data of the _Planets</entry>
<entry key="tabInsolar">In the _Solarsystem</entry>
+<entry key="closeButtonTip">Hide this tab for one request cycle</entry>
<entry key="tabMoons">_Moons</entry>
Propchange: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview.properties.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sat Apr 26 19:52:05 2014
@@ -0,0 +1,3 @@
+/myfaces/tobago/branches/tobago-1.5.x/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview.properties.xml:1356585,1357124
+/myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview.properties.xml:1226794-1341423
+/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview.properties.xml:1571193,1571804,1571816,1571941,1571945,1571962,1571966,1576730,1589960,1590288
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview_de.properties.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview_de.properties.xml?rev=1590289&r1=1590288&r2=1590289&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview_de.properties.xml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview_de.properties.xml Sat Apr 26 19:52:05 2014
@@ -124,6 +124,7 @@
<entry key="tabSwitchTypeReloadPage">Vollständig neu laden</entry>
<entry key="tabPlanet">_Planetendaten</entry>
<entry key="tabInsolar">im _Sonnensystem</entry>
+ <entry key="closeButtonTip">Diesen Reiter für einen Request schlieÃen</entry>
<entry key="tabMoons">Monde</entry>
<!-- solar -->
Propchange: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview_de.properties.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sat Apr 26 19:52:05 2014
@@ -0,0 +1,3 @@
+/myfaces/tobago/branches/tobago-1.5.x/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview_de.properties.xml:1356585,1357124
+/myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview_de.properties.xml:1226794-1341423
+/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview_de.properties.xml:1571193,1571804,1571816,1571941,1571945,1571962,1571966,1576730,1589960,1590288