Author: hansbak
Date: Fri Jun 10 07:39:35 2011 New Revision: 1134217 URL: http://svn.apache.org/viewvc?rev=1134217&view=rev Log: move the headeritem setting into the decorator Modified: ofbiz/trunk/applications/product/widget/catalog/CatalogScreens.xml ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml Modified: ofbiz/trunk/applications/product/widget/catalog/CatalogScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/CatalogScreens.xml?rev=1134217&r1=1134216&r2=1134217&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/CatalogScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/CatalogScreens.xml Fri Jun 10 07:39:35 2011 @@ -53,7 +53,6 @@ under the License. <section> <actions> <set field="titleProperty" value="PageTitleEditProductCatalog"/> - <set field="headerItem" value="catalog"/> <set field="tabButtonItem" value="ProductCatalog"/> <entity-one entity-name="ProdCatalog" value-field="prodCatalog"/> </actions> @@ -73,9 +72,7 @@ under the License. <section> <actions> <set field="titleProperty" value="PageTitleEditProductCatalog"/> - <set field="headerItem" value="catalog"/> <set field="tabButtonItem" value="ProductCatalog"/> - <set field="prodCatalogId" from-field="parameters.prodCatalogId"/> <entity-one entity-name="ProdCatalog" value-field="prodCatalog"/> </actions> @@ -98,7 +95,6 @@ under the License. <section> <actions> <set field="titleProperty" value="PageTitleEditProductCatalogCategories"/> - <set field="headerItem" value="catalog"/> <set field="tabButtonItem" value="ProductCategories"/> <entity-and entity-name="ProdCatalogCategory" list="prodCatalogCategories"> <field-map field-name="prodCatalogId" from-field="parameters.prodCatalogId"/> @@ -128,7 +124,6 @@ under the License. <section> <actions> <set field="titleProperty" value="PageTitleEditProductCatalogParties"/> - <set field="headerItem" value="catalog"/> <set field="tabButtonItem" value="PartyParties"/> <entity-and entity-name="ProdCatalogRole" list="prodCatalogRoleList"> <field-map field-name="prodCatalogId" from-field="parameters.prodCatalogId"/> @@ -154,7 +149,6 @@ under the License. <section> <actions> <set field="titleProperty" value="PageTitleEditProductCatalogStores"/> - <set field="headerItem" value="catalog"/> <set field="tabButtonItem" value="ProductStores"/> <entity-and entity-name="ProductStoreCatalog" list="productStoreCatalogList"> <field-map field-name="prodCatalogId" from-field="parameters.prodCatalogId"/> Modified: ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml?rev=1134217&r1=1134216&r2=1134217&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml Fri Jun 10 07:39:35 2011 @@ -22,6 +22,9 @@ under the License. xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd"> <screen name="CommonCategoryDecorator"> <section> + <actions> + <set field="headerItem" value="categories"/> + </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="left-column"> @@ -199,7 +202,6 @@ under the License. <section> <actions> <set field="titleProperty" value="PageTitleEditCategoryContent"/> - <set field="headerItem" value="categories"/> <set field="tabButtonItem" value="EditCategoryContent"/> <set field="labelTitleProperty" value="ProductCategoryContent"/> @@ -235,7 +237,6 @@ under the License. <section> <actions> <set field="titleProperty" value="PageTitleEditCategoryContentContent"/> - <set field="headerItem" value="categories"/> <set field="tabButtonItem" value="EditCategoryContent"/> <set field="labelTitleProperty" value="ProductCategoryContent"/> @@ -282,7 +283,6 @@ under the License. <section> <actions> <set field="titleProperty" value="PageTitleEditCategoryRollup"/> - <set field="headerItem" value="categories"/> <set field="tabButtonItem" value="EditCategoryRollup"/> <set field="labelTitleProperty" value="ProductRollup"/> <set field="productCategoryId" from-field="parameters.productCategoryId"/> @@ -312,7 +312,6 @@ under the License. <section> <actions> <set field="titleProperty" value="PageTitleEditCategoryProducts"/> - <set field="headerItem" value="categories"/> <set field="tabButtonItem" value="EditCategoryProducts"/> <set field="labelTitleProperty" value="ProductProducts"/> @@ -335,7 +334,6 @@ under the License. <section> <actions> <set field="titleProperty" value="PageTitleEditCategoryProductCatalogs"/> - <set field="headerItem" value="categories"/> <set field="tabButtonItem" value="EditCategoryProdCatalogs"/> <set field="labelTitleProperty" value="ProductCatalogs"/> @@ -409,7 +407,6 @@ under the License. <section> <actions> <set field="titleProperty" value="PageTitleEditCategoryParties"/> - <set field="headerItem" value="categories"/> <set field="tabButtonItem" value="EditCategoryParties"/> <set field="labelTitleProperty" value="PartyParties"/> @@ -441,7 +438,6 @@ under the License. <section> <actions> <set field="titleProperty" value="PageTitleEditCategoryAttributes"/> - <set field="headerItem" value="categories"/> <set field="tabButtonItem" value="EditCategoryAttributes"/> <set field="labelTitleProperty" value="ProductCategoryAttributes"/> <set field="productCategoryId" from-field="parameters.productCategoryId"/> @@ -490,7 +486,6 @@ under the License. <section> <actions> <set field="titleProperty" value="PageTitleCreateProductCategoryCheckExisting"/> - <set field="headerItem" value="categories"/> <set field="labelTitleProperty" value="ProductCreateProductInCategory"/> <set field="productCategoryId" from-field="parameters.productCategoryId"/> @@ -517,10 +512,8 @@ under the License. <property-map resource="ProductEntityLabels" map-name="uiLabelMap" global="true"/> <set field="titleProperty" value="PageTitleEditProductCategoryLink"/> - <set field="headerItem" value="categories"/> <set field="tabButtonItem" value="EditProductCategoryLinks"/> <set field="labelTitleProperty" value="ProductCategoryLinks"/> - <set field="productCategoryId" from-field="parameters.productCategoryId"/> <set field="linkSeqId" from-field="parameters.linkSeqId"/> <set field="fromDate" from-field="parameters.fromDate" type="Timestamp"/> Modified: ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml?rev=1134217&r1=1134216&r2=1134217&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml Fri Jun 10 07:39:35 2011 @@ -53,6 +53,9 @@ under the License. <screen name="CommonCatalogDecorator"> <section> + <actions> + <set field="headerItem" value="catalogs"/> + </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="left-column"> |
Free forum by Nabble | Edit this page |