You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by bu...@apache.org on 2009/11/22 21:14:14 UTC
svn commit: r883139 - in /ofbiz/trunk/applications/accounting/widget:
BillingAccountScreens.xml CommonScreens.xml FinAccountScreens.xml
GlobalGlAccountsScreens.xml InvoiceScreens.xml ap/CommonScreens.xml
ar/CommonScreens.xml
Author: buscob
Date: Sun Nov 22 20:14:11 2009
New Revision: 883139
URL: http://svn.apache.org/viewvc?rev=883139&view=rev
Log:
Accounting application
Moved TabBar Menus from the "body" decorator-section to the "pre-body" decorator section.
This makes better the rendering of themes such as Dropping Crumbs.
Removed several redundant <section><widget> tags also
Modified:
ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml
ofbiz/trunk/applications/accounting/widget/CommonScreens.xml
ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml
ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsScreens.xml
ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml
ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml
ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml
Modified: ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml?rev=883139&r1=883138&r2=883139&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml Sun Nov 22 20:14:11 2009
@@ -26,7 +26,7 @@
<section>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
+ <decorator-section name="pre-body">
<section>
<!-- do check for ACCOUNTING, _VIEW permission -->
<condition>
@@ -41,6 +41,16 @@
<include-menu name="BillingAccountTabBar" location="component://accounting/widget/AccountingMenus.xml"/>
</widgets>
</section>
+ </widgets>
+ </section>
+ </decorator-section>
+ <decorator-section name="body">
+ <section>
+ <!-- do check for ACCOUNTING, _VIEW permission -->
+ <condition>
+ <if-has-permission permission="ACCOUNTING" action="_VIEW"/>
+ </condition>
+ <widgets>
<decorator-section-include name="body"/>
</widgets>
<fail-widgets>
Modified: ofbiz/trunk/applications/accounting/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/CommonScreens.xml?rev=883139&r1=883138&r2=883139&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/CommonScreens.xml Sun Nov 22 20:14:11 2009
@@ -113,13 +113,22 @@
</actions>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
+ <decorator-section name="pre-body">
<section>
<condition>
<not><if-empty field="organizationPartyId"/></not>
</condition>
<widgets>
<include-menu name="PartyTopTabBar" location="component://accounting/widget/AccountingMenus.xml"/>
+ </widgets>
+ </section>
+ </decorator-section>
+ <decorator-section name="body">
+ <section>
+ <condition>
+ <not><if-empty field="organizationPartyId"/></not>
+ </condition>
+ <widgets>
<decorator-section-include name="body"/>
</widgets>
</section>
@@ -220,14 +229,10 @@
</actions>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="pre-body">
+ <include-menu name="GlobalGLSettingMenus" location="component://accounting/widget/AccountingMenus.xml"/>
+ </decorator-section>
<decorator-section name="body">
- <section>
- <widgets>
- <container>
- <include-menu name="GlobalGLSettingMenus" location="component://accounting/widget/AccountingMenus.xml"/>
- </container>
- </widgets>
- </section>
<decorator-section-include name="body"/>
</decorator-section>
</decorator-screen>
Modified: ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml?rev=883139&r1=883138&r2=883139&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml Sun Nov 22 20:14:11 2009
@@ -31,7 +31,7 @@
</actions>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
+ <decorator-section name="pre-body">
<section>
<condition>
<if-service-permission service-name="acctgFinAcctPermissionCheck" main-action="VIEW"/>
@@ -47,9 +47,16 @@
</fail-widgets>
</section>
</widgets>
- <fail-widgets>
+ </section>
+ </decorator-section>
+ <decorator-section name="body">
+ <section>
+ <condition>
+ <not><if-service-permission service-name="acctgFinAcctPermissionCheck" main-action="VIEW"/></not>
+ </condition>
+ <widgets>
<label style="h3" text="${uiLabelMap.AccountingViewPermissionError}"/>
- </fail-widgets>
+ </widgets>
</section>
<decorator-section-include name="body"/>
</decorator-section>
Modified: ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsScreens.xml?rev=883139&r1=883138&r2=883139&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsScreens.xml Sun Nov 22 20:14:11 2009
@@ -98,11 +98,7 @@
<widgets>
<decorator-screen name="GlobalGLSettingsDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <section>
- <widgets>
- <include-menu name="GlSettingTabBar" location="component://accounting/widget/AccountingMenus.xml"/>
- </widgets>
- </section>
+ <include-menu name="GlSettingTabBar" location="component://accounting/widget/AccountingMenus.xml"/>
<screenlet title="${uiLabelMap.AcctgAssignGlAccount}">
<include-form name="AssignGlAccount" location="component://accounting/widget/GlobalGlAccountsForms.xml"/>
</screenlet>
@@ -116,7 +112,6 @@
<section>
<actions>
<set field="titleProperty" value="AcctgNavigateAccts"/>
- <set field="headerItem" value="GlobalGLSettings"/>
<set field="tabButtonItem" value="Chartofaccounts"/>
<set field="tabButtonItem2" value="GlAccountNavigate"/>
<set field="labelTitleProperty" value="AcctgNavigateAccts"/>
@@ -128,15 +123,8 @@
<entity-one entity-name="GlAccount" value-field="glAccount"/>
</actions>
<widgets>
- <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="GlobalGLSettingsDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <section>
- <widgets>
- <container>
- <include-menu name="GlobalGLSettingMenus" location="component://accounting/widget/AccountingMenus.xml"/>
- </container>
- </widgets>
- </section>
<include-menu name="GlSettingTabBar" location="component://accounting/widget/AccountingMenus.xml"/>
<screenlet title="${uiLabelMap.AcctgNavigateAccts}">
<include-tree name="GlAccountTree" location="component://accounting/widget/AccountingTrees.xml"/>
Modified: ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml?rev=883139&r1=883138&r2=883139&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml Sun Nov 22 20:14:11 2009
@@ -31,6 +31,19 @@
</actions>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="pre-body">
+ <section>
+ <condition>
+ <and>
+ <if-service-permission service-name="acctgInvoicePermissionCheck" main-action="VIEW"/>
+ <not><if-empty field="parameters.invoiceId"/></not>
+ </and>
+ </condition>
+ <widgets>
+ <include-menu name="InvoiceTabBar" location="component://accounting/widget/AccountingMenus.xml"/>
+ </widgets>
+ </section>
+ </decorator-section>
<decorator-section name="body">
<section>
<condition>
@@ -40,7 +53,6 @@
<section>
<condition><not><if-empty field="parameters.invoiceId"/></not></condition>
<widgets>
- <include-menu name="InvoiceTabBar" location="component://accounting/widget/AccountingMenus.xml"/>
<include-menu name="InvoiceSubTabBar" location="component://accounting/widget/AccountingMenus.xml"/>
<container style="leftclear">
<label style="h1" text="${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonFor}: ${invoice.description} [${invoiceId}] ${${extraFunctionName}}"/>
Modified: ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml?rev=883139&r1=883138&r2=883139&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml Sun Nov 22 20:14:11 2009
@@ -160,14 +160,11 @@
</actions>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="pre-body">
+ <include-menu location="component://accounting/widget/ap/ApMenus.xml" name="ApInvoiceTabBar"/>
+ </decorator-section>
<decorator-section name="body">
- <section>
- <widgets>
- <include-menu location="component://accounting/widget/ap/ApMenus.xml" name="ApInvoiceTabBar"/>
- <container style="clear"/>
- <decorator-section-include name="body"/>
- </widgets>
- </section>
+ <decorator-section-include name="body"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -216,11 +213,7 @@
<widgets>
<decorator-screen name="main-decorator">
<decorator-section name="pre-body">
- <section>
- <widgets>
- <include-menu name="PaymentGroupTabBar" location="component://accounting/widget/AccountingMenus.xml"/>
- </widgets>
- </section>
+ <include-menu name="PaymentGroupTabBar" location="component://accounting/widget/AccountingMenus.xml"/>
</decorator-section>
<decorator-section name="body">
<section>
@@ -272,14 +265,11 @@
</actions>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="pre-body">
+ <include-menu name="ApReportTabBar" location="component://accounting/widget/ap/ApMenus.xml"/>
+ </decorator-section>
<decorator-section name="body">
- <section>
- <widgets>
- <include-menu name="ApReportTabBar" location="component://accounting/widget/ap/ApMenus.xml"/>
- <container style="clear"/>
- <decorator-section-include name="body"/>
- </widgets>
- </section>
+ <decorator-section-include name="body"/>
</decorator-section>
</decorator-screen>
</widgets>
Modified: ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml?rev=883139&r1=883138&r2=883139&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml Sun Nov 22 20:14:11 2009
@@ -134,13 +134,11 @@
<section>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="pre-body">
+ <include-menu name="ArPaymentTabBar" location="component://accounting/widget/ar/ArMenus.xml"/>
+ </decorator-section>
<decorator-section name="body">
- <section>
- <widgets>
- <include-menu name="ArPaymentTabBar" location="component://accounting/widget/ar/ArMenus.xml"/>
- <decorator-section-include name="body"/>
- </widgets>
- </section>
+ <decorator-section-include name="body"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -159,11 +157,7 @@
<widgets>
<decorator-screen name="main-decorator">
<decorator-section name="pre-body">
- <section>
- <widgets>
- <include-menu name="PaymentGroupTabBar" location="component://accounting/widget/AccountingMenus.xml"/>
- </widgets>
- </section>
+ <include-menu name="PaymentGroupTabBar" location="component://accounting/widget/AccountingMenus.xml"/>
</decorator-section>
<decorator-section name="body">
<section>