myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ckor...@apache.org
Subject svn commit: r927579 - in /myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main: java/org/apache/myfaces/trinidaddemo/components/buttonsAndLinks/commandLink/ webapp/components/buttonsAndLinks/commandLink/ weba...
Date Thu, 25 Mar 2010 20:16:21 GMT
Author: ckormos
Date: Thu Mar 25 20:16:20 2010
New Revision: 927579

URL: http://svn.apache.org/viewvc?rev=927579&view=rev
Log:
improved some of the components demos. 
replaced with one main form and subforms for each section to get rid of validation errors
where they are not needed.

Modified:
    myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/components/buttonsAndLinks/commandLink/CommandLinkBean.java
    myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/buttonsAndLinks/commandLink/commandLink.xhtml
    myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/buttonsAndLinks/goButton/goButton.xhtml
    myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/buttonsAndLinks/goLink/goLink.xhtml
    myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/panel/panelBox/panelBox.xhtml
    myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/panel/panelBox/panelBoxDark.xhtml
    myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/panel/panelBox/panelBoxLight.xhtml
    myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/panel/panelBox/panelBoxMedium.xhtml
    myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/panel/panelBox/panelBoxTransparent.xhtml
    myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/pages/componentDemo.xhtml
    myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/template/componentsShowCaseTemplate.xhtml

Modified: myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/components/buttonsAndLinks/commandLink/CommandLinkBean.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/components/buttonsAndLinks/commandLink/CommandLinkBean.java?rev=927579&r1=927578&r2=927579&view=diff
==============================================================================
--- myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/components/buttonsAndLinks/commandLink/CommandLinkBean.java
(original)
+++ myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/components/buttonsAndLinks/commandLink/CommandLinkBean.java
Thu Mar 25 20:16:20 2010
@@ -22,31 +22,31 @@ package org.apache.myfaces.trinidaddemo.
  *
  */
 public class CommandLinkBean {
-    private String text;
-    private String message;
+    private float celsiusDegrees;
+    private float fahrenheitDegrees;
 
     public CommandLinkBean() {
-        this.text = "Input text";
+        this.celsiusDegrees = 0;
+        this.fahrenheitDegrees = 32;
     }
 
-    public String getText() {
-        return text;
+    public float getCelsiusDegrees() {
+        return celsiusDegrees;
     }
 
-    public String getMessage() {
-        return message;
+    public float getFahrenheitDegrees() {
+        return fahrenheitDegrees;
     }
 
-    public void setText(String text) {
-        this.text = text;
+    public void setCelsiusDegrees(float celsiusDegrees) {
+        this.celsiusDegrees = celsiusDegrees;
     }
 
-    public void setMessage(String message) {
-        this.message = message;
+    public void setFahrenheitDegrees(float fahrenheitDegrees) {
+        this.fahrenheitDegrees = fahrenheitDegrees;
     }
 
-    public void showMessage() {
-        this.message="Input text: "+text;
+    public void convertToFahrenheit(){
+         fahrenheitDegrees = (9*celsiusDegrees)/5+32;
     }
-
 }

Modified: myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/buttonsAndLinks/commandLink/commandLink.xhtml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/buttonsAndLinks/commandLink/commandLink.xhtml?rev=927579&r1=927578&r2=927579&view=diff
==============================================================================
--- myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/buttonsAndLinks/commandLink/commandLink.xhtml
(original)
+++ myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/buttonsAndLinks/commandLink/commandLink.xhtml
Thu Mar 25 20:16:20 2010
@@ -24,10 +24,18 @@
 
     <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 rows="5" labelAlignment="start">
+            <tr:outputFormatted value="&lt;b&gt;Temperature converter&lt;b&gt;"/>
+            <tr:spacer height="5px"/>
+            <tr:panelHorizontalLayout>
+                <tr:inputText value="#{commandLinkBean.celsiusDegrees}" onclick="this.value='';"/>
+                <tr:outputText value="C"/>
+            </tr:panelHorizontalLayout>
+            <tr:commandLink text="Convert" action="#{commandLinkBean.convertToFahrenheit}"/>
+            <tr:panelHorizontalLayout>
+                <tr:inputText value="#{commandLinkBean.fahrenheitDegrees}" disabled="true"/>
+                <tr:outputText value="F"/>
+            </tr:panelHorizontalLayout>
         </tr:panelFormLayout>
 
     </ui:define>

Modified: myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/buttonsAndLinks/goButton/goButton.xhtml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/buttonsAndLinks/goButton/goButton.xhtml?rev=927579&r1=927578&r2=927579&view=diff
==============================================================================
--- myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/buttonsAndLinks/goButton/goButton.xhtml
(original)
+++ myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/buttonsAndLinks/goButton/goButton.xhtml
Thu Mar 25 20:16:20 2010
@@ -24,10 +24,9 @@
 
     <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>
+        <tr:outputFormatted value="Navigate to the &lt;i&gt;Go Link&lt;/i&gt;
component demo"/>
+        <tr:spacer height="15px"/>
+        <tr:goButton text="Navigate" destination="/component-demo/goLink-Default"/>
 
     </ui:define>
 </ui:composition>

Modified: myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/buttonsAndLinks/goLink/goLink.xhtml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/buttonsAndLinks/goLink/goLink.xhtml?rev=927579&r1=927578&r2=927579&view=diff
==============================================================================
--- myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/buttonsAndLinks/goLink/goLink.xhtml
(original)
+++ myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/buttonsAndLinks/goLink/goLink.xhtml
Thu Mar 25 20:16:20 2010
@@ -24,10 +24,9 @@
 
     <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>
+        <tr:outputFormatted value="Navigate to the &lt;i&gt;Go Button&lt;/i&gt;
component demo"/>
+        <tr:spacer height="15px"/>
+        <tr:goLink text="Navigate" destination="/component-demo/goButton-Default"/>
 
     </ui:define>
 </ui:composition>

Modified: myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/panel/panelBox/panelBox.xhtml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/panel/panelBox/panelBox.xhtml?rev=927579&r1=927578&r2=927579&view=diff
==============================================================================
--- myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/panel/panelBox/panelBox.xhtml
(original)
+++ myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/panel/panelBox/panelBox.xhtml
Thu Mar 25 20:16:20 2010
@@ -24,21 +24,19 @@
 
     <ui:define name="demoContent">
 
-        <tr:panelBox text="Header"
-                     inlineStyle="width: 25%;">
-            <tr:panelList rows="10" inlineStyle="width: 100px;">
-                <tr:goLink text="point 1"
-                           destination="http://myfaces.apache.org"/>
-                <tr:goLink text="point 2"
-                           destination="http://myfaces.apache.org"/>
-                <tr:goLink text="point 3"
-                           destination="http://myfaces.apache.org"/>
-                <tr:goLink text="point 4"
-                           destination="http://myfaces.apache.org"/>
-                <tr:goLink text="point 5"
-                           destination="http://myfaces.apache.org"/>
-            </tr:panelList>
-        </tr:panelBox>
+        <tr:panelFormLayout inlineStyle="padding-bottom:4px; position:relative;">
+            <tr:outputText value="The Web is like a dominatrix.  Everywhere you turn,
you see little buttons ordering you to Submit."
+                           inlineStyle="font-size:2.6em; color:#E8E2D7; line-height:1.1em;"/>
+            <tr:panelBox text="To do list:"
+                         inlineStyle="position:absolute; top:0px; left:100px;">
+                <tr:selectManyCheckbox inlineStyle="font-weight:bold;">
+                    <tr:selectItem label="Change car oil"/>
+                    <tr:selectItem label="Pick up laundry"/>
+                    <tr:selectItem label="Walk dog"/>
+                    <tr:selectItem label="Repair patio deck"/>
+                </tr:selectManyCheckbox>
+            </tr:panelBox>
+        </tr:panelFormLayout>
 
     </ui:define>
 </ui:composition>

Modified: myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/panel/panelBox/panelBoxDark.xhtml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/panel/panelBox/panelBoxDark.xhtml?rev=927579&r1=927578&r2=927579&view=diff
==============================================================================
--- myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/panel/panelBox/panelBoxDark.xhtml
(original)
+++ myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/panel/panelBox/panelBoxDark.xhtml
Thu Mar 25 20:16:20 2010
@@ -24,22 +24,20 @@
 
     <ui:define name="demoContent">
 
-        <tr:panelBox text="Header"
-                     inlineStyle="width: 25%;"
-                     background="dark">
-            <tr:panelList rows="10" inlineStyle="width: 100px;">
-                <tr:goLink text="point 1"
-                           destination="http://myfaces.apache.org"/>
-                <tr:goLink text="point 2"
-                           destination="http://myfaces.apache.org"/>
-                <tr:goLink text="point 3"
-                           destination="http://myfaces.apache.org"/>
-                <tr:goLink text="point 4"
-                           destination="http://myfaces.apache.org"/>
-                <tr:goLink text="point 5"
-                           destination="http://myfaces.apache.org"/>
-            </tr:panelList>
-        </tr:panelBox>
+        <tr:panelFormLayout inlineStyle="padding-bottom:4px; position:relative;">
+            <tr:outputText value="The Web is like a dominatrix.  Everywhere you turn,
you see little buttons ordering you to Submit."
+                           inlineStyle="font-size:2.6em; color:#E8E2D7; line-height:1.1em;"/>
+            <tr:panelBox text="To do list:"
+                         background="dark"
+                         inlineStyle="position:absolute; top:0px; left:100px;">
+                <tr:selectManyCheckbox inlineStyle="text-align:left; font-weight:bold;">
+                    <tr:selectItem label="Change car oil"/>
+                    <tr:selectItem label="Pick up laundry"/>
+                    <tr:selectItem label="Walk dog"/>
+                    <tr:selectItem label="Repair patio deck"/>
+                </tr:selectManyCheckbox>
+            </tr:panelBox>
+        </tr:panelFormLayout>
 
     </ui:define>
 </ui:composition>

Modified: myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/panel/panelBox/panelBoxLight.xhtml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/panel/panelBox/panelBoxLight.xhtml?rev=927579&r1=927578&r2=927579&view=diff
==============================================================================
--- myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/panel/panelBox/panelBoxLight.xhtml
(original)
+++ myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/panel/panelBox/panelBoxLight.xhtml
Thu Mar 25 20:16:20 2010
@@ -24,22 +24,20 @@
 
     <ui:define name="demoContent">
 
-        <tr:panelBox text="Header"
-                     inlineStyle="width: 25%;"
-                     background="light">
-            <tr:panelList rows="10" inlineStyle="width: 100px;">
-                <tr:goLink text="point 1"
-                           destination="http://myfaces.apache.org"/>
-                <tr:goLink text="point 2"
-                           destination="http://myfaces.apache.org"/>
-                <tr:goLink text="point 3"
-                           destination="http://myfaces.apache.org"/>
-                <tr:goLink text="point 4"
-                           destination="http://myfaces.apache.org"/>
-                <tr:goLink text="point 5"
-                           destination="http://myfaces.apache.org"/>
-            </tr:panelList>
-        </tr:panelBox>
+        <tr:panelFormLayout inlineStyle="padding-bottom:4px; position:relative;">
+            <tr:outputText value="The Web is like a dominatrix.  Everywhere you turn,
you see little buttons ordering you to Submit."
+                           inlineStyle="font-size:2.6em; color:#E8E2D7; line-height:1.1em;"/>
+            <tr:panelBox text="To do list:"
+                         background="light"
+                         inlineStyle="position:absolute; top:0px; left:100px;">
+                <tr:selectManyCheckbox inlineStyle="text-align:left; font-weight:bold;">
+                    <tr:selectItem label="Change car oil"/>
+                    <tr:selectItem label="Pick up laundry"/>
+                    <tr:selectItem label="Walk dog"/>
+                    <tr:selectItem label="Repair patio deck"/>
+                </tr:selectManyCheckbox>
+            </tr:panelBox>
+        </tr:panelFormLayout>
 
     </ui:define>
 </ui:composition>

Modified: myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/panel/panelBox/panelBoxMedium.xhtml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/panel/panelBox/panelBoxMedium.xhtml?rev=927579&r1=927578&r2=927579&view=diff
==============================================================================
--- myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/panel/panelBox/panelBoxMedium.xhtml
(original)
+++ myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/panel/panelBox/panelBoxMedium.xhtml
Thu Mar 25 20:16:20 2010
@@ -24,22 +24,20 @@
 
     <ui:define name="demoContent">
 
-        <tr:panelBox text="Header"
-                     inlineStyle="width: 25%;"
-                     background="medium">
-            <tr:panelList rows="10" inlineStyle="width: 100px;">
-                <tr:goLink text="point 1"
-                           destination="http://myfaces.apache.org"/>
-                <tr:goLink text="point 2"
-                           destination="http://myfaces.apache.org"/>
-                <tr:goLink text="point 3"
-                           destination="http://myfaces.apache.org"/>
-                <tr:goLink text="point 4"
-                           destination="http://myfaces.apache.org"/>
-                <tr:goLink text="point 5"
-                           destination="http://myfaces.apache.org"/>
-            </tr:panelList>
-        </tr:panelBox>
+        <tr:panelFormLayout inlineStyle="padding-bottom:4px; position:relative;">
+            <tr:outputText value="The Web is like a dominatrix.  Everywhere you turn,
you see little buttons ordering you to Submit."
+                           inlineStyle="font-size:2.6em; color:#E8E2D7; line-height:1.1em;"/>
+            <tr:panelBox text="To do list:"
+                         background="medium"
+                         inlineStyle="position:absolute; top:0px; left:100px;">
+                <tr:selectManyCheckbox inlineStyle="text-align:left; font-weight:bold;">
+                    <tr:selectItem label="Change car oil"/>
+                    <tr:selectItem label="Pick up laundry"/>
+                    <tr:selectItem label="Walk dog"/>
+                    <tr:selectItem label="Repair patio deck"/>
+                </tr:selectManyCheckbox>
+            </tr:panelBox>
+        </tr:panelFormLayout>
 
     </ui:define>
 </ui:composition>

Modified: myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/panel/panelBox/panelBoxTransparent.xhtml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/panel/panelBox/panelBoxTransparent.xhtml?rev=927579&r1=927578&r2=927579&view=diff
==============================================================================
--- myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/panel/panelBox/panelBoxTransparent.xhtml
(original)
+++ myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/panel/panelBox/panelBoxTransparent.xhtml
Thu Mar 25 20:16:20 2010
@@ -24,22 +24,20 @@
 
     <ui:define name="demoContent">
 
-        <tr:panelBox text="Header"
-                     inlineStyle="width: 25%;"
-                     background="transparent">
-            <tr:panelList rows="10" inlineStyle="width: 100px;">
-                <tr:goLink text="point 1"
-                           destination="http://myfaces.apache.org"/>
-                <tr:goLink text="point 2"
-                           destination="http://myfaces.apache.org"/>
-                <tr:goLink text="point 3"
-                           destination="http://myfaces.apache.org"/>
-                <tr:goLink text="point 4"
-                           destination="http://myfaces.apache.org"/>
-                <tr:goLink text="point 5"
-                           destination="http://myfaces.apache.org"/>
-            </tr:panelList>
-        </tr:panelBox>
+        <tr:panelFormLayout inlineStyle="padding-bottom:4px; position:relative;">
+            <tr:outputText value="The Web is like a dominatrix.  Everywhere you turn,
you see little buttons ordering you to Submit."
+                           inlineStyle="font-size:2.6em; color:#E8E2D7; line-height:1.1em;"/>
+            <tr:panelBox text="To do list:"
+                         background="transparent"
+                         inlineStyle="position:absolute; top:0px; left:100px;">
+                <tr:selectManyCheckbox inlineStyle="text-align:left; font-weight:bold;">
+                    <tr:selectItem label="Change car oil"/>
+                    <tr:selectItem label="Pick up laundry"/>
+                    <tr:selectItem label="Walk dog"/>
+                    <tr:selectItem label="Repair patio deck"/>
+                </tr:selectManyCheckbox>
+            </tr:panelBox>
+        </tr:panelFormLayout>
 
     </ui:define>
 </ui:composition>

Modified: myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/pages/componentDemo.xhtml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/pages/componentDemo.xhtml?rev=927579&r1=927578&r2=927579&view=diff
==============================================================================
--- myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/pages/componentDemo.xhtml
(original)
+++ myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/pages/componentDemo.xhtml
Thu Mar 25 20:16:20 2010
@@ -28,72 +28,80 @@
 
     <ui:define name="componentContent">
 
-        <table width="100%" cellpadding="0" cellspacing="0" border="0">
-            <tr>
-                <td align="left" width="70%">
-                     <h1>
-                        #{navigationHandler.currentComponentVariantDemo.title}
-                    </h1>
-                </td>
-                <td align="right" width="25%">
-                    <tr:statusIndicator>
-                        <f:facet name="busy">
-                            <tr:outputText value="Loading, please wait..." inlineStyle="color:
#cc3300;"/>
-                        </f:facet>
-                    </tr:statusIndicator>
-                </td>
-                <td align="right" width="5%" style="padding-right: 12px">
-                    <tr:statusIndicator/>
-                </td>
-            </tr>
-        </table>
-
+        <tr:subform>
+            <table width="100%" cellpadding="0" cellspacing="0" border="0">
+                <tr>
+                    <td align="left" width="70%">
+                        <h1>
+                            #{navigationHandler.currentComponentVariantDemo.title}
+                        </h1>
+                    </td>
+                    <td align="right" width="25%">
+                        <tr:statusIndicator>
+                            <f:facet name="busy">
+                                <tr:outputText value="Loading, please wait..." inlineStyle="color:
#cc3300;"/>
+                            </f:facet>
+                        </tr:statusIndicator>
+                    </td>
+                    <td align="right" width="5%" style="padding-right: 12px">
+                        <tr:statusIndicator/>
+                    </td>
+                </tr>
+            </table>
+        </tr:subform>
+      
         <tr:panelGroupLayout layout="vertical" inlineStyle="margin-top: 22px;" styleClass="rightColumn">
 
-            <h:panelGrid columns="2" width="100%" style="width: 100%;" cellpadding="0"
cellspacing="0"
-                         columnClasses="#{navigationHandler.currentComponentDemo.columnStyleClassNames}">
-
-                <tr:panelBox text="Component Demo" inlineStyle="width: 100%">
-                    <ui:insert name="demoContent"/>
-                </tr:panelBox>
-
-                <tr:panelBox text="Variant" inlineStyle="width: 100%;"
-                             rendered="#{navigationHandler.currentComponentDemo.supportsMultipleVariants}"
-                             styleClass="component_variations af_panelBox_light">
-                    <tr:navigationPane hint="list" var="aComponentVariant"
-                                       value="#{navigationHandler.currentComponentDemo.variants}">
-                        <f:facet name="nodeStamp">
-                            <tr:commandNavigationItem text="#{aComponentVariant.variantDisplayName}"
-                                                      selected="#{navigationHandler.componentVariantDemoSelected[aComponentVariant]}"
-                                                      destination="#{aComponentVariant.destination}">
-                            </tr:commandNavigationItem>
-                        </f:facet>
-                    </tr:navigationPane>
-                </tr:panelBox>
-
-            </h:panelGrid>
-
-            <h2 class="page">Sumary</h2>
-
-            <ui:include src="#{navigationHandler.currentComponentVariantDemo.summaryResourcePath}"/>
-
-            <div class="samples">
-                <h2 class="page">Code samples</h2>
-                <tr:panelTabbed position="above">
-
-                    <c:forEach items="#{navigationHandler.currentComponentVariantDemo.jsfResourcePaths}"
var="aJsfPath">
-                        <tr:showDetailItem text="JSF Page">
-                            <trd:outputSource value="#{aJsfPath}"
-                                              styleClass="sourceCode" styleUsage="xml"/>
+            <tr:subform>
+                <h:panelGrid columns="2" width="100%" style="width: 100%;" cellpadding="0"
cellspacing="0"
+                             columnClasses="#{navigationHandler.currentComponentDemo.columnStyleClassNames}">
+
+                    <tr:panelBox text="Component Demo" inlineStyle="width: 100%">
+                        <ui:insert name="demoContent"/>
+                    </tr:panelBox>
+
+                    <tr:panelBox text="Variant" inlineStyle="width: 100%;"
+                                 rendered="#{navigationHandler.currentComponentDemo.supportsMultipleVariants}"
+                                 styleClass="component_variations af_panelBox_light">
+                        <tr:navigationPane hint="list" var="aComponentVariant"
+                                           value="#{navigationHandler.currentComponentDemo.variants}">
+                            <f:facet name="nodeStamp">
+                                <tr:commandNavigationItem text="#{aComponentVariant.variantDisplayName}"
+                                                          selected="#{navigationHandler.componentVariantDemoSelected[aComponentVariant]}"
+                                                          destination="#{aComponentVariant.destination}">
+                                </tr:commandNavigationItem>
+                            </f:facet>
+                        </tr:navigationPane>
+                    </tr:panelBox>
+
+                </h:panelGrid>
+            </tr:subform>
+
+            <tr:subform>
+                <h2 class="page">Sumary</h2>
+                <ui:include src="#{navigationHandler.currentComponentVariantDemo.summaryResourcePath}"/>
+            </tr:subform>
+
+            <tr:subform>
+                <div class="samples">
+                    <h2 class="page">Code samples</h2>
+                    <tr:panelTabbed position="above">
+
+                        <c:forEach items="#{navigationHandler.currentComponentVariantDemo.jsfResourcePaths}"
var="aJsfPath">
+                            <tr:showDetailItem text="JSF Page">
+                                <trd:outputSource value="#{aJsfPath}"
+                                                  styleClass="sourceCode" styleUsage="xml"/>
+                            </tr:showDetailItem>
+                        </c:forEach>
+
+                        <tr:showDetailItem text="Backing Beans" rendered="#{!navigationHandler.currentComponentVariantDemo.static}">
+                            <trd:outputSource value="#{navigationHandler.currentComponentVariantDemo.backingBeanResourcePath}"
+                                              pathPrefix="/WEB-INF/src" styleClass="sourceCode"
styleUsage="java"/>
                         </tr:showDetailItem>
-                    </c:forEach>
+                    </tr:panelTabbed>
+                </div>
+            </tr:subform>
 
-                    <tr:showDetailItem text="Backing Beans" rendered="#{!navigationHandler.currentComponentVariantDemo.static}">
-                        <trd:outputSource value="#{navigationHandler.currentComponentVariantDemo.backingBeanResourcePath}"
-                                          pathPrefix="/WEB-INF/src" styleClass="sourceCode"
styleUsage="java"/>
-                    </tr:showDetailItem>
-                </tr:panelTabbed>
-            </div>
         </tr:panelGroupLayout>
 
     </ui:define>

Modified: myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/template/componentsShowCaseTemplate.xhtml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/template/componentsShowCaseTemplate.xhtml?rev=927579&r1=927578&r2=927579&view=diff
==============================================================================
--- myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/template/componentsShowCaseTemplate.xhtml
(original)
+++ myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/template/componentsShowCaseTemplate.xhtml
Thu Mar 25 20:16:20 2010
@@ -29,32 +29,36 @@
          <h:panelGrid columns="2" columnClasses="column25percent,column75percent" cellpadding="0"
                       cellspacing="0" style="width: 100%;" width="100%">
 
-            <tr:panelGroupLayout layout="vertical">
-            
-                <tr:outputText value="Browse Components" styleClass="head"/>
-
-                <tr:panelAccordion discloseNone="true" inlineStyle="width: 100%;" styleClass="components_accordion">
-                	<c:forEach items="#{navigationHandler.demoCategories}" var="aCategory">
-                		<tr:showDetailItem text="#{aCategory.name}" immediate="true" 
-                						   disclosed="#{navigationHandler.categoryDisclosed[aCategory]}">
-	                        <tr:navigationPane hint="list" var="aComponent" value="#{aCategory.componentDemos}"
styleClass="components_list">
-	                        	<f:facet name="nodeStamp">
-
-							    	<tr:commandNavigationItem text="#{aComponent.displayName}"
-							    							  selected="#{navigationHandler.componentDemoSelected[aComponent]}"
-                                                              destination="#{aComponent.destination}">
-		                            </tr:commandNavigationItem>
-							  	</f:facet>
-	                        </tr:navigationPane>                                     
                        
-	                    </tr:showDetailItem>
-                	</c:forEach>
-                </tr:panelAccordion>
-                
-            </tr:panelGroupLayout>
-
-            <tr:panelGroupLayout layout="vertical">            
-				 <ui:insert name="componentContent"/>            
-            </tr:panelGroupLayout>
+            <tr:subform>
+                <tr:panelGroupLayout layout="vertical">
+
+                    <tr:outputText value="Browse Components" styleClass="head"/>
+
+                    <tr:panelAccordion discloseNone="true" inlineStyle="width: 100%;"
styleClass="components_accordion">
+                        <c:forEach items="#{navigationHandler.demoCategories}" var="aCategory">
+                            <tr:showDetailItem text="#{aCategory.name}" immediate="true"
+                                               disclosed="#{navigationHandler.categoryDisclosed[aCategory]}">
+                                <tr:navigationPane hint="list" var="aComponent" value="#{aCategory.componentDemos}"
styleClass="components_list">
+                                    <f:facet name="nodeStamp">
+
+                                        <tr:commandNavigationItem text="#{aComponent.displayName}"
+                                                                  selected="#{navigationHandler.componentDemoSelected[aComponent]}"
+                                                                  destination="#{aComponent.destination}">
+                                        </tr:commandNavigationItem>
+                                    </f:facet>
+                                </tr:navigationPane>
+                            </tr:showDetailItem>
+                        </c:forEach>
+                    </tr:panelAccordion>
+
+                </tr:panelGroupLayout>
+            </tr:subform>
+
+            <tr:subform>
+                <tr:panelGroupLayout layout="vertical">
+                     <ui:insert name="componentContent"/>
+                </tr:panelGroupLayout>
+            </tr:subform>
 
         </h:panelGrid>
 



Mime
View raw message