[richfaces-svn-commits] JBoss Rich Faces SVN: r9031 - in trunk/samples/richfaces-demo/src/main: webapp/richfaces and 3 other directories.

Author: dsvyatobatsko Date: 2008-06-13 10:08:46 -0400 (Fri, 13 Jun 2008) New Revision: 9031 Added: trunk/samples/richfaces-demo/src/main/webapp/richfaces/listShuttle/usage.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/orderingList/usage.xhtml trunk/samples/richfaces-demo/src/main/webapp/templates/include/tab-panel.xhtml Removed: trunk/samples/richfaces-demo/src/main/webapp/richfaces/listShuttle/listShuttle.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/orderingList/orderingList.xhtml trunk/samples/richfaces-demo/src/main/webapp/templates/include/tagInfo.xhtml Modified: trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/common/ComponentDescriptor.java trunk/samples/richfaces-demo/src/main/webapp/richfaces/actionparam.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/ajaxListener.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/bundle.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/calendar.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/columns.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/comboBox.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/commandButton.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/commandLink.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/componentControl.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/contextMenu.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataFilterSlider.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataGrid.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataLists.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTable.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTableScroller.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/dragIndicator.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/dragSupport.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/dropDownMenu.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/dropSupport.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/effect.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/fileUpload.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/form.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/gmap.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/htmlCommandLink.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/include.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/inplaceInput.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/inplaceSelect.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/inputNumberSlider.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/inputNumberSpinner.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/insert.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/jQuery.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/jsFunction.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/keepAlive.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/listShuttle.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/log.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/mediaOutput.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/message.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/messages.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/modalPanel.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/orderingList.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/outputPanel.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/page.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/paint2D.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/panel.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/panelBar.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/panelMenu.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/pickList.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/plugnskin.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/poll.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/portlet.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/progressBar.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/push.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/region.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/repeat.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/script.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/scrollableDataTable.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/separator.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/simpleTogglePanel.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/spacer.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/standardSkinning.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/status.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/style.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/suggestionBox.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/support.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/tabPanel.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/togglePanel.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/toolBar.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/toolTip.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/tree.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/treeNodesAdaptor.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/virtualEarth.xhtml Log: extracted tab panel into separate template Modified: trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/common/ComponentDescriptor.java =================================================================== --- trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/common/ComponentDescriptor.java 2008-06-13 13:41:37 UTC (rev 9030) +++ trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/common/ComponentDescriptor.java 2008-06-13 14:08:46 UTC (rev 9031) @@ -3,107 +3,152 @@ import javax.faces.context.FacesContext; public class ComponentDescriptor { - private String id; - private String name; - private String group; - private String captionImage; - private String iconImage; - private String devGuideLocation; - private String tldDocLocation; - private String javaDocLocation; - private String demoLocation; - private boolean current; - - public ComponentDescriptor() { - this.id = ""; - this.name = ""; - this.captionImage = ""; - this.iconImage = ""; - this.devGuideLocation = ""; - this.tldDocLocation = ""; - this.javaDocLocation = ""; - this.current = false; - } - - public String getCaptionImage() { - return captionImage; - } - public void setCaptionImage(String captionImage) { - this.captionImage = captionImage; - } - public String getDevGuideLocation() { - return devGuideLocation; - } - public void setDevGuideLocation(String devGuideLocation) { - this.devGuideLocation = devGuideLocation; - } - public String getId() { - return id; - } - public void setId(String id) { - this.id = id; - } - public String getJavaDocLocation() { - return javaDocLocation; - } - public void setJavaDocLocation(String javaDocLocation) { - this.javaDocLocation = javaDocLocation; - } - public String getName() { - return name; - } - public void setName(String name) { - this.name = name; - } - public String getTldDocLocation() { - return tldDocLocation; - } - public void setTldDocLocation(String tldDocLocation) { - this.tldDocLocation = tldDocLocation; - } - public boolean isCurrent() { - return current; - } + private String id; - public void setCurrent(boolean current) { - this.current = current; - } + private String name; - public String getIconImage() { - return iconImage; - } + private String group; - public void setIconImage(String iconImage) { - this.iconImage = iconImage; - } + private String captionImage; - public String getDemoLocation() { - return demoLocation; - } + private String iconImage; - public void setDemoLocation(String demoLocation) { - this.demoLocation = demoLocation; - } - public String getContextRelativeDemoLocation() { - FacesContext fc = FacesContext.getCurrentInstance(); - return fc.getExternalContext().getRequestContextPath()+getDemoLocation(); - } + private String devGuideLocation; - public String getGroup() { - return group; - } + private String tldDocLocation; - public void setGroup(String group) { - this.group = group; - } - - public String getTagInfoLocation() { - int pos = tldDocLocation.indexOf("tlddoc"); - if (pos > 0) { - return tldDocLocation.substring(pos); - } - return tldDocLocation; - } + private String javaDocLocation; + private String demoLocation; + + private boolean current; + + private String activeTab; + + public ComponentDescriptor() { + this.id = ""; + this.name = ""; + this.captionImage = ""; + this.iconImage = ""; + this.devGuideLocation = ""; + this.tldDocLocation = ""; + this.javaDocLocation = ""; + this.current = false; + this.activeTab = "usage"; + } + + public String getCaptionImage() { + return captionImage; + } + + public void setCaptionImage(String captionImage) { + this.captionImage = captionImage; + } + + public String getDevGuideLocation() { + return devGuideLocation; + } + + public void setDevGuideLocation(String devGuideLocation) { + this.devGuideLocation = devGuideLocation; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getJavaDocLocation() { + return javaDocLocation; + } + + public void setJavaDocLocation(String javaDocLocation) { + this.javaDocLocation = javaDocLocation; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getTldDocLocation() { + return tldDocLocation; + } + + public void setTldDocLocation(String tldDocLocation) { + this.tldDocLocation = tldDocLocation; + } + + public boolean isCurrent() { + return current; + } + + public void setCurrent(boolean current) { + this.current = current; + } + + public String getIconImage() { + return iconImage; + } + + public void setIconImage(String iconImage) { + this.iconImage = iconImage; + } + + public String getDemoLocation() { + return demoLocation; + } + + public void setDemoLocation(String demoLocation) { + this.demoLocation = demoLocation; + } + + public String getContextRelativeDemoLocation() { + FacesContext fc = FacesContext.getCurrentInstance(); + return fc.getExternalContext().getRequestContextPath() + getDemoLocation(); + } + + public String getGroup() { + return group; + } + + public void setGroup(String group) { + this.group = group; + } + + public String getTagInfoLocation() { + int pos = tldDocLocation.indexOf("tlddoc"); + if (pos > 0) { + return tldDocLocation.substring(pos); + } + return tldDocLocation; + } + + public String getTagUsageLocation() { + return demoLocation.replaceAll("\\.jsf[\\s]*$", ""); + } + + /** + * Gets value of activeTab field. + * @return value of activeTab field + */ + public String getActiveTab() { + return activeTab; + } + + /** + * Set a new value for activeTab field. + * @param activeTab a new value for activeTab field + */ + public void setActiveTab(String activeTab) { + this.activeTab = activeTab; + } + } Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/actionparam.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/actionparam.xhtml 2008-06-13 13:41:37 UTC (rev 9030) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/actionparam.xhtml 2008-06-13 14:08:46 UTC (rev 9031) @@ -7,14 +7,7 @@ <ui:composition template="/templates/main.xhtml"> <ui:define name="title">RichFaces - Open Source Rich JSF Components - Action Parameter</ui:define> <ui:define name="body"> - <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> - <rich:tab label="Usage"> - <ui:include src="/richfaces/actionparam/usage.xhtml"/> - </rich:tab> - <ui:include src="/templates/include/tagInfo.xhtml"> - <ui:param name="path" value="a4j/actionparam"/> - </ui:include> - </rich:tabPanel> + <ui:include src="/templates/include/tab-panel.xhtml" /> </ui:define> </ui:composition> </html> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes.xhtml 2008-06-13 13:41:37 UTC (rev 9030) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes.xhtml 2008-06-13 14:08:46 UTC (rev 9031) @@ -7,8 +7,7 @@ <ui:composition template="/templates/main.xhtml"> <ui:define name="title">RichFaces - Open Source Rich JSF Components - Ajax Attributes</ui:define> <ui:define name="body"> - - <ui:include src="/richfaces/ajaxAttributes/usage.xhtml"/> + <ui:include src="/richfaces/ajaxAttributes/usage.xhtml"/> </ui:define> </ui:composition> </html> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/ajaxListener.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/ajaxListener.xhtml 2008-06-13 13:41:37 UTC (rev 9030) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/ajaxListener.xhtml 2008-06-13 14:08:46 UTC (rev 9031) @@ -7,14 +7,7 @@ <ui:composition template="/templates/main.xhtml"> <ui:define name="title">RichFaces - Open Source Rich JSF Components - Ajax Listener</ui:define> <ui:define name="body"> - <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> - <rich:tab label="Usage"> - <ui:include src="/richfaces/ajaxListener/usage.xhtml"/> - </rich:tab> - <ui:include src="/templates/include/tagInfo.xhtml"> - <ui:param name="path" value="a4j/ajaxListener"/> - </ui:include> - </rich:tabPanel> + <ui:include src="/templates/include/tab-panel.xhtml" /> </ui:define> </ui:composition> </html> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/bundle.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/bundle.xhtml 2008-06-13 13:41:37 UTC (rev 9030) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/bundle.xhtml 2008-06-13 14:08:46 UTC (rev 9031) @@ -7,14 +7,7 @@ <ui:composition template="/templates/main.xhtml"> <ui:define name="title">RichFaces - Open Source Rich JSF Components - Load Bundle</ui:define> <ui:define name="body"> - <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> - <rich:tab label="Usage"> - <ui:include src="/richfaces/bundle/usage.xhtml"/> - </rich:tab> - <ui:include src="/templates/include/tagInfo.xhtml"> - <ui:param name="path" value="a4j/loadBundle"/> - </ui:include> - </rich:tabPanel> + <ui:include src="/templates/include/tab-panel.xhtml" /> </ui:define> </ui:composition> </html> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/calendar.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/calendar.xhtml 2008-06-13 13:41:37 UTC (rev 9030) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/calendar.xhtml 2008-06-13 14:08:46 UTC (rev 9031) @@ -16,10 +16,11 @@ </rich:tab> <rich:tab label="Client Side API"> <ui:include src="/richfaces/calendar/jsAPI.xhtml"/> - </rich:tab> - <ui:include src="/templates/include/tagInfo.xhtml"> - <ui:param name="path" value="rich/calendar"/> - </ui:include> + </rich:tab> + <rich:tab label="Tag Information"> + <rich:insert src="/WEB-INF/#{componentNavigator.currentComponent.tagInfoLocation}" + errorContent="/templates/include/tagInfoNotes.xhtml"/> + </rich:tab> </rich:tabPanel> </ui:define> </ui:composition> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/columns.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/columns.xhtml 2008-06-13 13:41:37 UTC (rev 9030) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/columns.xhtml 2008-06-13 14:08:46 UTC (rev 9031) @@ -7,14 +7,7 @@ <ui:composition template="/templates/main.xhtml"> <ui:define name="title">RichFaces - Open Source Rich JSF Components - Columns Component</ui:define> <ui:define name="body"> - <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> - <rich:tab label="Usage"> - <ui:include src="/richfaces/columns/usage.xhtml"/> - </rich:tab> - <ui:include src="/templates/include/tagInfo.xhtml"> - <ui:param name="path" value="rich/columns"/> - </ui:include> - </rich:tabPanel> + <ui:include src="/templates/include/tab-panel.xhtml" /> </ui:define> </ui:composition> </html> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/comboBox.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/comboBox.xhtml 2008-06-13 13:41:37 UTC (rev 9030) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/comboBox.xhtml 2008-06-13 14:08:46 UTC (rev 9031) @@ -7,14 +7,7 @@ <ui:composition template="/templates/main.xhtml"> <ui:define name="title">RichFaces - Open Source Rich JSF Components - Combo Box Component</ui:define> <ui:define name="body"> - <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> - <rich:tab label="Usage"> - <ui:include src="/richfaces/comboBox/usage.xhtml"/> - </rich:tab> - <ui:include src="/templates/include/tagInfo.xhtml"> - <ui:param name="path" value="rich/comboBox"/> - </ui:include> - </rich:tabPanel> + <ui:include src="/templates/include/tab-panel.xhtml" /> </ui:define> </ui:composition> </html> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/commandButton.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/commandButton.xhtml 2008-06-13 13:41:37 UTC (rev 9030) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/commandButton.xhtml 2008-06-13 14:08:46 UTC (rev 9031) @@ -7,14 +7,7 @@ <ui:composition template="/templates/main.xhtml"> <ui:define name="title">RichFaces - Open Source Rich JSF Components - Ajax Button</ui:define> <ui:define name="body"> - <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> - <rich:tab label="Usage"> - <ui:include src="/richfaces/commandButton/usage.xhtml"/> - </rich:tab> - <ui:include src="/templates/include/tagInfo.xhtml"> - <ui:param name="path" value="a4j/commandButton"/> - </ui:include> - </rich:tabPanel> + <ui:include src="/templates/include/tab-panel.xhtml" /> </ui:define> </ui:composition> </html> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/commandLink.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/commandLink.xhtml 2008-06-13 13:41:37 UTC (rev 9030) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/commandLink.xhtml 2008-06-13 14:08:46 UTC (rev 9031) @@ -7,14 +7,7 @@ <ui:composition template="/templates/main.xhtml"> <ui:define name="title">RichFaces - Open Source Rich JSF Components - Ajax Link</ui:define> <ui:define name="body"> - <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> - <rich:tab label="Usage"> - <ui:include src="/richfaces/commandLink/usage.xhtml"/> - </rich:tab> - <ui:include src="/templates/include/tagInfo.xhtml"> - <ui:param name="path" value="a4j/commandLink"/> - </ui:include> - </rich:tabPanel> + <ui:include src="/templates/include/tab-panel.xhtml" /> </ui:define> </ui:composition> </html> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/componentControl.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/componentControl.xhtml 2008-06-13 13:41:37 UTC (rev 9030) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/componentControl.xhtml 2008-06-13 14:08:46 UTC (rev 9031) @@ -7,14 +7,7 @@ <ui:composition template="/templates/main.xhtml"> <ui:define name="title">RichFaces - Open Source Rich JSF Components - Component Control Component</ui:define> <ui:define name="body"> - <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> - <rich:tab label="Usage"> - <ui:include src="/richfaces/componentControl/usage.xhtml"/> - </rich:tab> - <ui:include src="/templates/include/tagInfo.xhtml"> - <ui:param name="path" value="rich/componentControl"/> - </ui:include> - </rich:tabPanel> + <ui:include src="/templates/include/tab-panel.xhtml" /> </ui:define> </ui:composition> </html> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/contextMenu.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/contextMenu.xhtml 2008-06-13 13:41:37 UTC (rev 9030) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/contextMenu.xhtml 2008-06-13 14:08:46 UTC (rev 9031) @@ -7,14 +7,7 @@ <ui:composition template="/templates/main.xhtml"> <ui:define name="title">RichFaces - Open Source Rich JSF Components - Context Menu Component</ui:define> <ui:define name="body"> - <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> - <rich:tab label="Usage"> - <ui:include src="/richfaces/contextMenu/usage.xhtml"/> - </rich:tab> - <ui:include src="/templates/include/tagInfo.xhtml"> - <ui:param name="path" value="rich/contextMenu"/> - </ui:include> - </rich:tabPanel> + <ui:include src="/templates/include/tab-panel.xhtml" /> </ui:define> </ui:composition> </html> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataFilterSlider.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataFilterSlider.xhtml 2008-06-13 13:41:37 UTC (rev 9030) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataFilterSlider.xhtml 2008-06-13 14:08:46 UTC (rev 9031) @@ -7,14 +7,7 @@ <ui:composition template="/templates/main.xhtml"> <ui:define name="title">RichFaces - Open Source Rich JSF Components - Data FIlter Slider</ui:define> <ui:define name="body"> - <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> - <rich:tab label="Usage"> - <ui:include src="/richfaces/dataFilterSlider/usage.xhtml"/> - </rich:tab> - <ui:include src="/templates/include/tagInfo.xhtml"> - <ui:param name="path" value="rich/dataFilterSlider"/> - </ui:include> - </rich:tabPanel> + <ui:include src="/templates/include/tab-panel.xhtml" /> </ui:define> </ui:composition> </html> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataGrid.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataGrid.xhtml 2008-06-13 13:41:37 UTC (rev 9030) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataGrid.xhtml 2008-06-13 14:08:46 UTC (rev 9031) @@ -7,14 +7,7 @@ <ui:composition template="/templates/main.xhtml"> <ui:define name="title">RichFaces - Open Source Rich JSF Components - Data Grid</ui:define> <ui:define name="body"> - <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> - <rich:tab label="Usage"> - <ui:include src="/richfaces/dataGrid/usage.xhtml"/> - </rich:tab> - <ui:include src="/templates/include/tagInfo.xhtml"> - <ui:param name="path" value="rich/dataGrid"/> - </ui:include> - </rich:tabPanel> + <ui:include src="/templates/include/tab-panel.xhtml" /> </ui:define> </ui:composition> </html> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataLists.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataLists.xhtml 2008-06-13 13:41:37 UTC (rev 9030) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataLists.xhtml 2008-06-13 14:08:46 UTC (rev 9031) @@ -7,14 +7,7 @@ <ui:composition template="/templates/main.xhtml"> <ui:define name="title">RichFaces - Open Source Rich JSF Components - Data Lists</ui:define> <ui:define name="body"> - <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> - <rich:tab label="Usage"> - <ui:include src="/richfaces/dataLists/usage.xhtml"/> - </rich:tab> - <ui:include src="/templates/include/tagInfo.xhtml"> - <ui:param name="path" value="rich/dataList"/> - </ui:include> - </rich:tabPanel> + <ui:include src="/templates/include/tab-panel.xhtml" /> </ui:define> </ui:composition> </html> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTable.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTable.xhtml 2008-06-13 13:41:37 UTC (rev 9030) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTable.xhtml 2008-06-13 14:08:46 UTC (rev 9031) @@ -7,17 +7,7 @@ <ui:composition template="/templates/main.xhtml"> <ui:define name="title">RichFaces - Open Source Rich JSF Components - Data Table</ui:define> <ui:define name="body"> - <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> - <rich:tab label="Usage"> - <ui:include src="/richfaces/dataTable/usage.xhtml"/> - </rich:tab> - <rich:tab label="Extended Data Model"> - <ui:include src="/richfaces/dataTable/extended-data-model.xhtml"/> - </rich:tab> - <ui:include src="/templates/include/tagInfo.xhtml"> - <ui:param name="path" value="rich/dataTable"/> - </ui:include> - </rich:tabPanel> + <ui:include src="/templates/include/tab-panel.xhtml" /> </ui:define> </ui:composition> </html> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTableScroller.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTableScroller.xhtml 2008-06-13 13:41:37 UTC (rev 9030) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTableScroller.xhtml 2008-06-13 14:08:46 UTC (rev 9031) @@ -7,14 +7,7 @@ <ui:composition template="/templates/main.xhtml"> <ui:define name="title">RichFaces - Open Source Rich JSF Components - Data Table Scroller</ui:define> <ui:define name="body"> - <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> - <rich:tab label="Usage"> - <ui:include src="/richfaces/dataTableScroller/usage.xhtml"/> - </rich:tab> - <ui:include src="/templates/include/tagInfo.xhtml"> - <ui:param name="path" value="rich/datascroller"/> - </ui:include> - </rich:tabPanel> + <ui:include src="/templates/include/tab-panel.xhtml" /> </ui:define> </ui:composition> </html> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/dragIndicator.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/dragIndicator.xhtml 2008-06-13 13:41:37 UTC (rev 9030) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/dragIndicator.xhtml 2008-06-13 14:08:46 UTC (rev 9031) @@ -7,14 +7,7 @@ <ui:composition template="/templates/main.xhtml"> <ui:define name="title">RichFaces - Open Source Rich JSF Components - Drag-n-Drop. Drag Indicator</ui:define> <ui:define name="body"> - <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> - <rich:tab label="Usage"> - <ui:include src="/richfaces/dragSupport/usage.xhtml"/> - </rich:tab> - <ui:include src="/templates/include/tagInfo.xhtml"> - <ui:param name="path" value="rich/dragIndicator"/> - </ui:include> - </rich:tabPanel> + <ui:include src="/templates/include/tab-panel.xhtml" /> </ui:define> </ui:composition> </html> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/dragSupport.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/dragSupport.xhtml 2008-06-13 13:41:37 UTC (rev 9030) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/dragSupport.xhtml 2008-06-13 14:08:46 UTC (rev 9031) @@ -7,14 +7,7 @@ <ui:composition template="/templates/main.xhtml"> <ui:define name="title">RichFaces - Open Source Rich JSF Components - Drag-n-Drop. DragSupport</ui:define> <ui:define name="body"> - <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> - <rich:tab label="Usage"> - <ui:include src="/richfaces/dragSupport/usage.xhtml"/> - </rich:tab> - <ui:include src="/templates/include/tagInfo.xhtml"> - <ui:param name="path" value="rich/dragSupport"/> - </ui:include> - </rich:tabPanel> + <ui:include src="/templates/include/tab-panel.xhtml" /> </ui:define> </ui:composition> </html> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/dropDownMenu.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/dropDownMenu.xhtml 2008-06-13 13:41:37 UTC (rev 9030) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/dropDownMenu.xhtml 2008-06-13 14:08:46 UTC (rev 9031) @@ -7,14 +7,7 @@ <ui:composition template="/templates/main.xhtml"> <ui:define name="title">RichFaces - Open Source Rich JSF Components - Drop Down Menu Component</ui:define> <ui:define name="body"> - <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> - <rich:tab label="Usage"> - <ui:include src="/richfaces/dropDownMenu/usage.xhtml"/> - </rich:tab> - <ui:include src="/templates/include/tagInfo.xhtml"> - <ui:param name="path" value="rich/dropDownMenu"/> - </ui:include> - </rich:tabPanel> + <ui:include src="/templates/include/tab-panel.xhtml" /> </ui:define> </ui:composition> </html> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/dropSupport.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/dropSupport.xhtml 2008-06-13 13:41:37 UTC (rev 9030) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/dropSupport.xhtml 2008-06-13 14:08:46 UTC (rev 9031) @@ -7,14 +7,7 @@ <ui:composition template="/templates/main.xhtml"> <ui:define name="title">RichFaces - Open Source Rich JSF Components - Drag-n-Drop. DragSupport</ui:define> <ui:define name="body"> - <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> - <rich:tab label="Usage"> - <ui:include src="/richfaces/dragSupport/usage.xhtml"/> - </rich:tab> - <ui:include src="/templates/include/tagInfo.xhtml"> - <ui:param name="path" value="rich/dropSupport"/> - </ui:include> - </rich:tabPanel> + <ui:include src="/templates/include/tab-panel.xhtml" /> </ui:define> </ui:composition> </html> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/effect.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/effect.xhtml 2008-06-13 13:41:37 UTC (rev 9030) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/effect.xhtml 2008-06-13 14:08:46 UTC (rev 9031) @@ -13,10 +13,11 @@ </rich:tab> <rich:tab label="Key Attributes"> <ui:include src="/richfaces/effect/attributes.xhtml"/> - </rich:tab> - <ui:include src="/templates/include/tagInfo.xhtml"> - <ui:param name="path" value="rich/effect"/> - </ui:include> + </rich:tab> + <rich:tab label="Tag Information"> + <rich:insert src="/WEB-INF/#{componentNavigator.currentComponent.tagInfoLocation}" + errorContent="/templates/include/tagInfoNotes.xhtml"/> + </rich:tab> </rich:tabPanel> </ui:define> </ui:composition> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/fileUpload.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/fileUpload.xhtml 2008-06-13 13:41:37 UTC (rev 9030) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/fileUpload.xhtml 2008-06-13 14:08:46 UTC (rev 9031) @@ -7,14 +7,7 @@ <ui:composition template="/templates/main.xhtml"> <ui:define name="title">RichFaces - Open Source Rich JSF Components - Combo Box Component</ui:define> <ui:define name="body"> - <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> - <rich:tab label="Usage"> - <ui:include src="/richfaces/fileUpload/usage.xhtml"/> - </rich:tab> - <ui:include src="/templates/include/tagInfo.xhtml"> - <ui:param name="path" value="rich/fileUpload"/> - </ui:include> - </rich:tabPanel> + <ui:include src="/templates/include/tab-panel.xhtml" /> </ui:define> </ui:composition> </html> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/form.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/form.xhtml 2008-06-13 13:41:37 UTC (rev 9030) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/form.xhtml 2008-06-13 14:08:46 UTC (rev 9031) @@ -7,14 +7,7 @@ <ui:composition template="/templates/main.xhtml"> <ui:define name="title">RichFaces - Open Source Rich JSF Components - Ajax Form</ui:define> <ui:define name="body"> - <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> - <rich:tab label="Usage"> - <ui:include src="/richfaces/form/usage.xhtml"/> - </rich:tab> - <ui:include src="/templates/include/tagInfo.xhtml"> - <ui:param name="path" value="a4j/form"/> - </ui:include> - </rich:tabPanel> + <ui:include src="/templates/include/tab-panel.xhtml" /> </ui:define> </ui:composition> </html> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/gmap.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/gmap.xhtml 2008-06-13 13:41:37 UTC (rev 9030) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/gmap.xhtml 2008-06-13 14:08:46 UTC (rev 9031) @@ -8,14 +8,7 @@ <ui:define name="title">RichFaces - Open Source Rich JSF Components - Google Map Component</ui:define> <ui:define name="body"> <f:view contentType="text/html"> - <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> - <rich:tab label="Usage"> - <ui:include src="/richfaces/gmap/usage.xhtml"/> - </rich:tab> - <ui:include src="/templates/include/tagInfo.xhtml"> - <ui:param name="path" value="rich/gmap"/> - </ui:include> - </rich:tabPanel> + <ui:include src="/templates/include/tab-panel.xhtml" /> </f:view> </ui:define> </ui:composition> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/htmlCommandLink.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/htmlCommandLink.xhtml 2008-06-13 13:41:37 UTC (rev 9030) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/htmlCommandLink.xhtml 2008-06-13 14:08:46 UTC (rev 9031) @@ -7,14 +7,7 @@ <ui:composition template="/templates/main.xhtml"> <ui:define name="title">RichFaces - Open Source Rich JSF Components - Html Command Link</ui:define> <ui:define name="body"> - <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> - <rich:tab label="Usage"> - <ui:include src="/richfaces/htmlCommandLink/usage.xhtml"/> - </rich:tab> - <ui:include src="/templates/include/tagInfo.xhtml"> - <ui:param name="path" value="a4j/htmlCommandLink"/> - </ui:include> - </rich:tabPanel> + <ui:include src="/templates/include/tab-panel.xhtml" /> </ui:define> </ui:composition> </html> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/include.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/include.xhtml 2008-06-13 13:41:37 UTC (rev 9030) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/include.xhtml 2008-06-13 14:08:46 UTC (rev 9031) @@ -7,14 +7,7 @@ <ui:composition template="/templates/main.xhtml"> <ui:define name="title">RichFaces - Open Source Rich JSF Components - Include</ui:define> <ui:define name="body"> - <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> - <rich:tab label="Usage"> - <ui:include src="/richfaces/include/usage.xhtml"/> - </rich:tab> - <ui:include src="/templates/include/tagInfo.xhtml"> - <ui:param name="path" value="a4j/include"/> - </ui:include> - </rich:tabPanel> + <ui:include src="/templates/include/tab-panel.xhtml" /> </ui:define> </ui:composition> </html> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/inplaceInput.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/inplaceInput.xhtml 2008-06-13 13:41:37 UTC (rev 9030) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/inplaceInput.xhtml 2008-06-13 14:08:46 UTC (rev 9031) @@ -7,14 +7,7 @@ <ui:composition template="/templates/main.xhtml"> <ui:define name="title">RichFaces - Open Source Rich JSF Components - Inplace Input component</ui:define> <ui:define name="body"> - <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> - <rich:tab label="Usage"> - <ui:include src="/richfaces/inplaceInput/usage.xhtml"/> - </rich:tab> - <ui:include src="/templates/include/tagInfo.xhtml"> - <ui:param name="path" value="rich/inplaceInput"/> - </ui:include> - </rich:tabPanel> + <ui:include src="/templates/include/tab-panel.xhtml" /> </ui:define> </ui:composition> </html> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/inplaceSelect.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/inplaceSelect.xhtml 2008-06-13 13:41:37 UTC (rev 9030) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/inplaceSelect.xhtml 2008-06-13 14:08:46 UTC (rev 9031) @@ -7,14 +7,7 @@ <ui:composition template="/templates/main.xhtml"> <ui:define name="title">RichFaces - Open Source Rich JSF Components - Inplace Select component</ui:define> <ui:define name="body"> - <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> - <rich:tab label="Usage"> - <ui:include src="/richfaces/inplaceSelect/usage.xhtml"/> - </rich:tab> - <ui:include src="/templates/include/tagInfo.xhtml"> - <ui:param name="path" value="rich/inplaceSelect"/> - </ui:include> - </rich:tabPanel> + <ui:include src="/templates/include/tab-panel.xhtml" /> </ui:define> </ui:composition> </html> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/inputNumberSlider.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/inputNumberSlider.xhtml 2008-06-13 13:41:37 UTC (rev 9030) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/inputNumberSlider.xhtml 2008-06-13 14:08:46 UTC (rev 9031) @@ -8,14 +8,7 @@ <ui:composition template="/templates/main.xhtml"> <ui:define name="title">RichFaces - Open Source Rich JSF Components - InputNumberSlider</ui:define> <ui:define name="body"> - <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> - <rich:tab label="Usage"> - <ui:include src="/richfaces/inputNumberSlider/usage.xhtml"/> - </rich:tab> - <ui:include src="/templates/include/tagInfo.xhtml"> - <ui:param name="path" value="rich/inputNumberSlider"/> - </ui:include> - </rich:tabPanel> + <ui:include src="/templates/include/tab-panel.xhtml" /> </ui:define> </ui:composition> </html> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/inputNumberSpinner.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/inputNumberSpinner.xhtml 2008-06-13 13:41:37 UTC (rev 9030) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/inputNumberSpinner.xhtml 2008-06-13 14:08:46 UTC (rev 9031) @@ -8,14 +8,7 @@ <ui:composition template="/templates/main.xhtml"> <ui:define name="title">RichFaces - Open Source Rich JSF Components - InputNumberSpinner</ui:define> <ui:define name="body"> - <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> - <rich:tab label="Usage"> - <ui:include src="/richfaces/inputNumberSpinner/usage.xhtml"/> - </rich:tab> - <ui:include src="/templates/include/tagInfo.xhtml"> - <ui:param name="path" value="rich/inputNumberSpinner"/> - </ui:include> - </rich:tabPanel> + <ui:include src="/templates/include/tab-panel.xhtml" /> </ui:define> </ui:composition> </html> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/insert.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/insert.xhtml 2008-06-13 13:41:37 UTC (rev 9030) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/insert.xhtml 2008-06-13 14:08:46 UTC (rev 9031) @@ -7,14 +7,7 @@ <ui:composition template="/templates/main.xhtml"> <ui:define name="title">RichFaces - Open Source Rich JSF Components - Page Insert</ui:define> <ui:define name="body"> - <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> - <rich:tab label="Usage"> - <ui:include src="/richfaces/insert/usage.xhtml"/> - </rich:tab> - <ui:include src="/templates/include/tagInfo.xhtml"> - <ui:param name="path" value="rich/insert"/> - </ui:include> - </rich:tabPanel> + <ui:include src="/templates/include/tab-panel.xhtml" /> </ui:define> </ui:composition> </html> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/jQuery.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/jQuery.xhtml 2008-06-13 13:41:37 UTC (rev 9030) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/jQuery.xhtml 2008-06-13 14:08:46 UTC (rev 9031) @@ -7,17 +7,7 @@ <ui:composition template="/templates/main.xhtml"> <ui:define name="title">RichFaces - Open Source Rich JSF Components - jQuery Extension</ui:define> <ui:define name="body"> - - <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> - - <rich:tab label="Usage"> - <ui:include src="/richfaces/jQuery/usage.xhtml"/> - </rich:tab> - <ui:include src="/templates/include/tagInfo.xhtml"> - <ui:param name="path" value="rich/jQuery"/> - </ui:include> - </rich:tabPanel> - + <ui:include src="/templates/include/tab-panel.xhtml" /> </ui:define> </ui:composition> </html> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/jsFunction.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/jsFunction.xhtml 2008-06-13 13:41:37 UTC (rev 9030) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/jsFunction.xhtml 2008-06-13 14:08:46 UTC (rev 9031) @@ -7,17 +7,7 @@ <ui:composition template="/templates/main.xhtml"> <ui:define name="title">RichFaces - Open Source Rich JSF Components - Ajax JS Function</ui:define> <ui:define name="body"> - - <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> - - <rich:tab label="Usage"> - <ui:include src="/richfaces/jsFunction/usage.xhtml"/> - </rich:tab> - <ui:include src="/templates/include/tagInfo.xhtml"> - <ui:param name="path" value="a4j/jsFunction"/> - </ui:include> - </rich:tabPanel> - + <ui:include src="/templates/include/tab-panel.xhtml" /> </ui:define> </ui:composition> </html> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/keepAlive.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/keepAlive.xhtml 2008-06-13 13:41:37 UTC (rev 9030) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/keepAlive.xhtml 2008-06-13 14:08:46 UTC (rev 9031) @@ -7,14 +7,7 @@ <ui:composition template="/templates/main.xhtml"> <ui:define name="title">RichFaces - Open Source Rich JSF Components - Keep Bean Alive</ui:define> <ui:define name="body"> - <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> - <rich:tab label="Usage"> - <ui:include src="/richfaces/keepAlive/usage.xhtml"/> - </rich:tab> - <ui:include src="/templates/include/tagInfo.xhtml"> - <ui:param name="path" value="a4j/keepAlive"/> - </ui:include> - </rich:tabPanel> + <ui:include src="/templates/include/tab-panel.xhtml" /> </ui:define> </ui:composition> </html> Deleted: trunk/samples/richfaces-demo/src/main/webapp/richfaces/listShuttle/listShuttle.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/listShuttle/listShuttle.xhtml 2008-06-13 13:41:37 UTC (rev 9030) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/listShuttle/listShuttle.xhtml 2008-06-13 14:08:46 UTC (rev 9031) @@ -1,49 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://richfaces.org/rich"> - <ui:composition template="/templates/component-sample.xhtml"> - <ui:define name="sample"> - <p> - <b>listShuttle</b> component allows to select items using two lists with move controls and reorder items in result list. - </p> - <p> - List Shuttle could contain several columns in list representation. And it - also has strong keyboard support out of the box. - </p> - - <fieldset class="demo_fieldset"> - <legend class="demo_legend">ListShuttle example</legend> - <div class="sample-container"> - <p>Customize simple application toolbar using List Shuttle. - In this example you may select items and their order within the toolBar. - <br/> - After you move some items between lists or reorder them in "Currently Active" list - you'll - see the changes on the toolbar - </p> - <br/><br/> - <ui:include src="/richfaces/listShuttle/examples/toolBarCustomization.xhtml"/> - <ui:include src="/templates/include/sourceview.xhtml"> - <ui:param name="sourcepath" value="/richfaces/listShuttle/examples/toolBarCustomization.xhtml"/> - </ui:include> - </div> - </fieldset> - <p> - Content definition for this component - analogous to any Iteration component. - So, all you need is define collection in List Shuttle <b>sourceValue</b> attribute - and iterate the collection in nested columns through <b>var</b> attribute. - </p> - <p> - Result items will be stored under the collection defined in <b>targetValue</b> attribute. - </p> - <p> - In order to set initially selected rows or to process submitted selection - - use <b>sourceSelection</b> and <b>targetSelection</b> attributes. - </p> - </ui:define> - - </ui:composition> -</html> Copied: trunk/samples/richfaces-demo/src/main/webapp/richfaces/listShuttle/usage.xhtml (from rev 8973, trunk/samples/richfaces-demo/src/main/webapp/richfaces/listShuttle/listShuttle.xhtml) =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/listShuttle/usage.xhtml (rev 0) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/listShuttle/usage.xhtml 2008-06-13 14:08:46 UTC (rev 9031) @@ -0,0 +1,49 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich"> + <ui:composition template="/templates/component-sample.xhtml"> + <ui:define name="sample"> + <p> + <b>listShuttle</b> component allows to select items using two lists with move controls and reorder items in result list. + </p> + <p> + List Shuttle could contain several columns in list representation. And it + also has strong keyboard support out of the box. + </p> + + <fieldset class="demo_fieldset"> + <legend class="demo_legend">ListShuttle example</legend> + <div class="sample-container"> + <p>Customize simple application toolbar using List Shuttle. + In this example you may select items and their order within the toolBar. + <br/> + After you move some items between lists or reorder them in "Currently Active" list - you'll + see the changes on the toolbar + </p> + <br/><br/> + <ui:include src="/richfaces/listShuttle/examples/toolBarCustomization.xhtml"/> + <ui:include src="/templates/include/sourceview.xhtml"> + <ui:param name="sourcepath" value="/richfaces/listShuttle/examples/toolBarCustomization.xhtml"/> + </ui:include> + </div> + </fieldset> + <p> + Content definition for this component - analogous to any Iteration component. + So, all you need is define collection in List Shuttle <b>sourceValue</b> attribute + and iterate the collection in nested columns through <b>var</b> attribute. + </p> + <p> + Result items will be stored under the collection defined in <b>targetValue</b> attribute. + </p> + <p> + In order to set initially selected rows or to process submitted selection - + use <b>sourceSelection</b> and <b>targetSelection</b> attributes. + </p> + </ui:define> + + </ui:composition> +</html> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/listShuttle.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/listShuttle.xhtml 2008-06-13 13:41:37 UTC (rev 9030) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/listShuttle.xhtml 2008-06-13 14:08:46 UTC (rev 9031) @@ -7,14 +7,7 @@ <ui:composition template="/templates/main.xhtml"> <ui:define name="title">RichFaces - Open Source Rich JSF Components - Ordering List Component</ui:define> <ui:define name="body"> - <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> - <rich:tab label="Usage"> - <ui:include src="/richfaces/listShuttle/listShuttle.xhtml"/> - </rich:tab> - <ui:include src="/templates/include/tagInfo.xhtml"> - <ui:param name="path" value="rich/listShuttle"/> - </ui:include> - </rich:tabPanel> + <ui:include src="/templates/include/tab-panel.xhtml" /> </ui:define> </ui:composition> </html> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/log.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/log.xhtml 2008-06-13 13:41:37 UTC (rev 9030) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/log.xhtml 2008-06-13 14:08:46 UTC (rev 9031) @@ -7,14 +7,7 @@ <ui:composition template="/templates/main.xhtml"> <ui:define name="title">RichFaces - Open Source Rich JSF Components - Log component</ui:define> <ui:define name="body"> - <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> - <rich:tab label="Usage"> - <ui:include src="/richfaces/log/usage.xhtml"/> - </rich:tab> - <ui:include src="/templates/include/tagInfo.xhtml"> - <ui:param name="path" value="a4j/log"/> - </ui:include> - </rich:tabPanel> + <ui:include src="/templates/include/tab-panel.xhtml" /> </ui:define> </ui:composition> </html> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/mediaOutput.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/mediaOutput.xhtml 2008-06-13 13:41:37 UTC (rev 9030) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/mediaOutput.xhtml 2008-06-13 14:08:46 UTC (rev 9031) @@ -7,14 +7,7 @@ <ui:composition template="/templates/main.xhtml"> <ui:define name="title">RichFaces - Open Source Rich JSF Components - Media Output</ui:define> <ui:define name="body"> - <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> - <rich:tab label="Usage"> - <ui:include src="/richfaces/mediaOutput/usage.xhtml"/> - </rich:tab> - <ui:include src="/templates/include/tagInfo.xhtml"> - <ui:param name="path" value="a4j/mediaOutput"/> - </ui:include> - </rich:tabPanel> + <ui:include src="/templates/include/tab-panel.xhtml" /> </ui:define> </ui:composition> </html> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/message.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/message.xhtml 2008-06-13 13:41:37 UTC (rev 9030) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/message.xhtml 2008-06-13 14:08:46 UTC (rev 9031) @@ -7,14 +7,7 @@ <ui:composition template="/templates/main.xhtml"> <ui:define name="title">RichFaces - Open Source Rich JSF Components - Rich Message</ui:define> <ui:define name="body"> - <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> - <rich:tab label="Usage"> - <ui:include src="/richfaces/message/usage.xhtml"/> - </rich:tab> - <ui:include src="/templates/include/tagInfo.xhtml"> - <ui:param name="path" value="rich/message"/> - </ui:include> - </rich:tabPanel> + <ui:include src="/templates/include/tab-panel.xhtml" /> </ui:define> </ui:composition> </html> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/messages.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/messages.xhtml 2008-06-13 13:41:37 UTC (rev 9030) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/messages.xhtml 2008-06-13 14:08:46 UTC (rev 9031) @@ -7,14 +7,7 @@ <ui:composition template="/templates/main.xhtml"> <ui:define name="title">RichFaces - Open Source Rich JSF Components - Rich Messages</ui:define> <ui:define name="body"> - <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> - <rich:tab label="Usage"> - <ui:include src="/richfaces/messages/usage.xhtml"/> - </rich:tab> - <ui:include src="/templates/include/tagInfo.xhtml"> - <ui:param name="path" value="rich/messages"/> - </ui:include> - </rich:tabPanel> + <ui:include src="/templates/include/tab-panel.xhtml" /> </ui:define> </ui:composition> </html> \ No newline at end of file Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/modalPanel.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/modalPanel.xhtml 2008-06-13 13:41:37 UTC (rev 9030) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/modalPanel.xhtml 2008-06-13 14:08:46 UTC (rev 9031) @@ -7,14 +7,7 @@ <ui:composition template="/templates/main.xhtml"> <ui:define name="title">RichFaces - Open Source Rich JSF Components - Modal Panel</ui:define> <ui:define name="body"> - <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> - <rich:tab label="Usage"> - <ui:include src="/richfaces/modalPanel/usage.xhtml"/> - </rich:tab> - <ui:include src="/templates/include/tagInfo.xhtml"> - <ui:param name="path" value="rich/modalPanel"/> - </ui:include> - </rich:tabPanel> + <ui:include src="/templates/include/tab-panel.xhtml" /> </ui:define> </ui:composition> </html> Deleted: trunk/samples/richfaces-demo/src/main/webapp/richfaces/orderingList/orderingList.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/orderingList/orderingList.xhtml 2008-06-13 13:41:37 UTC (rev 9030) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/orderingList/orderingList.xhtml 2008-06-13 14:08:46 UTC (rev 9031) @@ -1,47 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://richfaces.org/rich"> - <ui:composition template="/templates/component-sample.xhtml"> - <ui:define name="sample"> - <p> - <b>orderingList</b> component allows to reorder items in a list. - </p> - <p> - Ordering List could contain several columns in list representation. And it - also has strong keyboard support out of the box. - </p> - - <fieldset class="demo_fieldset"> - <legend class="demo_legend">OrderingList example</legend> - <div class="sample-container"> - <p>Manage simple playlist represented via Ordering List:</p> - <br/> - <ui:include src="/richfaces/orderingList/example/playlist.xhtml"/> - <ui:include src="/templates/include/sourceview.xhtml"> - <ui:param name="sourcepath" value="/richfaces/orderingList/example/playlist.xhtml"/> - </ui:include> - <br/> - </div> - </fieldset> - <p> - In this example you may select some songs (using the mouse and Ctrl/Shift keys) and move them - within the list using controls. - </p> - - <p> - Content definition for this component is similar to any Iteration component. - Thus, all you need is to define collection in Ordering List <b>value</b> attribute - and iterate the collection in nested columns with <b>var</b> attribute. - </p> - <p> - In order to set initially selected rows or to process submitted selection, - use <b>selection</b> attribute. - </p> - </ui:define> - - </ui:composition> -</html> Copied: trunk/samples/richfaces-demo/src/main/webapp/richfaces/orderingList/usage.xhtml (from rev 8973, trunk/samples/richfaces-demo/src/main/webapp/richfaces/orderingList/orderingList.xhtml) =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/orderingList/usage.xhtml (rev 0) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/orderingList/usage.xhtml 2008-06-13 14:08:46 UTC (rev 9031) @@ -0,0 +1,47 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich"> + <ui:composition template="/templates/component-sample.xhtml"> + <ui:define name="sample"> + <p> + <b>orderingList</b> component allows to reorder items in a list. + </p> + <p> + Ordering List could contain several columns in list representation. And it + also has strong keyboard support out of the box. + </p> + + <fieldset class="demo_fieldset"> + <legend class="demo_legend">OrderingList example</legend> + <div class="sample-container"> + <p>Manage simple playlist represented via Ordering List:</p> + <br/> + <ui:include src="/richfaces/orderingList/example/playlist.xhtml"/> + <ui:include src="/templates/include/sourceview.xhtml"> + <ui:param name="sourcepath" value="/richfaces/orderingList/example/playlist.xhtml"/> + </ui:include> + <br/> + </div> + </fieldset> + <p> + In this example you may select some songs (using the mouse and Ctrl/Shift keys) and move them + within the list using controls. + </p> + + <p> + Content definition for this component is similar to any Iteration component. + Thus, all you need is to define collection in Ordering List <b>value</b> attribute + and iterate the collection in nested columns with <b>var</b> attribute. + </p> + <p> + In order to set initially selected rows or to process submitted selection, + use <b>selection</b> attribute. + </p> + </ui:define> + + </ui:composition> +</html> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/orderingList.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/orderingList.xhtml 2008-06-13 13:41:37 UTC (rev 9030) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/orderingList.xhtml 2008-06-13 14:08:46 UTC (rev 9031) @@ -7,14 +7,7 @@ <ui:composition template="/templates/main.xhtml"> <ui:define name="title">RichFaces - Open Source Rich JSF Components - Ordering List Component</ui:define> <ui:define name="body"> - <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> - <rich:tab label="Usage"> - <ui:include src="/richfaces/orderingList/orderingList.xhtml"/> - </rich:tab> - <ui:include src="/templates/include/tagInfo.xhtml"> - <ui:param name="path" value="rich/orderingList"/> - </ui:include> - </rich:tabPanel> + <ui:include src="/templates/include/tab-panel.xhtml" /> </ui:define> </ui:composition> </html> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/outputPanel.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/outputPanel.xhtml 2008-06-13 13:41:37 UTC (rev 9030) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/outputPanel.xhtml 2008-06-13 14:08:46 UTC (rev 9031) @@ -7,14 +7,7 @@ <ui:composition template="/templates/main.xhtml"> <ui:define name="title">RichFaces - Open Source Rich JSF Components - Output Panel</ui:define> <ui:define name="body"> - <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> - <rich:tab label="Usage"> - <ui:include src="/richfaces/outputPanel/usage.xhtml"/> - </rich:tab> - <ui:include src="/templates/include/tagInfo.xhtml"> - <ui:param name="path" value="a4j/outputPanel"/> - </ui:include> - </rich:tabPanel> + <ui:include src="/templates/include/tab-panel.xhtml" /> </ui:define> </ui:composition> </html> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/page.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/page.xhtml 2008-06-13 13:41:37 UTC (rev 9030) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/page.xhtml 2008-06-13 14:08:46 UTC (rev 9031) @@ -7,14 +7,7 @@ <ui:composition template="/templates/main.xhtml"> <ui:define name="title">RichFaces - Open Source Rich JSF Components - Page component</ui:define> <ui:define name="body"> - <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> - <rich:tab label="Usage"> - <ui:include src="/richfaces/page/usage.xhtml"/> - </rich:tab> - <ui:include src="/templates/include/tagInfo.xhtml"> - <ui:param name="path" value="a4j/page"/> - </ui:include> - </rich:tabPanel> + <ui:include src="/templates/include/tab-panel.xhtml" /> </ui:define> </ui:composition> </html> \ No newline at end of file Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/paint2D.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/paint2D.xhtml 2008-06-13 13:41:37 UTC (rev 9030) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/paint2D.xhtml 2008-06-13 14:08:46 UTC (rev 9031) @@ -7,14 +7,7 @@ <ui:composition template="/templates/main.xhtml"> <ui:define name="title">RichFaces - Open Source Rich JSF Components - Paint 2D Graphic</ui:define> <ui:define name="body"> - <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> - <rich:tab label="Usage"> - <ui:include src="/richfaces/paint2D/usage.xhtml"/> - </rich:tab> - <ui:include src="/templates/include/tagInfo.xhtml"> - <ui:param name="path" value="rich/paint2D"/> - </ui:include> - </rich:tabPanel> + <ui:include src="/templates/include/tab-panel.xhtml" /> </ui:define> </ui:composition> </html> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/panel.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/panel.xhtml 2008-06-13 13:41:37 UTC (rev 9030) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/panel.xhtml 2008-06-13 14:08:46 UTC (rev 9031) @@ -16,9 +16,10 @@ <rich:tab label="Look Customization"> <ui:include src="/richfaces/panel/look-customization.xhtml"/> </rich:tab> - <ui:include src="/templates/include/tagInfo.xhtml"> - <ui:param name="path" value="rich/panel"/> - </ui:include> + <rich:tab label="Tag Information"> + <rich:insert src="/WEB-INF/#{componentNavigator.currentComponent.tagInfoLocation}" + errorContent="/templates/include/tagInfoNotes.xhtml"/> + </rich:tab> </rich:tabPanel> </ui:define> </ui:composition> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/panelBar.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/panelBar.xhtml 2008-06-13 13:41:37 UTC (rev 9030) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/panelBar.xhtml 2008-06-13 14:08:46 UTC (rev 9031) @@ -9,14 +9,7 @@ <ui:define name="title">RichFaces - Open Source Rich JSF Components - PanelBar</ui:define> <ui:define name="current">panel</ui:define> <ui:define name="body"> - <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> - <rich:tab label="Usage"> - <ui:include src="/richfaces/panelBar/usage.xhtml"/> - </rich:tab> - <ui:include src="/templates/include/tagInfo.xhtml"> - <ui:param name="path" value="rich/panelBar"/> - </ui:include> - </rich:tabPanel> + <ui:include src="/templates/include/tab-panel.xhtml" /> </ui:define> </ui:composition> </html> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/panelMenu.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/panelMenu.xhtml 2008-06-13 13:41:37 UTC (rev 9030) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/panelMenu.xhtml 2008-06-13 14:08:46 UTC (rev 9031) @@ -9,14 +9,7 @@ <ui:define name="title">RichFaces - Open Source Rich JSF Components - Panel Menu</ui:define> <ui:define name="current">panel</ui:define> <ui:define name="body"> - <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> - <rich:tab label="Usage"> - <ui:include src="/richfaces/panelMenu/usage.xhtml"/> - </rich:tab> - <ui:include src="/templates/include/tagInfo.xhtml"> - <ui:param name="path" value="rich/panelMenu"/> - </ui:include> - </rich:tabPanel> + <ui:include src="/templates/include/tab-panel.xhtml" /> </ui:define> </ui:composition> </html> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/pickList.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/pickList.xhtml 2008-06-13 13:41:37 UTC (rev 9030) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/pickList.xhtml 2008-06-13 14:08:46 UTC (rev 9031) @@ -7,14 +7,7 @@ <ui:composition template="/templates/main.xhtml"> <ui:define name="title">RichFaces - Open Source Rich JSF Components - Pick List component</ui:define> <ui:define name="body"> - <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> - <rich:tab label="Usage"> - <ui:include src="/richfaces/pickList/usage.xhtml"/> - </rich:tab> - <ui:include src="/templates/include/tagInfo.xhtml"> - <ui:param name="path" value="rich/pickList"/> - </ui:include> - </rich:tabPanel> + <ui:include src="/templates/include/tab-panel.xhtml" /> </ui:define> </ui:composition> </html> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/plugnskin.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/plugnskin.xhtml 2008-06-13 13:41:37 UTC (rev 9030) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/plugnskin.xhtml 2008-06-13 14:08:46 UTC (rev 9031) @@ -7,14 +7,7 @@ <ui:composition template="/templates/main.xhtml"> <ui:define name="title">RichFaces - Open Source Rich JSF Components - Plug'n'Skin Feature</ui:define> <ui:define name="body"> - <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> - <rich:tab label="Usage"> - <ui:include src="/richfaces/plugnskin/usage.xhtml"/> - </rich:tab> - <ui:include src="/templates/include/tagInfo.xhtml"> - <ui:param name="path" value="rich/plugnskin"/> - </ui:include> - </rich:tabPanel> + <ui:include src="/templates/include/tab-panel.xhtml" /> </ui:define> </ui:composition> </html> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/poll.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/poll.xhtml 2008-06-13 13:41:37 UTC (rev 9030) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/poll.xhtml 2008-06-13 14:08:46 UTC (rev 9031) @@ -7,14 +7,7 @@ <ui:composition template="/templates/main.xhtml"> <ui:define name="title">RichFaces - Open Source Rich JSF Components - Ajax Poll</ui:define> <ui:define name="body"> - <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> - <rich:tab label="Usage"> - <ui:include src="/richfaces/poll/usage.xhtml"/> - </rich:tab> - <ui:include src="/templates/include/tagInfo.xhtml"> - <ui:param name="path" value="a4j/poll"/> - </ui:include> - </rich:tabPanel> + <ui:include src="/templates/include/tab-panel.xhtml" /> </ui:define> </ui:composition> </html> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/portlet.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/portlet.xhtml 2008-06-13 13:41:37 UTC (rev 9030) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/portlet.xhtml 2008-06-13 14:08:46 UTC (rev 9031) @@ -7,14 +7,7 @@ <ui:composition template="/templates/main.xhtml"> <ui:define name="title">RichFaces - Open Source Rich JSF Components - Portlet component</ui:define> <ui:define name="body"> - <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> - <rich:tab label="Usage"> - <ui:include src="/richfaces/portlet/usage.xhtml"/> - </rich:tab> - <ui:include src="/templates/include/tagInfo.xhtml"> - <ui:param name="path" value="a4j/portlet"/> - </ui:include> - </rich:tabPanel> + <ui:include src="/templates/include/tab-panel.xhtml" /> </ui:define> </ui:composition> </html> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/progressBar.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/progressBar.xhtml 2008-06-13 13:41:37 UTC (rev 9030) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/progressBar.xhtml 2008-06-13 14:08:46 UTC (rev 9031) @@ -7,14 +7,7 @@ <ui:composition template="/templates/main.xhtml"> <ui:define name="title">RichFaces - Open Source Rich JSF Components - Progress Bar component</ui:define> <ui:define name="body"> - <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> - <rich:tab label="Usage"> - <ui:include src="/richfaces/progressBar/usage.xhtml"/> - </rich:tab> - <ui:include src="/templates/include/tagInfo.xhtml"> - <ui:param name="path" value="a4j/progressBar"/> - </ui:include> - </rich:tabPanel> + <ui:include src="/templates/include/tab-panel.xhtml" /> </ui:define> </ui:composition> </html> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/push.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/push.xhtml 2008-06-13 13:41:37 UTC (rev 9030) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/push.xhtml 2008-06-13 14:08:46 UTC (rev 9031) @@ -7,14 +7,7 @@ <ui:composition template="/templates/main.xhtml"> <ui:define name="title">RichFaces - Open Source Rich JSF Components - Ajax Push</ui:define> <ui:define name="body"> - <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> - <rich:tab label="Usage"> - <ui:include src="/richfaces/push/usage.xhtml"/> - </rich:tab> - <ui:include src="/templates/include/tagInfo.xhtml"> - <ui:param name="path" value="a4j/push"/> - </ui:include> - </rich:tabPanel> + <ui:include src="/templates/include/tab-panel.xhtml" /> </ui:define> </ui:composition> </html> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/region.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/region.xhtml 2008-06-13 13:41:37 UTC (rev 9030) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/region.xhtml 2008-06-13 14:08:46 UTC (rev 9031) @@ -7,14 +7,7 @@ <ui:composition template="/templates/main.xhtml"> <ui:define name="title">RichFaces - Open Source Rich JSF Components - Ajax Region</ui:define> <ui:define name="body"> - <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> - <rich:tab label="Usage"> - <ui:include src="/richfaces/region/usage.xhtml"/> - </rich:tab> - <ui:include src="/templates/include/tagInfo.xhtml"> - <ui:param name="path" value="a4j/region"/> - </ui:include> - </rich:tabPanel> + <ui:include src="/templates/include/tab-panel.xhtml" /> </ui:define> </ui:composition> </html> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/repeat.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/repeat.xhtml 2008-06-13 13:41:37 UTC (rev 9030) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/repeat.xhtml 2008-06-13 14:08:46 UTC (rev 9031) @@ -7,14 +7,7 @@ <ui:composition template="/templates/main.xhtml"> <ui:define name="title">RichFaces - Open Source Rich JSF Components - Repeat</ui:define> <ui:define name="body"> - <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> - <rich:tab label="Usage"> - <ui:include src="/richfaces/repeat/usage.xhtml"/> - </rich:tab> - <ui:include src="/templates/include/tagInfo.xhtml"> - <ui:param name="path" value="richfaces/repeat/examples/repeater.xhtml"/> - </ui:include> - </rich:tabPanel> + <ui:include src="/templates/include/tab-panel.xhtml" /> </ui:define> </ui:composition> </html> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/script.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/script.xhtml 2008-06-13 13:41:37 UTC (rev 9030) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/script.xhtml 2008-06-13 14:08:46 UTC (rev 9031) @@ -7,14 +7,7 @@ <ui:composition template="/templates/main.xhtml"> <ui:define name="title">RichFaces - Open Source Rich JSF Components - Load Script</ui:define> <ui:define name="body"> - <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> - <rich:tab label="Usage"> - <ui:include src="/richfaces/script/usage.xhtml"/> - </rich:tab> - <ui:include src="/templates/include/tagInfo.xhtml"> - <ui:param name="path" value="a4j/loadScript"/> - </ui:include> - </rich:tabPanel> + <ui:include src="/templates/include/tab-panel.xhtml" /> </ui:define> </ui:composition> </html> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/scrollableDataTable.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/scrollableDataTable.xhtml 2008-06-13 13:41:37 UTC (rev 9030) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/scrollableDataTable.xhtml 2008-06-13 14:08:46 UTC (rev 9031) @@ -7,14 +7,7 @@ <ui:composition template="/templates/main.xhtml"> <ui:define name="title">RichFaces - Open Source Rich JSF Components - Scrollable Data Table</ui:define> <ui:define name="body"> - <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> - <rich:tab label="Usage"> - <ui:include src="/richfaces/scrollableDataTable/usage.xhtml"/> - </rich:tab> - <ui:include src="/templates/include/tagInfo.xhtml"> - <ui:param name="path" value="rich/scrollableDataTable"/> - </ui:include> - </rich:tabPanel> + <ui:include src="/templates/include/tab-panel.xhtml" /> </ui:define> </ui:composition> </html> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/separator.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/separator.xhtml 2008-06-13 13:41:37 UTC (rev 9030) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/separator.xhtml 2008-06-13 14:08:46 UTC (rev 9031) @@ -8,14 +8,7 @@ <ui:composition template="/templates/main.xhtml"> <ui:define name="title">RichFaces - Open Source Rich JSF Components - Separator</ui:define> <ui:define name="body"> - <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> - <rich:tab label="Usage"> - <ui:include src="/richfaces/separator/usage.xhtml"/> - </rich:tab> - <ui:include src="/templates/include/tagInfo.xhtml"> - <ui:param name="path" value="rich/separator"/> - </ui:include> - </rich:tabPanel> + <ui:include src="/templates/include/tab-panel.xhtml" /> </ui:define> </ui:composition> </html> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/simpleTogglePanel.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/simpleTogglePanel.xhtml 2008-06-13 13:41:37 UTC (rev 9030) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/simpleTogglePanel.xhtml 2008-06-13 14:08:46 UTC (rev 9031) @@ -7,14 +7,7 @@ <ui:composition template="/templates/main.xhtml"> <ui:define name="title">RichFaces - Open Source Rich JSF Components - Simple Toggle Panel</ui:define> <ui:define name="body"> - <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> - <rich:tab label="Usage"> - <ui:include src="/richfaces/simpleTogglePanel/usage.xhtml"/> - </rich:tab> - <ui:include src="/templates/include/tagInfo.xhtml"> - <ui:param name="path" value="rich/simpleTogglePanel"/> - </ui:include> - </rich:tabPanel> + <ui:include src="/templates/include/tab-panel.xhtml" /> </ui:define> </ui:composition> </html> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/spacer.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/spacer.xhtml 2008-06-13 13:41:37 UTC (rev 9030) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/spacer.xhtml 2008-06-13 14:08:46 UTC (rev 9031) @@ -8,14 +8,7 @@ <ui:composition template="/templates/main.xhtml"> <ui:define name="title">RichFaces - Open Source Rich JSF Components - Spacer</ui:define> <ui:define name="body"> - <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> - <rich:tab label="Usage"> - <ui:include src="/richfaces/spacer/usage.xhtml"/> - </rich:tab> - <ui:include src="/templates/include/tagInfo.xhtml"> - <ui:param name="path" value="rich/spacer"/> - </ui:include> - </rich:tabPanel> + <ui:include src="/templates/include/tab-panel.xhtml" /> </ui:define> </ui:composition> </html> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/standardSkinning.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/standardSkinning.xhtml 2008-06-13 13:41:37 UTC (rev 9030) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/standardSkinning.xhtml 2008-06-13 14:08:46 UTC (rev 9031) @@ -7,8 +7,7 @@ <ui:composition template="/templates/main.xhtml"> <ui:define name="title">RichFaces - Open Source Rich JSF Components - Standard Components Skinning</ui:define> <ui:define name="body"> - - <ui:include src="/richfaces/standardSkinning/usage.xhtml"/> + <ui:include src="/richfaces/standardSkinning/usage.xhtml"/> </ui:define> </ui:composition> </html> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/status.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/status.xhtml 2008-06-13 13:41:37 UTC (rev 9030) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/status.xhtml 2008-06-13 14:08:46 UTC (rev 9031) @@ -7,14 +7,7 @@ <ui:composition template="/templates/main.xhtml"> <ui:define name="title">RichFaces - Open Source Rich JSF Components - Ajax Status</ui:define> <ui:define name="body"> - <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> - <rich:tab label="Usage"> - <ui:include src="/richfaces/status/usage.xhtml"/> - </rich:tab> - <ui:include src="/templates/include/tagInfo.xhtml"> - <ui:param name="path" value="a4j/status"/> - </ui:include> - </rich:tabPanel> + <ui:include src="/templates/include/tab-panel.xhtml" /> </ui:define> </ui:composition> </html> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/style.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/style.xhtml 2008-06-13 13:41:37 UTC (rev 9030) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/style.xhtml 2008-06-13 14:08:46 UTC (rev 9031) @@ -7,14 +7,7 @@ <ui:composition template="/templates/main.xhtml"> <ui:define name="title">RichFaces - Open Source Rich JSF Components - Load Style</ui:define> <ui:define name="body"> - <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> - <rich:tab label="Usage"> - <ui:include src="/richfaces/style/usage.xhtml"/> - </rich:tab> - <ui:include src="/templates/include/tagInfo.xhtml"> - <ui:param name="path" value="a4j/loadStyle"/> - </ui:include> - </rich:tabPanel> + <ui:include src="/templates/include/tab-panel.xhtml" /> </ui:define> </ui:composition> </html> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/suggestionBox.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/suggestionBox.xhtml 2008-06-13 13:41:37 UTC (rev 9030) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/suggestionBox.xhtml 2008-06-13 14:08:46 UTC (rev 9031) @@ -7,14 +7,7 @@ <ui:composition template="/templates/main.xhtml"> <ui:define name="title">RichFaces - Open Source Rich JSF Components - Suggestion Box</ui:define> <ui:define name="body"> - <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> - <rich:tab label="Usage"> - <ui:include src="/richfaces/suggestionBox/usage.xhtml"/> - </rich:tab> - <ui:include src="/templates/include/tagInfo.xhtml"> - <ui:param name="path" value="rich/suggestionbox"/> - </ui:include> - </rich:tabPanel> + <ui:include src="/templates/include/tab-panel.xhtml" /> </ui:define> </ui:composition> </html> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/support.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/support.xhtml 2008-06-13 13:41:37 UTC (rev 9030) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/support.xhtml 2008-06-13 14:08:46 UTC (rev 9031) @@ -7,15 +7,7 @@ <ui:composition template="/templates/main.xhtml"> <ui:define name="title">RichFaces - Open Source Rich JSF Components - Ajax Support</ui:define> <ui:define name="body"> - - <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> - <rich:tab label="Usage"> - <ui:include src="/richfaces/support/usage.xhtml"/> - </rich:tab> - <ui:include src="/templates/include/tagInfo.xhtml"> - <ui:param name="path" value="a4j/support"/> - </ui:include> - </rich:tabPanel> + <ui:include src="/templates/include/tab-panel.xhtml" /> </ui:define> </ui:composition> </html> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/tabPanel.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/tabPanel.xhtml 2008-06-13 13:41:37 UTC (rev 9030) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/tabPanel.xhtml 2008-06-13 14:08:46 UTC (rev 9031) @@ -14,9 +14,10 @@ <rich:tab label="Look Customization"> <ui:include src="/richfaces/tabPanel/look-customization.xhtml"/> </rich:tab> - <ui:include src="/templates/include/tagInfo.xhtml"> - <ui:param name="path" value="rich/tabPanel"/> - </ui:include> + <rich:tab label="Tag Information"> + <rich:insert src="/WEB-INF/#{componentNavigator.currentComponent.tagInfoLocation}" + errorContent="/templates/include/tagInfoNotes.xhtml"/> + </rich:tab> </rich:tabPanel> </ui:define> </ui:composition> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/togglePanel.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/togglePanel.xhtml 2008-06-13 13:41:37 UTC (rev 9030) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/togglePanel.xhtml 2008-06-13 14:08:46 UTC (rev 9031) @@ -9,14 +9,7 @@ <ui:define name="title">RichFaces - Open Source Rich JSF Components - Toggle Panel</ui:define> <ui:define name="current">panel</ui:define> <ui:define name="body"> - <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> - <rich:tab label="Usage"> - <ui:include src="/richfaces/togglePanel/usage.xhtml"/> - </rich:tab> - <ui:include src="/templates/include/tagInfo.xhtml"> - <ui:param name="path" value="rich/togglePanel"/> - </ui:include> - </rich:tabPanel> + <ui:include src="/templates/include/tab-panel.xhtml" /> </ui:define> </ui:composition> </html> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/toolBar.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/toolBar.xhtml 2008-06-13 13:41:37 UTC (rev 9030) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/toolBar.xhtml 2008-06-13 14:08:46 UTC (rev 9031) @@ -9,14 +9,7 @@ <ui:define name="title">RichFaces - Open Source Rich JSF Components - Tool Bar</ui:define> <ui:define name="current">panel</ui:define> <ui:define name="body"> - <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> - <rich:tab label="Usage"> - <ui:include src="/richfaces/toolBar/usage.xhtml"/> - </rich:tab> - <ui:include src="/templates/include/tagInfo.xhtml"> - <ui:param name="path" value="rich/toolBar"/> - </ui:include> - </rich:tabPanel> + <ui:include src="/templates/include/tab-panel.xhtml" /> </ui:define> </ui:composition> </html> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/toolTip.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/toolTip.xhtml 2008-06-13 13:41:37 UTC (rev 9030) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/toolTip.xhtml 2008-06-13 14:08:46 UTC (rev 9031) @@ -16,9 +16,10 @@ <rich:tab label="Use ToolTip with DataTable"> <ui:include src="/richfaces/toolTip/use-with-data-table.xhtml"/> </rich:tab> - <ui:include src="/templates/include/tagInfo.xhtml"> - <ui:param name="path" value="rich/toolTip"/> - </ui:include> + <rich:tab label="Tag Information"> + <rich:insert src="/WEB-INF/#{componentNavigator.currentComponent.tagInfoLocation}" + errorContent="/templates/include/tagInfoNotes.xhtml"/> + </rich:tab> </rich:tabPanel> </ui:define> </ui:composition> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/tree.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/tree.xhtml 2008-06-13 13:41:37 UTC (rev 9030) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/tree.xhtml 2008-06-13 14:08:46 UTC (rev 9031) @@ -16,9 +16,10 @@ <rich:tab label="Default Tree Model"> <ui:include src="/richfaces/tree/simple-tree.xhtml"/> </rich:tab> - <ui:include src="/templates/include/tagInfo.xhtml"> - <ui:param name="path" value="rich/tree"/> - </ui:include> + <rich:tab label="Tag Information"> + <rich:insert src="/WEB-INF/#{componentNavigator.currentComponent.tagInfoLocation}" + errorContent="/templates/include/tagInfoNotes.xhtml"/> + </rich:tab> </rich:tabPanel> </ui:define> </ui:composition> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/treeNodesAdaptor.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/treeNodesAdaptor.xhtml 2008-06-13 13:41:37 UTC (rev 9030) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/treeNodesAdaptor.xhtml 2008-06-13 14:08:46 UTC (rev 9031) @@ -9,14 +9,7 @@ <ui:define name="title">RichFaces - Open Source Rich JSF Components - Tree Nodes Adaptor</ui:define> <ui:define name="current">panel</ui:define> <ui:define name="body"> - <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> - <rich:tab label="Usage"> - <ui:include src="/richfaces/treeNodesAdaptor/usage.xhtml"/> - </rich:tab> - <ui:include src="/templates/include/tagInfo.xhtml"> - <ui:param name="path" value="rich/treeNodesAdaptor"/> - </ui:include> - </rich:tabPanel> + <ui:include src="/templates/include/tab-panel.xhtml" /> </ui:define> </ui:composition> </html> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/virtualEarth.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/virtualEarth.xhtml 2008-06-13 13:41:37 UTC (rev 9030) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/virtualEarth.xhtml 2008-06-13 14:08:46 UTC (rev 9031) @@ -7,14 +7,7 @@ <ui:composition template="/templates/main.xhtml"> <ui:define name="title">RichFaces - Open Source Rich JSF Components - Virtual Earth</ui:define> <ui:define name="body"> - <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> - <rich:tab label="Usage"> - <ui:include src="/richfaces/virtualEarth/usage.xhtml"/> - </rich:tab> - <ui:include src="/templates/include/tagInfo.xhtml"> - <ui:param name="path" value="rich/virtualEarth"/> - </ui:include> - </rich:tabPanel> + <ui:include src="/templates/include/tab-panel.xhtml" /> </ui:define> </ui:composition> </html> Added: trunk/samples/richfaces-demo/src/main/webapp/templates/include/tab-panel.xhtml =================================================================== (Binary files differ) Property changes on: trunk/samples/richfaces-demo/src/main/webapp/templates/include/tab-panel.xhtml ___________________________________________________________________ Name: svn:mime-type + application/xhtml+xml Deleted: trunk/samples/richfaces-demo/src/main/webapp/templates/include/tagInfo.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/templates/include/tagInfo.xhtml 2008-06-13 13:41:37 UTC (rev 9030) +++ trunk/samples/richfaces-demo/src/main/webapp/templates/include/tagInfo.xhtml 2008-06-13 14:08:46 UTC (rev 9031) @@ -1,12 +0,0 @@ -<html xmlns="http://www.w3.org/1999/xhtml" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:rich="http://richfaces.org/rich"> -<ui:composition> - <rich:tab label="Tag Information"> - <rich:insert src="/WEB-INF/#{componentNavigator.currentComponent.tagInfoLocation}" - errorContent="/templates/include/tagInfoNotes.xhtml"/> - </rich:tab> -</ui:composition> -</html>