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/14 08:45:47 UTC
svn commit: r836137 - in /ofbiz/trunk/applications/order/widget/ordermgr:
CommonScreens.xml RequirementScreens.xml
Author: buscob
Date: Sat Nov 14 07:45:47 2009
New Revision: 836137
URL: http://svn.apache.org/viewvc?rev=836137&view=rev
Log:
Moved TabBar menus to tabbar decorator-section for the order application
Modified:
ofbiz/trunk/applications/order/widget/ordermgr/CommonScreens.xml
ofbiz/trunk/applications/order/widget/ordermgr/RequirementScreens.xml
Modified: ofbiz/trunk/applications/order/widget/ordermgr/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/CommonScreens.xml?rev=836137&r1=836136&r2=836137&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/CommonScreens.xml Sat Nov 14 07:45:47 2009
@@ -64,7 +64,7 @@
</actions>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
+ <decorator-section name="tabbar">
<section>
<condition>
<not><if-empty field="custRequest"/></not>
@@ -73,6 +73,8 @@
<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>
@@ -98,6 +100,19 @@
</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 -->
@@ -105,14 +120,6 @@
<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>
@@ -134,6 +141,19 @@
<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 -->
@@ -141,14 +161,6 @@
<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=836137&r1=836136&r2=836137&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/RequirementScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/RequirementScreens.xml Sat Nov 14 07:45:47 2009
@@ -24,7 +24,7 @@
<section>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
+ <decorator-section name="tabbar">
<section>
<!-- do check for ORDERMGR, _VIEW permission -->
<condition>
@@ -37,6 +37,16 @@
<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>
@@ -57,6 +67,16 @@
<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 -->
@@ -64,7 +84,6 @@
<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>