[OFBiz] SVN: r4666 - in trunk/applications/product: config
webapp/catalog/WEB-INF webapp/catalog/WEB-INF/actions/catalog
webapp/catalog/WEB-INF/pagedefs webapp/catalog/catalog
widget/catalog
jonesde at svn.ofbiz.org
jonesde at svn.ofbiz.org
Mon Mar 14 10:01:46 EST 2005
Author: jonesde
Date: 2005-03-14 09:01:30 -0600 (Mon, 14 Mar 2005)
New Revision: 4666
Added:
trunk/applications/product/webapp/catalog/catalog/CatalogTabBar.ftl
trunk/applications/product/widget/catalog/CatalogScreens.xml
Removed:
trunk/applications/product/webapp/catalog/WEB-INF/pagedefs/catalog/
trunk/applications/product/webapp/catalog/catalog/EditProdCatalog.ftl
trunk/applications/product/webapp/catalog/catalog/EditProdCatalogCategories.ftl
trunk/applications/product/webapp/catalog/catalog/EditProdCatalogParties.ftl
trunk/applications/product/webapp/catalog/catalog/EditProdCatalogStores.ftl
Modified:
trunk/applications/product/config/ProductUiLabels.properties
trunk/applications/product/webapp/catalog/WEB-INF/actions/catalog/EditProdCatalogParties.bsh
trunk/applications/product/webapp/catalog/WEB-INF/actions/catalog/EditProdCatalogStores.bsh
trunk/applications/product/webapp/catalog/WEB-INF/controller.xml
trunk/applications/product/webapp/catalog/catalog/FindProdCatalog.ftl
trunk/applications/product/webapp/catalog/catalog/ProdCatalogForms.xml
Log:
Added changes from Chris Howe, conversion to screen widget usage for the ProdCatalog pages; also did some cleanups and finished the FindProdCatalog screen conversion
Modified: trunk/applications/product/config/ProductUiLabels.properties
===================================================================
--- trunk/applications/product/config/ProductUiLabels.properties 2005-03-14 07:41:54 UTC (rev 4665)
+++ trunk/applications/product/config/ProductUiLabels.properties 2005-03-14 15:01:30 UTC (rev 4666)
@@ -246,7 +246,7 @@
ProductCatalogManagerApplication=Catalog Manager Application
ProductCatalogManagerIsFor=This application is primarily intended for those responsible for the maintenance of product catalog related information
ProductCatalogName=Catalog Name
-ProductCatalogNameId=Catalog ; Name ; [Id]
+ProductCatalogNameId=Catalog Name [Id]
ProductCatalogs=Catalogs
ProductCatalogViewPermissionError=You do not have permission to view this page. ("CATALOG_VIEW" or "CATALOG_ADMIN" needed)
ProductCategories=Categories
Modified: trunk/applications/product/webapp/catalog/WEB-INF/actions/catalog/EditProdCatalogParties.bsh
===================================================================
--- trunk/applications/product/webapp/catalog/WEB-INF/actions/catalog/EditProdCatalogParties.bsh 2005-03-14 07:41:54 UTC (rev 4665)
+++ trunk/applications/product/webapp/catalog/WEB-INF/actions/catalog/EditProdCatalogParties.bsh 2005-03-14 15:01:30 UTC (rev 4666)
@@ -54,15 +54,6 @@
}
}
-HtmlFormWrapper updateProdCatalogToPartyWrapper = new HtmlFormWrapper("/catalog/ProdCatalogForms.xml", "UpdateProdCatalogToParty", request, response);
-updateProdCatalogToPartyWrapper.putInContext("prodCatalogRoleDatas", prodCatalogRoleDatas);
-updateProdCatalogToPartyWrapper.putInContext("uiLabelMap", request.getAttribute("uiLabelMap"));
-
-HtmlFormWrapper addProdCatalogToPartyWrapper = new HtmlFormWrapper("/catalog/ProdCatalogForms.xml", "AddProdCatalogToParty", request, response);
-addProdCatalogToPartyWrapper.putInContext("prodCatalog", prodCatalog);
-addProdCatalogToPartyWrapper.putInContext("uiLabelMap", request.getAttribute("uiLabelMap"));
-
context.put("prodCatalogId", prodCatalogId);
context.put("prodCatalog", prodCatalog);
-context.put("updateProdCatalogToPartyWrapper", updateProdCatalogToPartyWrapper);
-context.put("addProdCatalogToPartyWrapper", addProdCatalogToPartyWrapper);
+context.put("prodCatalogRoleDatas", prodCatalogRoleDatas);
Modified: trunk/applications/product/webapp/catalog/WEB-INF/actions/catalog/EditProdCatalogStores.bsh
===================================================================
--- trunk/applications/product/webapp/catalog/WEB-INF/actions/catalog/EditProdCatalogStores.bsh 2005-03-14 07:41:54 UTC (rev 4665)
+++ trunk/applications/product/webapp/catalog/WEB-INF/actions/catalog/EditProdCatalogStores.bsh 2005-03-14 15:01:30 UTC (rev 4666)
@@ -53,15 +53,7 @@
}
}
-HtmlFormWrapper updateProductStoreCatalogWrapper = new HtmlFormWrapper("/catalog/ProdCatalogForms.xml", "UpdateProductStoreCatalog", request, response);
-updateProductStoreCatalogWrapper.putInContext("productStoreCatalogDatas", productStoreCatalogDatas);
-updateProductStoreCatalogWrapper.putInContext("uiLabelMap", request.getAttribute("uiLabelMap"));
-HtmlFormWrapper createProductStoreCatalogWrapper = new HtmlFormWrapper("/catalog/ProdCatalogForms.xml", "CreateProductStoreCatalog", request, response);
-createProductStoreCatalogWrapper.putInContext("prodCatalog", prodCatalog);
-createProductStoreCatalogWrapper.putInContext("uiLabelMap", request.getAttribute("uiLabelMap"));
-
context.put("prodCatalogId", prodCatalogId);
context.put("prodCatalog", prodCatalog);
-context.put("updateProductStoreCatalogWrapper", updateProductStoreCatalogWrapper);
-context.put("createProductStoreCatalogWrapper", createProductStoreCatalogWrapper);
+context.put("productStoreCatalogDatas", productStoreCatalogDatas);
\ No newline at end of file
Modified: trunk/applications/product/webapp/catalog/WEB-INF/controller.xml
===================================================================
--- trunk/applications/product/webapp/catalog/WEB-INF/controller.xml 2005-03-14 07:41:54 UTC (rev 4665)
+++ trunk/applications/product/webapp/catalog/WEB-INF/controller.xml 2005-03-14 15:01:30 UTC (rev 4666)
@@ -2038,11 +2038,11 @@
<view-map name="EditFeatureTypes" type="screen" page="component://product/widget/catalog/FeatureScreens.xml#EditFeatureTypes"/>
<view-map name="EditFeatureType" type="screen" page="component://product/widget/catalog/FeatureScreens.xml#EditFeatureType"/>
- <view-map name="FindProdCatalog" type="jpublish" page="/catalog/FindProdCatalog.ftl"/>
- <view-map name="EditProdCatalog" type="jpublish" page="/catalog/EditProdCatalog.ftl"/>
- <view-map name="EditProdCatalogCategories" type="jpublish" page="/catalog/EditProdCatalogCategories.ftl"/>
- <view-map name="EditProdCatalogStores" type="jpublish" page="/catalog/EditProdCatalogStores.ftl"/>
- <view-map name="EditProdCatalogParties" type="jpublish" page="/catalog/EditProdCatalogParties.ftl"/>
+ <view-map name="FindProdCatalog" type="screen" page="component://product/widget/catalog/CatalogScreens.xml#FindProdCatalog"/>
+ <view-map name="EditProdCatalog" type="screen" page="component://product/widget/catalog/CatalogScreens.xml#EditProdCatalog"/>
+ <view-map name="EditProdCatalogCategories" type="screen" page="component://product/widget/catalog/CatalogScreens.xml#EditProdCatalogCategories"/>
+ <view-map name="EditProdCatalogStores" type="screen" page="component://product/widget/catalog/CatalogScreens.xml#EditProdCatalogStores"/>
+ <view-map name="EditProdCatalogParties" type="screen" page="component://product/widget/catalog/CatalogScreens.xml#EditProdCatalogParties"/>
<view-map name="FindProductPromo" type="jpublish" page="/promo/FindProductPromo.ftl"/>
<view-map name="EditProductPromo" type="jpublish" page="/promo/EditProductPromo.ftl"/>
Added: trunk/applications/product/webapp/catalog/catalog/CatalogTabBar.ftl
===================================================================
--- trunk/applications/product/webapp/catalog/catalog/CatalogTabBar.ftl 2005-03-14 07:41:54 UTC (rev 4665)
+++ trunk/applications/product/webapp/catalog/catalog/CatalogTabBar.ftl 2005-03-14 15:01:30 UTC (rev 4666)
@@ -0,0 +1,34 @@
+<#--
+ * Copyright (c) 2003-2005 The Open For Business Project - www.ofbiz.org
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
+ * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ *@author Andy Zeneski (jaz at ofbiz.org)
+ *@version $Rev$
+ *@since 3.0
+-->
+
+<#assign unselectedClassName = "tabButton">
+<#assign selectedClassMap = {page.tabButtonItem?default("void") : "tabButtonSelected"}>
+<div class="tabContainer">
+ <a href="<@ofbizUrl>/EditProdCatalog?prodCatalogId=${prodCatalogId}</@ofbizUrl>" class="${selectedClassMap.ProductCatalog?default(unselectedClassName)}">${uiLabelMap.ProductCatalog}</a>
+ <a href="<@ofbizUrl>/EditProdCatalogStores?prodCatalogId=${prodCatalogId}</@ofbizUrl>" class="${selectedClassMap.ProductStores?default(unselectedClassName)}">${uiLabelMap.ProductStores}</a>
+ <a href="<@ofbizUrl>/EditProdCatalogParties?prodCatalogId=${prodCatalogId}</@ofbizUrl>" class="${selectedClassMap.PartyParties?default(unselectedClassName)}">${uiLabelMap.PartyParties}</a>
+ <a href="<@ofbizUrl>/EditProdCatalogCategories?prodCatalogId=${prodCatalogId}</@ofbizUrl>" class="${selectedClassMap.ProductCategories?default(unselectedClassName)}">${uiLabelMap.ProductCategories}</a>
+ </div>
Property changes on: trunk/applications/product/webapp/catalog/catalog/CatalogTabBar.ftl
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ 'Id Rev Date Author'
Name: svn:eol-style
+ native
Deleted: trunk/applications/product/webapp/catalog/catalog/EditProdCatalog.ftl
===================================================================
--- trunk/applications/product/webapp/catalog/catalog/EditProdCatalog.ftl 2005-03-14 07:41:54 UTC (rev 4665)
+++ trunk/applications/product/webapp/catalog/catalog/EditProdCatalog.ftl 2005-03-14 15:01:30 UTC (rev 4666)
@@ -1,46 +0,0 @@
-<#--
- * Copyright (c) 2003 The Open For Business Project - www.ofbiz.org
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
- * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- *@author David E. Jones (jonesde at ofbiz.org)
- *@author Catherine Heintz (catherine.heintz at nereide.biz)
- *@version $Rev$
- *@since 2.1
--->
-
-<#assign uiLabelMap = requestAttributes.uiLabelMap>
-<#if hasPermission>
-
-<#if prodCatalogId?has_content>
- <div class='tabContainer'>
- <a href="<@ofbizUrl>/EditProdCatalog?prodCatalogId=${prodCatalogId}</@ofbizUrl>" class="tabButtonSelected">${uiLabelMap.ProductCatalog}</a>
- <a href="<@ofbizUrl>/EditProdCatalogStores?prodCatalogId=${prodCatalogId}</@ofbizUrl>" class="tabButton">${uiLabelMap.ProductStores}</a>
- <a href="<@ofbizUrl>/EditProdCatalogParties?prodCatalogId=${prodCatalogId}</@ofbizUrl>" class="tabButton">${uiLabelMap.PartyParties}</a>
- <a href="<@ofbizUrl>/EditProdCatalogCategories?prodCatalogId=${prodCatalogId}</@ofbizUrl>" class="tabButton">${uiLabelMap.ProductCategories}</a>
- </div>
-</#if>
-<div class="head1">${uiLabelMap.ProductCatalog} <span class='head2'><#if (prodCatalog.catalogName)?has_content>"${prodCatalog.catalogName}"</#if> [${uiLabelMap.CommonId}:${prodCatalogId?if_exists}]</span></div>
-<a href="<@ofbizUrl>/EditProdCatalog</@ofbizUrl>" class="buttontext">[${uiLabelMap.ProductNewProdCatalog}]</a>
-
-${editProdCatalogWrapper.renderFormString()}
-
-<#else>
- <h3>${uiLabelMap.ProductCatalogViewPermissionError}</h3>
-</#if>
Deleted: trunk/applications/product/webapp/catalog/catalog/EditProdCatalogCategories.ftl
===================================================================
--- trunk/applications/product/webapp/catalog/catalog/EditProdCatalogCategories.ftl 2005-03-14 07:41:54 UTC (rev 4665)
+++ trunk/applications/product/webapp/catalog/catalog/EditProdCatalogCategories.ftl 2005-03-14 15:01:30 UTC (rev 4666)
@@ -1,138 +0,0 @@
-<#--
- * Copyright (c) 2003 The Open For Business Project - www.ofbiz.org
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
- * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- *@author David E. Jones (jonesde at ofbiz.org)
- *@author Brad Steiner (bsteiner at thehungersite.com)
- *@author Olivier Heintz (olivier.heintz at nereide.biz)
- *@version $Rev$
- *@since 2.2
- -->
-<#assign uiLabelMap = requestAttributes.uiLabelMap>
-<#if hasPermission>
- <#if prodCatalogId?has_content>
- <div class="tabContainer">
- <a href="<@ofbizUrl>/EditProdCatalog?prodCatalogId=${prodCatalogId}</@ofbizUrl>" class="tabButton">${uiLabelMap.ProductCatalog}</a>
- <a href="<@ofbizUrl>/EditProdCatalogStores?prodCatalogId=${prodCatalogId}</@ofbizUrl>" class="tabButton">${uiLabelMap.ProductStores}</a>
- <a href="<@ofbizUrl>/EditProdCatalogParties?prodCatalogId=${prodCatalogId}</@ofbizUrl>" class="tabButton">${uiLabelMap.PartyParties}</a>
- <a href="<@ofbizUrl>/EditProdCatalogCategories?prodCatalogId=${prodCatalogId}</@ofbizUrl>" class="tabButtonSelected">${uiLabelMap.ProductCategories}</a>
- </div>
- </#if>
- <div class="head1">${uiLabelMap.ProductCategoriesFor} <span class="head2"> <#if prodCatalogId?has_content>${prodCatalogId}</#if>
- </span></div>
-
- <a href="<@ofbizUrl>/EditProdCatalog</@ofbizUrl>" class="buttontext">[${uiLabelMap.ProductNewProdCatalog}]</a>
- <p>
- <#if prodCatalogId?exists && prodCatalog?exists>
- <table border="1" width="100%" cellpadding="2" cellspacing="0">
- <tr>
- <td><div class="tabletext"><b>${uiLabelMap.ProductCategory_Id}</b></div></td>
- <td><div class="tabletext"><b>Type</b></div></td>
- <td><div class="tabletext"><b>${uiLabelMap.CommonFromDateTime}</b></div></td>
- <td align="center"><div class="tabletext"><b>${uiLabelMap.ProductThruDateTimeSequence}</b></div></td>
- <td><div class="tabletext"><b> </b></div></td>
- <td><div class="tabletext"><b> </b></div></td>
- </tr>
- <#assign line=0>
- <#list prodCatalogCategories as prodCatalogCategory>
- <#assign productCategory = prodCatalogCategory.getRelatedOne("ProductCategory")>
- <#assign curProdCatalogCategoryType = prodCatalogCategory.getRelatedOneCache("ProdCatalogCategoryType")>
-
- <tr valign="middle">
- <td><a href="<@ofbizUrl>/EditCategory?productCategoryId=${prodCatalogCategory.productCategoryId}</@ofbizUrl>" class="buttontext">
- ${(productCategory.description)?if_exists} [${prodCatalogCategory.productCategoryId}]</a>
- </td>
- <td>
- <div class="buttontext">${(curProdCatalogCategoryType.description)?default(prodCatalogCategory.prodCatalogCategoryTypeId)}</div>
- </td>
- <#assign hasntStarted = false>
- <#if prodCatalogCategory.getTimestamp("fromDate")?exists && Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().before(prodCatalogCategory.getTimestamp("fromDate"))>
- <#assign hasntStarted = true>
- </#if>
- <td><div class="tabletext" <#if hasntStarted == true> style="color: red;"</#if>>${prodCatalogCategory.fromDate}</div></td>
- <td align="center">
- <#assign hasExpired = false>
- <#if prodCatalogCategory.getTimestamp("thruDate")?exists && Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().after(prodCatalogCategory.getTimestamp("thruDate"))>
- <#assign hasExpired = true>
- </#if>
- <FORM method=POST action="<@ofbizUrl>/updateProductCategoryToProdCatalog</@ofbizUrl>" name="lineForm${line}">
- <input type="hidden" name="prodCatalogId" value="${prodCatalogCategory.prodCatalogId}">
- <input type="hidden" name="productCategoryId" value="${prodCatalogCategory.productCategoryId}">
- <input type="hidden" name="prodCatalogCategoryTypeId" value="${prodCatalogCategory.prodCatalogCategoryTypeId}">
- <input type="hidden" name="fromDate" value="${prodCatalogCategory.fromDate}">
- <input type="text" name="thruDate" class="inputBox" size="25" <#if hasExpired == true> style="color: red;"</#if> value="<#if prodCatalogCategory.getTimestamp("thruDate")?exists> ${prodCatalogCategory.getTimestamp("thruDate")}</#if>">
- <a href="javascript:call_cal(document.lineForm${line}.thruDate, null);"><img src="/images/cal.gif" width="16" height="16" border="0" alt="Calendar"></a>
- <input type="text" class="inputBox" size="5" name="sequenceNum" value="<#if prodCatalogCategory.sequenceNum?exists>${prodCatalogCategory.sequenceNum}</#if>">
- <#-- prodCatalogCategoryTypeId is part of the PK, so no longer selectable
- <select class="selectBox" name="prodCatalogCategoryTypeId" size="1">
- <#if prodCatalogCategory.get("prodCatalogCategoryTypeId")?exists>
- <option value="${prodCatalogCategory.getString("prodCatalogCategoryTypeId")}">
- <#if curProdCatalogCategoryType?exists && curProdCatalogCategoryType.getString("description")?exists>
- ${curProdCatalogCategoryType.getString("description")}
- <#else>
- ${prodCatalogCategory.getString("prodCatalogCategoryTypeId")}
- </#if>
- </option>
- <option value="${prodCatalogCategory.getString("prodCatalogCategoryTypeId")}">---</option>
- <#else>
- <option value=""> </option>
- </#if>
- <#list prodCatalogCategoryTypes as prodCatalogCategoryType>
- <option value="${prodCatalogCategoryType.getString("prodCatalogCategoryTypeId")}">${prodCatalogCategoryType.getString("description")}</option>
- </list>
- </select> -->
- <INPUT type=submit value="${uiLabelMap.CommonUpdate}">
- <td align="center">
- <a href="<@ofbizUrl>/removeProductCategoryFromProdCatalog?prodCatalogId=${prodCatalogCategory.prodCatalogId}&productCategoryId=${prodCatalogCategory.productCategoryId}&fromDate=${prodCatalogCategory.fromDate}&prodCatalogCategoryTypeId=${prodCatalogCategory.prodCatalogCategoryTypeId}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonDelete}]</a>
- </td>
- <td align="center">
- <a href="<@ofbizUrl>/EditCategory?CATALOG_TOP_CATEGORY=${prodCatalogCategory.productCategoryId}&productCategoryId=${prodCatalogCategory.productCategoryId}</@ofbizUrl>" class="buttontext"> [${uiLabelMap.ProductMakeTop}]</a>
- </td>
- </FORM>
- </td>
- </tr>
- <#assign line = line + 1>
- </#list>
- </table>
- <br>
- <form method="POST" action="<@ofbizUrl>/addProductCategoryToProdCatalog</@ofbizUrl>" style="margin: 0;" name="addNewForm">
- <input type="hidden" name="prodCatalogId" value="${prodCatalogId}">
- <input type="hidden" name="tryEntity" value="true">
- <div class="head2">${uiLabelMap.ProductAddCatalogProdCat}:</div>
- <br>
- <select class="selectBox" name="productCategoryId">
- <#list productCategories as productCategory>
- <option value="${productCategory.productCategoryId}"> ${productCategory.description?if_exists} [${productCategory.productCategoryId}]</option>
- </#list>
- </select>
- <select class="selectBox" name="prodCatalogCategoryTypeId" size=1>
- <!-- <option value=""> </option> -->
- <#list prodCatalogCategoryTypes as prodCatalogCategoryType>
- <option value="${prodCatalogCategoryType.prodCatalogCategoryTypeId}">${prodCatalogCategoryType.description?if_exists}</option>
- </#list>
- </select>
- <input type="text" class="inputBox" size="25" name="fromDate">
- <a href="javascript:call_cal(document.addNewForm.fromDate, null);"><img src="/images/cal.gif" width="16" height="16" border="0" alt="Calendar"></a>
- <input type="submit" value="${uiLabelMap.CommonAdd}">
- </form>
- </#if>
-<#else>
- <h3>${uiLabelMap.ProductCatalogViewPermissionError}</h3>
-</#if>
\ No newline at end of file
Deleted: trunk/applications/product/webapp/catalog/catalog/EditProdCatalogParties.ftl
===================================================================
--- trunk/applications/product/webapp/catalog/catalog/EditProdCatalogParties.ftl 2005-03-14 07:41:54 UTC (rev 4665)
+++ trunk/applications/product/webapp/catalog/catalog/EditProdCatalogParties.ftl 2005-03-14 15:01:30 UTC (rev 4666)
@@ -1,54 +0,0 @@
-<#--
- * Copyright (c) 2003 The Open For Business Project - www.ofbiz.org
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
- * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- *@author David E. Jones (jonesde at ofbiz.org)
- *@author Olivier Heintz (olivier.heintz at nereide.biz)
- *@version $Rev$
- *@since 2.1
--->
-
-<#assign uiLabelMap = requestAttributes.uiLabelMap>
-<#if hasPermission>
-
-<#if prodCatalogId?has_content>
- <div class='tabContainer'>
- <a href="<@ofbizUrl>/EditProdCatalog?prodCatalogId=${prodCatalogId}</@ofbizUrl>" class="tabButton">${uiLabelMap.ProductCatalog}</a>
- <a href="<@ofbizUrl>/EditProdCatalogStores?prodCatalogId=${prodCatalogId}</@ofbizUrl>" class="tabButton">${uiLabelMap.ProductStores}</a>
- <a href="<@ofbizUrl>/EditProdCatalogParties?prodCatalogId=${prodCatalogId}</@ofbizUrl>" class="tabButtonSelected">${uiLabelMap.PartyParties}</a>
- <a href="<@ofbizUrl>/EditProdCatalogCategories?prodCatalogId=${prodCatalogId}</@ofbizUrl>" class="tabButton">${uiLabelMap.ProductCategories}</a>
- </div>
-</#if>
-
-<div class="head1">${uiLabelMap.PartyPartiesFor}<span class='head2'> <#if (prodCatalog.catalogName)?has_content>"${prodCatalog.catalogName}"</#if> [${uiLabelMap.CommonId}:${prodCatalogId?if_exists}]</span></div>
-
-<a href="<@ofbizUrl>/EditProdCatalog</@ofbizUrl>" class="buttontext">[${uiLabelMap.ProductNewProdCatalog}]</a>
-<br>
-<br>
-<#if prodCatalogId?has_content>
-${updateProdCatalogToPartyWrapper.renderFormString()}
-<br>
-${addProdCatalogToPartyWrapper.renderFormString()}
-</#if>
-<br>
-
-<#else>
- <h3>${uiLabelMap.ProductCatalogViewPermissionError}</h3>
-</#if>
Deleted: trunk/applications/product/webapp/catalog/catalog/EditProdCatalogStores.ftl
===================================================================
--- trunk/applications/product/webapp/catalog/catalog/EditProdCatalogStores.ftl 2005-03-14 07:41:54 UTC (rev 4665)
+++ trunk/applications/product/webapp/catalog/catalog/EditProdCatalogStores.ftl 2005-03-14 15:01:30 UTC (rev 4666)
@@ -1,53 +0,0 @@
-<#--
- * Copyright (c) 2003 The Open For Business Project - www.ofbiz.org
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
- * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- *@author David E. Jones (jonesde at ofbiz.org)
- *@author Catherine Heintz (catherine.heintz at nereide.biz)
- *@version $Rev$
- *@since 2.1
--->
-
-<#assign uiLabelMap = requestAttributes.uiLabelMap>
-<#if hasPermission>
-
-<#if prodCatalogId?has_content>
- <div class='tabContainer'>
- <a href="<@ofbizUrl>/EditProdCatalog?prodCatalogId=${prodCatalogId}</@ofbizUrl>" class="tabButton">${uiLabelMap.ProductCatalog}</a>
- <a href="<@ofbizUrl>/EditProdCatalogStores?prodCatalogId=${prodCatalogId}</@ofbizUrl>" class="tabButtonSelected">${uiLabelMap.ProductStores}</a>
- <a href="<@ofbizUrl>/EditProdCatalogParties?prodCatalogId=${prodCatalogId}</@ofbizUrl>" class="tabButton">${uiLabelMap.PartyParties}</a>
- <a href="<@ofbizUrl>/EditProdCatalogCategories?prodCatalogId=${prodCatalogId}</@ofbizUrl>" class="tabButton">${uiLabelMap.ProductCategories}</a>
- </div>
-</#if>
-
-<div class="head1">${uiLabelMap.ProductStoresFor} <span class='head2'> <#if (prodCatalog.catalogName)?has_content>"${prodCatalog.catalogName}"</#if> [${uiLabelMap.CommonId}:${prodCatalogId?if_exists}]</span></div>
-<a href="<@ofbizUrl>/EditProdCatalog</@ofbizUrl>" class="buttontext">[${uiLabelMap.ProductNewProdCatalog}]</a>
-<br>
-<br>
-<#if prodCatalogId?has_content>
-${updateProductStoreCatalogWrapper.renderFormString()}
-<br>
-${createProductStoreCatalogWrapper.renderFormString()}
-</#if>
-<br>
-
-<#else>
- <h3>${uiLabelMap.ProductCatalogViewPermissionError}</h3>
-</#if>
Modified: trunk/applications/product/webapp/catalog/catalog/FindProdCatalog.ftl
===================================================================
--- trunk/applications/product/webapp/catalog/catalog/FindProdCatalog.ftl 2005-03-14 07:41:54 UTC (rev 4665)
+++ trunk/applications/product/webapp/catalog/catalog/FindProdCatalog.ftl 2005-03-14 15:01:30 UTC (rev 4666)
@@ -1,5 +1,5 @@
<#--
- * Copyright (c) 2003 The Open For Business Project - www.ofbiz.org
+ * Copyright (c) 2003-2005 The Open For Business Project - www.ofbiz.org
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@@ -25,7 +25,6 @@
*@since 2.1
-->
-<#assign uiLabelMap = requestAttributes.uiLabelMap>
<#if hasPermission>
<div class="head1">${uiLabelMap.ProductProductCatalogsList}</div>
Modified: trunk/applications/product/webapp/catalog/catalog/ProdCatalogForms.xml
===================================================================
--- trunk/applications/product/webapp/catalog/catalog/ProdCatalogForms.xml 2005-03-14 07:41:54 UTC (rev 4665)
+++ trunk/applications/product/webapp/catalog/catalog/ProdCatalogForms.xml 2005-03-14 15:01:30 UTC (rev 4666)
@@ -115,4 +115,52 @@
description="[Delete]" also-hidden="false"/>
</field>
</form>
+ <form name="EditProdCatalogCategories" type="list"
+ target="updateProductCategoryToProdCatalog" title="" list-name="prodCatalogCategories"
+ default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
+ <auto-fields-service service-name="updateProductCategoryToProdCatalog" map-name="listToDisplay"/>
+ <field name="prodCatalogId" widget-style="buttontext">
+ <hyperlink target="EditCategory?productCategoryId=${productCategoryId}"
+ description="${prodCatalog.catalogName} [${productCategoryId}]"/>
+ </field>
+ <field name="productCategoryId"><hidden/></field>
+ <field name="prodCatalogCategoryTypeId"><hidden/></field>
+ <field name="fromDate"><display/></field>
+ <field name="thruDate"></field>
+ <field name="sequenceNum"></field>
+ <field name="deleteLink" title="&nbsp;" widget-style="buttontext">
+ <hyperlink target="removeProductCategoryFromProdCatalog?prodCatalogId=${productCatalogCategory.prodCatalogId}&productproductCategoryId=${productCatalogCategory.productCategoryId}&fromDate=${productCatalogCategory.fromDate}&prodCatalogCategoryTypeId=${prodCatalogCategory.prodCatalogCategoryTypeId}"
+ description="[Delete]" also-hidden="false"/>
+ </field>
+ <field name="makeTopLink" title="" widget-style="buttontext">
+ <hyperlink target="EditCategory?CATALOG_TOP_CATEGORY=${prodCatalogCategory.productCategoryId}&productCategoryId=${prodCatalogCategory.productCategoryId}"
+ description="[${uiLabelMap.ProductMakeTop}]" also-hidden="false"/>
+ </field>
+ <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="standardSubmit"><submit button-type="button"/></field>
+ </form>
+ <form name="addProductCategoryToProdCatalog" type="single"
+ target="addProductCategoryToProdCatalog" title=""
+ default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
+ <auto-fields-service service-name="addProductCategoryToProdCatalog"/>
+ <field name="prodCatalogId"><hidden/></field>
+ <field name="tryEntity"><hidden/></field>
+ <field name="productCategoryId" title=" " widget-style="selectBox" position="1">
+ <drop-down>
+ <entity-options entity-name="ProductCategory" description="${description} [${productCategoryId}]">
+ <entity-order-by field-name="description"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="prodCatalogCategoryTypeId" title=" " widget-style="selectBox" position="2">
+ <drop-down>
+ <entity-options entity-name="ProdCatalogCategoryType" description="${description}">
+ <entity-order-by field-name="description"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="fromDate" title=" " widget-style="inputBox" position="3"/>
+ <field name="thruDate"><ignored/></field>
+ <field name="sequenceNum"><ignored/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonAdd}" position="4" widget-style="standardSubmit"><submit button-type="button"/></field>
+ </form>
</forms>
Added: trunk/applications/product/widget/catalog/CatalogScreens.xml
===================================================================
--- trunk/applications/product/widget/catalog/CatalogScreens.xml 2005-03-14 07:41:54 UTC (rev 4665)
+++ trunk/applications/product/widget/catalog/CatalogScreens.xml 2005-03-14 15:01:30 UTC (rev 4666)
@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Copyright (c) 2004-2005 The Open For Business Project - www.ofbiz.org
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
+ * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * $Id: CommonScreens.xml 4267 2005-01-15 08:00:01Z jonesde $
+-->
+
+<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-screen.xsd">
+ <screen name="CommonCatalogDecorator">
+ <section>
+ <actions>
+ <set field="leftbarScreenName" value="leftbar"/>
+ <!-- <set field="leftbarScreenLocation" value=""/> -->
+ </actions>
+ <widgets>
+ <decorator-screen name="main-decorator" location="component://product/widget/catalog/CommonScreens.xml">
+ <decorator-section name="body">
+ <section>
+ <!-- do check for CATALOG, _VIEW permission -->
+ <condition>
+ <if-has-permission permission="CATALOG" action="_VIEW"/>
+ </condition>
+ <widgets>
+ <platform-specific>
+ <html><html-template location="component://product/webapp/catalog/catalog/CatalogTabBar.ftl"/></html>
+ </platform-specific>
+ <container>
+ <link target="EditProdCatalog" text="[${uiLabelMap.ProductNewProdCatalog}]" style="buttontext"/>
+ </container>
+
+ <!-- add Create Product and View Product (in ecommerce) links -->
+ <decorator-section-include name="body"/>
+ </widgets>
+ <fail-widgets>
+ <label style="head3">${uiLabelMap.ProductCatalogViewPermissionError}</label>
+ </fail-widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+ <screen name="EditProdCatalog">
+ <section>
+ <actions>
+ <set field="title" value="Edit Product Catalog"/>
+ <set field="titleProperty" value="PageTitleEditProductCatalog"/>
+ <set field="leftbarScreenName" value="leftbar"/>
+ <set field="headerItem" value="catalog"/>
+ <set field="tabButtonItem" value="ProductCatalog"/>
+ <script location="component://product/webapp/catalog/WEB-INF/actions/catalog/EditProdCatalog.bsh"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="CommonCatalogDecorator">
+ <decorator-section name="body">
+ <container>
+ <label style="head1">${uiLabelMap.ProductCatalog}</label><label style="head2"> for "${prodCatalog.catalogName}" [${prodCatalogId}]</label>
+ </container>
+ <include-form name="EditProdCatalog" location="component://product/webapp/catalog/catalog/ProdCatalogForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+ <screen name="EditProdCatalogCategories">
+ <section>
+ <actions>
+ <set field="title" value="Edit Product Catalog Categories"/>
+ <set field="titleProperty" value="PageTitleEditProductCatalogCategories"/>
+ <set field="leftbarScreenName" value="leftbar"/>
+ <set field="headerItem" value="catalog"/>
+ <set field="tabButtonItem" value="ProductCategories"/>
+ <script location="component://product/webapp/catalog/WEB-INF/actions/catalog/EditProdCatalogCategories.bsh"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="CommonCatalogDecorator">
+ <decorator-section name="body">
+ <container>
+ <label style="head1">${uiLabelMap.ProductCategories}</label><label style="head2"> for "${prodCatalog.catalogName}" [${prodCatalogId}]</label>
+ </container>
+ <include-form name="EditProdCatalogCategories" location="component://product/webapp/catalog/catalog/ProdCatalogForms.xml"/>
+ <label style="head2">${uiLabelMap.ProductAddCatalogProdCat}</label>
+ <include-form name="addProductCategoryToProdCatalog" location="component://product/webapp/catalog/catalog/ProdCatalogForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+ <screen name="EditProdCatalogParties">
+ <section>
+ <actions>
+ <set field="title" value="Edit Product Catalog Parties"/>
+ <set field="titleProperty" value="PageTitleEditProductCatalogParties"/>
+ <set field="leftbarScreenName" value="leftbar"/>
+ <set field="headerItem" value="catalog"/>
+ <set field="tabButtonItem" value="PartyParties"/>
+ <script location="component://product/webapp/catalog/WEB-INF/actions/catalog/EditProdCatalogParties.bsh"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="CommonCatalogDecorator">
+ <decorator-section name="body">
+ <container>
+ <label style="head1">${uiLabelMap.PartyParties}</label><label style="head2"> for "${prodCatalog.catalogName}" [${prodCatalogId}]</label>
+ </container>
+ <include-form name="UpdateProdCatalogToParty" location="component://product/webapp/catalog/catalog/ProdCatalogForms.xml"/>
+ <include-form name="AddProdCatalogToParty" location="component://product/webapp/catalog/catalog/ProdCatalogForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+ <screen name="EditProdCatalogStores">
+ <section>
+ <actions>
+ <set field="title" value="Edit Product Catalog Stores"/>
+ <set field="titleProperty" value="PageTitleEditProductCatalog Stores"/>
+ <set field="leftbarScreenName" value="leftbar"/>
+ <set field="headerItem" value="catalog"/>
+ <set field="tabButtonItem" value="ProductStores"/>
+
+ <script location="component://product/webapp/catalog/WEB-INF/actions/catalog/EditProdCatalogStores.bsh"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="CommonCatalogDecorator">
+ <decorator-section name="body">
+ <container>
+ <label style="head1">${uiLabelMap.ProductStores}</label><label style="head2"> for "${prodCatalog.catalogName}" [${prodCatalogId}]</label>
+ </container>
+ <include-form name="UpdateProductStoreCatalog" location="component://product/webapp/catalog/catalog/ProdCatalogForms.xml"/>
+ <include-form name="CreateProductStoreCatalog" location="component://product/webapp/catalog/catalog/ProdCatalogForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+ <screen name="FindProdCatalog">
+ <section>
+ <actions>
+ <set field="title" value="Find Product Catalog"/>
+ <set field="titleProperty" value="PageTitleEditFindProductCatalog"/>
+ <set field="leftbarScreenName" value="leftbar"/>
+ <script location="component://product/webapp/catalog/WEB-INF/actions/catalog/FindProdCatalog.bsh"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="main-decorator" location="component://product/widget/catalog/CommonScreens.xml">
+ <decorator-section name="body">
+ <platform-specific>
+ <html><html-template location="component://product/webapp/catalog/catalog/FindProdCatalog.ftl"/></html>
+ </platform-specific>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+</screens>
+
\ No newline at end of file
Property changes on: trunk/applications/product/widget/catalog/CatalogScreens.xml
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ text/xml
Name: svn:keywords
+ 'Id Rev Date Author'
Name: svn:eol-style
+ native
More information about the Svn
mailing list