You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ck...@apache.org on 2010/02/09 21:18:32 UTC
svn commit: r908202 [3/9] - in
/myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main:
java/org/apache/myfaces/trinidaddemo/
java/org/apache/myfaces/trinidaddemo/components/buttonsAndLinks/commandButton/
java/org/apache/myfaces...
Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/components/select/selectOneListbox/SelectOneListboxDemo.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/components/select/selectOneListbox/SelectOneListboxDemo.java?rev=908202&r1=908201&r2=908202&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/components/select/selectOneListbox/SelectOneListboxDemo.java (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/components/select/selectOneListbox/SelectOneListboxDemo.java Tue Feb 9 20:18:14 2010
@@ -39,16 +39,19 @@
* Constructor.
*/
public SelectOneListboxDemo() {
- super(ComponentDemoId.selectOneListbox, "Select One Listbox");
+ super(ComponentDemoId.selectOneListbox, "Select One Listbox",
+ new String[]{
+ "/components/select/selectOneListbox/selectOneListbox.xhtml"
+ });
addComponentDemoVariant(new ComponentVariantDemoImpl(VARIANTS.Simple, this,
- "/components/select/selectOneListbox/selectOneListboxSimple.xhtml", getSummaryResourcePath()));
+ new String[]{
+ "/components/select/selectOneListbox/selectOneListboxSimple.xhtml"
+ }, getSummaryResourcePath()));
addComponentDemoVariant(new ComponentVariantDemoImpl(VARIANTS.Detailed, this,
- "/components/select/selectOneListbox/selectOneListboxDetailed.xhtml", getSummaryResourcePath()));
- }
-
- public String getJsfResourcePath() {
- return "/components/select/selectOneListbox/selectOneListbox.xhtml";
+ new String[]{
+ "/components/select/selectOneListbox/selectOneListboxDetailed.xhtml"
+ }, getSummaryResourcePath()));
}
public String getSummaryResourcePath() {
Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/components/select/selectOneRadio/SelectOneRadioDemo.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/components/select/selectOneRadio/SelectOneRadioDemo.java?rev=908202&r1=908201&r2=908202&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/components/select/selectOneRadio/SelectOneRadioDemo.java (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/components/select/selectOneRadio/SelectOneRadioDemo.java Tue Feb 9 20:18:14 2010
@@ -41,20 +41,30 @@
* Constructor.
*/
public SelectOneRadioDemo() {
- super(ComponentDemoId.selectOneRadio, "Select One Radio");
+ super(ComponentDemoId.selectOneRadio, "Select One Radio",
+ new String[]{
+ "/components/select/selectOneRadio/selectOneRadio.xhtml"
+ });
addComponentDemoVariant(new ComponentVariantDemoImpl(VARIANTS.Simple, this,
- "/components/select/selectOneRadio/selectOneRadioSimple.xhtml", getSummaryResourcePath()));
+ new String[]{
+ "/components/select/selectOneRadio/selectOneRadioSimple.xhtml"
+ }, getSummaryResourcePath()));
+
addComponentDemoVariant(new ComponentVariantDemoImpl(VARIANTS.Detailed, this,
- "/components/select/selectOneRadio/selectOneRadioDetailed.xhtml", getSummaryResourcePath()));
+ new String[]{
+ "/components/select/selectOneRadio/selectOneRadioDetailed.xhtml"
+ }, getSummaryResourcePath()));
+
addComponentDemoVariant(new ComponentVariantDemoImpl(VARIANTS.Horizontal, this,
- "/components/select/selectOneRadio/selectOneRadioHorizontal.xhtml", getSummaryResourcePath()));
- addComponentDemoVariant(new ComponentVariantDemoImpl(VARIANTS.Vertical, this,
- "/components/select/selectOneRadio/selectOneRadioVertical.xhtml", getSummaryResourcePath()));
- }
+ new String[]{
+ "/components/select/selectOneRadio/selectOneRadioHorizontal.xhtml"
+ }, getSummaryResourcePath()));
- public String getJsfResourcePath() {
- return "/components/select/selectOneRadio/selectOneRadio.xhtml";
+ addComponentDemoVariant(new ComponentVariantDemoImpl(VARIANTS.Vertical, this,
+ new String[]{
+ "/components/select/selectOneRadio/selectOneRadioVertical.xhtml"
+ }, getSummaryResourcePath()));
}
public String getSummaryResourcePath() {
Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/components/select/selectOrderShuttle/SelectOrderShuttleDemo.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/components/select/selectOrderShuttle/SelectOrderShuttleDemo.java?rev=908202&r1=908201&r2=908202&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/components/select/selectOrderShuttle/SelectOrderShuttleDemo.java (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/components/select/selectOrderShuttle/SelectOrderShuttleDemo.java Tue Feb 9 20:18:14 2010
@@ -39,14 +39,15 @@
* Constructor.
*/
public SelectOrderShuttleDemo() {
- super(ComponentDemoId.selectOrderShuttle, "Select Order Shuttle", VARIANTS.Default, "Default");
+ super(ComponentDemoId.selectOrderShuttle, "Select Order Shuttle", VARIANTS.Default, "Default",
+ new String[]{
+ "/components/select/selectOrderShuttle/selectOrderShuttle.xhtml"
+ });
addComponentDemoVariant(new ComponentVariantDemoImpl(VARIANTS.ShowDescription, "Show Description", this,
- "/components/select/selectOrderShuttle/selectOrderShuttleShowDescription.xhtml", getSummaryResourcePath()));
- }
-
- public String getJsfResourcePath() {
- return "/components/select/selectOrderShuttle/selectOrderShuttle.xhtml";
+ new String[]{
+ "/components/select/selectOrderShuttle/selectOrderShuttleShowDescription.xhtml"
+ }, getSummaryResourcePath()));
}
public String getSummaryResourcePath() {
Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/components/select/selectRangeChoiceBar/SelectRangeChoiceBarDemo.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/components/select/selectRangeChoiceBar/SelectRangeChoiceBarDemo.java?rev=908202&r1=908201&r2=908202&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/components/select/selectRangeChoiceBar/SelectRangeChoiceBarDemo.java (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/components/select/selectRangeChoiceBar/SelectRangeChoiceBarDemo.java Tue Feb 9 20:18:14 2010
@@ -32,11 +32,10 @@
* Constructor.
*/
public SelectRangeChoiceBarDemo(){
- super(ComponentDemoId.selectRangeChoiceBar, "Select Range Choice Bar");
- }
-
- public String getJsfResourcePath() {
- return "/components/select/selectRangeChoiceBar/selectRangeChoiceBar.xhtml";
+ super(ComponentDemoId.selectRangeChoiceBar, "Select Range Choice Bar",
+ new String[]{
+ "/components/select/selectRangeChoiceBar/selectRangeChoiceBar.xhtml"
+ });
}
public String getSummaryResourcePath() {
Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/components/showDetail/showDetail/ShowDetailDemo.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/components/showDetail/showDetail/ShowDetailDemo.java?rev=908202&r1=908201&r2=908202&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/components/showDetail/showDetail/ShowDetailDemo.java (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/components/showDetail/showDetail/ShowDetailDemo.java Tue Feb 9 20:18:14 2010
@@ -32,11 +32,10 @@
* Constructor.
*/
public ShowDetailDemo() {
- super(ComponentDemoId.showDetail, "Show Detail");
- }
-
- public String getJsfResourcePath() {
- return "/components/showDetail/showDetail/showDetail.xhtml";
+ super(ComponentDemoId.showDetail, "Show Detail",
+ new String[]{
+ "/components/showDetail/showDetail/showDetail.xhtml"
+ });
}
public String getSummaryResourcePath() {
Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/components/showDetail/showDetailHeader/ShowDetailHeaderDemo.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/components/showDetail/showDetailHeader/ShowDetailHeaderDemo.java?rev=908202&r1=908201&r2=908202&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/components/showDetail/showDetailHeader/ShowDetailHeaderDemo.java (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/components/showDetail/showDetailHeader/ShowDetailHeaderDemo.java Tue Feb 9 20:18:14 2010
@@ -41,20 +41,30 @@
* Constructor.
*/
public ShowDetailHeaderDemo(){
- super(ComponentDemoId.showDetailHeader, "Show Detail Header");
+ super(ComponentDemoId.showDetailHeader, "Show Detail Header",
+ new String[]{
+ "/components/showDetail/showDetailHeader/showDetailHeader.xhtml"
+ });
addComponentDemoVariant(new ComponentVariantDemoImpl(VARIANTS.InfoMessage, "Info Message", this,
- "/components/showDetail/showDetailHeader/showDetailHeaderInfoMessage.xhtml", getSummaryResourcePath()));
+ new String[]{
+ "/components/showDetail/showDetailHeader/showDetailHeaderInfoMessage.xhtml"
+ }, getSummaryResourcePath()));
+
addComponentDemoVariant(new ComponentVariantDemoImpl(VARIANTS.ConfirmationMessage, "Confirmation Message", this,
- "/components/showDetail/showDetailHeader/showDetailHeaderConfirmationMessage.xhtml", getSummaryResourcePath()));
+ new String[]{
+ "/components/showDetail/showDetailHeader/showDetailHeaderConfirmationMessage.xhtml"
+ }, getSummaryResourcePath()));
+
addComponentDemoVariant(new ComponentVariantDemoImpl(VARIANTS.ErrorMessage, "Error message", this,
- "/components/showDetail/showDetailHeader/showDetailHeaderErrorMessage.xhtml", getSummaryResourcePath()));
- addComponentDemoVariant(new ComponentVariantDemoImpl(VARIANTS.WarningMessage, "Warning message", this,
- "/components/showDetail/showDetailHeader/showDetailHeaderWarningMessage.xhtml", getSummaryResourcePath()));
- }
+ new String[]{
+ "/components/showDetail/showDetailHeader/showDetailHeaderErrorMessage.xhtml"
+ }, getSummaryResourcePath()));
- public String getJsfResourcePath() {
- return "/components/showDetail/showDetailHeader/showDetailHeader.xhtml";
+ addComponentDemoVariant(new ComponentVariantDemoImpl(VARIANTS.WarningMessage, "Warning message", this,
+ new String[]{
+ "/components/showDetail/showDetailHeader/showDetailHeaderWarningMessage.xhtml"
+ }, getSummaryResourcePath()));
}
public String getSummaryResourcePath() {
Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/components/showDetail/showDetailItem/ShowDetailItemDemo.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/components/showDetail/showDetailItem/ShowDetailItemDemo.java?rev=908202&r1=908201&r2=908202&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/components/showDetail/showDetailItem/ShowDetailItemDemo.java (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/components/showDetail/showDetailItem/ShowDetailItemDemo.java Tue Feb 9 20:18:14 2010
@@ -37,13 +37,12 @@
* Constructor.
*/
public ShowDetailItemDemo() {
- super(ComponentDemoId.showDetailItem, "Show Detail Item", VARIANTS.Default, "Default");
+ super(ComponentDemoId.showDetailItem, "Show Detail Item", VARIANTS.Default, "Default",
+ new String[]{
+ "/components/showDetail/showDetailItem/showDetailItem.xhtml"
+ });
}
- public String getJsfResourcePath() {
- return "/components/showDetail/showDetailItem/showDetailItem.xhtml";
- }
-
public String getSummaryResourcePath() {
return "/components/showDetail/showDetailItem/summary.xhtml";
}
Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/components/table/column/ColumnDemo.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/components/table/column/ColumnDemo.java?rev=908202&r1=908201&r2=908202&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/components/table/column/ColumnDemo.java (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/components/table/column/ColumnDemo.java Tue Feb 9 20:18:14 2010
@@ -41,25 +41,35 @@
* Constructor.
*/
public ColumnDemo() {
- super(ComponentDemoId.column, "Column");
+ super(ComponentDemoId.column, "Column",
+ new String[]{
+ "/components/table/column/column.xhtml"
+ });
addComponentDemoVariant(new ComponentVariantDemoImpl(VARIANTS.Center, this,
- "/components/table/column/columnCenter.xhtml", getSummaryResourcePath(),
+ new String[]{
+ "/components/table/column/columnCenter.xhtml"
+ }, getSummaryResourcePath(),
"/org/apache/myfaces/trinidaddemo/components/table/column/TableColumnBean.java"));
+
addComponentDemoVariant(new ComponentVariantDemoImpl(VARIANTS.End, this,
- "/components/table/column/columnEnd.xhtml", getSummaryResourcePath(),
+ new String[]{
+ "/components/table/column/columnEnd.xhtml"
+ }, getSummaryResourcePath(),
"/org/apache/myfaces/trinidaddemo/components/table/column/TableColumnBean.java"));
+
addComponentDemoVariant(new ComponentVariantDemoImpl(VARIANTS.Left, this,
- "/components/table/column/columnLeft.xhtml", getSummaryResourcePath(),
+ new String[]{
+ "/components/table/column/columnLeft.xhtml"
+ }, getSummaryResourcePath(),
"/org/apache/myfaces/trinidaddemo/components/table/column/TableColumnBean.java"));
+
addComponentDemoVariant(new ComponentVariantDemoImpl(VARIANTS.Right, this,
- "/components/table/column/columnRight.xhtml", getSummaryResourcePath(),
+ new String[]{
+ "/components/table/column/columnRight.xhtml"
+ }, getSummaryResourcePath(),
"/org/apache/myfaces/trinidaddemo/components/table/column/TableColumnBean.java"));
}
- public String getJsfResourcePath() {
- return "/components/table/column/column.xhtml";
- }
-
public String getSummaryResourcePath() {
return "/components/table/column/summary.xhtml";
}
Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/components/table/table/TableDemo.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/components/table/table/TableDemo.java?rev=908202&r1=908201&r2=908202&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/components/table/table/TableDemo.java (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/components/table/table/TableDemo.java Tue Feb 9 20:18:14 2010
@@ -41,20 +41,30 @@
* Constructor.
*/
public TableDemo() {
- super(ComponentDemoId.table, "Table");
+ super(ComponentDemoId.table, "Table",
+ new String[]{
+ "/components/table/table/table.xhtml"
+ });
addComponentDemoVariant(new ComponentVariantDemoImpl(VARIANTS.SingleRowSelection, "Single Row Selection", this,
- "/components/table/table/tableSingleRowSelection.xhtml", getSummaryResourcePath()));
+ new String[]{
+ "/components/table/table/tableSingleRowSelection.xhtml"
+ }, getSummaryResourcePath()));
+
addComponentDemoVariant(new ComponentVariantDemoImpl(VARIANTS.MultipleRowSelection, "Multiple Row Selection", this,
- "/components/table/table/tableMultipleRowSelection.xhtml", getSummaryResourcePath()));
+ new String[]{
+ "/components/table/table/tableMultipleRowSelection.xhtml"
+ }, getSummaryResourcePath()));
+
addComponentDemoVariant(new ComponentVariantDemoImpl(VARIANTS.NoGridLines, "No grid lines", this,
- "/components/table/table/tableNoGridLines.xhtml", getSummaryResourcePath()));
- addComponentDemoVariant(new ComponentVariantDemoImpl(VARIANTS.Pagination, this,
- "/components/table/table/tablePaginated.xhtml", getSummaryResourcePath()));
- }
+ new String[]{
+ "/components/table/table/tableNoGridLines.xhtml"
+ }, getSummaryResourcePath()));
- public String getJsfResourcePath() {
- return "/components/table/table/table.xhtml";
+ addComponentDemoVariant(new ComponentVariantDemoImpl(VARIANTS.Pagination, this,
+ new String[]{
+ "/components/table/table/tablePaginated.xhtml"
+ }, getSummaryResourcePath()));
}
public String getSummaryResourcePath() {
Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/components/table/treeTable/TreeTableDemo.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/components/table/treeTable/TreeTableDemo.java?rev=908202&r1=908201&r2=908202&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/components/table/treeTable/TreeTableDemo.java (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/components/table/treeTable/TreeTableDemo.java Tue Feb 9 20:18:14 2010
@@ -42,22 +42,35 @@
* Constructor.
*/
public TreeTableDemo() {
- super(ComponentDemoId.treeTable, "Tree Table");
+ super(ComponentDemoId.treeTable, "Tree Table",
+ new String[]{
+ "/components/table/treeTable/treeTable.xhtml"
+ });
addComponentDemoVariant(new ComponentVariantDemoImpl(VARIANTS.SingleRowSelection, "Single selection", this,
- "/components/table/treeTable/treeTableSingleRowSelection.xhtml", getSummaryResourcePath()));
+ new String[]{
+ "/components/table/treeTable/treeTableSingleRowSelection.xhtml"
+ }, getSummaryResourcePath()));
+
addComponentDemoVariant(new ComponentVariantDemoImpl(VARIANTS.MultipleRowSelection, "Multiple selection", this,
- "/components/table/treeTable/treeTableMultipleRowSelection.xhtml", getSummaryResourcePath()));
+ new String[]{
+ "/components/table/treeTable/treeTableMultipleRowSelection.xhtml"
+ }, getSummaryResourcePath()));
+
addComponentDemoVariant(new ComponentVariantDemoImpl(VARIANTS.NoGridLines, "No grid lines", this,
- "/components/table/treeTable/treeTableNoGridLines.xhtml", getSummaryResourcePath()));
+ new String[]{
+ "/components/table/treeTable/treeTableNoGridLines.xhtml"
+ }, getSummaryResourcePath()));
+
addComponentDemoVariant(new ComponentVariantDemoImpl(VARIANTS.Simple, this,
- "/components/table/treeTable/treeTableSimple.xhtml", getSummaryResourcePath()));
- addComponentDemoVariant(new ComponentVariantDemoImpl(VARIANTS.Detailed, this,
- "/components/table/treeTable/treeTableDetailed.xhtml", getSummaryResourcePath()));
- }
+ new String[]{
+ "/components/table/treeTable/treeTableSimple.xhtml"
+ }, getSummaryResourcePath()));
- public String getJsfResourcePath() {
- return "/components/table/treeTable/treeTable.xhtml";
+ addComponentDemoVariant(new ComponentVariantDemoImpl(VARIANTS.Detailed, this,
+ new String[]{
+ "/components/table/treeTable/treeTableDetailed.xhtml"
+ }, getSummaryResourcePath()));
}
public String getSummaryResourcePath() {
Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/support/IComponentDemo.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/support/IComponentDemo.java?rev=908202&r1=908201&r2=908202&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/support/IComponentDemo.java (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/support/IComponentDemo.java Tue Feb 9 20:18:14 2010
@@ -66,8 +66,8 @@
*
* @return a comma separated list of CSS styles classes.
*/
- String getColumnStyleClassNames();
-
+ String getColumnStyleClassNames();
+
/**
* Returns true if this component supports more than one variant, otherwise returns false.
*
Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/support/IComponentVariantDemo.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/support/IComponentVariantDemo.java?rev=908202&r1=908201&r2=908202&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/support/IComponentVariantDemo.java (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/support/IComponentVariantDemo.java Tue Feb 9 20:18:14 2010
@@ -73,11 +73,18 @@
String getVariantDisplayName();
/**
- * Returns the path to the corresponding JSF page.
+ * Returns the paths to the corresponding JSF pages.
+ *
+ * @return the paths or null if none is available.
+ */
+ String[] getJsfResourcePaths();
+
+ /**
+ * Returns the entry page path to the corresponding JSF page.
*
* @return the path or null if none is available.
*/
- String getJsfResourcePath();
+ String getEntryPagePath();
/**
* Returns the path to the corresponding JSF fragment which represents the summary of this demo.
Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/support/PrettyUrlFilter.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/support/PrettyUrlFilter.java?rev=908202&r1=908201&r2=908202&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/support/PrettyUrlFilter.java (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/support/PrettyUrlFilter.java Tue Feb 9 20:18:14 2010
@@ -54,9 +54,9 @@
navigationHandler.setCurrentComponentVariantDemo(resultingDemo);
- _LOG.log(Level.INFO, "Forwarding request [" + requestURI + "] to view [" + "/pages/componentDemo.xhtml?id="+resultingDemo.getId()+"&variantId="+resultingDemo.getVariantId()+"]");
+ _LOG.log(Level.INFO,"Forwarding request [" + requestURI + "] to view [" + resultingDemo.getEntryPagePath()+"]");
if (!response.isCommitted()) {
- request.getRequestDispatcher("/faces/pages/componentDemo.xhtml").forward(request, response);
+ request.getRequestDispatcher("/faces"+resultingDemo.getEntryPagePath()).forward(request, response);
}
}
Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/support/impl/AbstractComponentDemo.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/support/impl/AbstractComponentDemo.java?rev=908202&r1=908201&r2=908202&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/support/impl/AbstractComponentDemo.java (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/support/impl/AbstractComponentDemo.java Tue Feb 9 20:18:14 2010
@@ -43,7 +43,7 @@
private String displayName;
private IComponentDemoVariantId variantId;
private String variantDisplayName;
-
+ private String[] jsfResourcePaths;
private String title;
private enum VARIANTS implements IComponentDemoVariantId {
@@ -62,7 +62,11 @@
* @param displayName
*/
public AbstractComponentDemo(ComponentDemoId id, String displayName) {
- this(id, displayName, VARIANTS.Default, DEFAULT_VARIANT_NAME);
+ this(id, displayName, VARIANTS.Default, DEFAULT_VARIANT_NAME, new String[]{});
+ }
+
+ public AbstractComponentDemo(ComponentDemoId id, String displayName, String[] jsfResourcePaths) {
+ this(id, displayName, VARIANTS.Default, DEFAULT_VARIANT_NAME, jsfResourcePaths);
}
/**
@@ -73,7 +77,15 @@
* @param variantId
*/
public AbstractComponentDemo(ComponentDemoId id, String displayName, IComponentDemoVariantId variantId) {
- this(id, displayName, variantId, variantId.toString());
+ this(id, displayName, variantId, variantId.toString(), new String[]{});
+ }
+
+ public AbstractComponentDemo(ComponentDemoId id, String displayName, IComponentDemoVariantId variantId, String[] jsfResourcePaths) {
+ this(id, displayName, variantId, variantId.toString(), jsfResourcePaths);
+ }
+
+ public AbstractComponentDemo(ComponentDemoId id, String displayName, IComponentDemoVariantId variantId, String variantDisplayName) {
+ this(id, displayName, variantId, variantDisplayName, new String[]{});
}
/**
@@ -85,13 +97,14 @@
* @param variantDisplayName the display name of the variant this component demo represents.
*/
public AbstractComponentDemo(ComponentDemoId id, String displayName,
- IComponentDemoVariantId variantId, String variantDisplayName) {
+ IComponentDemoVariantId variantId, String variantDisplayName, String[] jsfResourcePaths) {
this.id = id;
this.displayName = displayName;
this.variantId = variantId;
this.variantDisplayName = variantDisplayName;
-
+ this.jsfResourcePaths = jsfResourcePaths;
+
this.variantsByName = new HashMap<String, IComponentVariantDemo>();
this.variants = new ArrayList<IComponentVariantDemo>();
@@ -166,6 +179,15 @@
return variantsByName.get(name);
}
+
+ public String[] getJsfResourcePaths(){
+ return jsfResourcePaths;
+ }
+
+ public String getEntryPagePath(){
+ return jsfResourcePaths.length != 0 ? jsfResourcePaths[0] : "";
+ }
+
public boolean isSupportsMultipleVariants() {
if (getVariants().size() > 1) {
return true;
Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/support/impl/ComponentVariantDemoImpl.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/support/impl/ComponentVariantDemoImpl.java?rev=908202&r1=908201&r2=908202&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/support/impl/ComponentVariantDemoImpl.java (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/support/impl/ComponentVariantDemoImpl.java Tue Feb 9 20:18:14 2010
@@ -25,7 +25,7 @@
*/
public class ComponentVariantDemoImpl extends AbstractComponentVariantDemo {
- private String jsfResourcePath;
+ private String[] jsfResourcePaths;
private String summaryResourcePath;
private String backingBeanResourcePath;
@@ -34,13 +34,13 @@
*
* @param variantId
* @param componentDemo
- * @param jsfResourcePath
+ * @param jsfResourcePaths
* @param summaryResourcePath
*/
public ComponentVariantDemoImpl(IComponentDemoVariantId variantId,
AbstractComponentDemo componentDemo,
- String jsfResourcePath, String summaryResourcePath) {
- this(variantId, variantId.toString(), componentDemo, jsfResourcePath, summaryResourcePath);
+ String[] jsfResourcePaths, String summaryResourcePath) {
+ this(variantId, variantId.toString(), componentDemo, jsfResourcePaths, summaryResourcePath);
}
/**
@@ -48,14 +48,14 @@
*
* @param variantId
* @param componentDemo
- * @param jsfResourcePath
+ * @param jsfResourcePaths
* @param summaryResourcePath
* @param backingBeanResourcePath
*/
public ComponentVariantDemoImpl(IComponentDemoVariantId variantId,
AbstractComponentDemo componentDemo,
- String jsfResourcePath, String summaryResourcePath, String backingBeanResourcePath) {
- this(variantId, variantId.toString(), componentDemo, jsfResourcePath, summaryResourcePath, backingBeanResourcePath);
+ String[] jsfResourcePaths, String summaryResourcePath, String backingBeanResourcePath) {
+ this(variantId, variantId.toString(), componentDemo, jsfResourcePaths, summaryResourcePath, backingBeanResourcePath);
}
/**
@@ -64,13 +64,13 @@
* @param variantId
* @param variantDisplayName
* @param componentDemo
- * @param jsfResourcePath
+ * @param jsfResourcePaths
* @param summaryResourcePath
*/
public ComponentVariantDemoImpl(IComponentDemoVariantId variantId, String variantDisplayName,
AbstractComponentDemo componentDemo,
- String jsfResourcePath, String summaryResourcePath) {
- this(variantId, variantDisplayName, componentDemo, jsfResourcePath, summaryResourcePath, null);
+ String[] jsfResourcePaths, String summaryResourcePath) {
+ this(variantId, variantDisplayName, componentDemo, jsfResourcePaths, summaryResourcePath, null);
}
/**
@@ -79,23 +79,28 @@
* @param variantId
* @param variantDisplayName
* @param componentDemo
- * @param jsfResourcePath
+ * @param jsfResourcePaths
* @param summaryResourcePath
* @param backingBeanResourcePath
*/
public ComponentVariantDemoImpl(IComponentDemoVariantId variantId, String variantDisplayName,
AbstractComponentDemo componentDemo,
- String jsfResourcePath, String summaryResourcePath, String backingBeanResourcePath) {
+ String[] jsfResourcePaths, String summaryResourcePath, String backingBeanResourcePath) {
super(variantId, variantDisplayName, componentDemo);
- this.jsfResourcePath = jsfResourcePath;
+ this.jsfResourcePaths = jsfResourcePaths;
this.summaryResourcePath = summaryResourcePath;
this.backingBeanResourcePath = backingBeanResourcePath;
}
- public String getJsfResourcePath() {
- return jsfResourcePath;
+ public String[] getJsfResourcePaths(){
+ return jsfResourcePaths;
+ }
+
+
+ public String getEntryPagePath(){
+ return jsfResourcePaths.length != 0 ? jsfResourcePaths[0] : "";
}
public String getSummaryResourcePath() {
Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/WEB-INF/faces-config.xml?rev=908202&r1=908201&r2=908202&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/WEB-INF/faces-config.xml (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/WEB-INF/faces-config.xml Tue Feb 9 20:18:14 2010
@@ -111,7 +111,7 @@
</managed-bean>
<managed-bean>
- <managed-bean-name>selectRangeChoiceBarBean</managed-bean-name>
+ <managed-bean-name>selectRangeChoiceBarBean</managed-bean-name>
<managed-bean-class>
org.apache.myfaces.trinidaddemo.components.select.selectRangeChoiceBar.SelectRangeChoiceBarBean
</managed-bean-class>
@@ -255,38 +255,28 @@
</navigation-case>
<navigation-case>
- <from-outcome>train</from-outcome>
- <to-view-id>/components/navigation/train/train.xhtml</to-view-id>
+ <from-outcome>trainGeneralInfo</from-outcome>
+ <to-view-id>/components/navigation/train/generalInfo.xhtml</to-view-id>
</navigation-case>
<navigation-case>
- <from-outcome>train2</from-outcome>
- <to-view-id>/components/navigation/train/train2.xhtml</to-view-id>
+ <from-outcome>trainCompanyInfo</from-outcome>
+ <to-view-id>/components/navigation/train/companyInfo.xhtml</to-view-id>
</navigation-case>
<navigation-case>
- <from-outcome>train3</from-outcome>
- <to-view-id>/components/navigation/train/train3.xhtml</to-view-id>
+ <from-outcome>trainJsfSurvey</from-outcome>
+ <to-view-id>/components/navigation/train/jsfSurvey.xhtml</to-view-id>
</navigation-case>
<navigation-case>
- <from-outcome>train4</from-outcome>
- <to-view-id>/components/navigation/train/train4.xhtml</to-view-id>
+ <from-outcome>trainTrinidadSurvey</from-outcome>
+ <to-view-id>/components/navigation/train/trinidadSurvey.xhtml</to-view-id>
</navigation-case>
<navigation-case>
- <from-outcome>train5</from-outcome>
- <to-view-id>/components/navigation/train/train5.xhtml</to-view-id>
- </navigation-case>
-
- <navigation-case>
- <from-outcome>train6</from-outcome>
- <to-view-id>/components/navigation/train/train6.xhtml</to-view-id>
- </navigation-case>
-
- <navigation-case>
- <from-outcome>train7</from-outcome>
- <to-view-id>/components/navigation/train/train7.xhtml</to-view-id>
+ <from-outcome>trainYouAreDone</from-outcome>
+ <to-view-id>/components/navigation/train/youAreDone.xhtml</to-view-id>
</navigation-case>
<navigation-case>
Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/buttonsAndLinks/commandButton/commandButton.xhtml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/buttonsAndLinks/commandButton/commandButton.xhtml?rev=908202&r1=908201&r2=908202&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/buttonsAndLinks/commandButton/commandButton.xhtml (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/buttonsAndLinks/commandButton/commandButton.xhtml Tue Feb 9 20:18:14 2010
@@ -1,16 +1,22 @@
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:f="http://java.sun.com/jsf/core"
- xmlns:tr="http://myfaces.apache.org/trinidad">
+ xmlns:tr="http://myfaces.apache.org/trinidad"
+ template="/pages/componentDemo.xhtml">
- <tr:panelHorizontalLayout halign="left">
- <f:facet name="separator">
- <tr:spacer width="10" height="5"/>
- </f:facet>
- <tr:inputText label="Your name" value="#{commandButtonBean.name}" required="true" />
- <tr:commandButton text="Say Hello" action="#{commandButtonBean.sayHello}"/>
- </tr:panelHorizontalLayout>
-
- <tr:outputText value="#{commandButtonBean.message}" inlineStyle="font-weight: bold;"/>
+ <ui:define name="demoContent">
+ <tr:panelHorizontalLayout halign="left">
+ <f:facet name="separator">
+ <tr:spacer width="10" height="5"/>
+ </f:facet>
+ <tr:inputText label="Your name" value="#{commandButtonBean.name}"
+ required="true"/>
+ <tr:commandButton text="Say Hello" action="#{commandButtonBean.sayHello}"/>
+ </tr:panelHorizontalLayout>
+
+ <tr:outputText value="#{commandButtonBean.message}"
+ inlineStyle="font-weight: bold;"/>
+
+ </ui:define>
</ui:composition>
\ No newline at end of file
Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/buttonsAndLinks/commandButton/commandButtonAjax.xhtml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/buttonsAndLinks/commandButton/commandButtonAjax.xhtml?rev=908202&r1=908201&r2=908202&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/buttonsAndLinks/commandButton/commandButtonAjax.xhtml (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/buttonsAndLinks/commandButton/commandButtonAjax.xhtml Tue Feb 9 20:18:14 2010
@@ -1,22 +1,26 @@
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:f="http://java.sun.com/jsf/core"
- xmlns:tr="http://myfaces.apache.org/trinidad">
+ xmlns:tr="http://myfaces.apache.org/trinidad"
+ template="/pages/componentDemo.xhtml">
- <tr:panelHorizontalLayout halign="left">
- <f:facet name="separator">
- <tr:spacer width="10" height="5"/>
- </f:facet>
+ <ui:define name="demoContent">
- <tr:inputText label="Your name" value="#{commandButtonBean.name}"
- required="true"/>
- <tr:commandButton id="sayHello" text="Say Hello"
- partialSubmit="true"
- action="#{commandButtonBean.sayHello}"/>
- </tr:panelHorizontalLayout>
+ <tr:panelHorizontalLayout halign="left">
+ <f:facet name="separator">
+ <tr:spacer width="10" height="5"/>
+ </f:facet>
- <tr:spacer height="15px"/>
- <tr:outputText value="#{commandButtonBean.message}" partialTriggers="sayHello"
- inlineStyle="font-weight: bold;"/>
+ <tr:inputText label="Your name" value="#{commandButtonBean.name}"
+ required="true"/>
+ <tr:commandButton id="sayHello" text="Say Hello"
+ partialSubmit="true"
+ action="#{commandButtonBean.sayHello}"/>
+ </tr:panelHorizontalLayout>
+ <tr:spacer height="15px"/>
+ <tr:outputText value="#{commandButtonBean.message}" partialTriggers="sayHello"
+ inlineStyle="font-weight: bold;"/>
+
+ </ui:define>
</ui:composition>
\ No newline at end of file
Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/buttonsAndLinks/commandLink/commandLink.xhtml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/buttonsAndLinks/commandLink/commandLink.xhtml?rev=908202&r1=908201&r2=908202&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/buttonsAndLinks/commandLink/commandLink.xhtml (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/buttonsAndLinks/commandLink/commandLink.xhtml Tue Feb 9 20:18:14 2010
@@ -1,10 +1,15 @@
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:tr="http://myfaces.apache.org/trinidad">
+ xmlns:tr="http://myfaces.apache.org/trinidad"
+ template="/pages/componentDemo.xhtml">
- <tr:panelFormLayout rows="4" labelAlignment="start">
- <tr:inputText value="#{commandLinkBean.text}"/>
- <tr:commandLink text="Submit" action="#{commandLinkBean.showMessage}"/>
- <tr:outputText value="#{commandLinkBean.message}"/>
- </tr:panelFormLayout>
+ <ui:define name="demoContent">
+
+ <tr:panelFormLayout rows="4" labelAlignment="start">
+ <tr:inputText value="#{commandLinkBean.text}"/>
+ <tr:commandLink text="Submit" action="#{commandLinkBean.showMessage}"/>
+ <tr:outputText value="#{commandLinkBean.message}"/>
+ </tr:panelFormLayout>
+
+ </ui:define>
</ui:composition>
\ No newline at end of file
Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/buttonsAndLinks/goButton/goButton.xhtml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/buttonsAndLinks/goButton/goButton.xhtml?rev=908202&r1=908201&r2=908202&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/buttonsAndLinks/goButton/goButton.xhtml (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/buttonsAndLinks/goButton/goButton.xhtml Tue Feb 9 20:18:14 2010
@@ -1,8 +1,14 @@
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:tr="http://myfaces.apache.org/trinidad">
+ xmlns:tr="http://myfaces.apache.org/trinidad"
+ template="/pages/componentDemo.xhtml">
- <tr:panelFormLayout rows="4" labelAlignment="start">
- <tr:goButton text="Go" destination="http://myfaces.apache.org/trinidad/trinidad-api/tagdoc/tr_goButton.html"/>
- </tr:panelFormLayout>
+ <ui:define name="demoContent">
+
+ <tr:panelFormLayout rows="4" labelAlignment="start">
+ <tr:goButton text="Go"
+ destination="http://myfaces.apache.org/trinidad/trinidad-api/tagdoc/tr_goButton.html"/>
+ </tr:panelFormLayout>
+
+ </ui:define>
</ui:composition>
\ No newline at end of file
Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/buttonsAndLinks/goLink/goLink.xhtml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/buttonsAndLinks/goLink/goLink.xhtml?rev=908202&r1=908201&r2=908202&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/buttonsAndLinks/goLink/goLink.xhtml (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/buttonsAndLinks/goLink/goLink.xhtml Tue Feb 9 20:18:14 2010
@@ -1,8 +1,14 @@
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:tr="http://myfaces.apache.org/trinidad">
+ xmlns:tr="http://myfaces.apache.org/trinidad"
+ template="/pages/componentDemo.xhtml">
- <tr:panelFormLayout rows="4" labelAlignment="start">
- <tr:goLink text="Go" destination="http://myfaces.apache.org/trinidad/trinidad-api/tagdoc/tr_goLink.html"/>
- </tr:panelFormLayout>
+ <ui:define name="demoContent">
+
+ <tr:panelFormLayout rows="4" labelAlignment="start">
+ <tr:goLink text="Go"
+ destination="http://myfaces.apache.org/trinidad/trinidad-api/tagdoc/tr_goLink.html"/>
+ </tr:panelFormLayout>
+
+ </ui:define>
</ui:composition>
\ No newline at end of file
Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/buttonsAndLinks/resetButton/resetButton.xhtml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/buttonsAndLinks/resetButton/resetButton.xhtml?rev=908202&r1=908201&r2=908202&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/buttonsAndLinks/resetButton/resetButton.xhtml (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/buttonsAndLinks/resetButton/resetButton.xhtml Tue Feb 9 20:18:14 2010
@@ -1,13 +1,17 @@
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:tr="http://myfaces.apache.org/trinidad">
+ xmlns:tr="http://myfaces.apache.org/trinidad"
+ template="/pages/componentDemo.xhtml">
- <tr:panelGroupLayout layout="vertical">
- <tr:panelHeader text="Reset Elements."/>
- <tr:selectBooleanCheckbox text="Box1"/>
- <tr:selectBooleanCheckbox text="Box2" selected="true"/>
- <tr:selectBooleanCheckbox text="Box3"/>
- <tr:resetButton textAndAccessKey="&Reset"/>
- </tr:panelGroupLayout>
+ <ui:define name="demoContent">
+ <tr:panelGroupLayout layout="vertical">
+ <tr:panelHeader text="Reset Elements."/>
+ <tr:selectBooleanCheckbox text="Box1"/>
+ <tr:selectBooleanCheckbox text="Box2" selected="true"/>
+ <tr:selectBooleanCheckbox text="Box3"/>
+ <tr:resetButton textAndAccessKey="&Reset"/>
+ </tr:panelGroupLayout>
+
+ </ui:define>
</ui:composition>
\ No newline at end of file
Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/graphic/icon/icon.xhtml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/graphic/icon/icon.xhtml?rev=908202&r1=908201&r2=908202&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/graphic/icon/icon.xhtml (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/graphic/icon/icon.xhtml Tue Feb 9 20:18:14 2010
@@ -1,25 +1,30 @@
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:tr="http://myfaces.apache.org/trinidad">
+ xmlns:tr="http://myfaces.apache.org/trinidad"
+ template="/pages/componentDemo.xhtml">
- <tr:outputText value="Types of icons that can be rendered are:"/>
- <tr:spacer height="10px"/>
+ <ui:define name="demoContent">
- <tr:panelHorizontalLayout>
- <tr:icon name="info"/>
- <tr:spacer width="5"/>
- <tr:outputText value="Info: "/>
- </tr:panelHorizontalLayout>
-
- <tr:panelHorizontalLayout>
- <tr:icon name="warning"/>
- <tr:spacer width="5"/>
- <tr:outputText value="Warning: "/>
- </tr:panelHorizontalLayout>
-
- <tr:panelHorizontalLayout>
- <tr:icon name="error"/>
- <tr:spacer width="5"/>
- <tr:outputText value="Error: "/>
- </tr:panelHorizontalLayout>
+ <tr:outputText value="Types of icons that can be rendered are:"/>
+ <tr:spacer height="10px"/>
+
+ <tr:panelHorizontalLayout>
+ <tr:icon name="info"/>
+ <tr:spacer width="5"/>
+ <tr:outputText value="Info: "/>
+ </tr:panelHorizontalLayout>
+
+ <tr:panelHorizontalLayout>
+ <tr:icon name="warning"/>
+ <tr:spacer width="5"/>
+ <tr:outputText value="Warning: "/>
+ </tr:panelHorizontalLayout>
+
+ <tr:panelHorizontalLayout>
+ <tr:icon name="error"/>
+ <tr:spacer width="5"/>
+ <tr:outputText value="Error: "/>
+ </tr:panelHorizontalLayout>
+
+ </ui:define>
</ui:composition>
\ No newline at end of file
Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/graphic/image/image.xhtml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/graphic/image/image.xhtml?rev=908202&r1=908201&r2=908202&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/graphic/image/image.xhtml (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/graphic/image/image.xhtml Tue Feb 9 20:18:14 2010
@@ -1,7 +1,11 @@
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:tr="http://myfaces.apache.org/trinidad">
+ xmlns:tr="http://myfaces.apache.org/trinidad"
+ template="/pages/componentDemo.xhtml">
- <tr:image source="/resources/Butterfly.jpg" shortDesc="Butterfly"/>
+ <ui:define name="demoContent">
+ <tr:image source="/resources/Butterfly.jpg" shortDesc="Butterfly"/>
+
+ </ui:define>
</ui:composition>
\ No newline at end of file
Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/graphic/media/media.xhtml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/graphic/media/media.xhtml?rev=908202&r1=908201&r2=908202&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/graphic/media/media.xhtml (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/graphic/media/media.xhtml Tue Feb 9 20:18:14 2010
@@ -1,8 +1,12 @@
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:tr="http://myfaces.apache.org/trinidad">
+ xmlns:tr="http://myfaces.apache.org/trinidad"
+ template="/pages/componentDemo.xhtml">
- <tr:media source="/resources/seattle.wmv" innerWidth="240" innerHeight="168"
- shortDesc="Visit Seattle"/>
+ <ui:define name="demoContent">
+ <tr:media source="/resources/seattle.wmv" innerWidth="240" innerHeight="168"
+ shortDesc="Visit Seattle"/>
+
+ </ui:define>
</ui:composition>
\ No newline at end of file
Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/graphic/media/mediaAllControls.xhtml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/graphic/media/mediaAllControls.xhtml?rev=908202&r1=908201&r2=908202&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/graphic/media/mediaAllControls.xhtml (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/graphic/media/mediaAllControls.xhtml Tue Feb 9 20:18:14 2010
@@ -1,9 +1,13 @@
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:tr="http://myfaces.apache.org/trinidad">
+ xmlns:tr="http://myfaces.apache.org/trinidad"
+ template="/pages/componentDemo.xhtml">
- <tr:media source="/resources/seattle.wmv" innerWidth="240" innerHeight="168"
- shortDesc="Visit Seattle"
- controls="all"/>
+ <ui:define name="demoContent">
+ <tr:media source="/resources/seattle.wmv" innerWidth="240" innerHeight="168"
+ shortDesc="Visit Seattle"
+ controls="all"/>
+
+ </ui:define>
</ui:composition>
\ No newline at end of file
Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/graphic/media/mediaLink.xhtml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/graphic/media/mediaLink.xhtml?rev=908202&r1=908201&r2=908202&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/graphic/media/mediaLink.xhtml (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/graphic/media/mediaLink.xhtml Tue Feb 9 20:18:14 2010
@@ -1,9 +1,13 @@
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:tr="http://myfaces.apache.org/trinidad">
+ xmlns:tr="http://myfaces.apache.org/trinidad"
+ template="/pages/componentDemo.xhtml">
- <tr:media source="/resources/seattle.wmv" innerWidth="240" innerHeight="168"
- shortDesc="Visit Seattle"
- player="link"/>
+ <ui:define name="demoContent">
+ <tr:media source="/resources/seattle.wmv" innerWidth="240" innerHeight="168"
+ shortDesc="Visit Seattle"
+ player="link"/>
+
+ </ui:define>
</ui:composition>
\ No newline at end of file
Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/graphic/media/mediaNoControls.xhtml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/graphic/media/mediaNoControls.xhtml?rev=908202&r1=908201&r2=908202&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/graphic/media/mediaNoControls.xhtml (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/graphic/media/mediaNoControls.xhtml Tue Feb 9 20:18:14 2010
@@ -1,9 +1,13 @@
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:tr="http://myfaces.apache.org/trinidad">
+ xmlns:tr="http://myfaces.apache.org/trinidad"
+ template="/pages/componentDemo.xhtml">
- <tr:media source="/resources/seattle.wmv" innerWidth="240" innerHeight="168"
- shortDesc="Visit Seattle"
- controls="none"/>
-
+ <ui:define name="demoContent">
+
+ <tr:media source="/resources/seattle.wmv" innerWidth="240" innerHeight="168"
+ shortDesc="Visit Seattle"
+ controls="none"/>
+
+ </ui:define>
</ui:composition>
\ No newline at end of file
Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/graphic/media/mediaQuicktime.xhtml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/graphic/media/mediaQuicktime.xhtml?rev=908202&r1=908201&r2=908202&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/graphic/media/mediaQuicktime.xhtml (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/graphic/media/mediaQuicktime.xhtml Tue Feb 9 20:18:14 2010
@@ -1,9 +1,13 @@
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:tr="http://myfaces.apache.org/trinidad">
+ xmlns:tr="http://myfaces.apache.org/trinidad"
+ template="/pages/componentDemo.xhtml">
- <tr:media source="/resources/seattle.wmv" innerWidth="240" innerHeight="168"
- shortDesc="Visit Seattle"
- player="quicktime"/>
+ <ui:define name="demoContent">
+ <tr:media source="/resources/seattle.wmv" innerWidth="240" innerHeight="168"
+ shortDesc="Visit Seattle"
+ player="quicktime"/>
+
+ </ui:define>
</ui:composition>
\ No newline at end of file
Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/graphic/media/mediaReal.xhtml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/graphic/media/mediaReal.xhtml?rev=908202&r1=908201&r2=908202&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/graphic/media/mediaReal.xhtml (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/graphic/media/mediaReal.xhtml Tue Feb 9 20:18:14 2010
@@ -1,9 +1,13 @@
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:tr="http://myfaces.apache.org/trinidad">
+ xmlns:tr="http://myfaces.apache.org/trinidad"
+ template="/pages/componentDemo.xhtml">
- <tr:media source="/resources/seattle.wmv" innerWidth="240" innerHeight="168"
- shortDesc="Visit Seattle"
- player="real"/>
+ <ui:define name="demoContent">
+ <tr:media source="/resources/seattle.wmv" innerWidth="240" innerHeight="168"
+ shortDesc="Visit Seattle"
+ player="real"/>
+
+ </ui:define>
</ui:composition>
\ No newline at end of file
Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/graphic/media/mediaWindows.xhtml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/graphic/media/mediaWindows.xhtml?rev=908202&r1=908201&r2=908202&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/graphic/media/mediaWindows.xhtml (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/graphic/media/mediaWindows.xhtml Tue Feb 9 20:18:14 2010
@@ -1,9 +1,13 @@
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:tr="http://myfaces.apache.org/trinidad">
+ xmlns:tr="http://myfaces.apache.org/trinidad"
+ template="/pages/componentDemo.xhtml">
- <tr:media source="/resources/seattle.wmv" innerWidth="240" innerHeight="168"
- shortDesc="Visit Seattle"
- player="windows"/>
+ <ui:define name="demoContent">
+ <tr:media source="/resources/seattle.wmv" innerWidth="240" innerHeight="168"
+ shortDesc="Visit Seattle"
+ player="windows"/>
+
+ </ui:define>
</ui:composition>
\ No newline at end of file
Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/input/inputColor/inputColor.xhtml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/input/inputColor/inputColor.xhtml?rev=908202&r1=908201&r2=908202&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/input/inputColor/inputColor.xhtml (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/input/inputColor/inputColor.xhtml Tue Feb 9 20:18:14 2010
@@ -1,7 +1,11 @@
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:tr="http://myfaces.apache.org/trinidad">
+ xmlns:tr="http://myfaces.apache.org/trinidad"
+ template="/pages/componentDemo.xhtml">
- <tr:inputColor label="Color" />
+ <ui:define name="demoContent">
+ <tr:inputColor label="Color"/>
+
+ </ui:define>
</ui:composition>
\ No newline at end of file
Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/input/inputColor/inputColorCompact.xhtml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/input/inputColor/inputColorCompact.xhtml?rev=908202&r1=908201&r2=908202&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/input/inputColor/inputColorCompact.xhtml (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/input/inputColor/inputColorCompact.xhtml Tue Feb 9 20:18:14 2010
@@ -1,7 +1,11 @@
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:tr="http://myfaces.apache.org/trinidad">
+ xmlns:tr="http://myfaces.apache.org/trinidad"
+ template="/pages/componentDemo.xhtml">
- <tr:inputColor label="Color" compact="true"/>
+ <ui:define name="demoContent">
+ <tr:inputColor label="Color" compact="true"/>
+
+ </ui:define>
</ui:composition>
\ No newline at end of file
Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/input/inputColor/inputColorDetailed.xhtml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/input/inputColor/inputColorDetailed.xhtml?rev=908202&r1=908201&r2=908202&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/input/inputColor/inputColorDetailed.xhtml (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/input/inputColor/inputColorDetailed.xhtml Tue Feb 9 20:18:14 2010
@@ -1,7 +1,11 @@
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:tr="http://myfaces.apache.org/trinidad">
+ xmlns:tr="http://myfaces.apache.org/trinidad"
+ template="/pages/componentDemo.xhtml">
- <tr:inputColor label="Color" simple="false"/>
+ <ui:define name="demoContent">
+ <tr:inputColor label="Color" simple="false"/>
+
+ </ui:define>
</ui:composition>
\ No newline at end of file
Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/input/inputColor/inputColorSimple.xhtml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/input/inputColor/inputColorSimple.xhtml?rev=908202&r1=908201&r2=908202&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/input/inputColor/inputColorSimple.xhtml (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/input/inputColor/inputColorSimple.xhtml Tue Feb 9 20:18:14 2010
@@ -1,7 +1,11 @@
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:tr="http://myfaces.apache.org/trinidad">
+ xmlns:tr="http://myfaces.apache.org/trinidad"
+ template="/pages/componentDemo.xhtml">
- <tr:inputColor label="Color" simple="true"/>
+ <ui:define name="demoContent">
+ <tr:inputColor label="Color" simple="true"/>
+
+ </ui:define>
</ui:composition>
\ No newline at end of file
Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/input/inputDate/inputDate.xhtml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/input/inputDate/inputDate.xhtml?rev=908202&r1=908201&r2=908202&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/input/inputDate/inputDate.xhtml (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/input/inputDate/inputDate.xhtml Tue Feb 9 20:18:14 2010
@@ -1,15 +1,20 @@
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:f="http://java.sun.com/jsf/core"
- xmlns:tr="http://myfaces.apache.org/trinidad">
+ xmlns:tr="http://myfaces.apache.org/trinidad"
+ template="/pages/componentDemo.xhtml">
- <tr:panelFormLayout rows="4" labelAlignment="start">
- <tr:inputDate id="mdf2" label="Short Date">
- <f:convertDateTime dateStyle="short"/>
- </tr:inputDate>
-
- <tr:inputDate id="mdf1" label="Full Date">
- <f:convertDateTime dateStyle="full"/>
- </tr:inputDate>
- </tr:panelFormLayout>
+ <ui:define name="demoContent">
+
+ <tr:panelFormLayout rows="4" labelAlignment="start">
+ <tr:inputDate id="mdf2" label="Short Date">
+ <f:convertDateTime dateStyle="short"/>
+ </tr:inputDate>
+
+ <tr:inputDate id="mdf1" label="Full Date">
+ <f:convertDateTime dateStyle="full"/>
+ </tr:inputDate>
+ </tr:panelFormLayout>
+
+ </ui:define>
</ui:composition>
\ No newline at end of file
Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/input/inputDate/inputDateDetailed.xhtml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/input/inputDate/inputDateDetailed.xhtml?rev=908202&r1=908201&r2=908202&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/input/inputDate/inputDateDetailed.xhtml (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/input/inputDate/inputDateDetailed.xhtml Tue Feb 9 20:18:14 2010
@@ -1,15 +1,20 @@
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:f="http://java.sun.com/jsf/core"
- xmlns:tr="http://myfaces.apache.org/trinidad">
-
- <tr:panelFormLayout rows="4" labelAlignment="start">
- <tr:inputDate id="mdf2" label="Short Date" simple="false">
- <f:convertDateTime dateStyle="short"/>
- </tr:inputDate>
+ xmlns:tr="http://myfaces.apache.org/trinidad"
+ template="/pages/componentDemo.xhtml">
- <tr:inputDate id="mdf1" label="Full Date" simple="false">
- <f:convertDateTime dateStyle="full"/>
- </tr:inputDate>
- </tr:panelFormLayout>
+ <ui:define name="demoContent">
+
+ <tr:panelFormLayout rows="4" labelAlignment="start">
+ <tr:inputDate id="mdf2" label="Short Date" simple="false">
+ <f:convertDateTime dateStyle="short"/>
+ </tr:inputDate>
+
+ <tr:inputDate id="mdf1" label="Full Date" simple="false">
+ <f:convertDateTime dateStyle="full"/>
+ </tr:inputDate>
+ </tr:panelFormLayout>
+
+ </ui:define>
</ui:composition>
\ No newline at end of file
Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/input/inputDate/inputDateSimple.xhtml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/input/inputDate/inputDateSimple.xhtml?rev=908202&r1=908201&r2=908202&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/input/inputDate/inputDateSimple.xhtml (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/input/inputDate/inputDateSimple.xhtml Tue Feb 9 20:18:14 2010
@@ -1,15 +1,20 @@
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:f="http://java.sun.com/jsf/core"
- xmlns:tr="http://myfaces.apache.org/trinidad">
+ xmlns:tr="http://myfaces.apache.org/trinidad"
+ template="/pages/componentDemo.xhtml">
- <tr:panelFormLayout rows="4" labelAlignment="start">
- <tr:inputDate id="mdf2" label="Short Date" simple="true">
- <f:convertDateTime dateStyle="short"/>
- </tr:inputDate>
+ <ui:define name="demoContent">
- <tr:inputDate id="mdf1" label="Full Date" simple="true">
- <f:convertDateTime dateStyle="full"/>
- </tr:inputDate>
- </tr:panelFormLayout>
+ <tr:panelFormLayout rows="4" labelAlignment="start">
+ <tr:inputDate id="mdf2" label="Short Date" simple="true">
+ <f:convertDateTime dateStyle="short"/>
+ </tr:inputDate>
+
+ <tr:inputDate id="mdf1" label="Full Date" simple="true">
+ <f:convertDateTime dateStyle="full"/>
+ </tr:inputDate>
+ </tr:panelFormLayout>
+
+ </ui:define>
</ui:composition>
\ No newline at end of file
Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/input/inputFile/inputFile.xhtml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/input/inputFile/inputFile.xhtml?rev=908202&r1=908201&r2=908202&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/input/inputFile/inputFile.xhtml (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/input/inputFile/inputFile.xhtml Tue Feb 9 20:18:14 2010
@@ -1,7 +1,11 @@
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:tr="http://myfaces.apache.org/trinidad">
+ xmlns:tr="http://myfaces.apache.org/trinidad"
+ template="/pages/componentDemo.xhtml">
- <tr:inputFile label="File" required="false" />
+ <ui:define name="demoContent">
+ <tr:inputFile label="File" required="false"/>
+
+ </ui:define>
</ui:composition>
\ No newline at end of file
Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/input/inputFile/inputFileDetailed.xhtml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/input/inputFile/inputFileDetailed.xhtml?rev=908202&r1=908201&r2=908202&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/input/inputFile/inputFileDetailed.xhtml (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/input/inputFile/inputFileDetailed.xhtml Tue Feb 9 20:18:14 2010
@@ -1,7 +1,11 @@
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:tr="http://myfaces.apache.org/trinidad">
+ xmlns:tr="http://myfaces.apache.org/trinidad"
+ template="/pages/componentDemo.xhtml">
- <tr:inputFile label="File" required="false" simple="false"/>
+ <ui:define name="demoContent">
+ <tr:inputFile label="File" required="false" simple="false"/>
+
+ </ui:define>
</ui:composition>
\ No newline at end of file
Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/input/inputFile/inputFileSimple.xhtml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/input/inputFile/inputFileSimple.xhtml?rev=908202&r1=908201&r2=908202&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/input/inputFile/inputFileSimple.xhtml (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/input/inputFile/inputFileSimple.xhtml Tue Feb 9 20:18:14 2010
@@ -1,7 +1,11 @@
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:tr="http://myfaces.apache.org/trinidad">
+ xmlns:tr="http://myfaces.apache.org/trinidad"
+ template="/pages/componentDemo.xhtml">
- <tr:inputFile label="File" required="false" simple="true"/>
+ <ui:define name="demoContent">
+ <tr:inputFile label="File" required="false" simple="true"/>
+
+ </ui:define>
</ui:composition>
\ No newline at end of file
Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/input/inputHidden/inputHidden.xhtml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/input/inputHidden/inputHidden.xhtml?rev=908202&r1=908201&r2=908202&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/input/inputHidden/inputHidden.xhtml (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/input/inputHidden/inputHidden.xhtml Tue Feb 9 20:18:14 2010
@@ -1,8 +1,12 @@
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:tr="http://myfaces.apache.org/trinidad">
+ xmlns:tr="http://myfaces.apache.org/trinidad"
+ template="/pages/componentDemo.xhtml">
- <tr:inputHidden value="Input Hiden Value"/>
- <tr:commandButton text="Submit"/>
+ <ui:define name="demoContent">
+ <tr:inputHidden value="Input Hiden Value"/>
+ <tr:commandButton text="Submit"/>
+
+ </ui:define>
</ui:composition>
\ No newline at end of file
Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/input/inputListOfValues/inputListOfValues.xhtml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/input/inputListOfValues/inputListOfValues.xhtml?rev=908202&r1=908201&r2=908202&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/input/inputListOfValues/inputListOfValues.xhtml (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/input/inputListOfValues/inputListOfValues.xhtml Tue Feb 9 20:18:14 2010
@@ -1,9 +1,13 @@
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:tr="http://myfaces.apache.org/trinidad">
+ xmlns:tr="http://myfaces.apache.org/trinidad"
+ template="/pages/componentDemo.xhtml">
- <tr:inputListOfValues label="Select your favorite name:" value=""
- action="dialog:periodicTable"
- searchDesc="Pick a name"/>
+ <ui:define name="demoContent">
+ <tr:inputListOfValues label="Select your favorite name:" value=""
+ action="dialog:periodicTable"
+ searchDesc="Pick a name"/>
+
+ </ui:define>
</ui:composition>
\ No newline at end of file
Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/input/inputListOfValues/inputListOfValuesDetailed.xhtml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/input/inputListOfValues/inputListOfValuesDetailed.xhtml?rev=908202&r1=908201&r2=908202&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/input/inputListOfValues/inputListOfValuesDetailed.xhtml (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/input/inputListOfValues/inputListOfValuesDetailed.xhtml Tue Feb 9 20:18:14 2010
@@ -1,10 +1,14 @@
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:tr="http://myfaces.apache.org/trinidad">
+ xmlns:tr="http://myfaces.apache.org/trinidad"
+ template="/pages/componentDemo.xhtml">
- <tr:inputListOfValues label="Select your favorite name:" value=""
- action="dialog:periodicTable"
- searchDesc="Pick a name"
- simple="false"/>
+ <ui:define name="demoContent">
+ <tr:inputListOfValues label="Select your favorite name:" value=""
+ action="dialog:periodicTable"
+ searchDesc="Pick a name"
+ simple="false"/>
+
+ </ui:define>
</ui:composition>
\ No newline at end of file
Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/input/inputListOfValues/inputListOfValuesSimple.xhtml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/input/inputListOfValues/inputListOfValuesSimple.xhtml?rev=908202&r1=908201&r2=908202&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/input/inputListOfValues/inputListOfValuesSimple.xhtml (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/input/inputListOfValues/inputListOfValuesSimple.xhtml Tue Feb 9 20:18:14 2010
@@ -1,10 +1,14 @@
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:tr="http://myfaces.apache.org/trinidad">
+ xmlns:tr="http://myfaces.apache.org/trinidad"
+ template="/pages/componentDemo.xhtml">
- <tr:inputListOfValues label="Select your favorite name:" value=""
- action="dialog:periodicTable"
- searchDesc="Pick a name"
- simple="true"/>
-
+ <ui:define name="demoContent">
+
+ <tr:inputListOfValues label="Select your favorite name:" value=""
+ action="dialog:periodicTable"
+ searchDesc="Pick a name"
+ simple="true"/>
+
+ </ui:define>
</ui:composition>
\ No newline at end of file
Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/input/inputNumberSpinbox/inputNumberSpinbox.xhtml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/input/inputNumberSpinbox/inputNumberSpinbox.xhtml?rev=908202&r1=908201&r2=908202&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/input/inputNumberSpinbox/inputNumberSpinbox.xhtml (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/input/inputNumberSpinbox/inputNumberSpinbox.xhtml Tue Feb 9 20:18:14 2010
@@ -1,7 +1,11 @@
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:tr="http://myfaces.apache.org/trinidad">
+ xmlns:tr="http://myfaces.apache.org/trinidad"
+ template="/pages/componentDemo.xhtml">
- <tr:inputNumberSpinbox label="Year:" value="2009" minimum="1900" maximum="2100"/>
-
+ <ui:define name="demoContent">
+
+ <tr:inputNumberSpinbox label="Year:" value="2009" minimum="1900" maximum="2100"/>
+
+ </ui:define>
</ui:composition>
\ No newline at end of file
Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/input/inputNumberSpinbox/inputNumberSpinboxDetailed.xhtml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/input/inputNumberSpinbox/inputNumberSpinboxDetailed.xhtml?rev=908202&r1=908201&r2=908202&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/input/inputNumberSpinbox/inputNumberSpinboxDetailed.xhtml (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/input/inputNumberSpinbox/inputNumberSpinboxDetailed.xhtml Tue Feb 9 20:18:14 2010
@@ -1,7 +1,12 @@
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:tr="http://myfaces.apache.org/trinidad">
+ xmlns:tr="http://myfaces.apache.org/trinidad"
+ template="/pages/componentDemo.xhtml">
- <tr:inputNumberSpinbox label="Year:" value="2009" minimum="1900" maximum="2100" simple="false"/>
+ <ui:define name="demoContent">
+ <tr:inputNumberSpinbox label="Year:" value="2009" minimum="1900" maximum="2100"
+ simple="false"/>
+
+ </ui:define>
</ui:composition>
\ No newline at end of file