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/24 13:42:38 UTC
svn commit: r883671 - in /ofbiz/trunk/applications/product/widget:
catalog/CategoryScreens.xml catalog/CommonScreens.xml
facility/CommonScreens.xml facility/ShipmentGatewayConfigScreens.xml
Author: buscob
Date: Tue Nov 24 12:42:37 2009
New Revision: 883671
URL: http://svn.apache.org/viewvc?rev=883671&view=rev
Log:
Product component
Moved TabBar Menus from the "body" decorator-section to the "pre-body" decorator section.
This makes better the rendering of themes such as Dropping Crumbs.
Removed several redundant <section><widget> tags also
Modified:
ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml
ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml
ofbiz/trunk/applications/product/widget/facility/CommonScreens.xml
ofbiz/trunk/applications/product/widget/facility/ShipmentGatewayConfigScreens.xml
Modified: ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml?rev=883671&r1=883670&r2=883671&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml Tue Nov 24 12:42:37 2009
@@ -29,6 +29,20 @@
</actions>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="pre-body">
+ <section>
+ <!-- do check for CATALOG, _VIEW permission -->
+ <condition>
+ <and>
+ <if-has-permission permission="CATALOG" action="_VIEW"/>
+ <not><if-empty field="productCategoryId"/></not>
+ </and>
+ </condition>
+ <widgets>
+ <include-menu name="CategoryTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/>
+ </widgets>
+ </section>
+ </decorator-section>
<decorator-section name="body">
<section>
<!-- do check for CATALOG, _VIEW permission -->
@@ -39,9 +53,6 @@
<section>
<condition><not><if-empty field="productCategoryId"/></not></condition>
<widgets>
- <container style="no-clear">
- <include-menu name="CategoryTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/>
- </container>
<container>
<label style="h1">${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonFor}: ${productCategory.description} [${uiLabelMap.CommonId}:${productCategoryId}] ${${extraFunctionName}}</label>
</container>
Modified: ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml?rev=883671&r1=883670&r2=883671&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml Tue Nov 24 12:42:37 2009
@@ -65,6 +65,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="product"/></not>
+ </and>
+ </condition>
+ <widgets>
+ <include-menu name="ProductTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/>
+ </widgets>
+ </section>
+ </decorator-section>
<decorator-section name="body">
<section>
<!-- do check for CATALOG, _VIEW permission -->
@@ -75,9 +88,6 @@
<section>
<condition><not><if-empty field="product"/></not></condition>
<widgets>
- <container style="no-clear">
- <include-menu name="ProductTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/>
- </container>
<container>
<label style="h1">${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonFor}: ${product.internalName} [${uiLabelMap.CommonId}:${productId}] ${${extraFunctionName}}</label>
<image src="${product.smallImageUrl}" height="40" width="40" url-mode="content" alt="${product.internalName}"/>
Modified: ofbiz/trunk/applications/product/widget/facility/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/CommonScreens.xml?rev=883671&r1=883670&r2=883671&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/facility/CommonScreens.xml Tue Nov 24 12:42:37 2009
@@ -58,7 +58,7 @@
</actions>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
+ <decorator-section name="pre-body">
<section>
<condition>
<if-service-permission service-name="facilityGenericPermission" main-action="VIEW"/>
@@ -73,6 +73,31 @@
</condition>
<widgets>
<include-menu name="FacilityTabBar" location="component://product/widget/facility/FacilityMenus.xml"/>
+ </widgets>
+ <fail-widgets>
+ <label style="h3">${uiLabelMap.ProductErrorFacilityIdNotFound}</label>
+ </fail-widgets>
+ </section>
+ </widgets>
+ <fail-widgets>
+ <label style="h3">${uiLabelMap.ProductFacilityViewPermissionError}</label>
+ </fail-widgets>
+ </section>
+ </decorator-section>
+ <decorator-section name="body">
+ <section>
+ <condition>
+ <if-service-permission service-name="facilityGenericPermission" main-action="VIEW"/>
+ </condition>
+ <widgets>
+ <section>
+ <condition>
+ <or>
+ <not><if-empty field="facility"/></not>
+ <not><if-empty field="displayWithNoFacility"/></not>
+ </or>
+ </condition>
+ <widgets>
<decorator-section-include name="body"/>
</widgets>
<fail-widgets>
@@ -93,13 +118,22 @@
<section>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
+ <decorator-section name="pre-body">
<section>
<condition>
<if-has-permission permission="FACILITY" action="_VIEW"/>
</condition>
<widgets>
<include-menu name="InventoryItemLabelsTabBar" location="component://product/widget/facility/FacilityMenus.xml"/>
+ </widgets>
+ </section>
+ </decorator-section>
+ <decorator-section name="body">
+ <section>
+ <condition>
+ <if-has-permission permission="FACILITY" action="_VIEW"/>
+ </condition>
+ <widgets>
<decorator-section-include name="body"/>
</widgets>
<fail-widgets>
Modified: ofbiz/trunk/applications/product/widget/facility/ShipmentGatewayConfigScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/ShipmentGatewayConfigScreens.xml?rev=883671&r1=883670&r2=883671&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/ShipmentGatewayConfigScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/facility/ShipmentGatewayConfigScreens.xml Tue Nov 24 12:42:37 2009
@@ -29,11 +29,13 @@
<widgets>
<!-- main defines the regions of the HTML page -->
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="pre-body">
+ <include-menu name="ShipmentGatewayConfigTabBar" location="component://product/widget/facility/FacilityMenus.xml"/>
+ </decorator-section>
<!-- body is the primary display for this page and is called recursively -->
<decorator-section name="body">
<section>
<widgets>
- <include-menu name="ShipmentGatewayConfigTabBar" location="component://product/widget/facility/FacilityMenus.xml"/>
<container>
<label style="h1">${uiLabelMap[labelTitleProperty]}</label>
</container>