Author: buscob
Date: Sun Nov 22 00:39:41 2009
New Revision: 883020
URL: http://svn.apache.org/viewvc?rev=883020&view=rev
Log:
Moved several TabBar Menus from the "body" decorator-section to the "pre-body"
decorator section.
Having the TabBar menu in the "pre-body" seems to be the right pattern (already
present in several screens) that should always be followed.
This change allows a much better rendering of the Dropping Crumbs while having
a very little TabBar menu shift in other themes.
All other screens will be changed accordingly.
This commit also fixes OFBIZ-3240
Modified:
ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml
ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml
ofbiz/trunk/applications/accounting/widget/TransactionScreens.xml
ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml
ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml
ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml
ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml
Modified: ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml?rev=883020&r1=883019&r2=883020&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml Sun Nov 22
00:39:41 2009
@@ -30,6 +30,19 @@
</actions>
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="pre-body">
+ <section>
+ <condition>
+ <and>
+ <if-service-permission
service-name="acctgAgreementPermissionCheck" main-action="VIEW"/>
+ <not><if-empty field="agreement"/></not>
+ </and>
+ </condition>
+ <widgets>
+ <include-menu name="AgreementTabBar"
location="component://accounting/widget/AccountingMenus.xml"/>
+ </widgets>
+ </section>
+ </decorator-section>
<decorator-section name="body">
<section>
<condition>
@@ -41,7 +54,6 @@
<not><if-empty
field="agreement"/></not>
</condition>
<widgets>
- <include-menu name="AgreementTabBar"
location="component://accounting/widget/AccountingMenus.xml"/>
<section>
<condition>
<not><if-empty
field="agreementItem"/></not>
Modified: ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml?rev=883020&r1=883019&r2=883020&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml Sun Nov 22
00:39:41 2009
@@ -28,6 +28,16 @@
</actions>
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="pre-body">
+ <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 -->
@@ -35,7 +45,6 @@
<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/accounting/widget/TransactionScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/TransactionScreens.xml?rev=883020&r1=883019&r2=883020&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/TransactionScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/TransactionScreens.xml Sun Nov
22 00:39:41 2009
@@ -30,13 +30,15 @@
<widgets>
<!-- main defines the regions of the HTML page -->
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
- <!-- body is the primary display for this page and is called
recursively -->
+ <decorator-section name="pre-body">
+ <include-menu name="TransactionsTabBar"
location="component://accounting/widget/AccountingMenus.xml"/>
+ </decorator-section>
+
+ <!-- body is the primary display for this page and is
called recursively -->
<decorator-section name="body">
<section>
<widgets>
- <include-menu name="TransactionsTabBar"
location="component://accounting/widget/AccountingMenus.xml"/>
-
- <label
style="h1">${uiLabelMap[labelTitleProperty]}</label>
+ <label
style="h1">${uiLabelMap[labelTitleProperty]}</label>
<!-- Now call the SimpleScreen form -->
<decorator-section-include name="body"/>
Modified: ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml?rev=883020&r1=883019&r2=883020&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml Sun Nov
22 00:39:41 2009
@@ -168,6 +168,19 @@
</actions>
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="pre-body">
+ <section>
+ <condition>
+ <and>
+ <if-has-permission permission="CATALOG"
action="_VIEW"/>
+ <not><if-empty
field="productStoreId"/></not>
+ </and>
+ </condition>
+ <widgets>
+ <include-menu name="ProductStoreTabBar"
location="component://product/widget/catalog/CatalogMenus.xml"/>
+ </widgets>
+ </section>
+ </decorator-section>
<decorator-section name="body">
<section>
<!-- do check for CATALOG, _VIEW permission -->
@@ -178,10 +191,6 @@
<section>
<condition><not><if-empty
field="productStoreId"/></not></condition>
<widgets>
- <container style="no-clear">
- <include-menu
name="ProductStoreTabBar"
location="component://product/widget/catalog/CatalogMenus.xml"/>
- </container>
-
<container>
<label
style="h1">${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonFor}:
${productStore.storeName} [${uiLabelMap.CommonId}:${productStoreId}]
${${extraFunctionName}}</label>
</container>
@@ -230,6 +239,16 @@
</actions>
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="pre-body">
+ <section>
+ <condition>
+ <if-has-permission permission="CATALOG"
action="_VIEW"/>
+ </condition>
+ <widgets>
+ <include-menu name="ShippingTabBar"
location="component://product/widget/catalog/CatalogMenus.xml"/>
+ </widgets>
+ </section>
+ </decorator-section>
<decorator-section name="body">
<section>
<!-- do check for CATALOG, _VIEW permission -->
@@ -237,9 +256,6 @@
<if-has-permission permission="CATALOG"
action="_VIEW"/>
</condition>
<widgets>
- <container style="no-clear">
- <include-menu name="ShippingTabBar"
location="component://product/widget/catalog/CatalogMenus.xml"/>
- </container>
<!--<include-menu
name="EditSubscriptionResource"
location="component://product/widget/catalog/SubscriptionMenus.xml"/>-->
<container>
<label
style="h1">${uiLabelMap[labelTitleProperty]}</label>
Modified: ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml?rev=883020&r1=883019&r2=883020&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml Sun Nov
22 00:39:41 2009
@@ -29,6 +29,19 @@
</actions>
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="pre-body">
+ <section>
+ <condition>
+ <and>
+ <if-has-permission permission="CATALOG"
action="_VIEW"/>
+ <not><if-empty field="configItemId"/></not>
+ </and>
+ </condition>
+ <widgets>
+ <include-menu name="ConfigItemTabBar"
location="component://product/widget/catalog/CatalogMenus.xml"/>
+ </widgets>
+ </section>
+ </decorator-section>
<decorator-section name="body">
<section>
<!-- do check for CATALOG, _VIEW permission -->
@@ -39,7 +52,6 @@
<section>
<condition><not><if-empty
field="configItemId"/></not></condition>
<widgets>
- <include-menu name="ConfigItemTabBar"
location="component://product/widget/catalog/CatalogMenus.xml"/>
<container>
<label
style="h1">${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonFor}:
${configItem.configItemName} [${uiLabelMap.CommonId}:${configItemId}]
${${extraFunctionName}}</label>
</container>
Modified: ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml?rev=883020&r1=883019&r2=883020&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml
(original)
+++ ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml Sun Nov
22 00:39:41 2009
@@ -32,6 +32,17 @@
</actions>
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="pre-body">
+ <section>
+ <!-- do check for CATALOG, _VIEW permission -->
+ <condition>
+ <if-has-permission permission="CATALOG"
action="_VIEW"/>
+ </condition>
+ <widgets>
+ <include-menu name="FeaturesTabBar"
location="component://product/widget/catalog/CatalogMenus.xml"/>
+ </widgets>
+ </section>
+ </decorator-section>
<decorator-section name="body">
<section>
<!-- do check for CATALOG, _VIEW permission -->
@@ -39,9 +50,6 @@
<if-has-permission permission="CATALOG"
action="_VIEW"/>
</condition>
<widgets>
- <container style="no-clear">
- <include-menu name="FeaturesTabBar"
location="component://product/widget/catalog/CatalogMenus.xml"/>
- </container>
<!-- add Create Product and View Product (in
ecommerce) links -->
<container style="no-clear">
<decorator-section-include name="body"/>
Modified: ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml?rev=883020&r1=883019&r2=883020&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml Sun Nov 22
00:39:41 2009
@@ -29,6 +29,19 @@
</actions>
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="pre-body">
+ <section>
+ <condition>
+ <and>
+ <if-has-permission permission="CATALOG"
action="_VIEW"/>
+ <not><if-empty
field="productPromoId"/></not>
+ </and>
+ </condition>
+ <widgets>
+ <include-menu name="PromoTabBar"
location="component://product/widget/catalog/CatalogMenus.xml"/>
+ </widgets>
+ </section>
+ </decorator-section>
<decorator-section name="body">
<section>
<!-- do check for CATALOG, _VIEW permission -->
@@ -39,8 +52,6 @@
<section>
<condition><not><if-empty
field="productPromoId"/></not></condition>
<widgets>
- <include-menu name="PromoTabBar"
location="component://product/widget/catalog/CatalogMenus.xml"/>
-
<container>
<label
style="h1">${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonFor}:
${productPromo.promoName} [${uiLabelMap.CommonId}:${productPromoId}]
${${extraFunctionName}}</label>
</container>
