Author: adrianc
Date: Sun Aug 10 11:06:00 2008
New Revision: 684565
URL: http://svn.apache.org/viewvc?rev=684565&view=rev
Log:
More CSS, HTML cleanups.
Modified:
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/advancedsearch.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/keywordsearch.ftl
ofbiz/trunk/framework/images/webapp/images/ecommain.css
Modified:
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/advancedsearch.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/advancedsearch.ftl?rev=684565&r1=684564&r2=684565&view=diff
==============================================================================
---
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/advancedsearch.ftl
(original)
+++
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/advancedsearch.ftl
Sun Aug 10 11:06:00 2008
@@ -16,68 +16,56 @@
specific language governing permissions and limitations
under the License.
-->
-<#assign searchOptionsHistoryList =
Static["org.ofbiz.product.product.ProductSearchSession"].getSearchOptionsHistoryList(session)>
-<#assign currentCatalogId =
Static["org.ofbiz.product.catalog.CatalogWorker"].getCurrentCatalogId(request)>
+<#assign searchOptionsHistoryList =
Static["org.ofbiz.product.product.ProductSearchSession"].getSearchOptionsHistoryList(session)/>
+<#assign currentCatalogId =
Static["org.ofbiz.product.catalog.CatalogWorker"].getCurrentCatalogId(request)/>
<h1>${uiLabelMap.ProductAdvancedSearchinCategory}</h1>
<br/>
<form name="advtokeywordsearchform" method="post"
action="<@ofbizUrl>keywordsearch</@ofbizUrl>" style="margin: 0;">
<input type="hidden" name="VIEW_SIZE" value="10"/>
<input type="hidden" name="PAGING" value="Y"/>
- <table border="0" wdith="100%">
+ <table width="100%">
<input type="hidden" name="SEARCH_CATALOG_ID" value="${currentCatalogId}">
<#if searchCategory?has_content>
<input type="hidden" name="SEARCH_CATEGORY_ID"
value="${searchCategoryId?if_exists}"/>
- <tr>
- <td align="right" valign="middle">
- <div class="tabletext">${uiLabelMap.ProductCategory}:</div>
- </td>
- <td valign="middle">
- <div class="tabletext">
- <b>"${(searchCategory.description)?if_exists}".
</b>${uiLabelMap.ProductIncludeSubcategories}
- ${uiLabelMap.CommonYes}<input type="radio"
name="SEARCH_SUB_CATEGORIES" value="Y" checked/>
- ${uiLabelMap.CommonNo}<input type="radio"
name="SEARCH_SUB_CATEGORIES" value="N"/>
- </div>
+ <tr valign="middle">
+ <td class="label">${uiLabelMap.ProductCategory}</td>
+ <td>${(searchCategory.description)?if_exists}</td>
+ <td> </td>
+ </tr>
+ <tr valign="middle">
+ <td class="label">${uiLabelMap.ProductIncludeSubcategories}</td>
+ <td>
+ ${uiLabelMap.CommonYes} <input type="radio"
name="SEARCH_SUB_CATEGORIES" value="Y" checked="checked"/>
+ ${uiLabelMap.CommonNo} <input type="radio"
name="SEARCH_SUB_CATEGORIES" value="N"/>
</td>
</tr>
</#if>
- <tr>
- <td align="right" valign="middle">
- <div class="tabletext">${uiLabelMap.ProductKeywords}:</div>
- </td>
- <td valign="middle">
- <div class="tabletext">
- <input type="text" class="inputBox" name="SEARCH_STRING" size="40"
value="${requestParameters.SEARCH_STRING?if_exists}">
- ${uiLabelMap.CommonAny}<input type="radio" name="SEARCH_OPERATOR"
value="OR" <#if searchOperator == "OR">checked</#if>>
- ${uiLabelMap.CommonAll}<input type="radio" name="SEARCH_OPERATOR"
value="AND" <#if searchOperator == "AND">checked</#if>>
- </div>
+ <tr valign="middle">
+ <td class="label">${uiLabelMap.ProductKeywords}</td>
+ <td><input type="text" name="SEARCH_STRING" size="40"
value="${requestParameters.SEARCH_STRING?if_exists}">
+ ${uiLabelMap.CommonAny} <input type="radio" name="SEARCH_OPERATOR"
value="OR" <#if searchOperator == "OR">checked</#if>>
+ ${uiLabelMap.CommonAll} <input type="radio" name="SEARCH_OPERATOR"
value="AND" <#if searchOperator == "AND">checked</#if>>
</td>
</tr>
<#list productFeatureTypeIdsOrdered 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 align="right" valign="middle">
- <div
class="tabletext">${(productFeatureType.get("description",locale))?if_exists}:</div>
- </td>
- <td valign="middle">
- <div class="tabletext">
- <select class="selectBox" name="pft_${productFeatureTypeId}">
+ <tr valign="middle">
+ <td
class="label">${(productFeatureType.get("description",locale))?if_exists}</td>
+ <td>
+ <select name="pft_${productFeatureTypeId}">
<option value="">- ${uiLabelMap.CommonSelectAny} -</option>
<#list productFeatures as productFeature>
<option
value="${productFeature.productFeatureId}">${productFeature.description?default(productFeature.productFeatureId)}</option>
</#list>
</select>
- </div>
</td>
</tr>
</#list>
- <tr>
- <td align="right" valign="middle">
- <div class="tabletext">${uiLabelMap.ProductSortedBy}:</div>
- </td>
- <td valign="middle">
- <div class="tabletext">
+ <tr valign="middle">
+ <td class="label">${uiLabelMap.ProductSortedBy}</td>
+ <td>
<select name="sortOrder" class="selectBox">
<option
value="SortKeywordRelevancy">${uiLabelMap.ProductKeywordRelevency}</option>
<option
value="SortProductField:productName">${uiLabelMap.ProductProductName}</option>
@@ -87,34 +75,28 @@
<option
value="SortProductPrice:LIST_PRICE">${uiLabelMap.ProductListPrice}</option>
<option
value="SortProductPrice:DEFAULT_PRICE">${uiLabelMap.ProductDefaultPrice}</option>
</select>
- ${uiLabelMap.EcommerceLowToHigh}<input type="radio"
name="sortAscending" value="Y" checked/>
- ${uiLabelMap.EcommerceHighToLow}<input type="radio"
name="sortAscending" value="N"/>
- </div>
+ ${uiLabelMap.EcommerceLowToHigh} <input type="radio"
name="sortAscending" value="Y" checked="checked"/>
+ ${uiLabelMap.EcommerceHighToLow} <input type="radio"
name="sortAscending" value="N"/>
</td>
</tr>
<#if searchConstraintStrings?has_content>
- <tr>
- <td align="right" valign="top">
- <div class="tabletext">${uiLabelMap.ProductLastSearch}:</div>
- </td>
- <td valign="top">
+ <tr valign="top">
+ <td class="label">${uiLabelMap.ProductLastSearch}</td>
+ <td>
<#list searchConstraintStrings as searchConstraintString>
- <div
class="tabletext"> - ${searchConstraintString}</div>
+ <div> - ${searchConstraintString}</div>
</#list>
- <div class="tabletext">${uiLabelMap.ProductSortedBy}:
${searchSortOrderString}</div>
- <div class="tabletext">
- ${uiLabelMap.ProductNewSearch}<input type="radio"
name="clearSearch" value="Y" checked/>
+ <div>${uiLabelMap.ProductSortedBy}: ${searchSortOrderString}</div>
+ <div>
+ ${uiLabelMap.ProductNewSearch}<input type="radio"
name="clearSearch" value="Y" checked="checked"/>
${uiLabelMap.ProductRefineSearch}<input type="radio"
name="clearSearch" value="N"/>
</div>
</td>
</tr>
</#if>
<tr>
- <td>
- <div class="tabletext">
- <a href="javascript:document.advtokeywordsearchform.submit()"
class="buttontext">${uiLabelMap.CommonFind}</a>
- </div>
- </td>
+ <td> </td>
+ <td><a href="javascript:document.advtokeywordsearchform.submit()"
class="buttontext">${uiLabelMap.CommonFind}</a></td>
</tr>
</table>
@@ -123,20 +105,20 @@
<h2>${uiLabelMap.OrderLastSearches}...</h2>
- <div class="tabletext">
+ <div>
<a href="<@ofbizUrl>clearSearchOptionsHistoryList</@ofbizUrl>"
class="buttontext">${uiLabelMap.OrderClearSearchHistory}</a>
- ${uiLabelMap.OrderClearSearchHistoryNote}
+ ${uiLabelMap.OrderClearSearchHistoryNote}
</div>
<#list searchOptionsHistoryList as searchOptions>
<#-- searchOptions type is ProductSearchSession.ProductSearchOptions -->
- <div class="tabletext">
+ <div>
<b>${uiLabelMap.EcommerceSearchNumber}${searchOptions_index + 1}</b>
<a
href="<@ofbizUrl>setCurrentSearchFromHistoryAndSearch?searchHistoryIndex=${searchOptions_index}&clearSearch=N</@ofbizUrl>"
class="buttontext">${uiLabelMap.CommonSearch}</a>
<a
href="<@ofbizUrl>setCurrentSearchFromHistory?searchHistoryIndex=${searchOptions_index}</@ofbizUrl>"
class="buttontext">${uiLabelMap.CommonRefine}</a>
</div>
<#assign constraintStrings =
searchOptions.searchGetConstraintStrings(false, delegator, locale)>
<#list constraintStrings as constraintString>
- <div class="tabletext"> - ${constraintString}</div>
+ <div> - ${constraintString}</div>
</#list>
<#if searchOptions_has_next>
<hr/>
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl?rev=684565&r1=684564&r2=684565&view=diff
==============================================================================
---
ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl
(original)
+++
ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl
Sun Aug 10 11:06:00 2008
@@ -120,6 +120,6 @@
</div>
<@paginationControls/>
<#else>
- <div><hr/></div>
+ <hr/>
<div>${uiLabelMap.ProductNoProductsInThisCategory}</div>
</#if>
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/keywordsearch.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/keywordsearch.ftl?rev=684565&r1=684564&r2=684565&view=diff
==============================================================================
---
ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/keywordsearch.ftl
(original)
+++
ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/keywordsearch.ftl
Sun Aug 10 11:06:00 2008
@@ -18,10 +18,15 @@
-->
<h1>${uiLabelMap.ProductProductSearch}, <span
class="h2">${uiLabelMap.ProductYouSearchedFor}:</span></h1>
+<br/>
+<ul>
<#list searchConstraintStrings as searchConstraintString>
- <div> <a
href="<@ofbizUrl>keywordsearch?removeConstraint=${searchConstraintString_index}&clearSearch=N</@ofbizUrl>"
class="buttontext">X</a> ${searchConstraintString}</div>
+ <li><a
href="<@ofbizUrl>keywordsearch?removeConstraint=${searchConstraintString_index}&clearSearch=N</@ofbizUrl>"
class="buttontext">X</a> ${searchConstraintString}</li>
</#list>
+</ul>
+<br/>
<div>${uiLabelMap.CommonSortedBy}: ${searchSortOrderString}</div>
+<br/>
<div><a
href="<@ofbizUrl>advancedsearch?SEARCH_CATEGORY_ID=${(reqeustParameters.SEARCH_CATEGORY_ID)?if_exists}</@ofbizUrl>"
class="buttontext">${uiLabelMap.ProductRefineSearch}</a></div>
<#if !productIds?has_content>
Modified: ofbiz/trunk/framework/images/webapp/images/ecommain.css
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/ecommain.css?rev=684565&r1=684564&r2=684565&view=diff
==============================================================================
--- ofbiz/trunk/framework/images/webapp/images/ecommain.css (original)
+++ ofbiz/trunk/framework/images/webapp/images/ecommain.css Sun Aug 10 11:06:00
2008
@@ -172,6 +172,15 @@
visibility: hidden;
}
+.label {
+/* Used for <input> element labels */
+font-weight: bold;
+padding-right: 11px;
+text-align: right;
+white-space: nowrap;
+width: 1%;
+}
+
/* ===== Header Styles ===== */
#ecom-header {
position: relative;
