svn commit: r718921 - in /ofbiz/trunk/applications/acco
Locked
 
|
Author: ashish
Date: Wed Nov 19 01:50:06 2008 New Revision: 718921 URL: http://svn.apache.org/viewvc?rev=718921&view=rev Log: Applied patch from Bruno Busco "Replacing FTL TabBar with menu widgets in Accounting" (OFBIZ-2050). Thanks Bruno for your contribution. Removed: ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementTabBar.ftl ofbiz/trunk/applications/accounting/webapp/accounting/billingaccount/BillingAccountTabBar.ftl ofbiz/trunk/applications/accounting/webapp/accounting/chartofaccounts/GlAccountTabBar.ftl ofbiz/trunk/applications/accounting/webapp/accounting/chartofaccounts/GlSettingTabBar.ftl ofbiz/trunk/applications/accounting/webapp/accounting/transaction/TransactionsTabBar.ftl Modified: ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsScreens.xml ofbiz/trunk/applications/accounting/widget/Menus.xml ofbiz/trunk/applications/accounting/widget/TransactionScreens.xml Modified: ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml?rev=718921&r1=718920&r2=718921&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml Wed Nov 19 01:50:06 2008 @@ -38,9 +38,15 @@ <not><if-empty field-name="agreement"/></not> </condition> <widgets> - <platform-specific> - <html><html-template location="component://accounting/webapp/accounting/agreement/AgreementTabBar.ftl"/></html> - </platform-specific> + <include-menu name="AgreementTabBar" location="component://accounting/widget/Menus.xml"/> + <section> + <condition> + <not><if-empty field-name="agreementItem"/></not> + </condition> + <widgets> + <include-menu name="AgreementItemTabBar" location="component://accounting/widget/Menus.xml"/> + </widgets> + </section> <container> <label style="h1">${agreement.description} [${agreement.agreementId}] </label> </container> Modified: ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml?rev=718921&r1=718920&r2=718921&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml Wed Nov 19 01:50:06 2008 @@ -31,9 +31,14 @@ <if-has-permission permission="ACCOUNTING" action="_VIEW"/> </condition> <widgets> - <platform-specific> - <html><html-template location="component://accounting/webapp/accounting/billingaccount/BillingAccountTabBar.ftl"/></html> - </platform-specific> + <section> + <condition> + <not><if-empty field-name="billingAccount"/></not> + </condition> + <widgets> + <include-menu name="BillingAccountTabBar" location="component://accounting/widget/Menus.xml"/> + </widgets> + </section> <decorator-section-include name="body"/> Modified: ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsScreens.xml?rev=718921&r1=718920&r2=718921&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsScreens.xml Wed Nov 19 01:50:06 2008 @@ -34,9 +34,7 @@ <decorator-section name="body"> <section> <widgets> - <platform-specific> - <html><html-template location="component://accounting/webapp/accounting/chartofaccounts/GlAccountTabBar.ftl"/></html> - </platform-specific> + <include-menu name="GlAccountTabBar" location="component://accounting/widget/Menus.xml"/> <container> <!-- label style="h1">List Accounts</label --> @@ -73,9 +71,7 @@ <if-has-permission permission="CATALOG" action="_VIEW"/> </condition --> <widgets> - <platform-specific> - <html><html-template location="component://accounting/webapp/accounting/chartofaccounts/GlAccountTabBar.ftl"/></html> - </platform-specific> + <include-menu name="GlAccountTabBar" location="component://accounting/widget/Menus.xml"/> <container> <label style="h1">${uiLabelMap.${labelTitleProperty}} ${product.internalName} [${uiLabelMap.CommonId}:${productId}]</label> @@ -110,9 +106,7 @@ <decorator-section name="body"> <section> <widgets> - <platform-specific> - <html><html-template location="component://accounting/webapp/accounting/chartofaccounts/GlSettingTabBar.ftl"/></html> - </platform-specific> + <include-menu name="GlSettingTabBar" location="component://accounting/widget/Menus.xml"/> </widgets> </section> <container style="screenlet"> @@ -160,9 +154,7 @@ </container> </widgets> </section> - <platform-specific> - <html><html-template location="component://accounting/webapp/accounting/chartofaccounts/GlSettingTabBar.ftl"/></html> - </platform-specific> + <include-menu name="GlSettingTabBar" location="component://accounting/widget/Menus.xml"/> <container style="screenlet"> <container style="screenlet-title-bar"> <container style="h3"> @@ -258,9 +250,7 @@ <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <platform-specific> - <html><html-template location="component://accounting/webapp/accounting/chartofaccounts/GlAccountTabBar.ftl"/></html> - </platform-specific> + <include-menu name="GlAccountTabBar" location="component://accounting/widget/Menus.xml"/> <container style="screenlet"> <container style="screenlet-title-bar"> <container style="h3"> @@ -346,9 +336,7 @@ <widgets> <decorator-screen name="GlobalGLSettingsDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <platform-specific> - <html><html-template location="component://accounting/webapp/accounting/chartofaccounts/GlSettingTabBar.ftl"/></html> - </platform-specific> + <include-menu name="GlSettingTabBar" location="component://accounting/widget/Menus.xml"/> <container style="screenlet"> <container style="screenlet-title-bar"> <container style="h3"> Modified: ofbiz/trunk/applications/accounting/widget/Menus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/Menus.xml?rev=718921&r1=718920&r2=718921&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/Menus.xml (original) +++ ofbiz/trunk/applications/accounting/widget/Menus.xml Wed Nov 19 01:50:06 2008 @@ -576,10 +576,112 @@ <link target="editInvoiceItemType"/> </menu-item> </menu> - <menu name="AgreementTabBar" menu-container-style="button-bar tab-bar" default-selected-style="selected"> - <menu-item name="createNewAgreement" title="${uiLabelMap.AccountingNewAgreement}"> - <link target="EditAgreement"/> + + <menu name="AgreementTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"> + <menu-item name="AgreementMain" title="${uiLabelMap.AccountingAgreement}"> + <link target="EditAgreement?agreementId=${agreement.agreementId}"/> + </menu-item> + <menu-item name="AgreementTerms" title="${uiLabelMap.AccountingAgreementTerms}"> + <link target="EditAgreementTerms?agreementId=${agreement.agreementId}"/> + </menu-item> + <menu-item name="AgreementItems" title="${uiLabelMap.AccountingAgreementItems}"> + <link target="ListAgreementItems?agreementId=${agreement.agreementId}"/> + </menu-item> + <menu-item name="AgreementWorkEffortAppls" title="${uiLabelMap.AccountingAgreementWorkEffortAppls}"> + <link target="EditAgreementWorkEffortAppls?agreementId=${agreement.agreementId}"/> + </menu-item> + <menu-item name="AgreementRoles" title="${uiLabelMap.AccountingAgreementRoles}"> + <link target="EditAgreementRoles?agreementId=${agreement.agreementId}"/> + </menu-item> + </menu> + + <menu name="AgreementItemTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml" selected-menuitem-context-field-name="buttonBarItem"> + <menu-item name="EditAgreementItem" title="${uiLabelMap.AccountingAgreementItem}"> + <link target="EditAgreementItem?agreementId=${agreementItem.agreementId}&agreementItemSeqId=${agreementItem.agreementItemSeqId}"/> + </menu-item> + <menu-item name="ListAgreementPromoAppls" title="${uiLabelMap.AccountingAgreementPromoAppls}"> + <link target="ListAgreementPromoAppls?agreementId=${agreementItem.agreementId}&agreementItemSeqId=${agreementItem.agreementItemSeqId}"/> + </menu-item> + <menu-item name="ListAgreementItemTerms" title="${uiLabelMap.AccountingAgreementItemTerms}"> + <link target="ListAgreementItemTerms?agreementId=${agreementItem.agreementId}&agreementItemSeqId=${agreementItem.agreementItemSeqId}"/> + </menu-item> + + <menu-item name="ListAgreementItemSupplierProducts" title="${uiLabelMap.ProductProducts}"> + <condition> + <if-compare field-name="agreement.agreementTypeId" operator="equals" value="PURCHASE_AGREEMENT"/> + </condition> + <link target="ListAgreementItemSupplierProducts?agreementId=${agreementItem.agreementId}&agreementItemSeqId=${agreementItem.agreementItemSeqId}"/> + </menu-item> + + <menu-item name="ListAgreementItemProducts" title="${uiLabelMap.ProductProducts}"> + <condition> + <if-compare field-name="agreement.agreementTypeId" operator="not-equals" value="PURCHASE_AGREEMENT"/> + </condition> + <link target="ListAgreementItemProducts?agreementId=${agreementItem.agreementId}&agreementItemSeqId=${agreementItem.agreementItemSeqId}"/> + </menu-item> + + <menu-item name="ListAgreementItemParties" title="${uiLabelMap.Party}"> + <link target="ListAgreementItemParties?agreementId=${agreementItem.agreementId}&agreementItemSeqId=${agreementItem.agreementItemSeqId}"/> + </menu-item> + <menu-item name="ListAgreementGeographicalApplic" title="${uiLabelMap.CommonGeo}"> + <link target="ListAgreementGeographicalApplic?agreementId=${agreementItem.agreementId}&agreementItemSeqId=${agreementItem.agreementItemSeqId}"/> </menu-item> </menu> + <menu name="BillingAccountTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"> + <menu-item name="EditBillingAccount" title="${uiLabelMap.AccountingAccount}"> + <link target="EditBillingAccount?billingAccountId=${billingAccount.billingAccountId}"/> + </menu-item> + <menu-item name="EditBillingAccountRoles" title="${uiLabelMap.PartyRoles}"> + <link target="EditBillingAccountRoles?billingAccountId=${billingAccount.billingAccountId}"/> + </menu-item> + <menu-item name="EditBillingAccountTerms" title="${uiLabelMap.PartyTerms}"> + <link target="EditBillingAccountTerms?billingAccountId=${billingAccount.billingAccountId}"/> + </menu-item> + <menu-item name="BillingAccountInvoices" title="${uiLabelMap.AccountingInvoices}"> + <link target="BillingAccountInvoices?billingAccountId=${billingAccount.billingAccountId}"/> + </menu-item> + <menu-item name="BillingAccountPayments" title="${uiLabelMap.AccountingPayments}"> + <link target="BillingAccountPayments?billingAccountId=${billingAccount.billingAccountId}"/> + </menu-item> + <menu-item name="BillingAccountOrders" title="${uiLabelMap.AccountingOrders}"> + <link target="BillingAccountOrders?billingAccountId=${billingAccount.billingAccountId}"/> + </menu-item> + </menu> + + <menu name="GlAccountTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"> + <menu-item name="FindGlobalGlAccount" title="${uiLabelMap.AcctgChartOfAcctsTabMenu}"> + <link target="FindGlobalGlAccount"/> + </menu-item> + <menu-item name="GlAccountNavigate" title="${uiLabelMap.AcctgNavigateAccts}"> + <link target="GlAccountNavigate"/> + </menu-item> + <menu-item name="AssignGlAccount" title="${uiLabelMap.AcctgAssignGlAccount}"> + <link target="AssignGlAccount"/> + </menu-item> + </menu> + + <menu name="GlSettingTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml" selected-menuitem-context-field-name="tabButtonItem2"> + <menu-item name="GlAccountNavigate" title="${uiLabelMap.AcctgNavigateAccts}"> + <link target="GlAccountNavigate"/> + </menu-item> + <menu-item name="AssignGlAccount" title="${uiLabelMap.AcctgAssignGlAccount}"> + <link target="AssignGlAccount"/> + </menu-item> + </menu> + + <menu name="TransactionsTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"> + <menu-item name="authorizetransactiontab" title="${uiLabelMap.AccountingAuthorize}"> + <link target="AuthorizeTransaction"/> + </menu-item> + <menu-item name="capturetransactiontab" title="${uiLabelMap.AccountingCapture}"> + <link target="CaptureTransaction"/> + </menu-item> + <menu-item name="gatewayresponsestab" title="${uiLabelMap.AccountingGatewayResponses}"> + <link target="FindGatewayResponses"/> + </menu-item> + <menu-item name="manualtransactiontab" title="${uiLabelMap.AccountingManualTransaction}"> + <link target="ManualTransaction"/> + </menu-item> + </menu> </menus> Modified: ofbiz/trunk/applications/accounting/widget/TransactionScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/TransactionScreens.xml?rev=718921&r1=718920&r2=718921&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/TransactionScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/TransactionScreens.xml Wed Nov 19 01:50:06 2008 @@ -33,9 +33,7 @@ <decorator-section name="body"> <section> <widgets> - <platform-specific> - <html><html-template location="component://accounting/webapp/accounting/transaction/TransactionsTabBar.ftl"/></html> - </platform-specific> + <include-menu name="TransactionsTabBar" location="component://accounting/widget/Menus.xml"/> <container> <label style="h1">${uiLabelMap.${labelTitleProperty}}</label> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |