You are viewing a plain text version of this content. The canonical link for it is here.
Posted to adffaces-commits@incubator.apache.org by ma...@apache.org on 2006/07/30 19:53:35 UTC
svn commit: r426922 [2/10] - in
/incubator/adffaces/branches/matzew-component-renaming/trinidad:
trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/
trinidad-build/src/main/resources/META-INF/maven-faces-plugin/rende...
Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/email/login.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/email/login.jspx?rev=426922&r1=426921&r2=426922&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/email/login.jspx (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/email/login.jspx Sun Jul 30 12:53:32 2006
@@ -56,7 +56,7 @@
value="Note: The Trinidad Email Demo application is not configured to use a secure communication channel between the browser and the application server - or between the application server and the IMAP server. This means that your data (including your user name/password and email contents) are transmitted in a non-secure manner. Thus, this sample application should only be used in environments that are known to be secure."/>
</f:facet>
<tr:panelHeader text="Email Log In">
- <tr:panelForm>
+ <tr:panelFormLayout>
<tr:inputText required="true" labelAndAccessKey="&Username"
value="#{email.username}">
<f:facet name="help">
@@ -75,7 +75,7 @@
value="#{email.server}"/>
<tr:inputText required="true" label="SMTP Server"
value="#{email.smtpServer}"/>
- </tr:panelForm>
+ </tr:panelFormLayout>
</tr:panelHeader>
<tr:panelButtonBar>
<tr:commandButton textAndAccessKey="&Log In"
Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/email/newMessage.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/email/newMessage.jspx?rev=426922&r1=426921&r2=426922&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/email/newMessage.jspx (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/email/newMessage.jspx Sun Jul 30 12:53:32 2006
@@ -69,7 +69,7 @@
</f:facet>
<tr:panelHeader text="New Message">
- <tr:panelForm inlineStyle="width: 100%" labelWidth="15%" fieldWidth="85%">
+ <tr:panelFormLayout inlineStyle="width: 100%" labelWidth="15%" fieldWidth="85%">
<tr:inputText label="Subject:"
required="true"
value="#{newMessageBacking.subject}"/>
@@ -88,7 +88,7 @@
value="#{newMessageBacking.attachment3}"/>
<tr:inputText label="Content:" columns="80" rows="20" wrap="soft"
value="#{newMessageBacking.content}"/>
- </tr:panelForm>
+ </tr:panelFormLayout>
</tr:panelHeader>
<!--
<f:facet name="infoReturn">
Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/email/preferences.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/email/preferences.jspx?rev=426922&r1=426921&r2=426922&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/email/preferences.jspx (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/email/preferences.jspx Sun Jul 30 12:53:32 2006
@@ -66,7 +66,7 @@
</f:facet>
<tr:panelHeader text="Update Preferences">
- <tr:panelForm>
+ <tr:panelFormLayout>
<tr:selectOneChoice label="Skin-family:"
value="#{email.preferences.skinFamily}">
<f:selectItems value="#{email.preferences.skinFamilyItems}"/>
@@ -92,7 +92,7 @@
value="#{email.preferences.displaySizeColumn}"/>
</tr:panelGroup>
</tr:panelLabelAndMessage>
- </tr:panelForm>
+ </tr:panelFormLayout>
</tr:panelHeader>
<tr:panelButtonBar>
<tr:commandButton textAndAccessKey="&Save"
Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/email/replyToMessage.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/email/replyToMessage.jspx?rev=426922&r1=426921&r2=426922&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/email/replyToMessage.jspx (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/email/replyToMessage.jspx Sun Jul 30 12:53:32 2006
@@ -69,7 +69,7 @@
</f:facet>
<tr:panelHeader text="New Message">
- <tr:panelForm inlineStyle="width: 100%" labelWidth="15%" fieldWidth="85%">
+ <tr:panelFormLayout inlineStyle="width: 100%" labelWidth="15%" fieldWidth="85%">
<tr:inputText label="Subject:"
required="true"
value="#{replyToMessageBacking.subject}"/>
@@ -88,7 +88,7 @@
value="#{replyToMessageBacking.attachment3}"/>
<tr:inputText label="Content:" columns="80" rows="20" wrap="soft"
value="#{replyToMessageBacking.content}"/>
- </tr:panelForm>
+ </tr:panelFormLayout>
</tr:panelHeader>
<!--
<f:facet name="infoReturn">
Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/email/showMessage.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/email/showMessage.jspx?rev=426922&r1=426921&r2=426922&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/email/showMessage.jspx (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/email/showMessage.jspx Sun Jul 30 12:53:32 2006
@@ -68,7 +68,7 @@
<tr:panelBorderLayout>
<!-- Top section: include the headers -->
<f:facet name="innerTop">
- <tr:panelForm inlineStyle="width: 100%" labelWidth="15%" fieldWidth="85%">
+ <tr:panelFormLayout inlineStyle="width: 100%" labelWidth="15%" fieldWidth="85%">
<tr:panelLabelAndMessage label="From:">
<tr:outputText value="#{showMessageBacking.message.sender}"/>
</tr:panelLabelAndMessage>
@@ -97,7 +97,7 @@
<tr:inputText label="Content type:" readOnly="true"
value="#{showMessageBacking.message.contentType}"/>
-->
- </tr:panelForm>
+ </tr:panelFormLayout>
</f:facet>
Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/performance/editForm_adf.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/performance/editForm_adf.jspx?rev=426922&r1=426921&r2=426922&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/performance/editForm_adf.jspx (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/performance/editForm_adf.jspx Sun Jul 30 12:53:32 2006
@@ -29,7 +29,7 @@
<body>
<tr:form >
<tr:messages/>
- <tr:panelForm>
+ <tr:panelFormLayout>
<tr:inputText label="First:" value="1"/>
<tr:inputText label="Second:" value="2"/>
<tr:inputText label="Third:" value="3"/>
@@ -48,7 +48,7 @@
<tr:inputText label="Textarea:" value="Long text" rows="5" />
<tr:selectBooleanCheckbox label="Checked:" selected="true"
text="True or false"/>
- </tr:panelForm>
+ </tr:panelFormLayout>
<tr:commandButton text="Submit"/>
</tr:form>
</body>
Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/skins/beach/beach.css
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/skins/beach/beach.css?rev=426922&r1=426921&r2=426922&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/skins/beach/beach.css (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/skins/beach/beach.css Sun Jul 30 12:53:32 2006
@@ -441,7 +441,7 @@
font-size:small;
}
-af|panelForm::label-cell
+af|panelFormLayout::label-cell
{
-ora-rule-ref: selector(".AFStartTextAlign:alias");
}
Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/surveydemo/surveyConfirm.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/surveydemo/surveyConfirm.jspx?rev=426922&r1=426921&r2=426922&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/surveydemo/surveyConfirm.jspx (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/surveydemo/surveyConfirm.jspx Sun Jul 30 12:53:32 2006
@@ -25,7 +25,7 @@
<tr:panelPage>
<tr:panelHeader text="Please review your answers and make any last changes:">
- <tr:panelForm>
+ <tr:panelFormLayout>
<!-- question 1 -->
<tr:selectOneRadio label="#{survey.q0.prompt}"
required="true"
@@ -74,7 +74,7 @@
<tr:selectItem label="#{survey.q4.answerString}" value="3"/>
</tr:selectOneRadio >
- </tr:panelForm>
+ </tr:panelFormLayout>
</tr:panelHeader>
<f:facet name="navigationGlobal">
<tr:menuButtons>
Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/surveydemo/surveyPage1.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/surveydemo/surveyPage1.jspx?rev=426922&r1=426921&r2=426922&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/surveydemo/surveyPage1.jspx (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/surveydemo/surveyPage1.jspx Sun Jul 30 12:53:32 2006
@@ -25,7 +25,7 @@
<tr:panelPage>
<tr:panelHeader text="Question 5 of 5">
- <tr:panelForm>
+ <tr:panelFormLayout>
<tr:selectOneRadio label="#{survey.q0.prompt}"
required="true"
@@ -37,7 +37,7 @@
</tr:forEach>
</tr:selectOneRadio >
- </tr:panelForm>
+ </tr:panelFormLayout>
</tr:panelHeader>
<f:facet name="navigationGlobal">
Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/surveydemo/surveyPage2.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/surveydemo/surveyPage2.jspx?rev=426922&r1=426921&r2=426922&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/surveydemo/surveyPage2.jspx (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/surveydemo/surveyPage2.jspx Sun Jul 30 12:53:32 2006
@@ -24,11 +24,11 @@
<tr:panelPage>
<tr:panelHeader text="Question 2 of 5">
- <tr:panelForm>
+ <tr:panelFormLayout>
<tr:inputText label="#{survey.q1.prompt}"
required="true"
value="#{survey.a1}"/>
- </tr:panelForm>
+ </tr:panelFormLayout>
</tr:panelHeader>
<f:facet name="navigationGlobal">
<tr:menuButtons>
Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/surveydemo/surveyPage3.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/surveydemo/surveyPage3.jspx?rev=426922&r1=426921&r2=426922&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/surveydemo/surveyPage3.jspx (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/surveydemo/surveyPage3.jspx Sun Jul 30 12:53:32 2006
@@ -25,7 +25,7 @@
<tr:panelPage>
<tr:panelHeader text="Question 3 of 5">
- <tr:panelForm>
+ <tr:panelFormLayout>
<tr:selectOneRadio label="#{survey.q2.prompt}"
required="true"
value="#{survey.a2}">
@@ -35,7 +35,7 @@
<tr:selectItem label="#{item}" value="#{''}#{iter.index}"/>
</tr:forEach>
</tr:selectOneRadio >
- </tr:panelForm>
+ </tr:panelFormLayout>
</tr:panelHeader>
<f:facet name="navigationGlobal">
Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/surveydemo/surveyPage5.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/surveydemo/surveyPage5.jspx?rev=426922&r1=426921&r2=426922&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/surveydemo/surveyPage5.jspx (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/surveydemo/surveyPage5.jspx Sun Jul 30 12:53:32 2006
@@ -24,7 +24,7 @@
<tr:panelPage>
<tr:panelHeader text="Question 5 of 5">
- <tr:panelForm>
+ <tr:panelFormLayout>
<tr:selectOneRadio label="#{survey.q4.prompt}"
required="true"
value="#{survey.a4}">
@@ -34,7 +34,7 @@
<tr:selectItem label="#{item}" value="#{''}#{iter.index}"/>
</tr:forEach>
</tr:selectOneRadio >
- </tr:panelForm>
+ </tr:panelFormLayout>
</tr:panelHeader>
<f:facet name="navigationGlobal">
Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/surveydemo/surveyResults.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/surveydemo/surveyResults.jspx?rev=426922&r1=426921&r2=426922&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/surveydemo/surveyResults.jspx (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/surveydemo/surveyResults.jspx Sun Jul 30 12:53:32 2006
@@ -26,7 +26,7 @@
<tr:panelPage>
<tr:panelHeader text="Please review your responses:">
- <tr:panelForm>
+ <tr:panelFormLayout>
<!-- question 1 -->
<tr:selectOneRadio label="#{survey.q0.prompt}"
required="true"
@@ -97,7 +97,7 @@
<survey:validate_answer questionIndex="4"/>
</tr:selectOneRadio >
- </tr:panelForm>
+ </tr:panelFormLayout>
</tr:panelHeader>
<f:facet name="navigationGlobal">
<tr:menuButtons>
Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/test/webapp/billing.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/test/webapp/billing.jspx?rev=426922&r1=426921&r2=426922&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/test/webapp/billing.jspx (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/test/webapp/billing.jspx Sun Jul 30 12:53:32 2006
@@ -29,14 +29,14 @@
<tr:panelPage>
<tr:messages/>
<tr:panelHeader text="Billing Address">
- <tr:panelForm>
+ <tr:panelFormLayout>
<tr:inputText label="First Name" value="#{order.billingAddress.firstName}"/>
<tr:inputText label="Last Name" value="#{order.billingAddress.lastName}"/>
<tr:inputText label="Street Address" value="#{order.billingAddress.streetAddress}"/>
<tr:inputText label="City" value="#{order.billingAddress.city}"/>
<tr:inputText label="State" value="#{order.billingAddress.state}"/>
<tr:inputText label="Zip Code" value="#{order.billingAddress.zip}"/>
- </tr:panelForm>
+ </tr:panelFormLayout>
<tr:panelButtonBar>
<tr:singleStepButtonBar selectedStep="3" maxStep="5"
nextActionListener="#{order.processNext}"
Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/test/webapp/cart.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/test/webapp/cart.jspx?rev=426922&r1=426921&r2=426922&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/test/webapp/cart.jspx (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/test/webapp/cart.jspx Sun Jul 30 12:53:32 2006
@@ -30,9 +30,9 @@
<tr:messages/>
<tr:panelHeader text="Shopping Cart">
- <tr:panelForm>
+ <tr:panelFormLayout>
<tr:inputText readOnly="true" value="foobar" label="Items" />
- </tr:panelForm>
+ </tr:panelFormLayout>
<tr:panelButtonBar>
<tr:commandButton action="checkout" text="Proceed to Checkout"/>
Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/test/webapp/credit.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/test/webapp/credit.jspx?rev=426922&r1=426921&r2=426922&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/test/webapp/credit.jspx (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/test/webapp/credit.jspx Sun Jul 30 12:53:32 2006
@@ -27,14 +27,14 @@
<tr:form>
<tr:panelPage>
<tr:messages/>
- <tr:panelForm>
+ <tr:panelFormLayout>
<tr:panelHeader text="Credit Card">
<tr:inputText label="First Name" value="#{order.creditCard.firstName}"/>
<tr:inputText label="Last Name" value="#{order.creditCard.lastName}"/>
<tr:inputText label="Card Number" value="#{order.creditCard.number}"/>
<tr:inputText label="Expiration Date" value="#{order.creditCard.expirationDate}"/>
</tr:panelHeader>
- </tr:panelForm>
+ </tr:panelFormLayout>
<tr:panelButtonBar>
<tr:singleStepButtonBar selectedStep="2" maxStep="5"
nextActionListener="#{order.processNext}"
Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/test/webapp/items.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/test/webapp/items.jspx?rev=426922&r1=426921&r2=426922&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/test/webapp/items.jspx (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/test/webapp/items.jspx Sun Jul 30 12:53:32 2006
@@ -29,9 +29,9 @@
<tr:panelPage>
<tr:messages/>
<tr:panelHeader text="Items">
- <tr:panelForm>
+ <tr:panelFormLayout>
<tr:inputText readOnly="true" value="foobar" label="Items" />
- </tr:panelForm>
+ </tr:panelFormLayout>
<tr:panelButtonBar>
<tr:singleStepButtonBar selectedStep="1" maxStep="5"
nextActionListener="#{order.processNext}"
Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/test/webapp/login.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/test/webapp/login.jspx?rev=426922&r1=426921&r2=426922&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/test/webapp/login.jspx (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/test/webapp/login.jspx Sun Jul 30 12:53:32 2006
@@ -29,10 +29,10 @@
<tr:panelPage>
<tr:messages/>
<tr:panelHeader text="Log In">
- <tr:panelForm>
+ <tr:panelFormLayout>
<tr:inputText label="UserName" value="#{order.customer.userName}"/>
<tr:inputText label="Password" value="#{order.customer.password}" secret="true"/>
- </tr:panelForm>
+ </tr:panelFormLayout>
<tr:panelButtonBar>
<tr:commandButton text="Log In" action="loggedIn"/>
<tr:commandButton text="New User" action="newUser"/>
Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/test/webapp/register.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/test/webapp/register.jspx?rev=426922&r1=426921&r2=426922&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/test/webapp/register.jspx (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/test/webapp/register.jspx Sun Jul 30 12:53:32 2006
@@ -29,12 +29,12 @@
<tr:panelPage>
<tr:messages/>
<tr:panelHeader text="Register">
- <tr:panelForm>
+ <tr:panelFormLayout>
<tr:inputText label="UserName" value="#{order.customer.userName}"/>
<tr:inputText label="Password" value="#{order.customer.password}" secret="true"/>
<tr:inputText label="First Name" value="#{order.customer.firstName}"/>
<tr:inputText label="Last Name" value="#{order.customer.lastName}"/>
- </tr:panelForm>
+ </tr:panelFormLayout>
<tr:panelButtonBar>
<tr:commandButton text="Log In" action="loggedIn"/>
</tr:panelButtonBar>
Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/test/webapp/review.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/test/webapp/review.jspx?rev=426922&r1=426921&r2=426922&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/test/webapp/review.jspx (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/test/webapp/review.jspx Sun Jul 30 12:53:32 2006
@@ -30,38 +30,38 @@
<tr:messages/>
<tr:panelHeader text="Review Order Information">
<tr:panelHeader text="Customer Information">
- <tr:panelForm>
+ <tr:panelFormLayout>
<tr:inputText readOnly="true" label="First Name" value="#{order.customer.firstName}"/>
<tr:inputText readOnly="true" label="Last Name" value="#{order.customer.lastName}"/>
- </tr:panelForm>
+ </tr:panelFormLayout>
</tr:panelHeader>
<tr:panelHeader text="Credit Card Information">
- <tr:panelForm>
+ <tr:panelFormLayout>
<tr:inputText readOnly="true" label="First Name" value="#{order.creditCard.firstName}"/>
<tr:inputText readOnly="true" label="Last Name" value="#{order.creditCard.lastName}"/>
<tr:inputText readOnly="true" label="Card Number" value="#{order.creditCard.number}"/>
<tr:inputText readOnly="true" label="Expiration Date" value="#{order.creditCard.expirationDate}"/>
- </tr:panelForm>
+ </tr:panelFormLayout>
</tr:panelHeader>
<tr:panelHeader text="Billing Address">
- <tr:panelForm>
+ <tr:panelFormLayout>
<tr:inputText readOnly="true" label="First Name" value="#{order.billingAddress.firstName}"/>
<tr:inputText readOnly="true" label="Last Name" value="#{order.billingAddress.lastName}"/>
<tr:inputText readOnly="true" label="Street Address" value="#{order.billingAddress.streetAddress}"/>
<tr:inputText readOnly="true" label="City" value="#{order.billingAddress.city}"/>
<tr:inputText readOnly="true" label="State" value="#{order.billingAddress.state}"/>
<tr:inputText readOnly="true" label="Zip Code" value="#{order.billingAddress.zip}"/>
- </tr:panelForm>
+ </tr:panelFormLayout>
</tr:panelHeader>
<tr:panelHeader text="Shipping Address">
- <tr:panelForm>
+ <tr:panelFormLayout>
<tr:inputText readOnly="true" label="First Name" value="#{order.shippingAddress.firstName}"/>
<tr:inputText readOnly="true" label="Last Name" value="#{order.shippingAddress.lastName}"/>
<tr:inputText readOnly="true" label="Street Address" value="#{order.shippingAddress.streetAddress}"/>
<tr:inputText readOnly="true" label="City" value="#{order.shippingAddress.city}"/>
<tr:inputText readOnly="true" label="State" value="#{order.shippingAddress.state}"/>
<tr:inputText readOnly="true" label="Zip Code" value="#{order.shippingAddress.zip}"/>
- </tr:panelForm>
+ </tr:panelFormLayout>
</tr:panelHeader>
<tr:panelButtonBar>
<tr:singleStepButtonBar selectedStep="5" maxStep="5"
Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/test/webapp/selectItemTest.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/test/webapp/selectItemTest.jspx?rev=426922&r1=426921&r2=426922&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/test/webapp/selectItemTest.jspx (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/test/webapp/selectItemTest.jspx Sun Jul 30 12:53:32 2006
@@ -25,7 +25,7 @@
<trh:head title="Test of selectItemSupport"/>
<trh:body>
<tr:form>
- <tr:panelForm rows="5" maxColumns="3">
+ <tr:panelFormLayout rows="5" maxColumns="3">
<tr:selectOneChoice label="Explicit selectItem">
<f:selectItem itemValue="foo" itemLabel="Foo"/>
<f:selectItem itemValue="bar" itemLabel="Bar"/>
@@ -98,7 +98,7 @@
<f:selectItems value="#{selectItemTest.itemMap}"/>
</tr:selectOneRadio>
- </tr:panelForm>
+ </tr:panelFormLayout>
<tr:selectOrderShuttle>
<f:selectItems value="#{selectItemTest.itemList}"/>
Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/test/webapp/shipping.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/test/webapp/shipping.jspx?rev=426922&r1=426921&r2=426922&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/test/webapp/shipping.jspx (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/test/webapp/shipping.jspx Sun Jul 30 12:53:32 2006
@@ -29,14 +29,14 @@
<tr:panelPage>
<tr:messages/>
<tr:panelHeader text="Shipping Address">
- <tr:panelForm>
+ <tr:panelFormLayout>
<tr:inputText label="First Name" value="#{order.shippingAddress.firstName}"/>
<tr:inputText label="Last Name" value="#{order.shippingAddress.lastName}"/>
<tr:inputText label="Street Address" value="#{order.shippingAddress.streetAddress}"/>
<tr:inputText label="City" value="#{order.shippingAddress.city}"/>
<tr:inputText label="State" value="#{order.shippingAddress.state}"/>
<tr:inputText label="Zip Code" value="#{order.shippingAddress.zip}"/>
- </tr:panelForm>
+ </tr:panelFormLayout>
<tr:panelButtonBar>
<tr:singleStepButtonBar selectedStep="4" maxStep="5"
nextActionListener="#{order.processNext}"
Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/test/webapp/showDetail.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/test/webapp/showDetail.jspx?rev=426922&r1=426921&r2=426922&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/test/webapp/showDetail.jspx (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/test/webapp/showDetail.jspx Sun Jul 30 12:53:32 2006
@@ -28,14 +28,14 @@
<tr:panelPage>
<tr:messages/>
<tr:panelHeader text="Detail of #{pageFlowScope.detail.string}">
- <tr:panelForm>
+ <tr:panelFormLayout>
<tr:panelLabelAndMessage label="Int:">
<tr:outputText value="#{pageFlowScope.detail.int}"/>
</tr:panelLabelAndMessage>
<tr:panelLabelAndMessage label="String:">
<tr:outputText value="#{pageFlowScope.detail.string}"/>
</tr:panelLabelAndMessage>
- </tr:panelForm>
+ </tr:panelFormLayout>
<tr:commandButton text="Return..."
action="sample"/>
</tr:panelHeader>
Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/LabelAndMessageRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/LabelAndMessageRenderer.java?rev=426922&r1=426921&r2=426922&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/LabelAndMessageRenderer.java (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/LabelAndMessageRenderer.java Sun Jul 30 12:53:32 2006
@@ -232,7 +232,7 @@
if (needsPanelFormLayout)
{
- PanelFormRenderer.encodeBetweenLabelAndFieldCells(context, arc, rw);
+ PanelFormLayoutRenderer.encodeBetweenLabelAndFieldCells(context, arc, rw);
}
_renderFieldCell(context, arc, component, bean, labelExists,
Copied: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelFormLayoutRenderer.java (from r426858, incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelFormRenderer.java)
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelFormLayoutRenderer.java?p2=incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelFormLayoutRenderer.java&p1=incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelFormRenderer.java&r1=426858&r2=426922&rev=426922&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelFormRenderer.java (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelFormLayoutRenderer.java Sun Jul 30 12:53:32 2006
@@ -33,7 +33,7 @@
import org.apache.myfaces.trinidad.bean.FacesBean;
import org.apache.myfaces.trinidad.bean.PropertyKey;
-import org.apache.myfaces.trinidad.component.core.layout.CorePanelForm;
+import org.apache.myfaces.trinidad.component.core.layout.CorePanelFormLayout;
import org.apache.myfaces.trinidad.component.UIXEditableValue;
import org.apache.myfaces.trinidad.component.UIXGroup;
import org.apache.myfaces.trinidad.component.UIXPanel;
@@ -41,11 +41,11 @@
import org.apache.myfaces.trinidadinternal.agent.TrinidadAgent;
import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
-public class PanelFormRenderer extends XhtmlRenderer
+public class PanelFormLayoutRenderer extends XhtmlRenderer
{
- public PanelFormRenderer()
+ public PanelFormLayoutRenderer()
{
- super(CorePanelForm.TYPE);
+ super(CorePanelFormLayout.TYPE);
}
protected void findTypeConstants(FacesBean.Type type)
@@ -256,7 +256,7 @@
{
// We must compute how many rows will fit in the given max number of columns
// and also see if there are actually fewer columns needed:
- Dimension actualResults = PanelFormRenderer._computeActualRowsAndColumns(
+ Dimension actualResults = PanelFormLayoutRenderer._computeActualRowsAndColumns(
actualRows,
actualColumns,
totalFormItemCount,
@@ -633,7 +633,7 @@
if (currentRow > 0)
{
// insert group separator
- PanelFormRenderer._encodeGroupDivider(
+ PanelFormLayoutRenderer._encodeGroupDivider(
context, arc, rw, startAlignedLabels);
}
groupSeparatorNeeded = true;
@@ -653,7 +653,7 @@
{
groupSeparatorNeeded = false;
// insert group separator
- PanelFormRenderer._encodeGroupDivider(
+ PanelFormLayoutRenderer._encodeGroupDivider(
context, arc, rw, startAlignedLabels);
}
_encodeFormItem(context, arc, rw, startAlignedLabels, itemChild);
@@ -723,12 +723,12 @@
if (startAlignedLabels)
{
arc.setSkinResourceKeyMap(
- PanelFormRenderer._RESOURCE_KEY_SIDE_BY_SIDE_MAP);
+ PanelFormLayoutRenderer._RESOURCE_KEY_SIDE_BY_SIDE_MAP);
}
else
{
arc.setSkinResourceKeyMap(
- PanelFormRenderer._RESOURCE_KEY_STACKED_MAP);
+ PanelFormLayoutRenderer._RESOURCE_KEY_STACKED_MAP);
}
encodeChild(context, item);
}
@@ -963,7 +963,7 @@
static
{
// style keys.
- // for panelForm, we want a specific af|panelForm style for the label cell,
+ // for panelForm, we want a specific af|panelFormLayout style for the label cell,
// instead of the generic prompt cell style.
// Start-aligned labels for side-by-side orientation:
Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafConstants.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafConstants.java?rev=426922&r1=426921&r2=426922&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafConstants.java (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafConstants.java Sun Jul 30 12:53:32 2006
@@ -246,19 +246,19 @@
// panelForm's styles
public static final String AF_PANEL_FORM_STYLE_CLASS =
- "af|panelForm";
+ "af|panelFormLayout";
public static final String AF_PANEL_FORM_COLUMN_STYLE_CLASS =
- "af|panelForm::column";
+ "af|panelFormLayout::column";
public static final String AF_PANEL_FORM_SEPARATOR_STYLE_CLASS =
- "af|panelForm::separator";
+ "af|panelFormLayout::separator";
public static final String AF_PANEL_FORM_LABEL_CELL_STYLE_CLASS =
- "af|panelForm::label-cell";
+ "af|panelFormLayout::label-cell";
public static final String AF_PANEL_FORM_LABEL_STACKED_CELL_STYLE_CLASS =
- "af|panelForm::label-stacked-cell";
+ "af|panelFormLayout::label-stacked-cell";
public static final String AF_PANEL_FORM_CONTENT_CELL_STYLE_CLASS =
- "af|panelForm::content-cell";
+ "af|panelFormLayout::content-cell";
public static final String AF_PANEL_FORM_MESSAGE_CELL_STYLE_CLASS =
- "af|panelForm::message-cell";
+ "af|panelFormLayout::message-cell";
// Link style classes
public static final String LINK_STYLE_CLASS =
Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/resources/META-INF/adf/styles/base-desktop.xss
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/resources/META-INF/adf/styles/base-desktop.xss?rev=426922&r1=426921&r2=426922&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/resources/META-INF/adf/styles/base-desktop.xss (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/resources/META-INF/adf/styles/base-desktop.xss Sun Jul 30 12:53:32 2006
@@ -1389,31 +1389,31 @@
</style>
<!-- panelForm styles -->
- <style selector="af|panelForm::column">
+ <style selector="af|panelFormLayout::column">
<property name="vertical-align">top</property>
</style>
- <style selector="af|panelForm::separator">
+ <style selector="af|panelFormLayout::separator">
<property name="background-color">gray</property>
<property name="height">1px</property>
<property name="font-size">1px</property>
<property name="margin-top">3px</property>
<property name="margin-bottom">3px</property>
</style>
- <style selector="af|panelForm::cell">
+ <style selector="af|panelFormLayout::cell">
<property name="padding">0px</property>
</style>
- <style selector="af|panelForm::label-cell">
+ <style selector="af|panelFormLayout::label-cell">
<includeStyle name="AFLabel"/>
</style>
- <style selector="af|panelForm::label-stacked-cell">
- <includeStyle selector="af|panelForm::cell"/>
+ <style selector="af|panelFormLayout::label-stacked-cell">
+ <includeStyle selector="af|panelFormLayout::cell"/>
<property name="text-align">left</property>
</style>
- <style selector="af|panelForm::content-cell">
- <includeStyle selector="af|panelForm::cell"/>
+ <style selector="af|panelFormLayout::content-cell">
+ <includeStyle selector="af|panelFormLayout::cell"/>
</style>
- <style selector="af|panelForm::message-cell">
- <includeStyle selector="af|panelForm::cell"/>
+ <style selector="af|panelFormLayout::message-cell">
+ <includeStyle selector="af|panelFormLayout::cell"/>
</style>
<!--
panelBox Styles
Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/resources/META-INF/adf/styles/minimal-desktop.xss
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/resources/META-INF/adf/styles/minimal-desktop.xss?rev=426922&r1=426921&r2=426922&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/resources/META-INF/adf/styles/minimal-desktop.xss (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/resources/META-INF/adf/styles/minimal-desktop.xss Sun Jul 30 12:53:32 2006
@@ -87,17 +87,17 @@
</style>
<!-- panelForm -->
- <style selector="af|panelForm::column">
+ <style selector="af|panelFormLayout::column">
<property name="vertical-align">top</property>
</style>
- <style selector="af|panelForm::separator">
+ <style selector="af|panelFormLayout::separator">
<property name="background-color">gray</property>
<property name="height">1px</property>
<property name="font-size">1px</property>
<property name="margin-top">3px</property>
<property name="margin-bottom">3px</property>
</style>
- <style selector="af|panelForm::cell">
+ <style selector="af|panelFormLayout::cell">
<property name="padding">1px 0px</property>
</style>
Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/resources/META-INF/adf/styles/oracle-desktop.xss
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/resources/META-INF/adf/styles/oracle-desktop.xss?rev=426922&r1=426921&r2=426922&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/resources/META-INF/adf/styles/oracle-desktop.xss (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/resources/META-INF/adf/styles/oracle-desktop.xss Sun Jul 30 12:53:32 2006
@@ -232,7 +232,7 @@
</style>
<!-- panelForm -->
- <style selector="af|panelForm::cell">
+ <style selector="af|panelFormLayout::cell">
<property name="padding">1px 0px</property>
</style>
@@ -1125,7 +1125,7 @@
<!-- panelForm -->
- <style selector="af|panelForm::cell">
+ <style selector="af|panelFormLayout::cell">
<property name="padding">0px</property>
</style>