Author: buscob
Date: Mon Nov 16 06:49:10 2009
New Revision: 880628
URL: http://svn.apache.org/viewvc?rev=880628&view=rev
Log:
Reverted changes 836143 and 836137 following Adrian's issue report in
https://issues.apache.org/jira/browse/OFBIZ-3206 "Recent Markup Changes Break
Layout"
Modified:
ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml
ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml
ofbiz/trunk/applications/order/widget/ordermgr/CommonScreens.xml
ofbiz/trunk/applications/order/widget/ordermgr/RequirementScreens.xml
Modified: ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml?rev=880628&r1=880627&r2=880628&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml Mon Nov 16
06:49:10 2009
@@ -31,20 +31,6 @@
</actions>
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
- <decorator-section name="tabbar">
- <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>
@@ -54,6 +40,7 @@
<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/PaymentScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml?rev=880628&r1=880627&r2=880628&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml Mon Nov 16
06:49:10 2009
@@ -28,16 +28,6 @@
</actions>
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
- <decorator-section name="tabbar">
- <section>
- <condition>
- <if-has-permission permission="ACCOUNTING"
action="_VIEW"/>
- </condition>
- <widgets>
- <include-menu name="PaymentTabBar"
location="component://accounting/widget/AccountingMenus.xml"/>
- </widgets>
- </section>
- </decorator-section>
<decorator-section name="body">
<section>
<!-- do check for ACCOUNTING, _VIEW permission -->
@@ -45,6 +35,7 @@
<if-has-permission permission="ACCOUNTING"
action="_VIEW"/>
</condition>
<widgets>
+ <include-menu name="PaymentTabBar"
location="component://accounting/widget/AccountingMenus.xml"/>
<include-menu name="PaymentSubTabBar"
location="component://accounting/widget/AccountingMenus.xml"/>
<container style="leftclear">
<label style="h1"
text="${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonId}:[${paymentId}]
${${extraFunctionName}}"/>
Modified: ofbiz/trunk/applications/order/widget/ordermgr/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/CommonScreens.xml?rev=880628&r1=880627&r2=880628&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/CommonScreens.xml Mon Nov 16
06:49:10 2009
@@ -64,7 +64,7 @@
</actions>
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
- <decorator-section name="tabbar">
+ <decorator-section name="body">
<section>
<condition>
<not><if-empty field="custRequest"/></not>
@@ -73,8 +73,6 @@
<include-menu name="RequestTabBar"
location="component://order/widget/ordermgr/OrderMenus.xml"/>
</widgets>
</section>
- </decorator-section>
- <decorator-section name="body">
<include-menu name="RequestSubTabBar"
location="component://order/widget/ordermgr/OrderMenus.xml"/>
<container>
<section>
@@ -100,19 +98,6 @@
</actions>
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
- <decorator-section name="tabbar">
- <section>
- <condition>
- <and>
- <if-has-permission permission="ORDERMGR"
action="_VIEW"/>
- <not><if-empty field="quote"/></not>
- </and>
- </condition>
- <widgets>
- <include-menu name="QuoteTabBar"
location="component://order/widget/ordermgr/OrderMenus.xml"/>
- </widgets>
- </section>
- </decorator-section>
<decorator-section name="body">
<section>
<!-- do check for ORDERMGR, _VIEW permission -->
@@ -120,6 +105,14 @@
<if-has-permission permission="ORDERMGR"
action="_VIEW"/>
</condition>
<widgets>
+ <section>
+ <condition>
+ <not><if-empty field="quote"/></not>
+ </condition>
+ <widgets>
+ <include-menu name="QuoteTabBar"
location="component://order/widget/ordermgr/OrderMenus.xml"/>
+ </widgets>
+ </section>
<container>
<label
style="h1">[${uiLabelMap.CommonId}:${quote.quoteId}]
${quote.description}</label>
</container>
@@ -141,19 +134,6 @@
<section>
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
- <decorator-section name="tabbar">
- <section>
- <condition>
- <and>
- <if-has-permission permission="ORDERMGR"
action="_QUOTE_PRICE"/>
- <not><if-empty field="quote"/></not>
- </and>
- </condition>
- <widgets>
- <include-menu name="QuoteTabBar"
location="component://order/widget/ordermgr/OrderMenus.xml"/>
- </widgets>
- </section>
- </decorator-section>
<decorator-section name="body">
<section>
<!-- do check for ORDERMGR, _QUOTE_PRICE
permission -->
@@ -161,6 +141,14 @@
<if-has-permission permission="ORDERMGR"
action="_QUOTE_PRICE"/>
</condition>
<widgets>
+ <section>
+ <condition>
+ <not><if-empty field="quote"/></not>
+ </condition>
+ <widgets>
+ <include-menu name="QuoteTabBar"
location="component://order/widget/ordermgr/OrderMenus.xml"/>
+ </widgets>
+ </section>
<container>
<label
style="h1">[${uiLabelMap.CommonId}:${quote.quoteId}]
${quote.description}</label>
</container>
Modified: ofbiz/trunk/applications/order/widget/ordermgr/RequirementScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/RequirementScreens.xml?rev=880628&r1=880627&r2=880628&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/RequirementScreens.xml
(original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/RequirementScreens.xml Mon
Nov 16 06:49:10 2009
@@ -24,7 +24,7 @@
<section>
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
- <decorator-section name="tabbar">
+ <decorator-section name="body">
<section>
<!-- do check for ORDERMGR, _VIEW permission -->
<condition>
@@ -37,16 +37,6 @@
<include-menu name="RequirementTabBar"
location="component://order/widget/ordermgr/OrderMenus.xml"/>
</widgets>
</section>
- </widgets>
- </section>
- </decorator-section>
- <decorator-section name="body">
- <section>
- <!-- do check for ORDERMGR, _VIEW permission -->
- <condition>
- <if-has-permission permission="ORDERMGR"
action="_VIEW"/>
- </condition>
- <widgets>
<container>
<label
style="h1">${uiLabelMap.OrderRequirement} [${requirementId}]</label>
</container>
@@ -67,16 +57,6 @@
<section>
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
- <decorator-section name="tabbar">
- <section>
- <condition>
- <if-has-permission permission="ORDERMGR"
action="_VIEW"/>
- </condition>
- <widgets>
- <include-menu name="RequirementsTabBar"
location="component://order/widget/ordermgr/OrderMenus.xml"/>
- </widgets>
- </section>
- </decorator-section>
<decorator-section name="body">
<section>
<!-- do check for ORDERMGR, _VIEW permission -->
@@ -84,6 +64,7 @@
<if-has-permission permission="ORDERMGR"
action="_VIEW"/>
</condition>
<widgets>
+ <include-menu name="RequirementsTabBar"
location="component://order/widget/ordermgr/OrderMenus.xml"/>
<container>
<link target="EditRequirement"
text="${uiLabelMap.OrderNewRequirement}" style="buttontext"/>
</container>
