Author: buscob
Date: Tue Nov 2 23:00:12 2010
New Revision: 1030274
URL: http://svn.apache.org/viewvc?rev=1030274&view=rev
Log:
Fixed Web Analytics menus.
Renamed button bar menus from xxxTabBar to xxxButtonBar and derived from
CommonButtonBarMenu instead of CommonTabBarMenu.
Modified:
ofbiz/trunk/applications/product/widget/catalog/CatalogMenus.xml
ofbiz/trunk/applications/product/widget/catalog/WebAnalyticsScreens.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=1030274&r1=1030273&r2=1030274&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/CatalogMenus.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/CatalogMenus.xml Tue Nov 2
23:00:12 2010
@@ -462,12 +462,12 @@ under the License.
</menu-item>
</menu>
- <menu name="WebAnalyticsConfigTabBar" extends="CommonTabBarMenu"
extends-resource="component://common/widget/CommonMenus.xml"
selected-menuitem-context-field-name="tabButtonItem2">
+ <menu name="WebAnalyticsConfigButtonBar" extends="CommonButtonBarMenu"
extends-resource="component://common/widget/CommonMenus.xml"
selected-menuitem-context-field-name="tabButtonItem2">
<menu-item name="FindWebAnalyticsConfigs"
title="${uiLabelMap.CommonFind}"><link
target="FindWebAnalyticsConfigs"/></menu-item>
<menu-item name="EditWebAnalyticsConfig"
title="${uiLabelMap.CommonNew}"><link
target="EditWebAnalyticsConfig"/></menu-item>
</menu>
- <menu name="WebAnalyticsTypeTabBar" extends="CommonTabBarMenu"
extends-resource="component://common/widget/CommonMenus.xml"
selected-menuitem-context-field-name="tabButtonItem2">
+ <menu name="WebAnalyticsTypeButtonBar" extends="CommonButtonBarMenu"
extends-resource="component://common/widget/CommonMenus.xml"
selected-menuitem-context-field-name="tabButtonItem2">
<menu-item name="FindWebAnalyticsTypes"
title="${uiLabelMap.CommonFind}"><link
target="FindWebAnalyticsTypes"/></menu-item>
<menu-item name="EditWebAnalyticsType"
title="${uiLabelMap.CommonNew}"><link
target="EditWebAnalyticsType"/></menu-item>
</menu>
Modified:
ofbiz/trunk/applications/product/widget/catalog/WebAnalyticsScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/WebAnalyticsScreens.xml?rev=1030274&r1=1030273&r2=1030274&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/WebAnalyticsScreens.xml
(original)
+++ ofbiz/trunk/applications/product/widget/catalog/WebAnalyticsScreens.xml Tue
Nov 2 23:00:12 2010
@@ -35,9 +35,7 @@ under the License.
<decorator-section name="body">
<decorator-screen name="FindScreenDecorator"
location="component://common/widget/CommonScreens.xml">
<decorator-section name="menu-bar">
- <container>
- <include-menu
name="WebAnalyticsConfigTabBar"
location="component://product/widget/catalog/CatalogMenus.xml"/>
- </container>
+ <include-menu
name="WebAnalyticsConfigButtonBar"
location="component://product/widget/catalog/CatalogMenus.xml"/>
</decorator-section>
<decorator-section name="search-options">
<include-form name="FindWebAnalyticsConfig"
location="component://product/widget/catalog/WebAnalyticsForms.xml"/>
@@ -65,7 +63,7 @@ under the License.
<widgets>
<decorator-screen name="CommonWebAnalyticsDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <include-menu name="WebAnalyticsConfigTabBar"
location="component://product/widget/catalog/CatalogMenus.xml"/>
+ <include-menu name="WebAnalyticsConfigButtonBar"
location="component://product/widget/catalog/CatalogMenus.xml"/>
<screenlet
title="${uiLabelMap.PageTitleEditWebAnalyticsConfig}">
<include-form name="EditWebAnalyticsConfig"
location="component://product/widget/catalog/WebAnalyticsForms.xml"/>
</screenlet>
@@ -91,7 +89,7 @@ under the License.
<decorator-screen name="FindScreenDecorator"
location="component://common/widget/CommonScreens.xml">
<decorator-section name="menu-bar">
<container>
- <include-menu
name="WebAnalyticsTypeTabBar"
location="component://product/widget/catalog/CatalogMenus.xml"/>
+ <include-menu
name="WebAnalyticsTypeButtonBar"
location="component://product/widget/catalog/CatalogMenus.xml"/>
</container>
</decorator-section>
<decorator-section name="search-options">
@@ -119,7 +117,7 @@ under the License.
<widgets>
<decorator-screen name="CommonWebAnalyticsDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <include-menu name="WebAnalyticsTypeTabBar"
location="component://product/widget/catalog/CatalogMenus.xml"/>
+ <include-menu name="WebAnalyticsTypeButtonBar"
location="component://product/widget/catalog/CatalogMenus.xml"/>
<screenlet
title="${uiLabelMap.PageTitleEditWebAnalyticsTypes}">
<include-form name="EditWebAnalyticsType"
location="component://product/widget/catalog/WebAnalyticsForms.xml"/>
</screenlet>
