Author: jacopoc
Date: Thu Sep 20 23:47:09 2007
New Revision: 578000
URL: http://svn.apache.org/viewvc?rev=578000&view=rev
Log:
Updated the 'edit content category' screens to look similar to the 'product
content' screens.
Modified:
ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml
ofbiz/trunk/applications/product/webapp/catalog/category/CategoryForms.xml
ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml
ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml
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=578000&r1=577999&r2=578000&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml
(original)
+++ ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml Thu
Sep 20 23:47:09 2007
@@ -425,6 +425,12 @@
<response name="success" type="view" value="EditCategoryContent"/>
<response name="error" type="view" value="EditCategoryContent"/>
</request-map>
+ <request-map uri="createSimpleTextContentForAlternateLocaleInCategory">
+ <security https="true" auth="true"/>
+ <event type="service" path=""
invoke="createSimpleTextContentForAlternateLocale"/>
+ <response name="success" type="view" value="EditCategoryContent"/>
+ <response name="error" type="view" value="EditCategoryContentContent"/>
+ </request-map>
<!-- ================ Product Category Attribute Requests
================= -->
<request-map uri="EditCategoryAttributes">
Modified:
ofbiz/trunk/applications/product/webapp/catalog/category/CategoryForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/category/CategoryForms.xml?rev=578000&r1=577999&r2=578000&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/category/CategoryForms.xml
(original)
+++ ofbiz/trunk/applications/product/webapp/catalog/category/CategoryForms.xml
Thu Sep 20 23:47:09 2007
@@ -66,17 +66,22 @@
<!-- <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"
- default-title-style="tableheadtext" default-widget-style="inputBox"
default-tooltip-style="tabletext">
+ <form name="UpdateCategoryContentAssoc" type="list"
target="updateContentToCategory" title=""
list-name="productCategoryContentList">
<field name="productCategoryId"><hidden/></field>
<field name="contentId" title="${uiLabelMap.ProductContent}"
widget-style="tabletext">
<display-entity entity-name="Content" description="${description}"
also-hidden="true">
- <sub-hyperlink
target="/content/control/EditContent?contentId=${contentId}"
description="${uiLabelMap.ProductContent}: ${contentId}"
target-type="inter-app" link-style="buttontext"/>
+ <sub-hyperlink
target="EditCategoryContentContent?productCategoryId=${productCategoryId}&contentId=${contentId}&prodCatContentTypeId=${prodCatContentTypeId}&fromDate=${fromDate}"
description="${contentId}" link-style="buttontext"/>
</display-entity>
</field>
- <field name="fromDate" widget-style="tabletext"><display/></field>
+ <field name="prodCatContentTypeId" title="${uiLabelMap.ProductType}">
+ <display-entity entity-name="ProductCategoryContentType"
also-hidden="false" description="${description}"/>
+ </field>
+ <field name="fromDate"><display/></field>
+ <field name="thruDate"><display/></field>
+ <!--
+ jacopoc: I've disabled the ability to update a content record because
it was not working
<field name="thruDate"><date-time type="timestamp"/></field>
- <field name="prodCatContentTypeId" widget-style="selectBox">
+ <field name="prodCatContentTypeId">
<drop-down>
<entity-options entity-name="ProductCategoryContentType"
description="${description}">
<entity-order-by field-name="description"/>
@@ -84,21 +89,23 @@
</drop-down>
</field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}"
widget-style="smallSubmit"><submit button-type="button"/></field>
- <field name="editLink" title="${uiLabelMap.CommonEmptyHeader}"
widget-style="buttontext">
- <hyperlink
target="EditCategoryContentContent?productCategoryId=${productCategoryId}&contentId=${contentId}&prodCatContentTypeId=${prodCatContentTypeId}&fromDate=${fromDate}"
description="${uiLabelMap.CommonEdit}"/>
+ -->
+ <field name="editLink" title="${uiLabelMap.ProductEditContent}"
widget-style="buttontext">
+ <hyperlink
target="/content/control/EditContent?contentId=${contentId}"
target-type="inter-app" description="${contentId}"/>
</field>
<field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}"
widget-style="buttontext">
<hyperlink
target="removeContentFromCategory?productCategoryId=${productCategoryId}&contentId=${contentId}&prodCatContentTypeId=${prodCatContentTypeId}&fromDate=${fromDate}"
description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
</field>
</form>
- <form name="EditCategoryContentSimpleText" type="single"
default-map-name="categoryContent" target="updateSimpleTextContentForCategory"
title="${uiLabelMap.ProductUpdateSimpleTextContentCategory}"
- default-title-style="tableheadtext" default-widget-style="inputBox"
default-tooltip-style="tabletext">
+ <form name="EditCategoryContentSimpleText" type="single"
default-map-name="categoryContent" target="updateSimpleTextContentForCategory"
title="${uiLabelMap.ProductUpdateSimpleTextContentCategory}">
<alt-target use-when="content==null"
target="createSimpleTextContentForCategory"/>
<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" widget-style="tabletext"><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="prodCatContentTypeId"
widget-style="tabletext"><display-entity
entity-name="ProductCategoryContentType" also-hidden="true"/></field>
<field name="description" map-name="content"><text size="40"/></field>
@@ -112,6 +119,14 @@
<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}">
+ <field name="productCategoryId"><hidden/></field>
+ <field name="mainContentId" entry-name="contentId"><hidden/></field>
+ <field name="localeString"><text/></field>
+ <field name="text"><text/></field>
+ <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"
Modified:
ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml?rev=578000&r1=577999&r2=578000&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml
(original)
+++ ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml
Thu Sep 20 23:47:09 2007
@@ -373,14 +373,14 @@
<field name="useTime"><display/></field>
<field name="useTimeUomId"><display/></field>
<field name="useRoleTypeId"><display/></field>
+ <field name="editContent" title="${uiLabelMap.ProductEditContent}"
widget-style="buttontext">
+ <hyperlink
target="/content/control/EditContent?contentId=${contentId}"
target-type="inter-app"
+ description="${contentId}" also-hidden="false"/>
+ </field>
<field name="removeContent" title="${uiLabelMap.CommonEmptyHeader}"
widget-style="buttontext">
<hyperlink
target="removeContentFromProduct?productId=${productId}&contentId=${contentId}&productContentTypeId=${productContentTypeId}&fromDate=${fromDate}"
description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
</field>
- <field name="editContent" title="${uiLabelMap.CommonEmptyHeader}"
widget-style="buttontext">
- <hyperlink
target="/content/control/EditContent?contentId=${contentId}"
target-type="inter-app"
- description="${uiLabelMap.ProductEditContent} ${contentId}"
also-hidden="false"/>
- </field>
</form>
<form name="AddProductContentAssoc" type="single"
target="addContentToProduct"
title="${uiLabelMap.ProductAddProductContentFromDate}"
@@ -483,35 +483,6 @@
<field name="mainContentId" entry-name="contentId"><hidden/></field>
<field name="localeString"><text/></field>
<field name="text"><text/></field>
- <!--
- <auto-fields-service
service-name="createSimpleTextContentForAlternateLocale"/>
- <field name="fromDate" title="${uiLabelMap.CommonFromDate}" ></field>
- <field name="thruDate" title="${uiLabelMap.CommonThruDate}"></field>
- <field name="purchaseFromDate"
title="${uiLabelMap.ProductPurchaseFromDate}"></field>
- <field name="purchaseThruDate"
title="${uiLabelMap.ProductPurchaseThruDate}"></field>
- <field name="useCountLimit"
title="${uiLabelMap.ProductUseCountLimit}"></field>
- <field name="useTime" title="${uiLabelMap.ProductUseTime}"></field>
- <field name="useTimeUomId" title="${uiLabelMap.ProductUseTimeUom}"
widget-style="selectBox">
- <drop-down allow-empty="true">
- <entity-options entity-name="Uom" key-field-name="uomId"
description="${description}">
- <entity-constraint name="uomTypeId"
value="TIME_FREQ_MEASURE"/>
- <entity-order-by field-name="description"/>
- </entity-options>
- </drop-down>
- </field>
- <field name="useRoleTypeId"
title="${uiLabelMap.ProductUseRole}"></field>
- <field name="description" title="${uiLabelMap.ProductDescription}"
map-name="content"><text size="40"/></field>
- <field name="subject" title="${uiLabelMap.ProductSubject}"
map-name="emailData"><text size="40"/></field>
- <field name="plainBody" title="${uiLabelMap.ContentPlainBody}"
widget-style="textAreaBox" map-name="emailData"><textarea cols="60"
rows="7"/></field>
- <field name="htmlBody" title="${uiLabelMap.ContentHtmlBody}"
widget-style="textAreaBox" map-name="emailData"><textarea cols="60"
rows="7"/></field>
- <field use-when="contentId == null" name="contentId"
title="${uiLabelMap.ProductContentId}"
tooltip="${uiLabelMap.ProductOptional}"><text maxlength="20"/></field>
- <field use-when="contentId != null" name="contentId"
title="${uiLabelMap.ProductContentId}"
tooltip="${uiLabelMap.ProductNotModificationRecrationProductContentAssociation}"
map-name="productContentData" ><display/></field>
- <field name="productId"><hidden/></field>
- <field name="subjectDataResourceId"
map-name="emailData"><hidden/></field>
- <field name="plainBodyDataResourceId"
map-name="emailData"><hidden/></field>
- <field name="htmlBodyDataResourceId"
map-name="emailData"><hidden/></field>
- <field name="productContentTypeId"><hidden/></field>
- -->
<field name="submitButton" title="${uiLabelMap.CommonCreate}"><submit
button-type="button"/></field>
</form>
<form name="EditProductContentEmail" type="single"
target="updateEmailContentForProduct"
title="${uiLabelMap.ProductUpdateEmailContentProduct}">
Modified: ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml?rev=578000&r1=577999&r2=578000&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml
(original)
+++ ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml Thu Sep
20 23:47:09 2007
@@ -146,6 +146,7 @@
</entity-one>
<set field="textDataMap.text"
from-field="electronicText.textData"/>
<set field="textDataMap.textDataResourceId"
from-field="content.dataResourceId"/>
+ <set field="contentId" from-field="content.contentId"/>
</actions>
<widgets>
<decorator-screen name="CommonCategoryDecorator">
@@ -155,6 +156,8 @@
<widgets><link
target="/content/control/gotoContent?contentId=${contentId}"
text="${uiLabelMap.ContentContent} ${uiLabelMap.CommonPage}"
url-mode="inter-app" style="buttontext"/></widgets>
</section>
<include-form name="EditCategoryContentSimpleText"
location="component://product/webapp/catalog/category/CategoryForms.xml"/>
+ <include-form name="ListAssociatedContentInfos"
location="component://product/webapp/catalog/product/ProductForms.xml"/>
+ <include-form
name="CreateSimpleTextContentForAlternateLocale"
location="component://product/webapp/catalog/category/CategoryForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
