Author: buscob
Date: Sun Dec 6 22:27:36 2009
New Revision: 887786
URL: http://svn.apache.org/viewvc?rev=887786&view=rev
Log:
Webtools application
Moved TabBar Menus from the "body" decorator-section to the "pre-body"
decorator section.
Modified:
ofbiz/trunk/framework/webtools/widget/CommonScreens.xml
ofbiz/trunk/framework/webtools/widget/LogScreens.xml
Modified: ofbiz/trunk/framework/webtools/widget/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/CommonScreens.xml?rev=887786&r1=887785&r2=887786&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/CommonScreens.xml Sun Dec 6 22:27:36
2009
@@ -99,6 +99,16 @@
</actions>
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="pre-body">
+ <section>
+ <condition>
+ <if-has-permission permission="ENTITY_MAINT"/>
+ </condition>
+ <widgets>
+ <include-menu name="EntityTabBar"
location="component://webtools/widget/Menus.xml"/>
+ </widgets>
+ </section>
+ </decorator-section>
<decorator-section name="body">
<section>
<!-- do check for WEBTOOLS, _VIEW permission -->
@@ -106,7 +116,6 @@
<if-has-permission permission="ENTITY_MAINT"/>
</condition>
<widgets>
- <include-menu name="EntityTabBar"
location="component://webtools/widget/Menus.xml"/>
<decorator-section-include name="body"/>
</widgets>
<fail-widgets>
@@ -126,6 +135,16 @@
</actions>
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="pre-body">
+ <section>
+ <condition>
+ <if-has-permission permission="WEBTOOLS"
action="_VIEW"/>
+ </condition>
+ <widgets>
+ <include-menu name="serviceTabBar"
location="component://webtools/widget/Menus.xml"/>
+ </widgets>
+ </section>
+ </decorator-section>
<decorator-section name="body">
<section>
<!-- do check for WEBTOOLS, _VIEW permission -->
@@ -133,7 +152,6 @@
<if-has-permission permission="WEBTOOLS"
action="_VIEW"/>
</condition>
<widgets>
- <include-menu name="serviceTabBar"
location="component://webtools/widget/Menus.xml"/>
<decorator-section-include name="body"/>
</widgets>
<fail-widgets>
@@ -153,6 +171,16 @@
</actions>
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="pre-body">
+ <section>
+ <condition>
+ <if-has-permission permission="ENTITY_MAINT"/>
+ </condition>
+ <widgets>
+ <include-menu name="importExportTabBar"
location="component://webtools/widget/Menus.xml"/>
+ </widgets>
+ </section>
+ </decorator-section>
<decorator-section name="body">
<section>
<!-- do check for WEBTOOLS, _VIEW permission -->
@@ -160,7 +188,6 @@
<if-has-permission permission="ENTITY_MAINT"/>
</condition>
<widgets>
- <include-menu name="importExportTabBar"
location="component://webtools/widget/Menus.xml"/>
<decorator-section-include name="body"/>
</widgets>
<fail-widgets>
@@ -180,6 +207,16 @@
</actions>
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="pre-body">
+ <section>
+ <condition>
+ <if-has-permission permission="ENTITY_MAINT"/>
+ </condition>
+ <widgets>
+ <include-menu name="artifactTabBar"
location="component://webtools/widget/Menus.xml"/>
+ </widgets>
+ </section>
+ </decorator-section>
<decorator-section name="body">
<section>
<!-- do check for WEBTOOLS, _VIEW permission -->
@@ -187,7 +224,6 @@
<if-has-permission permission="ENTITY_MAINT"/>
</condition>
<widgets>
- <include-menu name="artifactTabBar"
location="component://webtools/widget/Menus.xml"/>
<decorator-section-include name="body"/>
</widgets>
<fail-widgets>
@@ -207,6 +243,16 @@
</actions>
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="pre-body">
+ <section>
+ <condition>
+ <if-has-permission permission="ENTITY_MAINT"/>
+ </condition>
+ <widgets>
+ <include-menu name="configurationTabBar"
location="component://webtools/widget/Menus.xml"/>
+ </widgets>
+ </section>
+ </decorator-section>
<decorator-section name="body">
<section>
<!-- do check for WEBTOOLS, _VIEW permission -->
@@ -214,7 +260,6 @@
<if-has-permission permission="ENTITY_MAINT"/>
</condition>
<widgets>
- <include-menu name="configurationTabBar"
location="component://webtools/widget/Menus.xml"/>
<decorator-section-include name="body"/>
</widgets>
<fail-widgets>
Modified: ofbiz/trunk/framework/webtools/widget/LogScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/LogScreens.xml?rev=887786&r1=887785&r2=887786&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/LogScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/LogScreens.xml Sun Dec 6 22:27:36
2009
@@ -27,13 +27,22 @@
</actions>
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
+ <decorator-section name="pre-body">
<section>
<condition>
<if-has-permission permission="WEBTOOLS"
action="_VIEW"/>
</condition>
<widgets>
<include-menu
location="component://webtools/widget/Menus.xml" name="LoggingTabBar"/>
+ </widgets>
+ </section>
+ </decorator-section>
+ <decorator-section name="body">
+ <section>
+ <condition>
+ <if-has-permission permission="WEBTOOLS"
action="_VIEW"/>
+ </condition>
+ <widgets>
<decorator-section-include name="body"/>
</widgets>
<fail-widgets>
