You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ha...@apache.org on 2011/05/24 09:30:42 UTC
svn commit: r1126904 - in /ofbiz/trunk: applications/product/config/
applications/product/data/
applications/product/script/org/ofbiz/product/category/
applications/product/servicedef/
applications/product/webapp/catalog/WEB-INF/ applications/product/w...
Author: hansbak
Date: Tue May 24 07:30:42 2011
New Revision: 1126904
URL: http://svn.apache.org/viewvc?rev=1126904&view=rev
Log:
To be consistsent with product and the storage of alternative url, this function replaces the 'link' button on the category. We also improved the locale lookup with a search function
Added:
ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/category/EditCategoryContentContent.groovy (with props)
Modified:
ofbiz/trunk/applications/product/config/ProductUiLabels.xml
ofbiz/trunk/applications/product/data/ProductTypeData.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryContentServices.xml
ofbiz/trunk/applications/product/servicedef/services.xml
ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml
ofbiz/trunk/applications/product/widget/catalog/CategoryForms.xml
ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml
ofbiz/trunk/framework/common/config/CommonUiLabels.xml
ofbiz/trunk/framework/common/widget/LookupForms.xml
ofbiz/trunk/framework/common/widget/LookupScreens.xml
Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.xml?rev=1126904&r1=1126903&r2=1126904&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels.xml (original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels.xml Tue May 24 07:30:42 2011
@@ -24351,6 +24351,12 @@
<value xml:lang="zh">æ´æ°äº§ååå</value>
<value xml:lang="zh_TW">æ´æ°ç¢åè®é«</value>
</property>
+ <property key="ProductUpdateRelatedURLContentCategory">
+ <value xml:lang="en">Update Related URL Content for Category</value>
+ </property>
+ <property key="ProductUpdateSEOContentCategory">
+ <value xml:lang="en">Update SEO Content for Category</value>
+ </property>
<property key="ProductUpdateShipping">
<value xml:lang="de">Lieferung aktualisieren</value>
<value xml:lang="en">Update Shipping</value>
Modified: ofbiz/trunk/applications/product/data/ProductTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/data/ProductTypeData.xml?rev=1126904&r1=1126903&r2=1126904&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/data/ProductTypeData.xml (original)
+++ ofbiz/trunk/applications/product/data/ProductTypeData.xml Tue May 24 07:30:42 2011
@@ -231,6 +231,7 @@ under the License.
<ProductCategoryContentType description="Page Title" hasTable="N" parentTypeId="" prodCatContentTypeId="PAGE_TITLE"/>
<ProductCategoryContentType description="Meta Keyword" hasTable="N" parentTypeId="" prodCatContentTypeId="META_KEYWORD"/>
<ProductCategoryContentType description="Meta Description" hasTable="N" parentTypeId="" prodCatContentTypeId="META_DESCRIPTION"/>
+ <ProductCategoryContentType description="Related URL" hasTable="N" parentTypeId="" prodCatContentTypeId="RELATED_URL"/>
<ProductContentType description="Online Access" hasTable="N" parentTypeId="" productContentTypeId="ONLINE_ACCESS"/>
<ProductContentType description="Digital Download" hasTable="N" parentTypeId="" productContentTypeId="DIGITAL_DOWNLOAD"/>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryContentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryContentServices.xml?rev=1126904&r1=1126903&r2=1126904&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryContentServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryContentServices.xml Tue May 24 07:30:42 2011
@@ -70,7 +70,7 @@ under the License.
<set-service-fields service-name="updateSimpleTextContent" map="parameters" to-map="updateSimpleText"/>
<call-service service-name="updateSimpleTextContent" in-map-name="updateSimpleText"/>
</simple-method>
- <simple-method method-name="updateContentSEOForCategory" short-description="Update Category SEO">
+ <simple-method method-name="updateContentSEOForCategory" short-description="Update SEO Content For Product Category">
<if-not-empty field="parameters.title">
<entity-and list="productCategoryContents" entity-name="ProductCategoryContentAndInfo">
<field-map field-name="productCategoryId" from-field="parameters.productCategoryId"/>
@@ -138,4 +138,49 @@ under the License.
</if-not-empty>
</if-not-empty>
</simple-method>
+ <simple-method method-name="createRelatedUrlContentForCategory" short-description="Create Related URL Content For Product Category">
+ <set field="dataResource.dataResourceName" from-field="parameters.title"/>
+ <set field="dataResource.dataResourceTypeId" value="URL_RESOURCE"/>
+ <set field="dataResource.mimeTypeId" value="text/plain"/>
+ <set field="url" value="${groovy: temp = parameters.url;
+ temp = temp.trim();
+ if(temp.indexOf("http://") == 0) return temp;
+ if(temp.indexOf("https://") == 0) return temp;
+ if(temp.indexOf("http://") != 0) return "http://" + temp;
+ }" type="String"/>
+ <set field="dataResource.objectInfo" from-field="url"/>
+ <set field="dataResource.localeString" from-field="parameters.localeString"/>
+ <call-service service-name="createDataResource" in-map-name="dataResource">
+ <result-to-field result-name="dataResourceId" field="parameters.dataResourceId"/>
+ </call-service>
+
+ <set field="content.contentTypeId" value="DOCUMENT"/>
+ <set field="content.dataResourceId" from-field="parameters.dataResourceId"/>
+ <set field="content.contentName" from-field="parameters.title"/>
+ <set field="content.description" from-field="parameters.description"/>
+ <set field="content.localeString" from-field="parameters.localeString"/>
+ <set field="content.createdByUserLogin" from-field="userLogin.userLoginId"/>
+ <call-service service-name="createContent" in-map-name="content">
+ <result-to-field result-name="contentId" field="parameters.contentId"/>
+ </call-service>
+
+ <set-service-fields service-name="createCategoryContent" map="parameters" to-map="createCategoryContentMap"/>
+ <call-service service-name="createCategoryContent" in-map-name="createCategoryContentMap"/>
+ </simple-method>
+ <simple-method method-name="updateRelatedUrlContentForCategory" short-description="Update Related URL Content For Product Category">
+ <set-service-fields service-name="updateCategoryContent" map="parameters" to-map="updateCategoryContent"/>
+ <call-service service-name="updateCategoryContent" in-map-name="updateCategoryContent"/>
+
+ <set field="dataResource.dataResourceId" from-field="parameters.dataResourceId"/>
+ <set field="dataResource.dataResourceName" from-field="parameters.title"/>
+ <set field="dataResource.objectInfo" from-field="parameters.url"/>
+ <set field="dataResource.localeString" from-field="parameters.localeString"/>
+ <call-service service-name="updateDataResource" in-map-name="dataResource"/>
+
+ <set field="updateContent.contentId" from-field="parameters.contentId"/>
+ <set field="updateContent.contentName" from-field="parameters.title"/>
+ <set field="updateContent.description" from-field="parameters.description"/>
+ <set field="updateContent.localeString" from-field="parameters.localeString"/>
+ <call-service service-name="updateContent" in-map-name="updateContent"/>
+ </simple-method>
</simple-methods>
Modified: ofbiz/trunk/applications/product/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/servicedef/services.xml?rev=1126904&r1=1126903&r2=1126904&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/servicedef/services.xml (original)
+++ ofbiz/trunk/applications/product/servicedef/services.xml Tue May 24 07:30:42 2011
@@ -972,13 +972,38 @@ under the License.
<service name="updateContentSEOForCategory" engine="simple"
location="component://product/script/org/ofbiz/product/category/CategoryContentServices.xml" invoke="updateContentSEOForCategory" auth="true">
- <description>Update Category SEO</description>
+ <description>Update SEO Content For Product Category</description>
<attribute name="productCategoryId" mode="IN" type="String" optional="false"/>
<attribute name="title" mode="IN" type="String" optional="true"/>
<attribute name="metaKeyword" mode="IN" type="String" optional="true"/>
<attribute name="metaDescription" mode="IN" type="String" optional="true"/>
</service>
+ <service name="createRelatedUrlContentForCategory" engine="simple" default-entity-name="ProductCategoryContent"
+ location="component://product/script/org/ofbiz/product/category/CategoryContentServices.xml" invoke="createRelatedUrlContentForCategory" auth="true">
+ <description>Create Related URL Content For Product Category</description>
+ <auto-attributes include="pk" mode="IN" optional="false"/>
+ <auto-attributes include="nonpk" mode="IN" optional="true"/>
+ <attribute name="title" type="String" mode="IN" optional="false"/>
+ <attribute name="description" type="String" mode="IN" optional="false"/>
+ <attribute name="url" type="String" mode="IN" optional="false"/>
+ <attribute name="localeString" type="String" mode="IN" optional="true"/>
+ <override name="contentId" optional="true"/>
+ <override name="fromDate" optional="true"/>
+ </service>
+ <service name="updateRelatedUrlContentForCategory" engine="simple" default-entity-name="ProductCategoryContent"
+ location="component://product/script/org/ofbiz/product/category/CategoryContentServices.xml" invoke="updateRelatedUrlContentForCategory" auth="true">
+ <description>Update Related URL Content For Product Category</description>
+ <auto-attributes include="pk" mode="IN" optional="false"/>
+ <auto-attributes include="nonpk" mode="IN" optional="true"/>
+ <attribute name="contentId" type="String" mode="IN" optional="false"/>
+ <attribute name="dataResourceId" type="String" mode="IN" optional="false"/>
+ <attribute name="title" type="String" mode="IN" optional="true"/>
+ <attribute name="description" type="String" mode="IN" optional="true"/>
+ <attribute name="url" type="String" mode="IN" optional="true"/>
+ <attribute name="localeString" type="String" mode="IN" optional="true"/>
+ </service>
+
<!-- ProductFeatureDataResource services -->
<service name="createProductFeatureDataResource" default-entity-name="ProductFeatureDataResource" engine="simple"
location="component://product/script/org/ofbiz/product/product/ProductContentServices.xml" invoke="createProductFeatureDataResource" auth="true">
Added: ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/category/EditCategoryContentContent.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/category/EditCategoryContentContent.groovy?rev=1126904&view=auto
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/category/EditCategoryContentContent.groovy (added)
+++ ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/category/EditCategoryContentContent.groovy Tue May 24 07:30:42 2011
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.ofbiz.entity.*;
+import org.ofbiz.entity.util.*;
+import org.ofbiz.base.util.*;
+import java.sql.Timestamp;
+
+uiLabelMap = UtilProperties.getResourceBundleMap("ProductUiLabels", locale);
+
+contentId = parameters.contentId;
+if (!contentId) {
+ contentId = null;
+}
+
+prodCatContentTypeId = parameters.prodCatContentTypeId;
+context.contentFormName = "EditCategoryContentSimpleText";
+context.contentFormTitle = "${uiLabelMap.ProductUpdateSimpleTextContentCategory}";
+
+if (("PAGE_TITLE".equals(prodCatContentTypeId))||("META_KEYWORD".equals(prodCatContentTypeId))||("META_DESCRIPTION".equals(prodCatContentTypeId))) {
+ context.contentFormName = "EditCategoryContentSEO";
+ context.contentFormTitle = "${uiLabelMap.ProductUpdateSEOContentCategory}";
+}
+if ("RELATED_URL".equals(prodCatContentTypeId)) {
+ contentList = delegator.findByAnd("ContentDataResourceView", UtilMisc.toMap("contentId", contentId));
+ if (contentList) {
+ context.contentId = contentList.get(0).contentId;
+ context.dataResourceId = contentList.get(0).dataResourceId;
+ context.title = contentList.get(0).drDataResourceName;
+ context.description = contentList.get(0).description;
+ context.url = contentList.get(0).drObjectInfo;
+ context.localeString = contentList.get(0).localeString;
+ }
+ context.contentFormName = "EditCategoryContentRelatedUrl";
+ context.contentFormTitle = "${uiLabelMap.ProductUpdateRelatedURLContentCategory}";
+}
Propchange: ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/category/EditCategoryContentContent.groovy
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/category/EditCategoryContentContent.groovy
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/category/EditCategoryContentContent.groovy
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml?rev=1126904&r1=1126903&r2=1126904&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml Tue May 24 07:30:42 2011
@@ -624,6 +624,18 @@ under the License.
<response name="success" type="view" value="EditCategoryContent"/>
<response name="error" type="view" value="EditCategoryContentContent"/>
</request-map>
+ <request-map uri="createRelatedUrlContentForCategory">
+ <security https="true" auth="true"/>
+ <event type="service" path="" invoke="createRelatedUrlContentForCategory"/>
+ <response name="success" type="view" value="EditCategoryContent"/>
+ <response name="error" type="view" value="EditCategoryContentContent"/>
+ </request-map>
+ <request-map uri="updateRelatedUrlContentForCategory">
+ <security https="true" auth="true"/>
+ <event type="service" path="" invoke="updateRelatedUrlContentForCategory"/>
+ <response name="success" type="view" value="EditCategoryContent"/>
+ <response name="error" type="view" value="EditCategoryContentContent"/>
+ </request-map>
<!-- ================ Product Content Requests ================= -->
<request-map uri="EditProductContent">
Modified: ofbiz/trunk/applications/product/widget/catalog/CategoryForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/CategoryForms.xml?rev=1126904&r1=1126903&r2=1126904&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/CategoryForms.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/CategoryForms.xml Tue May 24 07:30:42 2011
@@ -55,6 +55,7 @@ under the License.
</field>
<field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
+
<form name="PrepareAddCategoryContentAssoc" type="single" target="prepareAddContentToCategory" title="${uiLabelMap.ProductAddProductCategoryContentFromDate}"
odd-row-style="alternate-row" default-table-style="basic-table">
<field name="productId"><hidden/></field>
@@ -69,6 +70,7 @@ under the License.
<!-- <field name="description"><text size="40"/></field> -->
<field name="submitButton" title="${uiLabelMap.ProductPrepareCreate}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
+
<form name="UpdateCategoryContentAssoc" type="list" target="updateContentToCategory" title="" list-name="productCategoryContentList"
odd-row-style="alternate-row" default-table-style="basic-table">
<field name="productCategoryId"><hidden/></field>
@@ -113,6 +115,7 @@ under the License.
</hyperlink>
</field>
</form>
+
<form name="EditCategoryContentSimpleText" type="single" default-map-name="categoryContent" target="updateSimpleTextContentForCategory" title="${uiLabelMap.ProductUpdateSimpleTextContentCategory}"
header-row-style="header-row" default-table-style="basic-table">
<alt-target use-when="content==null" target="createSimpleTextContentForCategory"/>
@@ -135,6 +138,7 @@ under the License.
<field use-when="content == null" name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field>
<field use-when="content != null" name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
+
<form name="CreateSimpleTextContentForAlternateLocale" type="single" target="createSimpleTextContentForAlternateLocaleInCategory" title="${uiLabelMap.ProductCreateSimpleTextContentForAlternateLocale}"
header-row-style="header-row" default-table-style="basic-table">
<field name="productCategoryId"><hidden/></field>
@@ -144,7 +148,6 @@ under the License.
<field name="submitButton" title="${uiLabelMap.CommonCreate}"><submit button-type="button"/></field>
</form>
-
<!-- ProductCategoryLink Forms-->
<form name="ListProductCategoryLinks" type="list" list-name="productCategoryLinks" target="updateProductCategoryLink" separate-columns="true"
title="" odd-row-style="alternate-row" default-table-style="basic-table">
@@ -178,6 +181,7 @@ under the License.
</field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
</form>
+
<form name="AddProductCategoryLink" type="single" target="createProductCategoryLink" title="" default-map-name="productCategoryLink"
header-row-style="header-row" default-table-style="basic-table">
<alt-target use-when="productCategoryLink != null" target="updateProductCategoryLink"/>
@@ -207,6 +211,7 @@ under the License.
</hyperlink>
</field>
</form>
+
<form name="ListTopCategory" type="list" list-name="noParentCategories" odd-row-style="alternate-row" default-table-style="basic-table">
<field name="productCategoryId" widget-style="buttontext">
<hyperlink target="EditCategory" description="${productCategoryId}" also-hidden="false">
@@ -216,7 +221,7 @@ under the License.
</field>
<field name="description"><display/></field>
</form>
-
+
<form name="FindCategory" type="single" target="FindCategory" title="" default-map-name="category"
header-row-style="header-row" default-table-style="basic-table">
<field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
@@ -250,8 +255,8 @@ under the License.
<field name="categoryName" sort-field="true"><display/></field>
<field name="description" sort-field="true"><display/></field>
</form>
-
- <form name="EditCategoryContentSEO" type="single" target="updateContentSEOForCategory" title="${uiLabelMap.ProductUpdateSimpleTextContentCategory}"
+
+ <form name="EditCategoryContentSEO" type="single" target="updateContentSEOForCategory" title="${uiLabelMap.ProductUpdateSEOContentCategory}"
header-row-style="header-row" default-table-style="basic-table">
<field name="title" title="${uiLabelMap.PageTitle}"><text size="40"/></field>
<field name="metaKeyword" title="${uiLabelMap.MetaKeywords}"><textarea cols="60" rows="5"/></field>
@@ -260,4 +265,29 @@ under the License.
<field name="prodCatContentTypeId"><hidden/></field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
+
+ <form name="EditCategoryContentRelatedUrl" type="single" target="updateRelatedUrlContentForCategory" title="${uiLabelMap.ProductUpdateRelatedURLContentCategory}"
+ header-row-style="header-row" default-table-style="basic-table">
+ <alt-target use-when="content==null" target="createRelatedUrlContentForCategory"/>
+ <auto-fields-entity entity-name="ProductCategoryContent"/>
+ <field use-when="content==null" name="contentId"><ignored/></field>
+ <field use-when="content!=null" name="contentId" tooltip="${uiLabelMap.ProductNotModificationRecrationProductContentAssociation}" map-name="categoryContentData"><display/></field>
+ <field name="fromDate" use-when="contentId==null" title="${uiLabelMap.CommonFromDate}*" ><date-time/></field>
+ <field name="fromDate" use-when="contentId!=null" title="${uiLabelMap.CommonFromDate}" ><display/></field>
+ <field name="dataResourceId"><hidden/></field>
+ <field name="prodCatContentTypeId"><display-entity entity-name="ProductCategoryContentType" also-hidden="true"/></field>
+ <field name="title" title="${uiLabelMap.CommonTitle}"><text size="50"></text></field>
+ <field name="description" title="${uiLabelMap.FormFieldTitle_description}"><textarea cols="50" rows="2"/></field>
+ <field name="url"><textarea cols="50" rows="2"/></field>
+ <field name="localeString">
+ <lookup target-form-name="LookupLocale"></lookup>
+ </field>
+ <field name="purchaseFromDate"><hidden/></field>
+ <field name="purchaseThruDate"><hidden/></field>
+ <field name="useCountLimit"><hidden/></field>
+ <field name="useDaysLimit"><hidden/></field>
+ <field name="productCategoryId"><hidden/></field>
+ <field use-when="content == null" name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field>
+ <field use-when="content != null" name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
+ </form>
</forms>
Modified: ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml?rev=1126904&r1=1126903&r2=1126904&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml Tue May 24 07:30:42 2011
@@ -206,6 +206,7 @@ under the License.
<set field="textDataMap.textDataResourceId" from-field="content.dataResourceId"/>
<set field="contentId" from-field="content.contentId"/>
+ <script location="component://product/webapp/catalog/WEB-INF/actions/category/EditCategoryContentContent.groovy"/>
<script location="component://product/webapp/catalog/WEB-INF/actions/category/EditCategorySEO.groovy"/>
</actions>
<widgets>
@@ -219,22 +220,8 @@ under the License.
</link>
</widgets>
</section>
- <screenlet title="${uiLabelMap.ProductUpdateSimpleTextContentCategory}">
- <section>
- <condition>
- <or>
- <if-compare operator="equals" value="PAGE_TITLE" field="parameters.prodCatContentTypeId"/>
- <if-compare operator="equals" value="META_KEYWORD" field="parameters.prodCatContentTypeId"/>
- <if-compare operator="equals" value="META_DESCRIPTION" field="parameters.prodCatContentTypeId"/>
- </or>
- </condition>
- <widgets>
- <include-form name="EditCategoryContentSEO" location="component://product/widget/catalog/CategoryForms.xml"/>
- </widgets>
- <fail-widgets>
- <include-form name="EditCategoryContentSimpleText" location="component://product/widget/catalog/CategoryForms.xml"/>
- </fail-widgets>
- </section>
+ <screenlet title="${contentFormTitle}">
+ <include-form name="${contentFormName}" location="component://product/widget/catalog/CategoryForms.xml"/>
</screenlet>
<screenlet title="${uiLabelMap.ProductListAssociatedContentInfos}">
<include-form name="ListAssociatedContentInfos" location="component://product/widget/catalog/ProductForms.xml"/>
@@ -502,6 +489,7 @@ under the License.
<include-form name="ListProductCategoryLinks" location="component://product/widget/catalog/CategoryForms.xml"/>
</screenlet>
<screenlet title="${uiLabelMap.PageTitleCreateProductCategoryLink}">
+ <label style="h3">>>>>>This function is depreciated and replaced by the function under the tab "Content" with the content type "Related URL"</label>
<include-form name="AddProductCategoryLink" location="component://product/widget/catalog/CategoryForms.xml"/>
</screenlet>
</decorator-section>
Modified: ofbiz/trunk/framework/common/config/CommonUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/CommonUiLabels.xml?rev=1126904&r1=1126903&r2=1126904&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/config/CommonUiLabels.xml (original)
+++ ofbiz/trunk/framework/common/config/CommonUiLabels.xml Tue May 24 07:30:42 2011
@@ -4542,6 +4542,9 @@
<value xml:lang="hi_IN">http://www.anywho.com/qry/wp_rl?npa=${telecomNumber.areaCode}&telephone=${telecomNumber.contactNumber}&btnsubmit.x=20&btnsubmit.y=8</value>
<value xml:lang="it">http://www.anywho.com/qry/wp_rl?npa=${telecomNumber.areaCode}&telephone=${telecomNumber.contactNumber}&btnsubmit.x=20&btnsubmit.y=8</value>
</property>
+ <property key="CommonLookupLocale">
+ <value xml:lang="en">Lookup Locale</value>
+ </property>
<property key="CommonLookupWhitepages">
<value xml:lang="en">Look up White pages</value>
<value xml:lang="es">Páginas Blancas</value>
Modified: ofbiz/trunk/framework/common/widget/LookupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/LookupForms.xml?rev=1126904&r1=1126903&r2=1126904&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/LookupForms.xml (original)
+++ ofbiz/trunk/framework/common/widget/LookupForms.xml Tue May 24 07:30:42 2011
@@ -59,14 +59,14 @@ under the License.
<field name="abbreviation" title="${uiLabelMap.CommonGeoAbbr}"><display/></field>
<field name="wellKnownText" title="${uiLabelMap.CommonGeoWellKnownText}"><display/></field>
</form>
-
+
<form name="LookupGeoName" extends="LookupGeo" target="LookupGeoName"/>
<form name="listLookupGeoName" extends="listLookupGeo" paginate-target="LookupGeoName">
<field name="geoId" widget-style="buttontext" title="${uiLabelMap.CommonGeoId}">
<hyperlink also-hidden="false" target-type="plain" description="${geoId}" target="javascript:set_values('${geoName}', '${geoId}')"/>
</field>
- </form>
-
+ </form>
+
<form name="LookupUserLogin" type="single" target="LookupUserLogin">
<field name="userLoginId" title="${uiLabelMap.CommonUserLoginId}"><text-find/></field>
<field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
@@ -97,7 +97,7 @@ under the License.
<field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
<field name="submitButton" title="${uiLabelMap.CommonFind}"><submit button-type="button"/></field>
</form>
-
+
<form name="ListPortalPages" type="list" list-name="listIt" paginate-target="LookupPortalPage"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
@@ -114,8 +114,15 @@ under the License.
<hyperlink also-hidden="false" target-type="plain" description="${portalPageId}" target="javascript:set_value('${portalPageId}')"/>
</field>
</form>
-
- <form name="LookupLocale" type="list" list-name="locales" paginate-target="LookupLocale"
+
+ <form name="LookupLocale" type="single" target="LookupLocale">
+ <field name="localeString"><text-find/></field>
+ <field name="localeName" title="${uiLabelMap.CommonLanguageTitle}"><text-find/></field>
+ <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
+ <field name="submitButton" title="${uiLabelMap.CommonFind}"><submit button-type="button"/></field>
+ </form>
+
+ <form name="ListLocales" type="list" list-name="locales" paginate-target="LookupLocale"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="localeString" widget-style="buttontext">
<hyperlink also-hidden="false" target-type="plain" description="${localeString}" target="javascript:set_value('${localeString}', '${localeName}')"/>
Modified: ofbiz/trunk/framework/common/widget/LookupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/LookupScreens.xml?rev=1126904&r1=1126903&r2=1126904&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/LookupScreens.xml (original)
+++ ofbiz/trunk/framework/common/widget/LookupScreens.xml Tue May 24 07:30:42 2011
@@ -207,7 +207,7 @@ under the License.
</widgets>
</section>
</screen>
-
+
<screen name="LookupPortalPage">
<section>
<actions>
@@ -225,22 +225,26 @@ under the License.
</widgets>
</section>
</screen>
-
+
<screen name="LookupLocale">
<section>
<actions>
<property-map resource="SecurityUiLabels" map-name="uiLabelMap" global="true"/>
<property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
- <set field="title" value="${uiLabelMap.CommonLanguageTitle}"/>
+ <set field="title" value="${uiLabelMap.CommonLookupLocale}"/>
<set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/>
<set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="20"/>
+ <set field="inputFields" from-field="parameters"/>
<script location="component://common/webcommon/WEB-INF/actions/includes/GetLocaleList.groovy"/>
</actions>
<widgets>
<decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
- <decorator-section name="search-results">
+ <decorator-section name="search-options">
<include-form name="LookupLocale" location="component://common/widget/LookupForms.xml"/>
</decorator-section>
+ <decorator-section name="search-results">
+ <include-form name="ListLocales" location="component://common/widget/LookupForms.xml"/>
+ </decorator-section>
</decorator-screen>
</widgets>
</section>