Author: buscob
Date: Fri Nov 20 21:43:15 2009
New Revision: 882725
URL: http://svn.apache.org/viewvc?rev=882725&view=rev
Log:
Fixed TabBars layout problems for Dropping Crumbs theme.
The offending TabBars include-menu tags have been wrapped with a <container
style="no-clear">.
I preferred this method instead of what suggested by Adrian in rev.881027 (that
consists in changing the menu style) because in principle the menu could be
used in other screens where there is no need of this (no multi-column) and also
because in this way there is no needs to change the menu every time we change
the screen layout.
Modified:
ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml
ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml
ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.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=882725&r1=882724&r2=882725&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml
(original)
+++ ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml Fri Nov
20 21:43:15 2009
@@ -39,7 +39,9 @@
<section>
<condition><not><if-empty
field="productCategoryId"/></not></condition>
<widgets>
- <include-menu name="CategoryTabBar"
location="component://product/widget/catalog/CatalogMenus.xml"/>
+ <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=882725&r1=882724&r2=882725&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml Fri Nov
20 21:43:15 2009
@@ -75,7 +75,9 @@
<section>
<condition><not><if-empty
field="product"/></not></condition>
<widgets>
- <include-menu name="ProductTabBar"
location="component://product/widget/catalog/CatalogMenus.xml"/>
+ <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}"/>
@@ -132,7 +134,9 @@
<section>
<condition><not><if-empty
field="prodCatalogId"/></not></condition>
<widgets>
- <include-menu name="CatalogTabBar"
location="component://product/widget/catalog/CatalogMenus.xml"/>
+ <container style="no-clear">
+ <include-menu name="CatalogTabBar"
location="component://product/widget/catalog/CatalogMenus.xml"/>
+ </container>
</widgets>
</section>
@@ -174,7 +178,9 @@
<section>
<condition><not><if-empty
field="productStoreId"/></not></condition>
<widgets>
- <include-menu
name="ProductStoreTabBar"
location="component://product/widget/catalog/CatalogMenus.xml"/>
+ <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>
@@ -231,7 +237,9 @@
<if-has-permission permission="CATALOG"
action="_VIEW"/>
</condition>
<widgets>
- <include-menu name="ShippingTabBar"
location="component://product/widget/catalog/CatalogMenus.xml"/>
+ <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/FeatureScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml?rev=882725&r1=882724&r2=882725&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml
(original)
+++ ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml Fri Nov
20 21:43:15 2009
@@ -39,7 +39,9 @@
<if-has-permission permission="CATALOG"
action="_VIEW"/>
</condition>
<widgets>
- <include-menu name="FeaturesTabBar"
location="component://product/widget/catalog/CatalogMenus.xml"/>
+ <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"/>
