Improved: Consitent menu bar in following screens decorator:
- Feature Category
- Product Store
- DataResource
- Template
- CMS Content
(OFBIZ-8187)(OFBIZ-8186)(OFBIZ-8185)(OFBIZ-8184)(OFBIZ-8183)
Thanks Avnindra Sharma for your contribution.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1768267 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/applications/content/widget/CommonScreens.xml b/applications/content/widget/CommonScreens.xml
index d1c48d0..77acd91 100644
--- a/applications/content/widget/CommonScreens.xml
+++ b/applications/content/widget/CommonScreens.xml
@@ -200,6 +200,7 @@
</condition>
<widgets>
<include-menu name="dataresource" location="component://content/widget/content/DataResourceMenus.xml"/>
+ <container style="button-bar"><link target="EditDataResource" text="${uiLabelMap.CommonCreateNew}" style="buttontext create"/></container>
<label style="h1" text="${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonFor}: ${currentValue.dataResourceName} [${currentValue.dataResourceId}] ${${extraFunctionName}}"/>
</widgets>
</section>
@@ -412,6 +413,12 @@
<include-menu name="layout" location="component://content/widget/layout/LayoutMenus.xml"/>
</widgets>
</section>
+ <container>
+ <link target="EditLayoutSubContent" text="${uiLabelMap.CommonCreateNew}" style="buttontext">
+ <parameter param-name="mode" value="add"/>
+ <parameter param-name="contentIdTo" value="TEMPLATE_MASTER"/>
+ </link>
+ </container>
</decorator-section>
<decorator-section name="body">
<section>
diff --git a/applications/content/widget/cms/CMSScreens.xml b/applications/content/widget/cms/CMSScreens.xml
index 1a7b6ca..5e6824c 100644
--- a/applications/content/widget/cms/CMSScreens.xml
+++ b/applications/content/widget/cms/CMSScreens.xml
@@ -39,9 +39,6 @@
<section>
<widgets>
<decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml">
- <decorator-section name="menu-bar">
- <container style="button-bar"><link target="EditAddContent" text="${uiLabelMap.CommonCreateNew}" style="buttontext create"/></container>
- </decorator-section>
<decorator-section name="search-options">
<include-form name="FindContent" location="component://content/widget/cms/CMSForms.xml"/>
</decorator-section>
diff --git a/applications/content/widget/layout/LayoutScreens.xml b/applications/content/widget/layout/LayoutScreens.xml
index a367a77..29a1b9b 100644
--- a/applications/content/widget/layout/LayoutScreens.xml
+++ b/applications/content/widget/layout/LayoutScreens.xml
@@ -36,14 +36,6 @@
<section>
<widgets>
<decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml">
- <decorator-section name="menu-bar">
- <container style="button-bar">
- <link target="EditLayoutSubContent" text="${uiLabelMap.CommonCreateNew}" style="buttontext">
- <parameter param-name="mode" value="add"/>
- <parameter param-name="contentIdTo" value="TEMPLATE_MASTER"/>
- </link>
- </container>
- </decorator-section>
<decorator-section name="search-options">
<include-form name="FindLayout" location="component://content/widget/layout/LayoutForms.xml"/>
</decorator-section>
@@ -75,12 +67,6 @@
<decorator-screen name="commonLayoutDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<screenlet title="${uiLabelMap.PageTitleListLayout}">
- <container>
- <link target="EditLayoutSubContent" text="${uiLabelMap.CommonCreateNew}" style="buttontext">
- <parameter param-name="mode" value="add"/>
- <parameter param-name="contentIdTo" value="TEMPLATE_MASTER"/>
- </link>
- </container>
<include-form name="ListListLayout" location="component://content/widget/layout/LayoutForms.xml"/>
</screenlet>
</decorator-section>
diff --git a/applications/product/widget/catalog/CommonScreens.xml b/applications/product/widget/catalog/CommonScreens.xml
index c2b3a84..d79e1d7 100644
--- a/applications/product/widget/catalog/CommonScreens.xml
+++ b/applications/product/widget/catalog/CommonScreens.xml
@@ -139,6 +139,9 @@
<section>
<widgets>
<include-menu name="ProductStoreSubTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/>
+ <container style="button-bar button-style-2">
+ <link target="EditProductStore" text="${uiLabelMap.ProductNewProductStore}" style="buttontext create" url-mode="plain"/>
+ </container>
</widgets>
</section>
</widgets>
diff --git a/applications/product/widget/catalog/FeatureScreens.xml b/applications/product/widget/catalog/FeatureScreens.xml
index a5a594c..8286c6b 100644
--- a/applications/product/widget/catalog/FeatureScreens.xml
+++ b/applications/product/widget/catalog/FeatureScreens.xml
@@ -39,6 +39,7 @@
</condition>
<widgets>
<include-menu name="FeaturesTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/>
+ <container style="button-bar"><link target="CreateProductFeature" text="${uiLabelMap.ProductNewFeatureCategory}" style="buttontext create"/></container>
<decorator-section-include name="body"/>
</widgets>
<fail-widgets>
@@ -227,9 +228,6 @@
<widgets>
<decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml">
<decorator-section name="menu-bar">
- <container style="button-bar">
- <link target="CreateProductFeature" text="${uiLabelMap.ProductNewFeatureCategory}" style="buttontext create"/>
- </container>
</decorator-section>
<decorator-section name="search-options">
<include-form name="FindProductFeature" location="component://product/widget/catalog/FeatureForms.xml"/>
diff --git a/specialpurpose/lucene/widget/LuceneScreens.xml b/specialpurpose/lucene/widget/LuceneScreens.xml
index 6171d6b..60ee272 100644
--- a/specialpurpose/lucene/widget/LuceneScreens.xml
+++ b/specialpurpose/lucene/widget/LuceneScreens.xml
@@ -44,6 +44,7 @@
<if-has-permission permission="CONTENTMGR" action="_VIEW"/>
</condition>
<widgets>
+ <container style="button-bar"><link target="EditAddContent" text="${uiLabelMap.CommonCreateNew}" style="buttontext create"/></container>
<decorator-section-include name="body"/>
</widgets>
<fail-widgets>
