You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by mr...@apache.org on 2007/12/22 17:26:14 UTC
svn commit: r606465 [2/3] - in /ofbiz/trunk/applications/product:
webapp/catalog/category/ widget/catalog/
Modified: ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProdCatalogs.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProdCatalogs.ftl?rev=606465&r1=606464&r2=606465&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProdCatalogs.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProdCatalogs.ftl Sat Dec 22 08:26:13 2007
@@ -18,78 +18,100 @@
-->
<#if productCategoryId?exists && productCategory?exists>
- <table border="1" cellpadding="2" cellspacing="0">
- <tr>
- <td><div class="tabletext"><b>${uiLabelMap.ProductCatalogNameId}</b></div></td>
- <td><div class="tabletext"><b>${uiLabelMap.CommonType}</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>
- </tr>
- <#assign line = 0>
- <#list prodCatalogCategories as prodCatalogCategory>
- <#assign line = line + 1>
- <#assign prodCatalog = prodCatalogCategory.getRelatedOne("ProdCatalog")>
- <#assign curProdCatalogCategoryType = prodCatalogCategory.getRelatedOneCache("ProdCatalogCategoryType")>
- <tr valign="middle">
- <td><a href="<@o...@ofbizUrl>" class="buttontext"><#if prodCatalog?exists>${(prodCatalog.catalogName)?if_exists}</#if> [${(prodCatalogCategory.prodCatalogId)?if_exists}]</a></td>
- <td>
- <div class="tabletext">${(curProdCatalogCategoryType.get("description",locale))?default(prodCatalogCategory.prodCatalogCategoryTypeId)}</div>
- </td>
- <#assign hasntStarted = false>
- <#if (prodCatalogCategory.getTimestamp("fromDate"))?exists && nowTimestamp.before(prodCatalogCategory.getTimestamp("fromDate"))> <#assign hasntStarted = true></#if>
- <td><div class="tabletext"<#if hasntStarted> style="color: red;"</#if>>${(prodCatalogCategory.fromDate)?if_exists}</div></td>
- <td align="center">
- <form method="post" action="<@o...@ofbizUrl>" name="lineForm${line}">
- <#assign hasExpired = false>
- <#if (prodCatalogCategory.getTimestamp("thruDate"))?exists && nowTimestamp.after(prodCatalogCategory.getTimestamp("thruDate"))> <#assign hasExpired = true></#if>
- <input type="hidden" name="prodCatalogId" value="${(prodCatalogCategory.prodCatalogId)?if_exists}"/>
- <input type="hidden" name="productCategoryId" value="${(prodCatalogCategory.productCategoryId)?if_exists}"/>
- <input type="hidden" name="prodCatalogCategoryTypeId" value="${prodCatalogCategory.prodCatalogCategoryTypeId}"/>
- <input type="hidden" name="fromDate" value="${(prodCatalogCategory.fromDate)?if_exists}"/>
- <input type="text" size="25" name="thruDate" value="${(prodCatalogCategory.thruDate)?if_exists}" class="inputBox" style="<#if (hasExpired) >color: red;</#if>"/>
- <a href="javascript:call_cal(document.lineForm${line}.thruDate, '${(prodCatalogCategory.thruDate)?default(nowTimestamp?string)}');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"/></a>
- <input type="text" size="5" name="sequenceNum" value="${(prodCatalogCategory.sequenceNum)?if_exists}" class="inputBox"/>
- <#-- the prodCatalogCategoryTypeId field is now part of the PK, so it can't be changed, must be re-created
- <select name="prodCatalogCategoryTypeId" size="1" class="selectBox">
- <#if (prodCatalogCategory.prodCatalogCategoryTypeId)?exists>
- <option value="${prodCatalogCategory.prodCatalogCategoryTypeId}"><#if curProdCatalogCategoryType?exists>${(curProdCatalogCategoryType.description)?if_exists}<#else> [${(prodCatalogCategory.prodCatalogCategoryTypeId)}]</#if></option>
- <option value="${prodCatalogCategory.prodCatalogCategoryTypeId}"></option>
- <#else>
- <option value=""> </option>
- </#if>
- <#list prodCatalogCategoryTypes as prodCatalogCategoryType>
- <option value="${(prodCatalogCategoryType.prodCatalogCategoryTypeId)?if_exists}">${(prodCatalogCategoryType.get("description",locale))?if_exists}</option>
- </#list>
- </select> -->
- <input type="submit" value="${uiLabelMap.CommonUpdate}" style="font-size: x-small;"/>
- </form>
- </td>
- <td align="center">
- <a href="<@o...@ofbizUrl>" class="buttontext">
- [${uiLabelMap.CommonDelete}]</a>
- </td>
- </tr>
- </#list>
- </table>
- <br/>
- <form method="post" action="<@o...@ofbizUrl>" style="margin: 0;" name="addNewForm">
- <input type="hidden" name="productCategoryId" value="${productCategoryId?if_exists}"/>
-
- <h2>${uiLabelMap.ProductAddCatalogProductCategory}:</h2>
- <br/>
- <select name="prodCatalogId" class="selectBox">
- <#list prodCatalogs as prodCatalog>
- <option value="${(prodCatalog.prodCatalogId)?if_exists}">${(prodCatalog.catalogName)?if_exists} [${(prodCatalog.prodCatalogId)?if_exists}]</option>
- </#list>
- </select>
- <select name="prodCatalogCategoryTypeId" size="1" class="selectBox">
- <#list prodCatalogCategoryTypes as prodCatalogCategoryType>
- <option value="${(prodCatalogCategoryType.prodCatalogCategoryTypeId)?if_exists}">${(prodCatalogCategoryType.get("description",locale))?if_exists}</option>
+ <div class="screenlet-title-bar">
+ <h3>${uiLabelMap.PageTitleEditCategoryProductCatalogs}</h3>
+ </div>
+ <div class="screenlet">
+ <div class="screenlet-body">
+ <table cellspacing="0" class="basic-table">
+ <tr class="header-row">
+ <td><b>${uiLabelMap.ProductCatalogNameId}</b></td>
+ <td><b>${uiLabelMap.CommonType}</b></td>
+ <td><b>${uiLabelMap.CommonFromDateTime}</b></td>
+ <td align="center"><b>${uiLabelMap.ProductThruDateTimeSequence}</b></td>
+ <td><b> </b></td>
+ </tr>
+ <#assign line = 0>
+ <#assign rowClass = "2">
+ <#list prodCatalogCategories as prodCatalogCategory>
+ <#assign line = line + 1>
+ <#assign prodCatalog = prodCatalogCategory.getRelatedOne("ProdCatalog")>
+ <#assign curProdCatalogCategoryType = prodCatalogCategory.getRelatedOneCache("ProdCatalogCategoryType")>
+ <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
+ <td><a href="<@o...@ofbizUrl>" class="buttontext"><#if prodCatalog?exists>${(prodCatalog.catalogName)?if_exists}</#if> [${(prodCatalogCategory.prodCatalogId)?if_exists}]</a></td>
+ <td>
+ ${(curProdCatalogCategoryType.get("description",locale))?default(prodCatalogCategory.prodCatalogCategoryTypeId)}
+ </td>
+ <#assign hasntStarted = false>
+ <#if (prodCatalogCategory.getTimestamp("fromDate"))?exists && nowTimestamp.before(prodCatalogCategory.getTimestamp("fromDate"))> <#assign hasntStarted = true></#if>
+ <td><div class="tabletext"<#if hasntStarted> style="color: red;"</#if>>${(prodCatalogCategory.fromDate)?if_exists}</div></td>
+ <td align="center">
+ <form method="post" action="<@o...@ofbizUrl>" name="lineForm${line}">
+ <#assign hasExpired = false>
+ <#if (prodCatalogCategory.getTimestamp("thruDate"))?exists && nowTimestamp.after(prodCatalogCategory.getTimestamp("thruDate"))> <#assign hasExpired = true></#if>
+ <input type="hidden" name="prodCatalogId" value="${(prodCatalogCategory.prodCatalogId)?if_exists}"/>
+ <input type="hidden" name="productCategoryId" value="${(prodCatalogCategory.productCategoryId)?if_exists}"/>
+ <input type="hidden" name="prodCatalogCategoryTypeId" value="${prodCatalogCategory.prodCatalogCategoryTypeId}"/>
+ <input type="hidden" name="fromDate" value="${(prodCatalogCategory.fromDate)?if_exists}"/>
+ <input type="text" size="25" name="thruDate" value="${(prodCatalogCategory.thruDate)?if_exists}" class="inputBox" style="<#if (hasExpired) >color: red;</#if>"/>
+ <a href="javascript:call_cal(document.lineForm${line}.thruDate, '${(prodCatalogCategory.thruDate)?default(nowTimestamp?string)}');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"/></a>
+ <input type="text" size="5" name="sequenceNum" value="${(prodCatalogCategory.sequenceNum)?if_exists}" class="inputBox"/>
+ <#-- the prodCatalogCategoryTypeId field is now part of the PK, so it can't be changed, must be re-created
+ <select name="prodCatalogCategoryTypeId" size="1" class="selectBox">
+ <#if (prodCatalogCategory.prodCatalogCategoryTypeId)?exists>
+ <option value="${prodCatalogCategory.prodCatalogCategoryTypeId}"><#if curProdCatalogCategoryType?exists>${(curProdCatalogCategoryType.description)?if_exists}<#else> [${(prodCatalogCategory.prodCatalogCategoryTypeId)}]</#if></option>
+ <option value="${prodCatalogCategory.prodCatalogCategoryTypeId}"></option>
+ <#else>
+ <option value=""> </option>
+ </#if>
+ <#list prodCatalogCategoryTypes as prodCatalogCategoryType>
+ <option value="${(prodCatalogCategoryType.prodCatalogCategoryTypeId)?if_exists}">${(prodCatalogCategoryType.get("description",locale))?if_exists}</option>
+ </#list>
+ </select> -->
+ <input type="submit" value="${uiLabelMap.CommonUpdate}"/>
+ </form>
+ </td>
+ <td align="center">
+ <a href="<@o...@ofbizUrl>" class="buttontext">
+ ${uiLabelMap.CommonDelete}</a>
+ </td>
+ </tr>
+ <#-- toggle the row color -->
+ <#if rowClass == "2">
+ <#assign rowClass = "1">
+ <#else>
+ <#assign rowClass = "2">
+ </#if>
</#list>
- </select>
- <input type="text" size="25" name="fromDate" class="inputBox"/>
- <a href="javascript:call_cal(document.addNewForm.fromDate, '${nowTimestamp?string}');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"/></a>
- <input type="submit" value="${uiLabelMap.CommonAdd}"/>
- </form>
-</#if>
+ </table>
+ <br/>
+ </div>
+ </div>
+ <div class="screenlet">
+ <div class="screenlet-title-bar">
+ <h3>${uiLabelMap.ProductAddCatalogProductCategory}</h3>
+ </div>
+ <div class="screenlet-body">
+ <table cellspacing="0" class="basic-table">
+ <tr><td>
+ <form method="post" action="<@o...@ofbizUrl>" style="margin: 0;" name="addNewForm">
+ <input type="hidden" name="productCategoryId" value="${productCategoryId?if_exists}"/>
+ <select name="prodCatalogId" class="selectBox">
+ <#list prodCatalogs as prodCatalog>
+ <option value="${(prodCatalog.prodCatalogId)?if_exists}">${(prodCatalog.catalogName)?if_exists} [${(prodCatalog.prodCatalogId)?if_exists}]</option>
+ </#list>
+ </select>
+ <select name="prodCatalogCategoryTypeId" size="1" class="selectBox">
+ <#list prodCatalogCategoryTypes as prodCatalogCategoryType>
+ <option value="${(prodCatalogCategoryType.prodCatalogCategoryTypeId)?if_exists}">${(prodCatalogCategoryType.get("description",locale))?if_exists}</option>
+ </#list>
+ </select>
+ <input type="text" size="25" name="fromDate" class="inputBox"/>
+ <a href="javascript:call_cal(document.addNewForm.fromDate, '${nowTimestamp?string}');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"/></a>
+ <input type="submit" value="${uiLabelMap.CommonAdd}"/>
+ </form>
+ </td></tr>
+ </table>
+ </div>
+ </div>
+</#if>
\ No newline at end of file
Modified: ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProducts.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProducts.ftl?rev=606465&r1=606464&r2=606465&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProducts.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProducts.ftl Sat Dec 22 08:26:13 2007
@@ -16,166 +16,202 @@
specific language governing permissions and limitations
under the License.
-->
- <#if activeOnly>
- <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.ProductActiveAndInactive}</a>
- <#else>
- <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.ProductActiveOnly}</a>
- </#if>
-
+<#if activeOnly>
+ <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.ProductActiveAndInactive}</a>
+<#else>
+ <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.ProductActiveOnly}</a>
+</#if>
+<div class="screenlet">
+ <div class="screenlet-title-bar">
<#if (listSize > 0)>
- <table border="0" cellpadding="2">
- <tr>
- <td align="right">
- <span class="tabletext">
- <b>
- <#if (viewIndex > 1)>
- <a href="<@o...@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonPrevious}]</a> |
- </#if>
- ${lowIndex} - ${highIndex} ${uiLabelMap.CommonOf} ${listSize}
- <#if (listSize > highIndex)>
- | <a href="<@o...@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonNext}]</a>
- </#if>
- </b>
- </span>
- </td>
- </tr>
- </table>
+ <div class="boxhead-right">
+ <#if (viewIndex > 1)>
+ <a href="<@o...@ofbizUrl>" class="lightbuttontext">${uiLabelMap.CommonPrevious}</a> |
+ </#if>
+ ${lowIndex} - ${highIndex} ${uiLabelMap.CommonOf} ${listSize}
+ <#if (listSize > highIndex)>
+ | <a class="lightbuttontext" href="<@o...@ofbizUrl>" class="lightbuttontext">${uiLabelMap.CommonNext}</a>
+ </#if>
+ </div>
+ <div class="boxhead-left">
+ <h3>${uiLabelMap.PageTitleEditCategoryProducts}<h3>
+ </div>
+ <div class="boxhead-fill"> </div>
</#if>
-
- <table border="1" cellpadding="2" cellspacing="0">
- <tr>
- <td><div class="tabletext"><b>${uiLabelMap.ProductProductNameId}</b></div></td>
- <td><div class="tabletext"><b>${uiLabelMap.CommonFromDateTime}</b></div></td>
- <td align="center"><div class="tabletext"><b>${uiLabelMap.ProductThruDateTimeSequenceQuantity}<br/>${uiLabelMap.CommonComments}</b></div></td>
- <td><div class="tabletext"><b> </b></div></td>
- </tr>
+ <br/>
+ </div>
+ <div class="screenlet-body">
+ <table cellspacing="0" class="basic-table">
+ <tr class="header-row">
+ <td>${uiLabelMap.ProductProductNameId}</td>
+ <td>${uiLabelMap.CommonFromDateTime}</td>
+ <td align="center">${uiLabelMap.ProductThruDateTimeSequenceQuantity} ${uiLabelMap.CommonComments}</td>
+ <td> </td>
+ </tr>
+ <#if (listSize > 0)>
+ <tr><td>
+ <form method="post" action="<@o...@ofbizUrl>" name="updateCategoryProductForm">
+ <input type="hidden" name="activeOnly" value="${activeOnly.toString()}">
+ <input type="hidden" name="productCategoryId" value="${productCategoryId?if_exists}">
+ <#assign rowClass = "2">
+ <#list productCategoryMembers as productCategoryMember>
+ <#assign suffix = "_o_" + productCategoryMember_index>
+ <#assign product = productCategoryMember.getRelatedOne("Product")>
+ <#assign hasntStarted = false>
+ <#if productCategoryMember.fromDate?exists && nowTimestamp.before(productCategoryMember.getTimestamp("fromDate"))><#assign hasntStarted = true></#if>
+ <#assign hasExpired = false>
+ <#if productCategoryMember.thruDate?exists && nowTimestamp.after(productCategoryMember.getTimestamp("thruDate"))><#assign hasExpired = true></#if>
+ <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
+ <td>
+ <#if (product.smallImageUrl)?exists>
+ <a href="<@o...@ofbizUrl>"><img alt="Small Image" src="<@o...@ofbizContentUrl>" height="40" width="40" align="middle"></a>
+ </#if>
+ <a href="<@o...@ofbizUrl>" class="buttontext"><#if product?exists>${(product.internalName)?if_exists}</#if> [${(productCategoryMember.productId)?if_exists}]</a>
+ </td>
+ <td><div class="tabletext"<#if hasntStarted> style="color: red;"</#if>>${(productCategoryMember.fromDate)?if_exists}</div></td>
+ <td align="center">
+ <input type="hidden" name="productId${suffix}" value="${(productCategoryMember.productId)?if_exists}">
+ <input type="hidden" name="productCategoryId${suffix}" value="${(productCategoryMember.productCategoryId)?if_exists}">
+ <input type="hidden" name="fromDate${suffix}" value="${(productCategoryMember.fromDate)?if_exists}">
+ <input type="text" size="25" name="thruDate${suffix}" value="${(productCategoryMember.thruDate)?if_exists}" class="inputBox" <#if hasExpired>style="color: red;"</#if>>
+ <a href="javascript:call_cal(document.updateCategoryProductForm.thruDate${suffix}, '${(productCategoryMember.thruDate)?default(nowTimestamp?string)}');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a>
+ <input type="text" size="5" name="sequenceNum${suffix}" value="${(productCategoryMember.sequenceNum)?if_exists}" class="inputBox">
+ <input type="text" size="5" name="quantity${suffix}" value="${(productCategoryMember.quantity)?if_exists}" class="inputBox">
+ <br/>
+ <textarea name="comments${suffix}" rows="2" cols="40">${(productCategoryMember.comments)?if_exists}</textarea>
+ </td>
+ <td align="center">
+ <a href="<@o...@ofbizUrl>" class="buttontext">
+ ${uiLabelMap.CommonDelete}</a>
+ </td>
+ </tr>
+ <#-- toggle the row color -->
+ <#if rowClass == "2">
+ <#assign rowClass = "1">
+ <#else>
+ <#assign rowClass = "2">
+ </#if>
+ </#list>
+ <tr valign="middle">
+ <td colspan="4" align="center">
+ <input type="submit" value="${uiLabelMap.CommonUpdate}" style="font-size: x-small;">
+ <input type="hidden" value="${productCategoryMembers.size()}" name="_rowCount">
+ </td>
+ </tr>
+ </form>
+ </#if>
+ </table>
+ </div>
+ <div class="screenlet-title-bar">
<#if (listSize > 0)>
- <form method="post" action="<@o...@ofbizUrl>" name="updateCategoryProductForm">
- <input type="hidden" name="activeOnly" value="${activeOnly.toString()}">
- <input type="hidden" name="productCategoryId" value="${productCategoryId?if_exists}">
- <#list productCategoryMembers as productCategoryMember>
- <#assign suffix = "_o_" + productCategoryMember_index>
- <#assign product = productCategoryMember.getRelatedOne("Product")>
- <#assign hasntStarted = false>
- <#if productCategoryMember.fromDate?exists && nowTimestamp.before(productCategoryMember.getTimestamp("fromDate"))><#assign hasntStarted = true></#if>
- <#assign hasExpired = false>
- <#if productCategoryMember.thruDate?exists && nowTimestamp.after(productCategoryMember.getTimestamp("thruDate"))><#assign hasExpired = true></#if>
- <tr valign="middle">
- <td>
- <#if (product.smallImageUrl)?exists>
- <a href="<@o...@ofbizUrl>"><img alt="Small Image" src="<@o...@ofbizContentUrl>" height="40" width="40" align="middle"></a>
- </#if>
- <a href="<@o...@ofbizUrl>" class="buttontext"><#if product?exists>${(product.internalName)?if_exists}</#if> [${(productCategoryMember.productId)?if_exists}]</a>
- </td>
- <td><div class="tabletext"<#if hasntStarted> style="color: red;"</#if>>${(productCategoryMember.fromDate)?if_exists}</div></td>
- <td align="center">
- <input type="hidden" name="productId${suffix}" value="${(productCategoryMember.productId)?if_exists}">
- <input type="hidden" name="productCategoryId${suffix}" value="${(productCategoryMember.productCategoryId)?if_exists}">
- <input type="hidden" name="fromDate${suffix}" value="${(productCategoryMember.fromDate)?if_exists}">
- <input type="text" size="25" name="thruDate${suffix}" value="${(productCategoryMember.thruDate)?if_exists}" class="inputBox" <#if hasExpired>style="color: red;"</#if>>
- <a href="javascript:call_cal(document.updateCategoryProductForm.thruDate${suffix}, '${(productCategoryMember.thruDate)?default(nowTimestamp?string)}');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a>
- <input type="text" size="5" name="sequenceNum${suffix}" value="${(productCategoryMember.sequenceNum)?if_exists}" class="inputBox">
- <input type="text" size="5" name="quantity${suffix}" value="${(productCategoryMember.quantity)?if_exists}" class="inputBox">
- <br/>
- <textarea name="comments${suffix}" rows="2" cols="40">${(productCategoryMember.comments)?if_exists}</textarea>
- </td>
- <td align="center">
- <a href="<@o...@ofbizUrl>" class="buttontext">
- ${uiLabelMap.CommonDelete}</a>
- </td>
- </tr>
- </#list>
- <tr valign="middle">
- <td colspan="4" align="center">
- <input type="submit" value="${uiLabelMap.CommonUpdate}" style="font-size: x-small;">
- <input type="hidden" value="${productCategoryMembers.size()}" name="_rowCount">
- </td>
- </tr>
- </form>
+ <div class="boxhead-right">
+ <#if (viewIndex > 1)>
+ <a href="<@o...@ofbizUrl>" class="lightbuttontext">${uiLabelMap.CommonPrevious}</a> |
+ </#if>
+ ${lowIndex} - ${highIndex} ${uiLabelMap.CommonOf} ${listSize}
+ <#if (listSize > highIndex)>
+ | <a class="lightbuttontext" href="<@o...@ofbizUrl>" class="lightbuttontext">${uiLabelMap.CommonNext}</a>
+ </#if>
+ </div>
+ <div class="boxhead-left">
+ <h3>${uiLabelMap.PageTitleEditCategoryProducts}<h3>
+ </div>
+ <div class="boxhead-fill"> </div>
</#if>
+ <br/>
+ </div>
+</div>
+<div class="screenlet">
+ <div class="screenlet-title-bar">
+ <h3>${uiLabelMap.ProductAddProductCategoryMember}:</h3>
+ </div>
+ <div class="screenlet-body">
+ <table cellspacing="0" class="basic-table">
+ <tr><td>
+ <form method="post" action="<@o...@ofbizUrl>" style="margin: 0;" name="addProductCategoryMemberForm">
+ <input type="hidden" name="productCategoryId" value="${productCategoryId?if_exists}">
+ <input type="hidden" name="activeOnly" value="${activeOnly.toString()}">
+ <div class="tabletext">
+ <span class="label">${uiLabelMap.ProductProductId}</span> <input type="text" size="20" name="productId" class="inputBox">
+ <a href="javascript:call_fieldlookup2(document.addProductCategoryMemberForm.productId, 'LookupProduct');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Lookup"></a>
+ <span class="label">${uiLabelMap.CommonFromDate}</span> <input type="text" size="22" name="fromDate" class="inputBox">
+ <a href="javascript:call_cal(document.addProductCategoryMemberForm.fromDate, '${nowTimestamp?string}');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a>
+ <br/>
+ <span class="label">${uiLabelMap.CommonComments}</span> <textarea name="comments" rows="2" cols="40"></textarea>
+ <input type="submit" value="${uiLabelMap.CommonAdd}">
+ </div>
+ </form>
+ </td></tr>
</table>
-
- <#if (listSize > 0)>
- <table border="0" cellpadding="2">
- <tr>
- <td align="right">
- <span class="tabletext">
- <b>
- <#if (viewIndex > 1)>
- <a href="<@o...@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonPrevious}]</a> |
- </#if>
- ${lowIndex} - ${highIndex} ${uiLabelMap.CommonOf} ${listSize}
- <#if (listSize > highIndex)>
- | <a href="<@o...@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonNext}]</a>
- </#if>
- </b>
- </span>
- </td>
- </tr>
- </table>
- </#if>
- <br/>
- <form method="post" action="<@o...@ofbizUrl>" style="margin: 0;" name="addProductCategoryMemberForm">
- <input type="hidden" name="productCategoryId" value="${productCategoryId?if_exists}">
- <input type="hidden" name="activeOnly" value="${activeOnly.toString()}">
-
- <h2>${uiLabelMap.ProductAddProductCategoryMember}:</h2>
- <div class="tabletext">
- ${uiLabelMap.ProductProductId}: <input type="text" size="20" name="productId" class="inputBox">
- <a href="javascript:call_fieldlookup2(document.addProductCategoryMemberForm.productId, 'LookupProduct');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Lookup"></a>
- ${uiLabelMap.CommonFromDate}: <input type="text" size="22" name="fromDate" class="inputBox">
- <a href="javascript:call_cal(document.addProductCategoryMemberForm.fromDate, '${nowTimestamp?string}');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a>
- <br/>
- ${uiLabelMap.CommonComments}: <textarea name="comments" rows="2" cols="40"></textarea>
- <input type="submit" value="${uiLabelMap.CommonAdd}">
- </div>
- </form>
-
- <br/>
- <form method="post" action="<@o...@ofbizUrl>" style="margin: 0;" name="copyCategoryProductMembersForm">
- <input type="hidden" name="productCategoryId" value="${productCategoryId?if_exists}">
- <input type="hidden" name="activeOnly" value="${activeOnly.toString()}">
-
- <h2>${uiLabelMap.ProductCopyProductCategoryMembersToAnotherCategory}:</h2>
- <div class="tabletext">
- ${uiLabelMap.ProductTargetProductCategory}:
- <input type="text" class="inputBox" name="productCategoryIdTo" size="20" maxlength="20"/>
- <a href="javascript:call_fieldlookup2(document.copyCategoryProductMembersForm.productCategoryIdTo,'LookupProductCategory');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt='Click here For Field Lookup'/></a>
- <br/>
- ${uiLabelMap.ProductOptionalFilterWithDate}: <input type="text" size="20" name="validDate" class="inputBox">
- <a href="javascript:call_cal(document.copyCategoryProductMembersForm.validDate, '${nowTimestamp?string}');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a>
- <br/>
- ${uiLabelMap.ProductIncludeSubCategories}?
- <select name="recurse" class="selectBox">
- <option value="N">${uiLabelMap.CommonN}</option>
- <option value="Y">${uiLabelMap.CommonY}</option>
- </select>
- <input type="submit" value="${uiLabelMap.CommonCopy}">
- </div>
- </form>
-
- <br/>
- <form method="post" action="<@o...@ofbizUrl>" style="margin: 0;" name="expireAllCategoryProductMembersForm">
- <input type="hidden" name="productCategoryId" value="${productCategoryId?if_exists}">
- <input type="hidden" name="activeOnly" value="${activeOnly.toString()}">
-
- <h2>${uiLabelMap.ProductExpireAllProductMembers}:</h2>
- <div class="tabletext">
- ${uiLabelMap.ProductOptionalExpirationDate}: <input type="text" size="20" name="thruDate" class="inputBox">
- <a href="javascript:call_cal(document.expireAllCategoryProductMembersForm.thruDate, '${nowTimestamp?string}');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a>
- <input type="submit" value="${uiLabelMap.CommonExpireAll}">
- </div>
- </form>
- <br/>
- <form method="post" action="<@o...@ofbizUrl>" style="margin: 0;" name="removeExpiredCategoryProductMembersForm">
- <input type="hidden" name="productCategoryId" value="${productCategoryId?if_exists}">
- <input type="hidden" name="activeOnly" value="${activeOnly.toString()}">
-
- <h2>${uiLabelMap.ProductRemoveExpiredProductMembers}:</h2>
- <div class="tabletext">
- ${uiLabelMap.ProductOptionalExpiredBeforeDate}: <input type="text" size="20" name="validDate" class="inputBox">
- <a href="javascript:call_cal(document.removeExpiredCategoryProductMembersForm.validDate, '${nowTimestamp?string}');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a>
- <input type="submit" value="${uiLabelMap.CommonRemoveExpired}">
- </div>
- </form>
-
+ </div>
+</div>
+<div class="screenlet">
+ <div class="screenlet-title-bar">
+ <h3>${uiLabelMap.ProductCopyProductCategoryMembersToAnotherCategory}:</h3>
+ </div>
+ <div class="screenlet-body">
+ <table cellspacing="0" class="basic-table">
+ <tr><td>
+ <form method="post" action="<@o...@ofbizUrl>" style="margin: 0;" name="copyCategoryProductMembersForm">
+ <input type="hidden" name="productCategoryId" value="${productCategoryId?if_exists}">
+ <input type="hidden" name="activeOnly" value="${activeOnly.toString()}">
+ <div class="tabletext">
+ <span class="label">${uiLabelMap.ProductTargetProductCategory}</span>
+ <input type="text" class="inputBox" name="productCategoryIdTo" size="20" maxlength="20"/>
+ <a href="javascript:call_fieldlookup2(document.copyCategoryProductMembersForm.productCategoryIdTo,'LookupProductCategory');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt='Click here For Field Lookup'/></a>
+ <br/>
+ <span class="label">${uiLabelMap.ProductOptionalFilterWithDate}</span> <input type="text" size="20" name="validDate" class="inputBox">
+ <a href="javascript:call_cal(document.copyCategoryProductMembersForm.validDate, '${nowTimestamp?string}');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a>
+ <br/>
+ <span class="label">${uiLabelMap.ProductIncludeSubCategories}?</span>
+ <select name="recurse" class="selectBox">
+ <option value="N">${uiLabelMap.CommonN}</option>
+ <option value="Y">${uiLabelMap.CommonY}</option>
+ </select>
+ <input type="submit" value="${uiLabelMap.CommonCopy}">
+ </div>
+ </form>
+ </td></tr>
+ </table>
+ </div>
+</div>
+<div class="screenlet">
+ <div class="screenlet-title-bar">
+ <h3>${uiLabelMap.ProductExpireAllProductMembers}:</h3>
+ </div>
+ <div class="screenlet-body">
+ <table cellspacing="0" class="basic-table">
+ <tr><td>
+ <form method="post" action="<@o...@ofbizUrl>" style="margin: 0;" name="expireAllCategoryProductMembersForm">
+ <input type="hidden" name="productCategoryId" value="${productCategoryId?if_exists}">
+ <input type="hidden" name="activeOnly" value="${activeOnly.toString()}">
+ <div class="tabletext">
+ <span class="label">${uiLabelMap.ProductOptionalExpirationDate}</span> <input type="text" size="20" name="thruDate" class="inputBox">
+ <a href="javascript:call_cal(document.expireAllCategoryProductMembersForm.thruDate, '${nowTimestamp?string}');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a>
+ <input type="submit" value="${uiLabelMap.CommonExpireAll}">
+ </div>
+ </form>
+ </td></tr>
+ </table>
+ </div>
+</div>
+<div class="screenlet">
+ <div class="screenlet-title-bar">
+ <h3>${uiLabelMap.ProductRemoveExpiredProductMembers}:</h3>
+ </div>
+ <div class="screenlet-body">
+ <table cellspacing="0" class="basic-table">
+ <tr><td>
+ <form method="post" action="<@o...@ofbizUrl>" style="margin: 0;" name="removeExpiredCategoryProductMembersForm">
+ <input type="hidden" name="productCategoryId" value="${productCategoryId?if_exists}">
+ <input type="hidden" name="activeOnly" value="${activeOnly.toString()}">
+ <div class="tabletext">
+ <span class="label">${uiLabelMap.ProductOptionalExpiredBeforeDate}</span> <input type="text" size="20" name="validDate" class="inputBox">
+ <a href="javascript:call_cal(document.removeExpiredCategoryProductMembersForm.validDate, '${nowTimestamp?string}');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a>
+ <input type="submit" value="${uiLabelMap.CommonRemoveExpired}">
+ </div>
+ </form>
+ </td></tr>
+ </table>
+ </div>
+</div>
\ No newline at end of file
Modified: ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryRollup.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryRollup.ftl?rev=606465&r1=606464&r2=606465&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryRollup.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryRollup.ftl Sat Dec 22 08:26:13 2007
@@ -17,135 +17,176 @@
under the License.
-->
-<#if productCategoryId?has_content>
-<h2>${uiLabelMap.ProductCategoryRollupParentCategories}</h2>
-
-<table border="1" cellpadding="2" cellspacing="0">
- <tr>
- <td><div class="tabletext"><b>${uiLabelMap.ProductParentCategoryId}</b></div></td>
- <td><div class="tabletext"><b>${uiLabelMap.CommonFromDate}</b></div></td>
- <td align="center"><div class="tabletext"><b>${uiLabelMap.ProductThruDateTimeSequence}</b></div></td>
- <td><div class="tabletext"><b> </b></div></td>
- </tr>
-<#if currentProductCategoryRollups.size() != 0>
- <form method="post" action="<@o...@ofbizUrl>" name="updateProductCategoryForm">
- <input type="hidden" name="showProductCategoryId" value="${productCategoryId}">
- <#list currentProductCategoryRollups as productCategoryRollup>
- <#assign suffix = "_o_" + productCategoryRollup_index>
- <#assign curCategory = productCategoryRollup.getRelatedOne("ParentProductCategory")>
- <#assign hasntStarted = false>
- <#if productCategoryRollup.fromDate?exists && nowTimestamp.before(productCategoryRollup.getTimestamp("fromDate"))><#assign hasntStarted = true></#if>
- <#assign hasExpired = false>
- <#if productCategoryRollup.thruDate?exists && nowTimestamp.after(productCategoryRollup.getTimestamp("thruDate"))><#assign hasExpired = true></#if>
- <tr valign="middle">
- <td><#if curCategory?has_content><a href="<@o...@ofbizUrl>" class="buttontext">${curCategory.description?if_exists} [${curCategory.productCategoryId}]</a></#if></td>
- <td><div class="tabletext" <#if hasntStarted>style="color: red;"</#if>>${productCategoryRollup.fromDate}</div></td>
- <td align="center">
- <input type="hidden" name="showProductCategoryId${suffix}" value="${productCategoryRollup.productCategoryId}">
- <input type="hidden" name="productCategoryId${suffix}" value="${productCategoryRollup.productCategoryId}">
- <input type="hidden" name="parentProductCategoryId${suffix}" value="${productCategoryRollup.parentProductCategoryId}">
- <input type="hidden" name="fromDate${suffix}" value="${productCategoryRollup.fromDate}">
- <input type="text" size="25" name="thruDate${suffix}" value="${productCategoryRollup.thruDate?if_exists}" class="inputBox" <#if hasExpired>style="color: red"</#if>>
- <a href="javascript:call_cal(document.updateProductCategoryForm.thruDate${suffix}, null);"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a>
- <input type="text" size="5" name="sequenceNum${suffix}" value="${productCategoryRollup.sequenceNum?if_exists}" class="inputBox">
- </td>
- <td>
- <a href="<@o...@ofbizUrl>" class="buttontext">
- [${uiLabelMap.CommonDelete}]</a>
- </td>
- </tr>
- </#list>
- <tr valign="middle">
- <td colspan="3" align="center">
- <input type="submit" value="${uiLabelMap.CommonUpdate}" style="font-size: x-small;">
- <input type="hidden" value="${currentProductCategoryRollups.size()}" name="_rowCount">
- </td>
- </tr>
- </form>
-</#if>
-<#if currentProductCategoryRollups.size() == 0>
- <tr valign="middle">
- <td colspan="5"><DIV class="tabletext">${uiLabelMap.ProductNoParentCategoriesFound}.</DIV></td>
- </tr>
-</#if>
-</table>
-<br/>
-<form method="post" action="<@o...@ofbizUrl>" style="margin: 0;" name="addParentForm">
- <input type="hidden" name="productCategoryId" value="${productCategoryId}">
- <input type="hidden" name="showProductCategoryId" value="${productCategoryId}">
- <div class="tabletext">${uiLabelMap.CommonAddA} <b>${uiLabelMap.ProductParent}</b> ${uiLabelMap.ProductCategorySelectCategoryAndEnterFromDate}:</div>
- <input type="text" class="inputBox" name="parentProductCategoryId" size="20" maxlength="20" value="${requestParameters.SEARCH_CATEGORY_ID?if_exists}"/>
- <a href="javascript:call_fieldlookup2(document.addParentForm.parentProductCategoryId,'LookupProductCategory');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt='Click here For Field Lookup'/></a>
- <input type="text" size="25" name="fromDate" class="inputBox">
- <a href="javascript:call_cal(document.addParentForm.fromDate, null);"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a>
- <input type="submit" value="${uiLabelMap.CommonAdd}">
-</form>
+<#if productCategoryId?has_content>
+<div class="screenlet">
+ <div class="screenlet-title-bar">
+ <h3>${uiLabelMap.ProductCategoryRollupParentCategories}</h3>
+ </div>
+ <div class="screenlet-body">
+ <table cellspacing="0" class="basic-table">
+ <tr class="header-row">
+ <td><b>${uiLabelMap.ProductParentCategoryId}</b></td>
+ <td><b>${uiLabelMap.CommonFromDate}</b></td>
+ <td align="center"><b>${uiLabelMap.ProductThruDateTimeSequence}</b></td>
+ <td><b> </b></td>
+ </tr>
+ <#if currentProductCategoryRollups.size() != 0>
+ <#assign rowClass = "2">
+ <#list currentProductCategoryRollups as productCategoryRollup>
+ <#assign suffix = "_o_" + productCategoryRollup_index>
+ <#assign curCategory = productCategoryRollup.getRelatedOne("ParentProductCategory")>
+ <#assign hasntStarted = false>
+ <#if productCategoryRollup.fromDate?exists && nowTimestamp.before(productCategoryRollup.getTimestamp("fromDate"))><#assign hasntStarted = true></#if>
+ <#assign hasExpired = false>
+ <#if productCategoryRollup.thruDate?exists && nowTimestamp.after(productCategoryRollup.getTimestamp("thruDate"))><#assign hasExpired = true></#if>
+ <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
+ <td><#if curCategory?has_content><a href="<@o...@ofbizUrl>" class="buttontext">${curCategory.description?if_exists} [${curCategory.productCategoryId}]</a></#if></td>
+ <td><div class="tabletext" <#if hasntStarted>style="color: red;"</#if>>${productCategoryRollup.fromDate}</div></td>
+ <td align="center">
+ <form method="post" action="<@o...@ofbizUrl>" name="updateProductCategoryForm">
+ <input type="hidden" name="showProductCategoryId" value="${productCategoryId}">
+ <input type="hidden" name="showProductCategoryId${suffix}" value="${productCategoryRollup.productCategoryId}">
+ <input type="hidden" name="productCategoryId${suffix}" value="${productCategoryRollup.productCategoryId}">
+ <input type="hidden" name="parentProductCategoryId${suffix}" value="${productCategoryRollup.parentProductCategoryId}">
+ <input type="hidden" name="fromDate${suffix}" value="${productCategoryRollup.fromDate}">
+ <input type="text" size="25" name="thruDate${suffix}" value="${productCategoryRollup.thruDate?if_exists}" class="inputBox" <#if hasExpired>style="color: red"</#if>>
+ <a href="javascript:call_cal(document.updateProductCategoryForm.thruDate${suffix}, null);"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a>
+ <input type="text" size="5" name="sequenceNum${suffix}" value="${productCategoryRollup.sequenceNum?if_exists}" class="inputBox">
+ </form>
+ </td>
+ <td>
+ <a href="<@o...@ofbizUrl>" class="buttontext">
+ ${uiLabelMap.CommonDelete}</a>
+ </td>
+ </tr>
+ <#-- toggle the row color -->
+ <#if rowClass == "2">
+ <#assign rowClass = "1">
+ <#else>
+ <#assign rowClass = "2">
+ </#if>
+ </#list>
+ <tr valign="middle">
+ <td colspan="4" align="center">
+ <input type="submit" value="${uiLabelMap.CommonUpdate}" style="font-size: x-small;">
+ <input type="hidden" value="${currentProductCategoryRollups.size()}" name="_rowCount">
+ </td>
+ </tr>
+ </#if>
+ <#if currentProductCategoryRollups.size() == 0>
+ <tr valign="middle">
+ <td colspan="4">${uiLabelMap.ProductNoParentCategoriesFound}.</td>
+ </tr>
+ </#if>
+ </table>
+ </div>
+</div>
+<div class="screenlet">
+ <div class="screenlet-title-bar">
+ <h3>${uiLabelMap.ProductAddCategoryFather} ${uiLabelMap.ProductCategorySelectCategoryAndEnterFromDate}:</h3>
+ </div>
+ <div class="screenlet-body">
+ <table cellspacing="0" class="basic-table">
+ <tr><td>
+ <form method="post" action="<@o...@ofbizUrl>" style="margin: 0;" name="addParentForm">
+ <input type="hidden" name="productCategoryId" value="${productCategoryId}">
+ <input type="hidden" name="showProductCategoryId" value="${productCategoryId}">
+ <input type="text" class="inputBox" name="parentProductCategoryId" size="20" maxlength="20" value="${requestParameters.SEARCH_CATEGORY_ID?if_exists}"/>
+ <a href="javascript:call_fieldlookup2(document.addParentForm.parentProductCategoryId,'LookupProductCategory');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt='Click here For Field Lookup'/></a>
+ <input type="text" size="25" name="fromDate" class="inputBox">
+ <a href="javascript:call_cal(document.addParentForm.fromDate, null);"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a>
+ <input type="submit" value="${uiLabelMap.CommonAdd}">
+ </form>
+ </td></tr>
+ </table>
+ </div>
+</div>
<br/>
<hr/>
<br/>
-
-<h2>${uiLabelMap.ProductCategoryRollupChildCategories}</h2>
-
-<table border="1" cellpadding="2" cellspacing="0">
- <tr>
- <td><div class="tabletext"><b>${uiLabelMap.ProductChildCategoryId}</b></div></td>
- <td><div class="tabletext"><b>${uiLabelMap.CommonFromDate}</b></div></td>
- <td align="center"><div class="tabletext"><b>${uiLabelMap.ProductThruDateTimeSequence}</b></div></td>
- <td><div class="tabletext"><b> </b></div></td>
- </tr>
-<#if parentProductCategoryRollups.size() != 0>
- <form method="post" action="<@o...@ofbizUrl>" name="updateProductCategoryToCategoryChild">
- <input type="hidden" name="showProductCategoryId" value="${productCategoryId}">
- <#assign lineChild = 0>
- <#list parentProductCategoryRollups as productCategoryRollup>
- <#assign suffix = "_o_" + lineChild>
- <#assign lineChild = lineChild + 1>
- <#assign curCategory = productCategoryRollup.getRelatedOne("CurrentProductCategory")>
- <#assign hasntStarted = false>
- <#if productCategoryRollup.fromDate?exists && nowTimestamp.before(productCategoryRollup.getTimestamp("fromDate"))><#assign hasntStarted = true></#if>
- <#assign hasExpired = false>
- <#if productCategoryRollup.thruDate?exists && nowTimestamp.after(productCategoryRollup.getTimestamp("thruDate"))><#assign hasExpired = true></#if>
- <tr valign="middle">
- <td><#if curCategory?has_content><a href="<@o...@ofbizUrl>" class="buttontext">${curCategory.description?if_exists} [${curCategory.productCategoryId}]</a></#if>
- <td><div class="tabletext" <#if hasntStarted>style="color: red"</#if>>${productCategoryRollup.fromDate}</div></td>
- <td align="center">
- <input type="hidden" name="productCategoryId${suffix}" value="${productCategoryRollup.productCategoryId}">
- <input type="hidden" name="parentProductCategoryId${suffix}" value="${productCategoryRollup.parentProductCategoryId}">
- <input type="hidden" name="fromDate${suffix}" value="${productCategoryRollup.fromDate}">
- <input type="text" size="25" name="thruDate${suffix}" value="${productCategoryRollup.thruDate?if_exists}" class="inputBox" <#if hasExpired>style="color: red;"</#if>>
- <a href="javascript:call_cal(document.updateProductCategoryToCategoryChild.thruDate${suffix}, null);"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a>
- <input type="text" size="5" name="sequenceNum${suffix}" value="${productCategoryRollup.sequenceNum?if_exists}" class="inputBox">
- </td>
- <td>
- <a href="<@o...@ofbizUrl>" class="buttontext">
- [${uiLabelMap.CommonDelete}]</a>
- </td>
- </tr>
- </#list>
- <tr valign="middle">
- <td colspan="3" align="center">
- <input type="submit" value="${uiLabelMap.CommonUpdate}" style="font-size: x-small;">
- <input type="hidden" value="${lineChild}" name="_rowCount">
- </td>
- </tr>
-</form>
-</#if>
-<#if parentProductCategoryRollups.size() == 0>
- <tr valign="middle">
- <td colspan="5"><div class="tabletext">${uiLabelMap.ProductNoChildCategoriesFound}.</div></td>
- </tr>
-</#if>
-</table>
-<br/>
-
-<form method="post" action="<@o...@ofbizUrl>" style="margin: 0;" name="addChildForm">
- <input type="hidden" name="showProductCategoryId" value="${productCategoryId}">
- <input type="hidden" name="parentProductCategoryId" value="${productCategoryId}">
- <div class="tabletext">${uiLabelMap.CommonAddA} <b>${uiLabelMap.ProductChild}</b> ${uiLabelMap.ProductCategorySelectCategoryAndEnterFromDate}:</div>
- <input type="text" class="inputBox" name="productCategoryId" size="20" maxlength="20" value="${requestParameters.SEARCH_CATEGORY_ID?if_exists}"/>
- <a href="javascript:call_fieldlookup2(document.addChildForm.productCategoryId,'LookupProductCategory');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt='Click here For Field Lookup'/></a>
- <input type="text" size="25" name="fromDate" class="inputBox">
- <a href="javascript:call_cal(document.addChildForm.fromDate, null);"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a>
- <input type="submit" value="${uiLabelMap.CommonAdd}">
-</form>
-</#if>
+<div class="screenlet">
+ <div class="screenlet-title-bar">
+ <h3>${uiLabelMap.ProductCategoryRollupChildCategories}</h3>
+ </div>
+ <div class="screenlet-body">
+ <table cellspacing="0" class="basic-table">
+ <tr class="header-row">
+ <td><b>${uiLabelMap.ProductChildCategoryId}</b></td>
+ <td><b>${uiLabelMap.CommonFromDate}</b></td>
+ <td align="center"><b>${uiLabelMap.ProductThruDateTimeSequence}</b></td>
+ <td><b> </b></td>
+ </tr>
+ <#if parentProductCategoryRollups.size() != 0>
+ <#assign lineChild = 0>
+ <#assign rowClass = "2">
+ <#list parentProductCategoryRollups as productCategoryRollup>
+ <#assign suffix = "_o_" + lineChild>
+ <#assign lineChild = lineChild + 1>
+ <#assign curCategory = productCategoryRollup.getRelatedOne("CurrentProductCategory")>
+ <#assign hasntStarted = false>
+ <#if productCategoryRollup.fromDate?exists && nowTimestamp.before(productCategoryRollup.getTimestamp("fromDate"))><#assign hasntStarted = true></#if>
+ <#assign hasExpired = false>
+ <#if productCategoryRollup.thruDate?exists && nowTimestamp.after(productCategoryRollup.getTimestamp("thruDate"))><#assign hasExpired = true></#if>
+ <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
+ <td><#if curCategory?has_content><a href="<@o...@ofbizUrl>" class="buttontext">${curCategory.description?if_exists} [${curCategory.productCategoryId}]</a></#if>
+ <td><div class="tabletext" <#if hasntStarted>style="color: red"</#if>>${productCategoryRollup.fromDate}</div></td>
+ <td align="center">
+ <form method="post" action="<@o...@ofbizUrl>" name="updateProductCategoryToCategoryChild">
+ <input type="hidden" name="showProductCategoryId" value="${productCategoryId}">
+ <input type="hidden" name="productCategoryId${suffix}" value="${productCategoryRollup.productCategoryId}">
+ <input type="hidden" name="parentProductCategoryId${suffix}" value="${productCategoryRollup.parentProductCategoryId}">
+ <input type="hidden" name="fromDate${suffix}" value="${productCategoryRollup.fromDate}">
+ <input type="text" size="25" name="thruDate${suffix}" value="${productCategoryRollup.thruDate?if_exists}" class="inputBox" <#if hasExpired>style="color: red;"</#if>>
+ <a href="javascript:call_cal(document.updateProductCategoryToCategoryChild.thruDate${suffix}, null);"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a>
+ <input type="text" size="5" name="sequenceNum${suffix}" value="${productCategoryRollup.sequenceNum?if_exists}" class="inputBox">
+ </form>
+ </td>
+ <td>
+ <a href="<@o...@ofbizUrl>" class="buttontext">
+ ${uiLabelMap.CommonDelete}</a>
+ </td>
+ </tr>
+ <#-- toggle the row color -->
+ <#if rowClass == "2">
+ <#assign rowClass = "1">
+ <#else>
+ <#assign rowClass = "2">
+ </#if>
+ </#list>
+ <tr valign="middle">
+ <td colspan="4" align="center">
+ <input type="submit" value="${uiLabelMap.CommonUpdate}" style="font-size: x-small;">
+ <input type="hidden" value="${lineChild}" name="_rowCount">
+ </td>
+ </tr>
+ </tr>
+ </#if>
+ <#if parentProductCategoryRollups.size() == 0>
+ <tr valign="middle">
+ <td colspan="4"><div class="tabletext">${uiLabelMap.ProductNoChildCategoriesFound}.</div></td>
+ </tr>
+ </#if>
+ </table>
+ </div>
+</div>
+<div class="screenlet">
+ <div class="screenlet-title-bar">
+ <h3>${uiLabelMap.ProductAddCategoryChild} ${uiLabelMap.ProductCategorySelectCategoryAndEnterFromDate}:</h3>
+ </div>
+ <div class="screenlet-body">
+ <table cellspacing="0" class="basic-table">
+ <tr><td>
+ <form method="post" action="<@o...@ofbizUrl>" style="margin: 0;" name="addChildForm">
+ <input type="hidden" name="showProductCategoryId" value="${productCategoryId}">
+ <input type="hidden" name="parentProductCategoryId" value="${productCategoryId}">
+ <input type="text" class="inputBox" name="productCategoryId" size="20" maxlength="20" value="${requestParameters.SEARCH_CATEGORY_ID?if_exists}"/>
+ <a href="javascript:call_fieldlookup2(document.addChildForm.productCategoryId,'LookupProductCategory');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt='Click here For Field Lookup'/></a>
+ <input type="text" size="25" name="fromDate" class="inputBox">
+ <a href="javascript:call_cal(document.addChildForm.fromDate, null);"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a>
+ <input type="submit" value="${uiLabelMap.CommonAdd}">
+ </form>
+ </td></tr>
+ </table>
+ </div>
+</div>
+</#if>
\ No newline at end of file
Modified: ofbiz/trunk/applications/product/webapp/catalog/category/createProductInCategoryCheckExisting.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/category/createProductInCategoryCheckExisting.ftl?rev=606465&r1=606464&r2=606465&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/category/createProductInCategoryCheckExisting.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/category/createProductInCategoryCheckExisting.ftl Sat Dec 22 08:26:13 2007
@@ -20,110 +20,115 @@
<#if productCategoryId?has_content>
<a href="<@o...@ofbizUrl>" class="buttontext">[${uiLabelMap.ProductBackToEditCategory}]</a>
</#if>
-
-<h1>
- ${uiLabelMap.ProductCheckingForExistingProductInCategory} <#if (productCategory.description)?has_content>"${productCategory.description}"</#if> [${uiLabelMap.CommonId}:${productCategoryId?if_exists}]
-
- <#if productFeatureAndTypeDatas?has_content>
- ${uiLabelMap.CommonWhere }
- <#list productFeatureAndTypeDatas as productFeatureAndTypeData>
- <#assign productFeatureType = productFeatureAndTypeData.productFeatureType>
- <#assign productFeature = productFeatureAndTypeData.productFeature>
- ${productFeatureType.description} = ${productFeature.description}
- <#if productFeatureAndTypeData_has_next>,${uiLabelMap.CommonAnd} </#if>
- </#list>
- </#if>
-</h1>
-
-<#if products?has_content>
- <table cellpadding="1" cellspacing="0" border="1">
- <tr>
- <td><div class="tableheadtext">${uiLabelMap.ProductInternalName}</div></td>
- <td><div class="tableheadtext">${uiLabelMap.ProductProductName}</div></td>
- <td width="10%"> </td>
- </tr>
- <#list products as product>
- <tr>
- <td><div class="tabletext">${product.internalName?default("-no internal name-")} [${product.productId}]</div></td>
- <td><div class="tabletext">${product.productName?default("-no name-")} [${product.productId}]</div></td>
- <td width="10%"><a href="<@o...@ofbizUrl>" class="buttontext">[${uiLabelMap.ProductThisIsIt}]</a></td>
- </tr>
- </#list>
- </table>
-<#else>
- <h3> ${uiLabelMap.ProductNoExistingProductsFound}.</h3>
-</#if>
-
-<br/>
-
-<form name="createProductInCategoryForm" method="post" action="<@o...@ofbizUrl>" style="margin: 0;">
- <input type="hidden" name="productCategoryId" value="${productCategoryId}">
- <table cellpadding="1" cellspacing="0" border="1">
- <#list productFeatureAndTypeDatas?if_exists as productFeatureAndTypeData>
- <#assign productFeatureType = productFeatureAndTypeData.productFeatureType>
- <#assign productFeature = productFeatureAndTypeData.productFeature>
- <#assign productFeatureTypeId = productFeatureType.productFeatureTypeId>
- <input type="hidden" name="pft_${productFeatureType.productFeatureTypeId}" value="${productFeature.productFeatureId}"/>
+<div class="screenlet">
+ <div class="screenlet-title-bar">
+ <table>
<tr>
- <td width="15%">
- <div class="tabletext">${productFeatureType.description}</div>
- </td>
- <td>
- <div class="tabletext">
- ${productFeature.description}
- <#if requestParameters["pftsel_" + productFeatureTypeId]?exists>
- <input type="hidden" name="pftsel_${productFeatureTypeId}" value="Y"/>
- [${uiLabelMap.ProductSelectable}]
- <#else>
- <input type="hidden" name="pftsel_${productFeatureTypeId}" value="N"/>
- [${uiLabelMap.ProductStandard}]
- </#if>
- </div>
+ <td style="head3">
+ <b>${uiLabelMap.ProductCheckingForExistingProductInCategory} <#if (productCategory.description)?has_content>"${productCategory.description}"</#if> [${uiLabelMap.CommonId}:${productCategoryId?if_exists}]</b>
+ <#if productFeatureAndTypeDatas?has_content>
+ ${uiLabelMap.CommonWhere }
+ <#list productFeatureAndTypeDatas as productFeatureAndTypeData>
+ <#assign productFeatureType = productFeatureAndTypeData.productFeatureType>
+ <#assign productFeature = productFeatureAndTypeData.productFeature>
+ ${productFeatureType.description} = ${productFeature.description}
+ <#if productFeatureAndTypeData_has_next>,${uiLabelMap.CommonAnd} </#if>
+ </#list>
+ </#if>
</td>
</tr>
+ </table>
+ </div>
+ <div class="screenlet-body">
+ <#if products?has_content>
+ <table cellspacing="0" class="basic-table">
+ <tr>
+ <td><div class="tableheadtext">${uiLabelMap.ProductInternalName}</div></td>
+ <td><div class="tableheadtext">${uiLabelMap.ProductProductName}</div></td>
+ <td width="10%"> </td>
+ </tr>
+ <#list products as product>
+ <tr>
+ <td><div class="tabletext">${product.internalName?default("-no internal name-")} [${product.productId}]</div></td>
+ <td><div class="tabletext">${product.productName?default("-no name-")} [${product.productId}]</div></td>
+ <td width="10%"><a href="<@o...@ofbizUrl>" class="buttontext">[${uiLabelMap.ProductThisIsIt}]</a></td>
+ </tr>
</#list>
- <tr>
- <td width="15%"><div class="tabletext">${uiLabelMap.ProductInternalName}:</div></td>
- <td>
- <input type="hidden" name="internalName" value="${requestParameters.internalName?if_exists}"/>
- <div class="tabletext"> ${requestParameters.internalName?default(" ")}</div>
- </td>
- </tr>
- <tr>
- <td width="15%"><div class="tabletext">${uiLabelMap.ProductProductName}:</div></td>
- <td>
- <input type="hidden" name="productName" value="${requestParameters.productName?if_exists}"/>
- <div class="tabletext"> ${requestParameters.productName?default(" ")}</div>
- </td>
- </tr>
- <tr>
- <td width="15%"><div class="tabletext">${uiLabelMap.ProductShortDescription}:</div></td>
- <td>
- <input type="hidden" name="description" value="${requestParameters.description?if_exists}"/>
- <div class="tabletext"> ${requestParameters.description?default(" ")}</div>
- </td>
- </tr>
- <tr>
- <td width="15%"><div class="tabletext">${uiLabelMap.ProductDefaultPrice}:</div></td>
- <td>
- <input type="hidden" name="defaultPrice" value="${requestParameters.defaultPrice?if_exists}"/>
- <div class="tabletext"> ${requestParameters.defaultPrice?default(" ")}</div>
- </td>
- </tr>
- <tr>
- <td width="15%"><div class="tabletext">${uiLabelMap.ProductAverageCost}:</div></td>
- <td>
- <input type="hidden" name="averageCost" value="${requestParameters.averageCost?if_exists}"/>
- <div class="tabletext"> ${requestParameters.averageCost?default(" ")}</div>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- <div class="tabletext">
- ${uiLabelMap.ProductNewProductId}: <input type="text" name="productId" value="" class="inputBox"/>
- <input type="submit" value="${uiLabelMap.ProductCreateNewProduct}" class="smallSubmit"/>
- </div>
- </td>
- </tr>
- </table>
-</form>
+ </table>
+ <#else>
+ <div class="head3"> ${uiLabelMap.ProductNoExistingProductsFound}.</div>
+ </#if>
+ </div>
+ <br/>
+ <div class="screenlet-body">
+ <form name="createProductInCategoryForm" method="post" action="<@o...@ofbizUrl>" style="margin: 0;">
+ <input type="hidden" name="productCategoryId" value="${productCategoryId}">
+ <table cellspacing="0" class="basic-table">
+ <#list productFeatureAndTypeDatas?if_exists as productFeatureAndTypeData>
+ <#assign productFeatureType = productFeatureAndTypeData.productFeatureType>
+ <#assign productFeature = productFeatureAndTypeData.productFeature>
+ <#assign productFeatureTypeId = productFeatureType.productFeatureTypeId>
+ <input type="hidden" name="pft_${productFeatureType.productFeatureTypeId}" value="${productFeature.productFeatureId}"/>
+ <tr>
+ <td width="15%">${productFeatureType.description}</td>
+ <td>
+ <div>
+ ${productFeature.description}
+ <#if requestParameters["pftsel_" + productFeatureTypeId]?exists>
+ <input type="hidden" name="pftsel_${productFeatureTypeId}" value="Y"/>
+ [${uiLabelMap.ProductSelectable}]
+ <#else>
+ <input type="hidden" name="pftsel_${productFeatureTypeId}" value="N"/>
+ [${uiLabelMap.ProductStandard}]
+ </#if>
+ </div>
+ </td>
+ </tr>
+ </#list>
+ <tr>
+ <td width="15%">${uiLabelMap.ProductInternalName}:</td>
+ <td>
+ <input type="hidden" name="internalName" value="${requestParameters.internalName?if_exists}"/>
+ <div> ${requestParameters.internalName?default(" ")}</div>
+ </td>
+ </tr>
+ <tr>
+ <td width="15%">${uiLabelMap.ProductProductName}:</td>
+ <td>
+ <input type="hidden" name="productName" value="${requestParameters.productName?if_exists}"/>
+ <div> ${requestParameters.productName?default(" ")}</div>
+ </td>
+ </tr>
+ <tr>
+ <td width="15%">${uiLabelMap.ProductShortDescription}:</td>
+ <td>
+ <input type="hidden" name="description" value="${requestParameters.description?if_exists}"/>
+ <div> ${requestParameters.description?default(" ")}</div>
+ </td>
+ </tr>
+ <tr>
+ <td width="15%">${uiLabelMap.ProductDefaultPrice}:</td>
+ <td>
+ <input type="hidden" name="defaultPrice" value="${requestParameters.defaultPrice?if_exists}"/>
+ <div> ${requestParameters.defaultPrice?default(" ")}</div>
+ </td>
+ </tr>
+ <tr>
+ <td width="15%">${uiLabelMap.ProductAverageCost}:</td>
+ <td>
+ <input type="hidden" name="averageCost" value="${requestParameters.averageCost?if_exists}"/>
+ <div> ${requestParameters.averageCost?default(" ")}</div>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="3">
+ <div>
+ ${uiLabelMap.ProductNewProductId}: <input type="text" name="productId" value="" class="inputBox"/>
+ <input type="submit" value="${uiLabelMap.ProductCreateNewProduct}" class="smallSubmit"/>
+ </div>
+ </td>
+ </tr>
+ </table>
+ </form>
+ </div>
+</div>
\ No newline at end of file
Modified: ofbiz/trunk/applications/product/webapp/catalog/category/createProductInCategoryStart.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/category/createProductInCategoryStart.ftl?rev=606465&r1=606464&r2=606465&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/category/createProductInCategoryStart.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/category/createProductInCategoryStart.ftl Sat Dec 22 08:26:13 2007
@@ -22,55 +22,61 @@
<#if productCategoryId?has_content>
<a href="<@o...@ofbizUrl>" class="buttontext">[${uiLabelMap.ProductBackToEditCategory}]</a>
</#if>
-
-<form name="createProductInCategoryCheckExistingForm" method="post" action="<@o...@ofbizUrl>" style="margin: 0;">
- <input type="hidden" name="productCategoryId" value="${productCategoryId}">
- <table cellpadding="1" cellspacing="0" border="1">
- <#list productFeaturesByTypeMap.keySet() as productFeatureTypeId>
- <#assign findPftMap = Static["org.ofbiz.base.util.UtilMisc"].toMap("productFeatureTypeId", productFeatureTypeId)>
- <#assign productFeatureType = delegator.findByPrimaryKeyCache("ProductFeatureType", findPftMap)>
- <#assign productFeatures = productFeaturesByTypeMap[productFeatureTypeId]>
- <tr>
- <td width="15%">
- <div class="tabletext">${productFeatureType.description}:</div>
- </td>
- <td>
- <div class="tabletext">
- <select class="selectBox" name="pft_${productFeatureTypeId}">
- <option value="">- ${uiLabelMap.CommonNone} -</option>
- <#list productFeatures as productFeature>
- <option value="${productFeature.productFeatureId}">${productFeature.description}</option>
- </#list>
- </select>
- <input type="checkbox" name="pftsel_${productFeatureTypeId}"/>${uiLabelMap.ProductSelectable}
- </div>
- </td>
- </tr>
- </#list>
- <tr>
- <td width="15%"><div class="tabletext">${uiLabelMap.ProductInternalName}:</div></td>
- <td><input type="text" name="internalName" size="30" maxlength="255" class="inputBox"/></td>
- </tr>
- <tr>
- <td width="15%"><div class="tabletext">${uiLabelMap.ProductProductName}:</div></td>
- <td><input type="text" name="productName" size="30" maxlength="60" class="inputBox"/></td>
- </tr>
- <tr>
- <td width="15%"><div class="tabletext">${uiLabelMap.ProductShortDescription}:</div></td>
- <td><input type="text" name="description" size="60" maxlength="250" class="inputBox"/></td>
- </tr>
- <tr>
- <td width="15%"><div class="tabletext">${uiLabelMap.ProductDefaultPrice}:</div></td>
- <td><input type="text" name="defaultPrice" size="8" class="inputBox"/></td>
- </tr>
- <tr>
- <td width="15%"><div class="tabletext">${uiLabelMap.ProductAverageCost}:</div></td>
- <td><input type="text" name="averageCost" size="8" class="inputBox"/></td>
- </tr>
- <tr>
- <td colspan="3">
- <a href="javascript:document.createProductInCategoryCheckExistingForm.submit()" class="buttontext">${uiLabelMap.ProductCheckExisting}</a>
- </td>
- </tr>
- </table>
-</form>
+<div class="screenlet">
+ <div class="screenlet-title-bar">
+ <table>
+ <tr><td style="head3"><b> </b></td></tr>
+ </table>
+ </div>
+ <div class="screenlet-body">
+ <form name="createProductInCategoryCheckExistingForm" method="post" action="<@o...@ofbizUrl>" style="margin: 0;">
+ <input type="hidden" name="productCategoryId" value="${productCategoryId}">
+ <table cellspacing="0" class="basic-table">
+ <#list productFeaturesByTypeMap.keySet() as productFeatureTypeId>
+ <#assign findPftMap = Static["org.ofbiz.base.util.UtilMisc"].toMap("productFeatureTypeId", productFeatureTypeId)>
+ <#assign productFeatureType = delegator.findByPrimaryKeyCache("ProductFeatureType", findPftMap)>
+ <#assign productFeatures = productFeaturesByTypeMap[productFeatureTypeId]>
+ <tr>
+ <td width="15%">${productFeatureType.description}:</td>
+ <td>
+ <div>
+ <select class="selectBox" name="pft_${productFeatureTypeId}">
+ <option value="">- ${uiLabelMap.CommonNone} -</option>
+ <#list productFeatures as productFeature>
+ <option value="${productFeature.productFeatureId}">${productFeature.description}</option>
+ </#list>
+ </select>
+ <input type="checkbox" name="pftsel_${productFeatureTypeId}"/>${uiLabelMap.ProductSelectable}
+ </div>
+ </td>
+ </tr>
+ </#list>
+ <tr>
+ <td width="15%">${uiLabelMap.ProductInternalName}:</td>
+ <td><input type="text" name="internalName" size="30" maxlength="60" class="inputBox"/></td>
+ </tr>
+ <tr>
+ <td width="15%">${uiLabelMap.ProductProductName}:</td>
+ <td><input type="text" name="productName" size="30" maxlength="60" class="inputBox"/></td>
+ </tr>
+ <tr>
+ <td width="15%">${uiLabelMap.ProductShortDescription}:</td>
+ <td><input type="text" name="description" size="60" maxlength="250" class="inputBox"/></td>
+ </tr>
+ <tr>
+ <td width="15%">${uiLabelMap.ProductDefaultPrice}:</td>
+ <td><input type="text" name="defaultPrice" size="8" class="inputBox"/></td>
+ </tr>
+ <tr>
+ <td width="15%">${uiLabelMap.ProductAverageCost}:</td>
+ <td><input type="text" name="averageCost" size="8" class="inputBox"/></td>
+ </tr>
+ <tr>
+ <td colspan="3">
+ <a href="javascript:document.createProductInCategoryCheckExistingForm.submit()" class="buttontext">${uiLabelMap.ProductCheckExisting}</a>
+ </td>
+ </tr>
+ </table>
+ </form>
+ </div>
+</div>
\ No newline at end of file