svn commit: r589317 - in /ofbiz/trunk/applications/prod
Locked
 
|
Author: jacopoc
Date: Sun Oct 28 03:06:56 2007 New Revision: 589317 URL: http://svn.apache.org/viewvc?rev=589317&view=rev Log: Divided the keywordsearch.ftl template into two templates to enhance reusability: keywordsearch.ftl now only displays the search results keywordsearchactions.ftl displays the actions available on the results list Added: ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearchactions.ftl (with props) Modified: ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearch.ftl ofbiz/trunk/applications/product/widget/catalog/FindScreens.xml Modified: ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearch.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearch.ftl?rev=589317&r1=589316&r2=589317&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearch.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearch.ftl Sun Oct 28 03:06:56 2007 @@ -69,7 +69,6 @@ } </script> -<#if productIds?has_content> <table border="0" width="100%" cellpadding="2"> <tr> <td align="left"><input type="checkbox" name="selectAll" value="0" onclick="javascript:toggleAll(this);"> <b>${uiLabelMap.ProductProduct}</b></td> @@ -89,7 +88,6 @@ </tr> <tr><td colspan="2"><hr class="sepbar"/></td></tr> </table> -</#if> <form method="post" name="products"> <table width="100%" cellpadding="0" cellspacing="0"> @@ -105,9 +103,7 @@ </#list> </table> <form> -</#if> -<#if productIds?has_content> <table border="0" width="100%" cellpadding="2"> <tr> <td align="right"> @@ -125,103 +121,4 @@ </td> </tr> </table> - -<hr class="sepbar"/> -<div class="tabletext"><b>${uiLabelMap.ProductNote}:</b> ${uiLabelMap.ProductNoteKeywordSearch}</div> -<hr class="sepbar"/> - -${screens.render("component://product/widget/catalog/ProductScreens.xml#CreateVirtualWithVariantsFormInclude")} - -<hr class="sepbar"/> - -<div class="tabletext"> -<form method="post" action="<@ofbizUrl>searchRemoveFromCategory</@ofbizUrl>" name="searchRemoveFromCategory"> - <b>${uiLabelMap.ProductRemoveResultsFrom} </b> ${uiLabelMap.ProductCategory}: - <input type="text" class="inputBox" name="SE_SEARCH_CATEGORY_ID" size="20" maxlength="20"/> - <a href="javascript:call_fieldlookup2(document.searchRemoveFromCategory.SE_SEARCH_CATEGORY_ID,'LookupProductCategory');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt='Click here For Field Lookup'/></a> - <input type="hidden" name="clearSearch" value="N"> - <input type="submit" value="${uiLabelMap.CommonRemove}" class="smallSubmit"><br/> -</form> -</div> - -<hr class="sepbar"/> - -<div class="tabletext"> -<form method="post" action="<@ofbizUrl>searchExpireFromCategory</@ofbizUrl>" name="searchExpireFromCategory"> - <b>${uiLabelMap.ProductExpireResultsFrom} </b> ${uiLabelMap.ProductCategory}: - <input type="text" class="inputBox" name="SE_SEARCH_CATEGORY_ID" size="20" maxlength="20"/> - <a href="javascript:call_fieldlookup2(document.searchExpireFromCategory.SE_SEARCH_CATEGORY_ID,'LookupProductCategory');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt='Click here For Field Lookup'/></a> - ${uiLabelMap.CommonThru}<input type="text" size="25" name="thruDate" class="inputBox"><a href="javascript:call_cal(document.searchExpireFromCategory.thruDate, null);"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a> - <input type="hidden" name="clearSearch" value="N"> - <input type="submit" value="${uiLabelMap.CommonExpire}" class="smallSubmit"><br/> -</form> -</div> - -<hr class="sepbar"/> - -<div class="tabletext"> -<form method="post" action="<@ofbizUrl>searchAddToCategory</@ofbizUrl>" name="searchAddToCategory"> - <b>${uiLabelMap.ProductAddResultsTo} </b> ${uiLabelMap.ProductCategory}: - <input type="text" class="inputBox" name="SE_SEARCH_CATEGORY_ID" size="20" maxlength="20"/> - <a href="javascript:call_fieldlookup2(document.searchAddToCategory.SE_SEARCH_CATEGORY_ID,'LookupProductCategory');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt='Click here For Field Lookup'/></a> - ${uiLabelMap.CommonFrom}<input type="text" size="25" name="fromDate" class="inputBox"><a href="javascript:call_cal(document.searchAddToCategory.fromDate, null);"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a> - <input type="hidden" name="clearSearch" value="N"> - <input type="submit" value="${uiLabelMap.ProductAddToCategory}" class="smallSubmit"><br/> -</form> -</div> - -<hr class="sepbar"/> - -<div class="tabletext"> -<form method="post" action="<@ofbizUrl>searchAddFeature</@ofbizUrl>" name="searchAddFeature"> - <b>${uiLabelMap.ProductAddFeatureToResults}:</b><br/> - ${uiLabelMap.ProductFeatureId}<input type="text" size="10" name="productFeatureId" value="" class="inputBox"> - ${uiLabelMap.CommonFrom}<input type="tex"t size="25" name="fromDate" class="inputBox"><a href="javascript:call_cal(document.searchAddFeature.fromDate, null);"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a> - ${uiLabelMap.CommonThru}<input type="text" size="25" name="thruDate" class="inputBox"><a href="javascript:call_cal(document.searchAddFeature.thruDate, null);"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a> - <br/> - ${uiLabelMap.CommonAmount}<input type="text" size="5" name="amount" value="" class="inputBox"> - ${uiLabelMap.CommonSequence}<input type="text" size="5" name="sequenceNum" value="" class="inputBox"> - ${uiLabelMap.ProductFeatureApplicationType} - ${uiLabelMap.ProductCategoryId}: - <select name='productFeatureApplTypeId' size='1' class='selectBox'> - <#list applicationTypes as applicationType> - <#assign displayDesc = applicationType.get("description", locale)?default("No Description")> - <#if 18 < displayDesc?length> - <#assign displayDesc = displayDesc[0..15] + "..."> - </#if> - <option value="${applicationType.productFeatureApplTypeId}">${displayDesc}</option> - </#list> - </select> - <input type="hidden" name="clearSearch" value="N"> - <input type="submit" value="${uiLabelMap.ProductAddFeature}" class="smallSubmit"><br/> -</form> -</div> - -<hr class="sepbar"/> -<div class="tabletext"> -<form method="post" action="<@ofbizUrl>searchRemoveFeature</@ofbizUrl>" name="searchRemoveFeature"> - <b>${uiLabelMap.ProductRemoveFeatureFromResults}:</b><br/> - ${uiLabelMap.ProductFeatureId}<input type="text" size="10" name="productFeatureId" value="" class="inputBox"> - <input type="hidden" name="clearSearch" value="N"> - <input type="submit" value="${uiLabelMap.ProductRemoveFeature}" class="smallSubmit"><br/> -</form> -</div> - -<hr class="sepbar"/> -<div class="tabletext"> -<form method="post" action="" name="searchShowParams"> - <#assign searchParams = Static["org.ofbiz.product.product.ProductSearchSession"].makeSearchParametersString(session)> - <div><b>${uiLabelMap.ProductPlainSearchParameters}:</b><input type="text" size="60" name="searchParameters" value="${searchParams}" class="inputBox"></div> - <div><b>${uiLabelMap.ProductHtmlSearchParameters}:</b><input type="text" size="60" name="searchParameters" value="${searchParams?html}" class="inputBox"></div> - <input type="hidden" name="clearSearch" value="N"> -</form> -</div> - -<hr class="sepbar"/> -<div class="tabletext"> - <b>${uiLabelMap.ProductSearchExportProductList}:</b> <a href="<@ofbizUrl>searchExportProductList?clearSearch=N</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductSearchExport}</a> - <#if productIds?has_content> - <a href="javascript:exportToeBay();" class="buttontext">${uiLabelMap.ProductExportToeBay}</a> - </#if> -</div> </#if> Added: ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearchactions.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearchactions.ftl?rev=589317&view=auto ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearchactions.ftl (added) +++ ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearchactions.ftl Sun Oct 28 03:06:56 2007 @@ -0,0 +1,120 @@ +<#-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + +<#if productIds?has_content> + +<hr class="sepbar"/> +<div class="tabletext"><b>${uiLabelMap.ProductNote}:</b> ${uiLabelMap.ProductNoteKeywordSearch}</div> +<hr class="sepbar"/> + +${screens.render("component://product/widget/catalog/ProductScreens.xml#CreateVirtualWithVariantsFormInclude")} + +<hr class="sepbar"/> + +<div class="tabletext"> +<form method="post" action="<@ofbizUrl>searchRemoveFromCategory</@ofbizUrl>" name="searchRemoveFromCategory"> + <b>${uiLabelMap.ProductRemoveResultsFrom} </b> ${uiLabelMap.ProductCategory}: + <input type="text" class="inputBox" name="SE_SEARCH_CATEGORY_ID" size="20" maxlength="20"/> + <a href="javascript:call_fieldlookup2(document.searchRemoveFromCategory.SE_SEARCH_CATEGORY_ID,'LookupProductCategory');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt='Click here For Field Lookup'/></a> + <input type="hidden" name="clearSearch" value="N"> + <input type="submit" value="${uiLabelMap.CommonRemove}" class="smallSubmit"><br/> +</form> +</div> + +<hr class="sepbar"/> + +<div class="tabletext"> +<form method="post" action="<@ofbizUrl>searchExpireFromCategory</@ofbizUrl>" name="searchExpireFromCategory"> + <b>${uiLabelMap.ProductExpireResultsFrom} </b> ${uiLabelMap.ProductCategory}: + <input type="text" class="inputBox" name="SE_SEARCH_CATEGORY_ID" size="20" maxlength="20"/> + <a href="javascript:call_fieldlookup2(document.searchExpireFromCategory.SE_SEARCH_CATEGORY_ID,'LookupProductCategory');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt='Click here For Field Lookup'/></a> + ${uiLabelMap.CommonThru}<input type="text" size="25" name="thruDate" class="inputBox"><a href="javascript:call_cal(document.searchExpireFromCategory.thruDate, null);"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a> + <input type="hidden" name="clearSearch" value="N"> + <input type="submit" value="${uiLabelMap.CommonExpire}" class="smallSubmit"><br/> +</form> +</div> + +<hr class="sepbar"/> + +<div class="tabletext"> +<form method="post" action="<@ofbizUrl>searchAddToCategory</@ofbizUrl>" name="searchAddToCategory"> + <b>${uiLabelMap.ProductAddResultsTo} </b> ${uiLabelMap.ProductCategory}: + <input type="text" class="inputBox" name="SE_SEARCH_CATEGORY_ID" size="20" maxlength="20"/> + <a href="javascript:call_fieldlookup2(document.searchAddToCategory.SE_SEARCH_CATEGORY_ID,'LookupProductCategory');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt='Click here For Field Lookup'/></a> + ${uiLabelMap.CommonFrom}<input type="text" size="25" name="fromDate" class="inputBox"><a href="javascript:call_cal(document.searchAddToCategory.fromDate, null);"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a> + <input type="hidden" name="clearSearch" value="N"> + <input type="submit" value="${uiLabelMap.ProductAddToCategory}" class="smallSubmit"><br/> +</form> +</div> + +<hr class="sepbar"/> + +<div class="tabletext"> +<form method="post" action="<@ofbizUrl>searchAddFeature</@ofbizUrl>" name="searchAddFeature"> + <b>${uiLabelMap.ProductAddFeatureToResults}:</b><br/> + ${uiLabelMap.ProductFeatureId}<input type="text" size="10" name="productFeatureId" value="" class="inputBox"> + ${uiLabelMap.CommonFrom}<input type="tex"t size="25" name="fromDate" class="inputBox"><a href="javascript:call_cal(document.searchAddFeature.fromDate, null);"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a> + ${uiLabelMap.CommonThru}<input type="text" size="25" name="thruDate" class="inputBox"><a href="javascript:call_cal(document.searchAddFeature.thruDate, null);"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a> + <br/> + ${uiLabelMap.CommonAmount}<input type="text" size="5" name="amount" value="" class="inputBox"> + ${uiLabelMap.CommonSequence}<input type="text" size="5" name="sequenceNum" value="" class="inputBox"> + ${uiLabelMap.ProductFeatureApplicationType} + ${uiLabelMap.ProductCategoryId}: + <select name='productFeatureApplTypeId' size='1' class='selectBox'> + <#list applicationTypes as applicationType> + <#assign displayDesc = applicationType.get("description", locale)?default("No Description")> + <#if 18 < displayDesc?length> + <#assign displayDesc = displayDesc[0..15] + "..."> + </#if> + <option value="${applicationType.productFeatureApplTypeId}">${displayDesc}</option> + </#list> + </select> + <input type="hidden" name="clearSearch" value="N"> + <input type="submit" value="${uiLabelMap.ProductAddFeature}" class="smallSubmit"><br/> +</form> +</div> + +<hr class="sepbar"/> +<div class="tabletext"> +<form method="post" action="<@ofbizUrl>searchRemoveFeature</@ofbizUrl>" name="searchRemoveFeature"> + <b>${uiLabelMap.ProductRemoveFeatureFromResults}:</b><br/> + ${uiLabelMap.ProductFeatureId}<input type="text" size="10" name="productFeatureId" value="" class="inputBox"> + <input type="hidden" name="clearSearch" value="N"> + <input type="submit" value="${uiLabelMap.ProductRemoveFeature}" class="smallSubmit"><br/> +</form> +</div> + +<hr class="sepbar"/> +<div class="tabletext"> +<form method="post" action="" name="searchShowParams"> + <#assign searchParams = Static["org.ofbiz.product.product.ProductSearchSession"].makeSearchParametersString(session)> + <div><b>${uiLabelMap.ProductPlainSearchParameters}:</b><input type="text" size="60" name="searchParameters" value="${searchParams}" class="inputBox"></div> + <div><b>${uiLabelMap.ProductHtmlSearchParameters}:</b><input type="text" size="60" name="searchParameters" value="${searchParams?html}" class="inputBox"></div> + <input type="hidden" name="clearSearch" value="N"> +</form> +</div> + +<hr class="sepbar"/> +<div class="tabletext"> + <b>${uiLabelMap.ProductSearchExportProductList}:</b> <a href="<@ofbizUrl>searchExportProductList?clearSearch=N</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductSearchExport}</a> + <#if productIds?has_content> + <a href="javascript:exportToeBay();" class="buttontext">${uiLabelMap.ProductExportToeBay}</a> + </#if> +</div> +</#if> Propchange: ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearchactions.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearchactions.ftl ------------------------------------------------------------------------------ svn:keywords = "Date Rev Author URL Id" Propchange: ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearchactions.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: ofbiz/trunk/applications/product/widget/catalog/FindScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/FindScreens.xml?rev=589317&r1=589316&r2=589317&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/FindScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/FindScreens.xml Sun Oct 28 03:06:56 2007 @@ -85,6 +85,9 @@ <platform-specific> <html><html-template location="component://product/webapp/catalog/find/keywordsearch.ftl"/></html> </platform-specific> + <platform-specific> + <html><html-template location="component://product/webapp/catalog/find/keywordsearchactions.ftl"/></html> + </platform-specific> </decorator-section> </decorator-screen> </widgets> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |