ofbiz-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bus...@apache.org
Subject svn commit: r735552 - in /ofbiz/trunk/applications/accounting/widget: AgreementScreens.xml FinAccountScreens.xml InvoiceScreens.xml PaymentScreens.xml TransactionScreens.xml ap/CommonScreens.xml
Date Sun, 18 Jan 2009 21:53:44 GMT
Author: buscob
Date: Sun Jan 18 13:53:43 2009
New Revision: 735552

URL: http://svn.apache.org/viewvc?rev=735552&view=rev
Log:
Changed all FindScreens in Accounting application to use the FindScreenDecorator

Modified:
    ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml
    ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml
    ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml
    ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml
    ofbiz/trunk/applications/accounting/widget/TransactionScreens.xml
    ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml

Modified: ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml?rev=735552&r1=735551&r2=735552&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml Sun Jan 18 13:53:43 2009
@@ -81,28 +81,24 @@
                                 <if-service-permission service-name="acctgAgreementPermissionCheck"
main-action="VIEW"/>
                             </condition>
                             <widgets>
-                                <container style="button-bar">
-                                    <link target="EditAgreement" text="${uiLabelMap.AccountingNewAgreement}"
style="buttontext"/>
-                                </container>
-                                <screenlet title="${uiLabelMap.PageTitleFindAgreement}">
-                                    <section>
-                                        <widgets>
-                                            <include-form name="FindAgreements" location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/>
-                                        </widgets>
-                                    </section>
-                                </screenlet>
-                                <screenlet title="${uiLabelMap.PageTitleListAgreement}">
-                                    <section>
-                                        <widgets>
-                                            <include-form name="ListAgreements" location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/>
-                                        </widgets>
-                                    </section>
-                                </screenlet>
+                                <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml">
+                                    <decorator-section name="menu-bar">
+                                        <container style="button-bar">
+                                            <link target="EditAgreement" text="${uiLabelMap.AccountingNewAgreement}"
style="buttontext"/>
+                                        </container>
+                                    </decorator-section>
+                                    <decorator-section name="search-options">
+                                        <include-form name="FindAgreements" location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/>
+                                    </decorator-section>
+                                    <decorator-section name="search-results">
+                                        <include-form name="ListAgreements" location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/>
+                                    </decorator-section>
+                                </decorator-screen>
                             </widgets>
                             <fail-widgets>
                                 <label style="h3">${uiLabelMap.AcccountingViewPermissionError}</label>
                             </fail-widgets>
-                        </section>                    
+                        </section>
                     </decorator-section>
                 </decorator-screen>
             </widgets>

Modified: ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml?rev=735552&r1=735551&r2=735552&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml Sun Jan 18 13:53:43 2009
@@ -65,37 +65,23 @@
             <widgets>
                 <decorator-screen name="CommonFinAccountDecorator" location="${parameters.finAccountDecoratorLocation}">
                     <decorator-section name="body">
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.AccountingFindFinAccount}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>    
+                        <section>
+                            <widgets>
+                                <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml">
+                                    <decorator-section name="menu-bar">
                                         <container style="button-bar">
                                             <link target="EditFinAccount" text="${uiLabelMap.CommonCreateNew}
${uiLabelMap.AccountingFinAccount}" style="buttontext"/>
                                         </container>
+                                    </decorator-section>
+                                    <decorator-section name="search-options">
                                         <include-form name="FindFinAccounts" location="component://accounting/widget/FinAccountForms.xml"/>
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.AccountingFindFinAccount}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>    
+                                    </decorator-section>
+                                    <decorator-section name="search-results">
                                         <include-form name="ListFinAccounts" location="component://accounting/widget/FinAccountForms.xml"/>
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>
+                                    </decorator-section>
+                                </decorator-screen>
+                            </widgets>
+                        </section>
                     </decorator-section>
                 </decorator-screen>
             </widgets>

Modified: ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml?rev=735552&r1=735551&r2=735552&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml Sun Jan 18 13:53:43 2009
@@ -68,13 +68,21 @@
             <widgets>
                 <decorator-screen name="CommonInvoiceDecorator" location="${parameters.invoiceDecoratorLocation}">
                     <decorator-section name="body">
-                        <include-menu name="InvoiceSubTabBar" location="component://accounting/widget/Menus.xml"/>
-                        <screenlet title="${uiLabelMap.PageTitleFindInvoice}">
-                            <include-form name="FindInvoices" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
-                        </screenlet>
-                        <screenlet title="${uiLabelMap.PageTitleListInvoices}" navigation-form-name="ListInvoices">
-                            <include-form name="ListInvoices"  location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
-                        </screenlet>
+                        <section>
+                            <widgets>
+                                <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml">
+                                    <decorator-section name="menu-bar">
+                                        <include-menu name="InvoiceSubTabBar" location="component://accounting/widget/Menus.xml"/>
+                                    </decorator-section>
+                                    <decorator-section name="search-options">
+                                        <include-form name="FindInvoices" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
+                                    </decorator-section>
+                                    <decorator-section name="search-results">
+                                        <include-form name="ListInvoices"  location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
+                                    </decorator-section>
+                                </decorator-screen>
+                            </widgets>
+                        </section>
                     </decorator-section>
                 </decorator-screen>
             </widgets>

Modified: ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml?rev=735552&r1=735551&r2=735552&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml Sun Jan 18 13:53:43 2009
@@ -29,15 +29,25 @@
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                    	<screenlet title="${uiLabelMap.AccountingFindPayments}" collapsible="true"
name="FindPayments">
-	                        <link target="newPayment" text="${uiLabelMap.CommonCreateNew}
${uiLabelMap.AccountingPayment}" style="buttontext"/>
-    		                <link target="FindSalesInvoicesByDueDate" text="${uiLabelMap.AccountingFindSalesInvoicesByDueDate}"
style="buttontext"/>
-                            <link target="FindPurchaseInvoicesByDueDate" text="${uiLabelMap.AccountingFindPurchaseInvoicesByDueDate}"
style="buttontext"/>
-                            <include-form name="FindPayments" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/>
-                    	</screenlet>
-                    	<screenlet title="${uiLabelMap.AccountingFindPayments}" navigation-form-name="ListPayments">
- 	                       <include-form name="ListPayments"  location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/>
-                    	</screenlet>
+                        <section>
+                            <widgets>
+                                <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml">
+                                    <decorator-section name="menu-bar">
+                                        <container style="button-bar">
+                	                        <link target="newPayment" text="${uiLabelMap.CommonCreateNew}
${uiLabelMap.AccountingPayment}" style="buttontext"/>
+    		                                <link target="FindSalesInvoicesByDueDate" text="${uiLabelMap.AccountingFindSalesInvoicesByDueDate}"
style="buttontext"/>
+                                            <link target="FindPurchaseInvoicesByDueDate"
text="${uiLabelMap.AccountingFindPurchaseInvoicesByDueDate}" style="buttontext"/>
+                                        </container>
+                                    </decorator-section>
+                                    <decorator-section name="search-options">
+                                        <include-form name="FindPayments" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/>
+                                    </decorator-section>
+                                    <decorator-section name="search-results">
+             	                       <include-form name="ListPayments"  location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/>
+                                    </decorator-section>
+                                </decorator-screen>
+                            </widgets>
+                        </section>
                     </decorator-section>
                 </decorator-screen>
             </widgets>

Modified: ofbiz/trunk/applications/accounting/widget/TransactionScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/TransactionScreens.xml?rev=735552&r1=735551&r2=735552&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/TransactionScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/TransactionScreens.xml Sun Jan 18 13:53:43
2009
@@ -61,34 +61,18 @@
             <widgets>
                 <decorator-screen name="GenericTransactionDecorator">
                     <decorator-section name="body">
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.PageTitleFindGatewayResponses}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>    
+                        <section>
+                            <widgets>
+                                <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml">
+                                    <decorator-section name="search-options">
                                         <include-form name="FindGatewayResponses" location="component://accounting/widget/TransactionForms.xml"/>
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.PageTitleFindGatewayResponses}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>    
+                                    </decorator-section>
+                                    <decorator-section name="search-results">
                                         <include-form name="ListGatewayResponses" location="component://accounting/widget/TransactionForms.xml"/>
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>
+                                    </decorator-section>
+                                </decorator-screen>
+                            </widgets>
+                        </section>
                     </decorator-section>
                 </decorator-screen>
             </widgets>

Modified: ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml?rev=735552&r1=735551&r2=735552&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml Sun Jan 18 13:53:43 2009
@@ -187,13 +187,23 @@
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameter.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <container style="button-bar"><link target="editVendor"
text="${uiLabelMap.CommonNew} ${uiLabelMap.PartyVendor}" style="buttontext"/></container>
-                        <screenlet name="findVendors" collapsible="true" title="${uiLabelMap.AccountingApPageTitleFindVendors}">
-                            <include-form name="FindVendors" location="component://accounting/widget/ap/forms/VendorForms.xml"/>
-                        </screenlet>
-                        <screenlet title="${uiLabelMap.AccountingApPageTitleFindVendorResults}"
navigation-form-name="ListVendors">
-                            <include-form name="ListVendors" location="component://accounting/widget/ap/forms/VendorForms.xml"/>
-                        </screenlet>
+                        <section>
+                            <widgets>
+                                <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml">
+                                    <decorator-section name="menu-bar">
+                                        <container style="button-bar">
+                                            <link target="editVendor" text="${uiLabelMap.CommonNew}
${uiLabelMap.PartyVendor}" style="buttontext"/>
+                                        </container>
+                                    </decorator-section>
+                                    <decorator-section name="search-options">
+                                        <include-form name="FindVendors" location="component://accounting/widget/ap/forms/VendorForms.xml"/>
+                                    </decorator-section>
+                                    <decorator-section name="search-results">
+                                        <include-form name="ListVendors" location="component://accounting/widget/ap/forms/VendorForms.xml"/>
+                                    </decorator-section>
+                                </decorator-screen>
+                            </widgets>
+                        </section>
                     </decorator-section>
                 </decorator-screen>
             </widgets>



Mime
View raw message