You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by de...@apache.org on 2016/11/05 18:26:40 UTC
svn commit: r1768267 - in /ofbiz/trunk: applications/content/widget/
applications/content/widget/cms/ applications/content/widget/layout/
applications/product/widget/catalog/ specialpurpose/lucene/widget/
Author: deepak
Date: Sat Nov 5 18:26:40 2016
New Revision: 1768267
URL: http://svn.apache.org/viewvc?rev=1768267&view=rev
Log:
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.
Modified:
ofbiz/trunk/applications/content/widget/CommonScreens.xml
ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml
ofbiz/trunk/applications/content/widget/layout/LayoutScreens.xml
ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml
ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml
ofbiz/trunk/specialpurpose/lucene/widget/LuceneScreens.xml
Modified: ofbiz/trunk/applications/content/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/CommonScreens.xml?rev=1768267&r1=1768266&r2=1768267&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/CommonScreens.xml Sat Nov 5 18:26:40 2016
@@ -200,6 +200,7 @@ under the License.
</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 @@ under the License.
<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>
Modified: ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml?rev=1768267&r1=1768266&r2=1768267&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml Sat Nov 5 18:26:40 2016
@@ -39,9 +39,6 @@ under the License.
<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>
Modified: ofbiz/trunk/applications/content/widget/layout/LayoutScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/layout/LayoutScreens.xml?rev=1768267&r1=1768266&r2=1768267&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/layout/LayoutScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/layout/LayoutScreens.xml Sat Nov 5 18:26:40 2016
@@ -36,14 +36,6 @@ under the License.
<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 @@ under the License.
<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>
Modified: ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml?rev=1768267&r1=1768266&r2=1768267&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml Sat Nov 5 18:26:40 2016
@@ -139,6 +139,9 @@ under the License.
<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>
Modified: ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml?rev=1768267&r1=1768266&r2=1768267&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml Sat Nov 5 18:26:40 2016
@@ -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"/>
Modified: ofbiz/trunk/specialpurpose/lucene/widget/LuceneScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/lucene/widget/LuceneScreens.xml?rev=1768267&r1=1768266&r2=1768267&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/lucene/widget/LuceneScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/lucene/widget/LuceneScreens.xml Sat Nov 5 18:26:40 2016
@@ -44,6 +44,7 @@ under the License.
<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>