You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2009/10/28 18:20:12 UTC
svn commit: r830679 -
/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/keywordsearchbox.ftl
Author: jleroux
Date: Wed Oct 28 17:20:11 2009
New Revision: 830679
URL: http://svn.apache.org/viewvc?rev=830679&view=rev
Log:
A patch from Deepak Dixit "Html cleanup of keyword search boxes." (https://issues.apache.org/jira/browse/OFBIZ-2986) - OFBIZ-2986
For the order component.
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/keywordsearchbox.ftl
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/keywordsearchbox.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/keywordsearchbox.ftl?rev=830679&r1=830678&r2=830679&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/keywordsearchbox.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/keywordsearchbox.ftl Wed Oct 28 17:20:11 2009
@@ -23,13 +23,13 @@
</div>
<div class="screenlet-body">
<form name="keywordsearchform" id="keywordsearchbox_keywordsearchform" method="post" action="<@o...@ofbizUrl>">
- <fieldset>
- <input type="hidden" name="VIEW_SIZE" value="10"/>
- <input type="hidden" name="PAGING" value="Y"/>
+ <fieldset class="inline">
+ <input type="hidden" name="VIEW_SIZE" value="10" />
+ <input type="hidden" name="PAGING" value="Y" />
<div>
- <input type="text" name="SEARCH_STRING" size="14" maxlength="50" value="${requestParameters.SEARCH_STRING?if_exists}"/>
+ <input type="text" name="SEARCH_STRING" size="14" maxlength="50" value="${requestParameters.SEARCH_STRING?if_exists}" />
</div>
- <#if 0 < otherSearchProdCatalogCategories?size>
+ <#if 0 < otherSearchProdCatalogCategories?size>
<div>
<select name="SEARCH_CATEGORY_ID" size="1">
<option value="${searchCategoryId?if_exists}">${uiLabelMap.ProductEntireCatalog}</option>
@@ -42,21 +42,20 @@
</select>
</div>
<#else>
- <input type="hidden" name="SEARCH_CATEGORY_ID" value="${searchCategoryId?if_exists}"/>
+ <input type="hidden" name="SEARCH_CATEGORY_ID" value="${searchCategoryId?if_exists}" />
</#if>
<div>
- <input type="radio" name="SEARCH_OPERATOR" value="OR" <#if searchOperator == "OR">checked="checked"</#if>/>${uiLabelMap.CommonAny}
- <input type="radio" name="SEARCH_OPERATOR" value="AND" <#if searchOperator == "AND">checked="checked"</#if>/>${uiLabelMap.CommonAll}
- <input type="submit" value="${uiLabelMap.CommonFind}" class="button"/>
+ <input type="radio" name="SEARCH_OPERATOR" id="SEARCH_OPERATOR_OR" value="OR" <#if searchOperator == "OR">checked="checked"</#if> /><label for="SEARCH_OPERATOR_OR">${uiLabelMap.CommonAny}</label>
+ <input type="radio" name="SEARCH_OPERATOR" id="SEARCH_OPERATOR_AND" value="AND" <#if searchOperator == "AND">checked="checked"</#if> /><label for="SEARCH_OPERATOR_AND">${uiLabelMap.CommonAll}</label>
+ <input type="submit" value="${uiLabelMap.CommonFind}" class="button" />
</div>
</fieldset>
</form>
<form name="advancedsearchform" id="keywordsearchbox_advancedsearchform" method="post" action="<@o...@ofbizUrl>">
<fieldset>
- <#if 0 < otherSearchProdCatalogCategories?size>
- <div>
- <label>${uiLabelMap.ProductAdvancedSearchIn}: </label>
- <select name="SEARCH_CATEGORY_ID" size="1">
+ <#if 0 < otherSearchProdCatalogCategories?size>
+ <label for="SEARCH_CATEGORY_ID">${uiLabelMap.ProductAdvancedSearchIn}: </label>
+ <select name="SEARCH_CATEGORY_ID" id="SEARCH_CATEGORY_ID" size="1">
<option value="${searchCategoryId?if_exists}">${uiLabelMap.ProductEntireCatalog}</option>
<#list otherSearchProdCatalogCategories as otherSearchProdCatalogCategory>
<#assign searchProductCategory = otherSearchProdCatalogCategory.getRelatedOneCache("ProductCategory")>
@@ -65,14 +64,11 @@
</#if>
</#list>
</select>
- </div>
<#else>
- <input type="hidden" name="SEARCH_CATEGORY_ID" value="${searchCategoryId?if_exists}"/>
+ <input type="hidden" name="SEARCH_CATEGORY_ID" value="${searchCategoryId?if_exists}" />
</#if>
- <div>
- <input type="submit" value="${uiLabelMap.ProductAdvancedSearch}" class="button"/>
- </div>
+ <input type="submit" value="${uiLabelMap.ProductAdvancedSearch}" class="button" />
</fieldset>
</form>
</div>
-</div>
+</div>
\ No newline at end of file