svn commit: r431434 - /incubator/ofbiz/trunk/applications/ecommerce/widget/

Author: jleroux
Date: Mon Aug 14 14:09:44 2006
New Revision: 431434

URL: http://svn.apache.org/viewvc?rev=431434&view=rev
Log:
This patch from Cyrille de Lambert corrects a problem when variable has as dash in its name. It is interpreted as an operator between 2 numeric values by the process which interpret ${} (among others).

Modified:
    incubator/ofbiz/trunk/applications/ecommerce/widget/CartScreens.xml
    incubator/ofbiz/trunk/applications/ecommerce/widget/CatalogScreens.xml
    incubator/ofbiz/trunk/applications/ecommerce/widget/CommonScreens.xml
    incubator/ofbiz/trunk/applications/ecommerce/widget/ContentScreens.xml
    incubator/ofbiz/trunk/applications/ecommerce/widget/CustomerScreens.xml
    incubator/ofbiz/trunk/applications/ecommerce/widget/ForumScreens.xml
    incubator/ofbiz/trunk/applications/ecommerce/widget/OrderScreens.xml
    incubator/ofbiz/trunk/applications/ecommerce/widget/QuoteScreens.xml
    incubator/ofbiz/trunk/applications/ecommerce/widget/RequestScreens.xml
    incubator/ofbiz/trunk/applications/ecommerce/widget/ShoppingListScreens.xml

Modified: incubator/ofbiz/trunk/applications/ecommerce/widget/CartScreens.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/ecommerce/widget/CartScreens.xml?rev=431434&r1=431433&r2=431434&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/ecommerce/widget/CartScreens.xml (original)
+++ incubator/ofbiz/trunk/applications/ecommerce/widget/CartScreens.xml Mon Aug 14 14:09:44 2006
@@ -61,7 +61,7 @@
                 <set field="leftbarScreenName" value="leftbar"/>
                 <set field="MainColumnStyle" value="leftonly"/>
 
-                <set field="title-property" value="PageTitleShoppingCart"/>
+                <set field="titleProperty" value="PageTitleShoppingCart"/>
                 <set field="headerItem" value="Shopping Cart"/>
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/cart/showcart.bsh"/>
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/cart/showpromotext.bsh"/>
@@ -83,7 +83,7 @@
                 
                 <set field="promoUseDetailsInlineScreen" value="component://ecommerce/widget/CartScreens.xml#promoUseDetailsInline"/>
 
- <set field="title-property" value="PageTitleShowAllPromotions"/>
+ <set field="titleProperty" value="PageTitleShowAllPromotions"/>
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/cart/showcart.bsh"/>
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/cart/showpromotext.bsh"/>
             </actions>
@@ -105,7 +105,7 @@
 
                 <set field="productsummaryScreen" value="component://ecommerce/widget/CatalogScreens.xml#productsummary"/>
 
- <set field="title-property" value="PageTitleShowPromotionDetails"/>
+ <set field="titleProperty" value="PageTitleShowPromotionDetails"/>
                 <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/cart/showPromotionDetails.bsh"/>
             </actions>
             <widgets>

Modified: incubator/ofbiz/trunk/applications/ecommerce/widget/CatalogScreens.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/ecommerce/widget/CatalogScreens.xml?rev=431434&r1=431433&r2=431434&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/ecommerce/widget/CatalogScreens.xml (original)
+++ incubator/ofbiz/trunk/applications/ecommerce/widget/CatalogScreens.xml Mon Aug 14 14:09:44 2006
@@ -158,7 +158,7 @@
                 <set field="rightbarScreenName" value="rightbar"/>
                 <set field="MainColumnStyle" value="center"/>
 
-                <set field="title-property" value="PageTitleCategoryPage"/>
+                <set field="titleProperty" value="PageTitleCategoryPage"/>
             </actions>
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
@@ -212,7 +212,7 @@
                 <set field="rightbarScreenName" value="rightbar"/>
                 <set field="MainColumnStyle" value="center"/>
 
-                <set field="title-property" value="PageTitleProductPage"/>
+                <set field="titleProperty" value="PageTitleProductPage"/>
                 <set field="configproductdetailScreen" value="component://ecommerce/widget/CatalogScreens.xml#configproductdetail"/>
                 <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/product.bsh"/>
             </actions>
@@ -272,7 +272,7 @@
                 <set field="rightbarScreenName" value="rightbar"/>
                 <set field="MainColumnStyle" value="center"/>
 
-                <set field="title-property" value="PageTitleProductReview"/>
+                <set field="titleProperty" value="PageTitleProductReview"/>
             </actions>
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
@@ -291,7 +291,7 @@
                 <set field="rightbarScreenName" value="rightbar"/>
                 <set field="MainColumnStyle" value="center"/>
 
-                <set field="title-property" value="PageTitleLastViewProducts"/>
+                <set field="titleProperty" value="PageTitleLastViewProducts"/>
             </actions>
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
@@ -334,7 +334,7 @@
                 
                 <set field="quickaddsummaryScreen" value="component://ecommerce/widget/CatalogScreens.xml#quickaddsummary"/>
 
-                <set field="title-property" value="PageTitleQuickAdd"/>
+                <set field="titleProperty" value="PageTitleQuickAdd"/>
                 <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/quickadd.bsh"/>
             </actions>
             <widgets>
@@ -367,7 +367,7 @@
                 
                 <set field="productsummaryScreen" value="component://ecommerce/widget/CatalogScreens.xml#productsummary"/>
 
-                <set field="title-property" value="PageTitleSearchResults"/>
+                <set field="titleProperty" value="PageTitleSearchResults"/>
                 <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/keywordsearch.bsh"/>
             </actions>
             <widgets>
@@ -387,7 +387,7 @@
                 <set field="rightbarScreenName" value="rightbar"/>
                 <set field="MainColumnStyle" value="center"/>
 
-                <set field="title-property" value="PageTitleAdvancedSearch"/>
+                <set field="titleProperty" value="PageTitleAdvancedSearch"/>
                 <set field="headerItem" value="Advanced Search"/>
                 <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/advancedsearchoptions.bsh"/>
             </actions>

Modified: incubator/ofbiz/trunk/applications/ecommerce/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/ecommerce/widget/CommonScreens.xml?rev=431434&r1=431433&r2=431434&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/ecommerce/widget/CommonScreens.xml (original)
+++ incubator/ofbiz/trunk/applications/ecommerce/widget/CommonScreens.xml Mon Aug 14 14:09:44 2006
@@ -127,7 +127,7 @@
                 <set field="rightbarScreenName" value="rightbar"/>
                 <set field="MainColumnStyle" value="center"/>
 
-                <set field="title-property" value="PageTitleMain"/>
+                <set field="titleProperty" value="PageTitleMain"/>
                 <set field="headerItem" value="main"/>
                 <set field="randomSurveyGroup" value="testSurveyGroup"/>
 
@@ -148,7 +148,7 @@
     <screen name="login">
         <section>
             <actions>
-                <set field="title-property" value="PageTitleLogin"/>
+                <set field="titleProperty" value="PageTitleLogin"/>
                 <set field="headerItem" value="login"/>
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/login.bsh"/>
             </actions>

Modified: incubator/ofbiz/trunk/applications/ecommerce/widget/ContentScreens.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/ecommerce/widget/ContentScreens.xml?rev=431434&r1=431433&r2=431434&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/ecommerce/widget/ContentScreens.xml (original)
+++ incubator/ofbiz/trunk/applications/ecommerce/widget/ContentScreens.xml Mon Aug 14 14:09:44 2006
@@ -68,7 +68,7 @@
                 <set field="leftbarScreenName" value="leftbar"/>
                 <set field="MainColumnStyle" value="leftonly"/>
 
- <set field="title-property" value="PageTitleContentPage"/>
+ <set field="titleProperty" value="PageTitleContentPage"/>
                 <set field="headerItem" value="main"/>
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/main.bsh"/>
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/content/contentprep.bsh"/>
@@ -89,7 +89,7 @@
                 <set field="rightbarScreenName" value="rightbar"/>
                 <set field="MainColumnStyle" value="center"/>
 
- <set field="title-property" value="PageTitleViewBlog"/>
+ <set field="titleProperty" value="PageTitleViewBlog"/>
                 <set field="headerItem" value="Blog"/>
                 <set field="formDefFile" value="/BlogForms.xml"/>
                 <set field="entityName" value="Content"/>
@@ -112,7 +112,7 @@
                 <set field="rightbarScreenName" value="rightbar"/>
                 <set field="MainColumnStyle" value="center"/>
 
-                <set field="title-property" value="PageTitleShoppingCart"/>
+                <set field="titleProperty" value="PageTitleShoppingCart"/>
                 <set field="headerItem" value="ContentMenu"/>
                 <set field="formDefFile" value="/content/ContentForms.xml"/>
                 <set field="entityName" value=""/>
@@ -140,7 +140,7 @@
                 <set field="rightbarScreenName" value="rightbar"/>
                 <set field="MainColumnStyle" value="center"/>
 
-                <set field="title-property" value="PageTitleViewContent"/>
+                <set field="titleProperty" value="PageTitleViewContent"/>
                 <set field="headerItem" value="Content"/>
                 <set field="entityName" value="ContentAssocDataResourceViewFrom"/>
                 <set field="permissionType" value="none"/>

Modified: incubator/ofbiz/trunk/applications/ecommerce/widget/CustomerScreens.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/ecommerce/widget/CustomerScreens.xml?rev=431434&r1=431433&r2=431434&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/ecommerce/widget/CustomerScreens.xml (original)
+++ incubator/ofbiz/trunk/applications/ecommerce/widget/CustomerScreens.xml Mon Aug 14 14:09:44 2006
@@ -26,7 +26,7 @@
                 <set field="rightbarScreenName" value="rightbar"/>
                 <set field="MainColumnStyle" value="center"/>
 
-                <set field="title-property" value="PageTitleAdditionalInfo"/>
+                <set field="titleProperty" value="PageTitleAdditionalInfo"/>
             </actions>
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
@@ -41,7 +41,7 @@
     <screen name="newcustomer">
         <section>
             <actions>
-                <set field="title-property" value="PageTitleNewCustomer"/>
+                <set field="titleProperty" value="PageTitleNewCustomer"/>
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/customer/newcustomer.bsh"/>
             </actions>
             <widgets>
@@ -77,7 +77,7 @@
     <screen name="viewprofile">
         <section>
             <actions>
-                <set field="title-property" value="PageTitleViewProfile"/>
+                <set field="titleProperty" value="PageTitleViewProfile"/>
                 
                 <set field="partyId" from-field="userLogin.partyId"/>
                 <entity-one entity-name="Party" value-name="party"/>
@@ -98,7 +98,7 @@
     <screen name="editcontactmech">
         <section>
             <actions>
-                <set field="title-property" value="PageTitleEditContactMechanism"/>
+                <set field="titleProperty" value="PageTitleEditContactMechanism"/>
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/customer/editcontactmech.bsh"/>
             </actions>
             <widgets>
@@ -114,7 +114,7 @@
     <screen name="editcreditcard">
         <section>
             <actions>
-                <set field="title-property" value="PageTitleEditCreditCard"/>
+                <set field="titleProperty" value="PageTitleEditCreditCard"/>
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/customer/editpaymentmethod.bsh"/>
             </actions>
             <widgets>
@@ -129,7 +129,7 @@
     <screen name="editeftaccount">
         <section>
             <actions>
-                <set field="title-property" value="PageTitleEditEFTAccount"/>
+                <set field="titleProperty" value="PageTitleEditEFTAccount"/>
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/customer/editpaymentmethod.bsh"/>
             </actions>
             <widgets>
@@ -144,7 +144,7 @@
     <screen name="editgiftcard">
         <section>
             <actions>
-                <set field="title-property" value="PageTitleEditGiftCard"/>
+                <set field="titleProperty" value="PageTitleEditGiftCard"/>
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/customer/editpaymentmethod.bsh"/>
             </actions>
             <widgets>
@@ -160,7 +160,7 @@
     <screen name="changepassword">
         <section>
             <actions>
-                <set field="title-property" value="PageTitleChangePassword"/>
+                <set field="titleProperty" value="PageTitleChangePassword"/>
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/customer/changepassword.bsh"/>
             </actions>
             <widgets>
@@ -175,7 +175,7 @@
     <screen name="editperson">
         <section>
             <actions>
-                <set field="title-property" value="PageTitleEditPerson"/>
+                <set field="titleProperty" value="PageTitleEditPerson"/>
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/customer/editperson.bsh"/>
             </actions>
             <widgets>
@@ -195,7 +195,7 @@
                 <set field="rightbarScreenName" value="rightbar"/>
                 <set field="MainColumnStyle" value="center"/>
 
-                <set field="title-property" value="PageTitleGiftCardBalance"/>
+                <set field="titleProperty" value="PageTitleGiftCardBalance"/>
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/customer/giftcardbalance.bsh"/>
             </actions>
             <widgets>
@@ -214,7 +214,7 @@
                 <set field="rightbarScreenName" value="rightbar"/>
                 <set field="MainColumnStyle" value="center"/>
 
-                <set field="title-property" value="PageTitleGiftCardLink"/>
+                <set field="titleProperty" value="PageTitleGiftCardLink"/>
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/customer/giftcardlink.bsh"/>
             </actions>
             <widgets>
@@ -230,7 +230,7 @@
     <screen name="customersurvey">
         <section>
             <actions>
-                <set field="title-property" value="PageTitleProfileSurvey"/>
+                <set field="titleProperty" value="PageTitleProfileSurvey"/>
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/customer/customersurvey.bsh"/>
             </actions>
             <widgets>
@@ -249,7 +249,7 @@
                 <set field="rightbarScreenName" value="rightbar"/>
                 <set field="MainColumnStyle" value="rightonly"/>
 
-                <set field="title-property" value="PageTitleLogin"/>
+                <set field="titleProperty" value="PageTitleLogin"/>
                 <set field="pageHeader" value="Contact Us"/>
                 <set field="headerItem" value="contactus"/>
                 <set field="submitRequest" value="contactsubmit"/>
@@ -266,7 +266,7 @@
     <screen name="messagelist">
         <section>
             <actions>
-                <set field="title-property" value="PageTitleMessageList"/>
+                <set field="titleProperty" value="PageTitleMessageList"/>
             </actions>
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
@@ -303,7 +303,7 @@
     <screen name="messagedetail">
         <section>
             <actions>
-                <set field="title-property" value="PageTitleMessageDetail"/>
+                <set field="titleProperty" value="PageTitleMessageDetail"/>
                 <entity-one entity-name="CommunicationEvent" value-name="communicationEvent" auto-field-map="true"/>
             </actions>
             <widgets>
@@ -318,7 +318,7 @@
     <screen name="messagecreate">
         <section>
             <actions>
-                <set field="title-property" value="PageTitleNewMessage"/>
+                <set field="titleProperty" value="PageTitleNewMessage"/>
                 <set field="pageHeader" value="New Message"/>
                 <set field="showMessageLinks" value="true"/>
 
@@ -339,7 +339,7 @@
     <screen name="digitalproductlist">
         <section>
             <actions>
-                <set field="title-property" value="PageTitleDigitalProductList"/>
+                <set field="titleProperty" value="PageTitleDigitalProductList"/>
                 
                 <entity-and entity-name="SupplierProduct" list-name="supplierProductList">
                     <field-map field-name="partyId" env-name="userLogin.partyId"/>
@@ -365,7 +365,7 @@
     <screen name="digitalproductedit">
         <section>
             <actions>
-                <set field="title-property" value="PageTitleDigitalProductEdit"/>
+                <set field="titleProperty" value="PageTitleDigitalProductEdit"/>
 
                 <set field="parameters.minimumOrderQuantity" value="1" type="Double"/>
                 <entity-one entity-name="SupplierProduct" value-name="supplierProduct" auto-field-map="false">

Modified: incubator/ofbiz/trunk/applications/ecommerce/widget/ForumScreens.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/ecommerce/widget/ForumScreens.xml?rev=431434&r1=431433&r2=431434&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/ecommerce/widget/ForumScreens.xml (original)
+++ incubator/ofbiz/trunk/applications/ecommerce/widget/ForumScreens.xml Mon Aug 14 14:09:44 2006
@@ -54,7 +54,7 @@
                 <set field="rightbarScreenName" value="rightbar"/>
                 <set field="MainColumnStyle" value="center"/>
 
-                <set field="title-property" value="PageTitleForumSummary"/>
+                <set field="titleProperty" value="PageTitleForumSummary"/>
                 <entity-one entity-name="Content" value-name="forum">
                     <field-map field-name="contentId" env-name="parameters.forumId"/>
                 </entity-one>
@@ -105,7 +105,7 @@
                 <set field="leftbarScreenName" value="leftbar"/>
                 <set field="rightbarScreenName" value="rightbar"/>
                 <set field="MainColumnStyle" value="center"/>
-                <set field="title-property" value="PageTitleForumArticle"/>
+                <set field="titleProperty" value="PageTitleForumArticle"/>
                 <entity-and entity-name="" list-name="">
                     <field-map field-name=""/>
                 </entity-and>
@@ -128,7 +128,7 @@
 
                 <set field="includeHtmlArea" value="Y"/>
 
-                <set field="title-property" value="PageTitleAddContent"/>
+                <set field="titleProperty" value="PageTitleAddContent"/>
                 <set field="headerItem" value="Forum"/>
                 <set field="formDefFile" value="/forum/ForumForms.xml"/>
                 <set field="singleFormName" value="AddContent"/>
@@ -175,7 +175,7 @@
 
                 <set field="includeHtmlArea" value="Y"/>
 
-                <set field="title-property" value="PageTitleEditContent"/>
+                <set field="titleProperty" value="PageTitleEditContent"/>
                 <set field="headerItem" value="Forum"/>
                 <set field="formDefFile" value="/forum/ForumForms.xml"/>
                 <set field="singleFormName" value="AddContent"/>
@@ -223,7 +223,7 @@
 
                 <set field="includeHtmlArea" value="Y"/>
 
-                <set field="title-property" value="PageTitleForumResponse"/>
+                <set field="titleProperty" value="PageTitleForumResponse"/>
                 <set field="headerItem" value="Forum"/>
                 <set field="formDefFile" value="/forum/ForumForms.xml"/>
                 <set field="singleFormName" value="ViewComboResponse"/>
@@ -268,7 +268,7 @@
 
                 <set field="includeHtmlArea" value="Y"/>
 
-                <set field="title-property" value="PageTitleAddResponse"/>
+                <set field="titleProperty" value="PageTitleAddResponse"/>
                 <set field="headerItem" value="Forum"/>
                 <set field="formDefFile" value="/forum/ForumForms.xml"/>
                 <set field="singleFormName" value="AddResponse"/>
@@ -318,7 +318,7 @@
                 <set field="rightbarScreenName" value="rightbar"/>
                 <set field="MainColumnStyle" value="center"/>
 
-                <set field="title-property" value="PageTitleEditForumContentInfo"/>
+                <set field="titleProperty" value="PageTitleEditForumContentInfo"/>
                 <set field="headerItem" value="Forum"/>
                 <set field="formDefFile" value="/forum/ForumForms.xml"/>
                 <set field="singleFormName" value="EditContentInfo"/>
@@ -360,7 +360,7 @@
 
                 <set field="includeHtmlArea" value="Y"/>
 
-                <set field="title-property" value="PageTitleEditAddContent"/>
+                <set field="titleProperty" value="PageTitleEditAddContent"/>
                 <set field="headerItem" value="Forum"/>
                 <set field="formDefFile" value="/forum/ForumForms.xml"/>
                 <set field="singleFormName" value="EditAddContent"/>
@@ -413,7 +413,7 @@
 
                 <set field="includeHtmlArea" value="Y"/>
 
-                <set field="title-property" value="PageTitleEditAddImage"/>
+                <set field="titleProperty" value="PageTitleEditAddImage"/>
                 <set field="headerItem" value="Forum"/>
                 <set field="formDefFile" value="/forum/ForumForms.xml"/>
                 <set field="singleFormName" value="EditAddImage"/>

Modified: incubator/ofbiz/trunk/applications/ecommerce/widget/OrderScreens.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/ecommerce/widget/OrderScreens.xml?rev=431434&r1=431433&r2=431434&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/ecommerce/widget/OrderScreens.xml (original)
+++ incubator/ofbiz/trunk/applications/ecommerce/widget/OrderScreens.xml Mon Aug 14 14:09:44 2006
@@ -61,7 +61,7 @@
                 <set field="rightbarScreenName" value="rightbar"/>
                 <set field="MainColumnStyle" value="rightonly"/>
 
-                <set field="title-property" value="PageTitleBillingInformation"/>
+                <set field="titleProperty" value="PageTitleBillingInformation"/>
                 <set field="anonymoustrailScreen" value="component://ecommerce/widget/OrderScreens.xml#anonymoustrail"/>
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/billsettings.bsh"/>
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/storepaymentoptions.bsh"/>
@@ -81,7 +81,7 @@
                 <set field="rightbarScreenName" value="rightbar"/>
                 <set field="MainColumnStyle" value="rightonly"/>
 
-                <set field="title-property" value="PageTitleShippingInformation"/>
+                <set field="titleProperty" value="PageTitleShippingInformation"/>
                 <set field="anonymoustrailScreen" value="component://ecommerce/widget/OrderScreens.xml#anonymoustrail"/>
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/shipsettings.bsh"/>
             </actions>
@@ -100,7 +100,7 @@
                 <set field="rightbarScreenName" value="rightbar"/>
                 <set field="MainColumnStyle" value="rightonly"/>
 
-                <set field="title-property" value="PageTitleShippingInformation"/>
+                <set field="titleProperty" value="PageTitleShippingInformation"/>
                 <set field="anonymoustrailScreen" value="component://ecommerce/widget/OrderScreens.xml#anonymoustrail"/>
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/shipsettings.bsh"/>
             </actions>
@@ -119,7 +119,7 @@
                 <set field="rightbarScreenName" value="rightbar"/>
                 <set field="MainColumnStyle" value="rightonly"/>
 
-                <set field="title-property" value="PageTitleShippingOptions"/>
+                <set field="titleProperty" value="PageTitleShippingOptions"/>
                 <set field="anonymoustrailScreen" value="component://ecommerce/widget/OrderScreens.xml#anonymoustrail"/>
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/optionsettings.bsh"/>
             </actions>
@@ -138,7 +138,7 @@
                 <set field="rightbarScreenName" value="rightbar"/>
                 <set field="MainColumnStyle" value="rightonly"/>
 
-                <set field="title-property" value="PageTitleOrderConfirmation"/>
+                <set field="titleProperty" value="PageTitleOrderConfirmation"/>
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/checkoutreview.bsh"/>
             </actions>
             <widgets>
@@ -154,7 +154,7 @@
     <screen name="checkoutoptions">
         <section>
             <actions>
-                <set field="title-property" value="PageTitleCheckoutOptions"/>
+                <set field="titleProperty" value="PageTitleCheckoutOptions"/>
 
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/checkoutpayment.bsh"/>
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/checkoutoptions.bsh"/>
@@ -175,7 +175,7 @@
                 <set field="rightbarScreenName" value="rightbar"/>
                 <set field="MainColumnStyle" value="rightonly"/>
 
-                <set field="title-property" value="PageTitleCheckoutOptions"/>
+                <set field="titleProperty" value="PageTitleCheckoutOptions"/>
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/checkoutshippingaddress.bsh"/>
             </actions>
             <widgets>
@@ -193,7 +193,7 @@
                 <set field="rightbarScreenName" value="rightbar"/>
                 <set field="MainColumnStyle" value="rightonly"/>
 
-                <set field="title-property" value="PageTitleCheckoutOptions"/>
+                <set field="titleProperty" value="PageTitleCheckoutOptions"/>
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/checkoutshippingoptions.bsh"/>
             </actions>
             <widgets>
@@ -211,7 +211,7 @@
                 <set field="rightbarScreenName" value="rightbar"/>
                 <set field="MainColumnStyle" value="rightonly"/>
 
-                <set field="title-property" value="PageTitleCheckoutOptions"/>
+                <set field="titleProperty" value="PageTitleCheckoutOptions"/>
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/checkoutpayment.bsh"/>
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/storepaymentoptions.bsh"/>
             </actions>
@@ -227,7 +227,7 @@
     <screen name="splitship">
         <section>
             <actions>
-                <set field="title-property" value="PageTitleSplitItemsForShipping"/>
+                <set field="titleProperty" value="PageTitleSplitItemsForShipping"/>
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/splitship.bsh"/>
             </actions>
             <widgets>
@@ -243,7 +243,7 @@
     <screen name="checkoutreview">
         <section>
             <actions>
-                <set field="title-property" value="PageTitleCheckoutReview"/>
+                <set field="titleProperty" value="PageTitleCheckoutReview"/>
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/checkoutreview.bsh"/>
             </actions>
             <widgets>
@@ -258,7 +258,7 @@
     <screen name="ordercomplete">
         <section>
             <actions>
-                <set field="title-property" value="PageTitleOrderSummary"/>
+                <set field="titleProperty" value="PageTitleOrderSummary"/>
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/orderstatus.bsh"/>
             </actions>
             <widgets>
@@ -277,7 +277,7 @@
                 <set field="rightbarScreenName" value="rightbar"/>
                 <set field="MainColumnStyle" value="rightonly"/>
 
-                <set field="title-property" value="PageTitleOrderHistory"/>
+                <set field="titleProperty" value="PageTitleOrderHistory"/>
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/orderhistory.bsh"/>
             </actions>
             <widgets>
@@ -296,7 +296,7 @@
                 <set field="MainColumnStyle" value="rightonly"/>
 
                 <set field="maySelectItems" value="Y"/>
-                <set field="title-property" value="PageTitleOrderStatus"/>
+                <set field="titleProperty" value="PageTitleOrderStatus"/>
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/orderstatus.bsh"/>
             </actions>
             <widgets>
@@ -314,7 +314,7 @@
                 <set field="rightbarScreenName" value="rightbar"/>
                 <set field="MainColumnStyle" value="rightonly"/>
 
-                <set field="title-property" value="PageTitleRequestReturn"/>
+                <set field="titleProperty" value="PageTitleRequestReturn"/>
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/requestreturn.bsh"/>
             </actions>
             <widgets>

Modified: incubator/ofbiz/trunk/applications/ecommerce/widget/QuoteScreens.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/ecommerce/widget/QuoteScreens.xml?rev=431434&r1=431433&r2=431434&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/ecommerce/widget/QuoteScreens.xml (original)
+++ incubator/ofbiz/trunk/applications/ecommerce/widget/QuoteScreens.xml Mon Aug 14 14:09:44 2006
@@ -24,7 +24,7 @@
                 <set field="rightbarScreenName" value="rightbar"/>
                 <set field="MainColumnStyle" value="rightonly"/>
 
-                <set field="title-property" value="PageTitleListQuotes"/>
+                <set field="titleProperty" value="PageTitleListQuotes"/>
                 <!--<set field="headerItem" value="Shopping List"/>-->
                 <entity-condition entity-name="Quote" list-name="quoteList">
                     <condition-list combine="and">
@@ -51,7 +51,7 @@
                 <set field="rightbarScreenName" value="rightbar"/>
                 <set field="MainColumnStyle" value="rightonly"/>
 
-                <set field="title-property" value="PageTitleViewQuote"/>
+                <set field="titleProperty" value="PageTitleViewQuote"/>
                 <!--<set field="headerItem" value="Shopping List"/>-->
                 <set field="quoteId" from-field="parameters.quoteId"/>
                 <entity-one entity-name="Quote" value-name="quote"/>

Modified: incubator/ofbiz/trunk/applications/ecommerce/widget/RequestScreens.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/ecommerce/widget/RequestScreens.xml?rev=431434&r1=431433&r2=431434&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/ecommerce/widget/RequestScreens.xml (original)
+++ incubator/ofbiz/trunk/applications/ecommerce/widget/RequestScreens.xml Mon Aug 14 14:09:44 2006
@@ -36,7 +36,7 @@
                 <set field="rightbarScreenName" value="rightbar"/>
                 <set field="MainColumnStyle" value="rightonly"/>
 
-                <set field="title-property" value="PageTitleListRequests"/>
+                <set field="titleProperty" value="PageTitleListRequests"/>
                 <!--<set field="headerItem" value="Shopping List"/>-->
                 <entity-condition entity-name="CustRequest" list-name="requestList">
                     <condition-list combine="and">
@@ -63,7 +63,7 @@
                 <set field="rightbarScreenName" value="rightbar"/>
                 <set field="MainColumnStyle" value="rightonly"/>
 
-                <set field="title-property" value="PageTitleViewRequest"/>
+                <set field="titleProperty" value="PageTitleViewRequest"/>
                 <!--<set field="headerItem" value="Shopping List"/>-->
                 <set field="custRequestId" from-field="parameters.custRequestId"/>
                 <entity-one entity-name="CustRequest" value-name="custRequest"/>

Modified: incubator/ofbiz/trunk/applications/ecommerce/widget/ShoppingListScreens.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/ecommerce/widget/ShoppingListScreens.xml?rev=431434&r1=431433&r2=431434&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/ecommerce/widget/ShoppingListScreens.xml (original)
+++ incubator/ofbiz/trunk/applications/ecommerce/widget/ShoppingListScreens.xml Mon Aug 14 14:09:44 2006
@@ -25,7 +25,7 @@
                 <set field="rightbarScreenName" value="rightbar"/>
                 <set field="MainColumnStyle" value="rightonly"/>
 
-                <set field="title-property" value="PageTitleShoppingList"/>
+                <set field="titleProperty" value="PageTitleShoppingList"/>
                 <set field="headerItem" value="Shopping List"/>
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/shoppinglist/editShoppingList.bsh"/>
             </actions>