Author: erwan
Date: Sat Jan 7 18:05:51 2012
New Revision: 1228687
URL: http://svn.apache.org/viewvc?rev=1228687&view=rev
Log:
Resolving issue OFBIZ-4623 - layout for image management does not work under
Flat Grey visual theme - There was no style defined for the button menu
Modified:
ofbiz/trunk/applications/product/widget/catalog/CatalogMenus.xml
ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml
Modified: ofbiz/trunk/applications/product/widget/catalog/CatalogMenus.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/CatalogMenus.xml?rev=1228687&r1=1228686&r2=1228687&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/CatalogMenus.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/CatalogMenus.xml Sat Jan 7
18:05:51 2012
@@ -583,7 +583,8 @@ under the License.
</menu-item>
</menu>
- <menu name="ImageManagementTabBar" extends="CommonTabBarMenu"
extends-resource="component://common/widget/CommonMenus.xml"
selected-menuitem-context-field-name="userTabButtonImage">
+ <menu name="ImageManagementTabBar" extends="CommonTabBarMenu"
extends-resource="component://common/widget/CommonMenus.xml"
+ selected-menuitem-context-field-name="userTabButtonImage"
menu-container-style="button-bar button-style-2 no-clear">
<menu-item name="main" title="${uiLabelMap.CommonMain}">
<condition>
<if-has-permission permission="IMAGE_MANAGEMENT_ADMIN"/>
Modified: ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml?rev=1228687&r1=1228686&r2=1228687&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml Sat Jan
7 18:05:51 2012
@@ -353,7 +353,7 @@ under the License.
</widgets>
</section>
</screen>
-
+
<screen name="ImageManagementDecorator">
<section>
<actions>
@@ -364,7 +364,7 @@ under the License.
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="left-column">
<include-screen name="leftbar"/>
- </decorator-section>
+ </decorator-section>
<decorator-section name="body">
<section>
<condition>
@@ -372,20 +372,18 @@ under the License.
</condition>
<widgets>
<include-menu name="ImageManagementTabBar"
location="component://product/widget/catalog/CatalogMenus.xml"/>
- <container style="h1">
- <label text=" "/>
- </container>
+ <decorator-section-include name="body"/>
</widgets>
<fail-widgets>
<label
style="h3">${uiLabelMap.ProductCatalogViewPermissionError}</label>
</fail-widgets>
</section>
- <decorator-section-include name="body"/>
</decorator-section>
</decorator-screen>
</widgets>
</section>
</screen>
+
<screen name="listMiniproduct">
<section>
<actions>
