Author: lektran
Date: Sat Mar 3 16:43:56 2007
New Revision: 514294
URL: http://svn.apache.org/viewvc?view=rev&rev=514294
Log:
Removed mainAccountingDecorator and replaced references to it with
"main-decorator", as it doesn't appear to serve any purpose. Reported by Eriks
Dobelis OFBIZ-766
Modified:
ofbiz/trunk/applications/accounting/widget/AccountingScreens.xml
ofbiz/trunk/applications/accounting/widget/AdminScreens.xml
ofbiz/trunk/applications/accounting/widget/CommonScreens.xml
ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml
ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml
Modified: ofbiz/trunk/applications/accounting/widget/AccountingScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/AccountingScreens.xml?view=diff&rev=514294&r1=514293&r2=514294
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/AccountingScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/AccountingScreens.xml Sat Mar 3
16:43:56 2007
@@ -203,7 +203,7 @@
</entity-and>
</actions>
<widgets>
- <decorator-screen name="mainAccountingDecorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<container style="column-left-wide">
<include-tree name="GlAccountTree"
location="component://accounting/widget/AccountingTrees.xml" />
@@ -226,7 +226,7 @@
</entity-and>
</actions>
<widgets>
- <decorator-screen name="mainAccountingDecorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<container style="column-left-wide">
<include-tree name="GlAccountTree"
location="component://accounting/widget/AccountingTrees.xml" />
Modified: ofbiz/trunk/applications/accounting/widget/AdminScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/AdminScreens.xml?view=diff&rev=514294&r1=514293&r2=514294
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/AdminScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/AdminScreens.xml Sat Mar 3
16:43:56 2007
@@ -33,7 +33,7 @@
</entity-condition>
</actions>
<widgets>
- <decorator-screen name="mainAccountingDecorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<include-form name="ListCompanies"
location="component://accounting/webapp/accounting/admin/AdminForms.xml"/>
</decorator-section>
Modified: ofbiz/trunk/applications/accounting/widget/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/CommonScreens.xml?view=diff&rev=514294&r1=514293&r2=514294
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/CommonScreens.xml Sat Mar 3
16:43:56 2007
@@ -40,57 +40,14 @@
</widgets>
</section>
</screen>
- <screen name="mainAccountingDecorator">
- <section>
- <actions>
- <!-- base/top/specific map first, then more common map added
for shared labels -->
- <property-map resource="AccountingUiLabels"
map-name="uiLabelMap" global="true"/>
- <property-map resource="PartyUiLabels" map-name="uiLabelMap"
global="true"/>
- <property-map resource="AccountingConfig"
map-name="uiConfigMap" global="true"/>
- <property-map resource="CommonUiLabels" map-name="uiLabelMap"
global="true"/>
-
- <set field="layoutSettings.companyName"
from-field="uiLabelMap.AccountingCompanyName" global="true"/>
- <set field="layoutSettings.companySubtitle"
from-field="uiLabelMap.AccountingCompanySubtitle" global="true"/>
- <set field="layoutSettings.headerImageUrl"
value="/images/ofbiz_logo.jpg" global="true"/>
- <!-- <set field="layoutSettings.headerMiddleBackgroundUrl"
value="" global="true"/> -->
- <!-- <set field="layoutSettings.headerRightBackgroundUrl"
value="" global="true"/> -->
- <set field="activeApp" value="accounting" global="true"/>
- </actions>
- <widgets>
- <!-- render header -->
- <platform-specific><html><html-template
location="component://common/webcommon/includes/header.ftl"/></html></platform-specific>
- <!-- render appbar -->
- <platform-specific><html><html-template
location="component://common/webcommon/includes/appbar.ftl"/></html></platform-specific>
-
- <container style="centerarea">
- <!-- render appheader -->
- <platform-specific><html><html-template
location="component://accounting/webapp/accounting/includes/appheader.ftl"/></html></platform-specific>
-
- <container style="contentarea">
- <!-- by default will render left-bar only if
leftbarScreen value not empty -->
- <!-- include-screen name="${leftbarScreenName}"
location="${leftbarScreenLocation}"/ -->
-
- <container style="column-main">
- <!-- render messages -->
- <platform-specific><html><html-template
location="component://common/webcommon/includes/messages.ftl"/></html></platform-specific>
- <decorator-section-include name="body"/>
- </container>
- </container>
- </container>
-
- <!-- render footer -->
- <platform-specific><html><html-template
location="component://common/webcommon/includes/footer.ftl"/></html></platform-specific>
- </widgets>
- </section>
- </screen>
-
+
<screen name="CommonInvoiceDecorator">
<section>
<actions>
<set field="headerItem" value="invoices"/>
</actions>
<widgets>
- <decorator-screen name="mainAccountingDecorator">
+ <decorator-screen name="main-decorator">
<decorator-section name="body">
<section>
<!-- do check for ACCOUNTING, _VIEW permission -->
@@ -119,7 +76,7 @@
<set field="headerItem" value="payments"/>
</actions>
<widgets>
- <decorator-screen name="mainAccountingDecorator">
+ <decorator-screen name="main-decorator">
<decorator-section name="body">
<section>
<!-- do check for ACCOUNTING, _VIEW permission -->
@@ -259,7 +216,7 @@
<set field="organizationPartyId"
from-field="parameters.organizationPartyId" global="true"/>
</actions>
<widgets>
- <decorator-screen name="mainAccountingDecorator">
+ <decorator-screen name="main-decorator">
<decorator-section name="body">
<section>
<widgets>
Modified: ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml?view=diff&rev=514294&r1=514293&r2=514294
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml Sat Mar 3
16:43:56 2007
@@ -31,7 +31,7 @@
<set field="viewSize" from-field="parameters.VIEW_SIZE"
type="Integer" default-value="30"/>
</actions>
<widgets>
- <decorator-screen name="mainAccountingDecorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<container><link target="editInvoice"
text="${uiLabelMap.AccountingCreateNewInvoice}"
style="buttontext"/></container>
<container><label style="head1"
text="${uiLabelMap.AccountingFindInvoices}"/></container>
Modified: ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml?view=diff&rev=514294&r1=514293&r2=514294
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml Sat Mar 3
16:43:56 2007
@@ -30,7 +30,7 @@
<set field="viewSize" from-field="parameters.VIEW_SIZE"
type="Integer" default-value="50"/>
</actions>
<widgets>
- <decorator-screen name="mainAccountingDecorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<container><link target="editPayment"
text="${uiLabelMap.CommonCreateNew} ${uiLabelMap.AccountingPayment}"
style="buttontext"/></container>
<container><label style="head1"
text="${uiLabelMap.AccountingFindPayments}"/></container>
@@ -279,7 +279,7 @@
<script
location="component://accounting/webapp/accounting/WEB-INF/actions/payment/manualTx.bsh"/>
</actions>
<widgets>
- <decorator-screen name="mainAccountingDecorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<platform-specific>
<html><html-template
location="component://accounting/webapp/accounting/payment/manualTx.ftl"/></html>
