svn commit: r607133 - in /ofbiz/trunk/applications/product/webapp/catalog: find/FindProductById.ftl find/advancedsearch.ftl find/keywordsearch.ftl find/keywordsearchactions.ftl find/keywordsearchbox.ftl find/miniproductlist.ftl main.ftl

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r607133 - in /ofbiz/trunk/applications/product/webapp/catalog: find/FindProductById.ftl find/advancedsearch.ftl find/keywordsearch.ftl find/keywordsearchactions.ftl find/keywordsearchbox.ftl find/miniproductlist.ftl main.ftl

mrisaliti
Author: mrisaliti
Date: Thu Dec 27 14:34:14 2007
New Revision: 607133

URL: http://svn.apache.org/viewvc?rev=607133&view=rev
Log:
Removed deprecated CSS style from product search forms(Part of issue OFBIZ-1544)

Modified:
    ofbiz/trunk/applications/product/webapp/catalog/find/FindProductById.ftl
    ofbiz/trunk/applications/product/webapp/catalog/find/advancedsearch.ftl
    ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearch.ftl
    ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearchactions.ftl
    ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearchbox.ftl
    ofbiz/trunk/applications/product/webapp/catalog/find/miniproductlist.ftl
    ofbiz/trunk/applications/product/webapp/catalog/main.ftl

Modified: ofbiz/trunk/applications/product/webapp/catalog/find/FindProductById.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/find/FindProductById.ftl?rev=607133&r1=607132&r2=607133&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/find/FindProductById.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/find/FindProductById.ftl Thu Dec 27 14:34:14 2007
@@ -24,43 +24,49 @@
     </div>
     <div class="screenlet-body">
         <form name="idsearchform" method="post" action="<@ofbizUrl>FindProductById</@ofbizUrl>" style="margin: 0;">
-          <div class="tabletext">${uiLabelMap.CommonId} ${uiLabelMap.CommonValue}: <input type="text" name="idValue" size="20" maxlength="50" value="${idValue?if_exists}">&nbsp;<a href="javascript:document.idsearchform.submit()" class="buttontext">${uiLabelMap.CommonFind}</a></div>
+          <span class="label">${uiLabelMap.CommonId} ${uiLabelMap.CommonValue}:</span> <input type="text" name="idValue" size="20" maxlength="50" value="${idValue?if_exists}">&nbsp;<a href="javascript:document.idsearchform.submit()" class="buttontext">${uiLabelMap.CommonFind}</a>
         </form>
+        <br/>
+        <h1>${uiLabelMap.ProductSearchResultsWithIdValue}: ${idValue?if_exists}</h1>
+        <#if !goodIdentifications?has_content && !idProduct?has_content>
+          <br/>
+          <h2>&nbsp;${uiLabelMap.ProductNoResultsFound}.</h2>
+        <#else/>
+          <table cellspacing="0" class="basic-table">
+            <#assign rowClass = "1">
+            <#if idProduct?has_content>
+            <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
+                <td>
+                    ${idProduct.productId}
+                </td>
+                <td>&nbsp;&nbsp;</td>
+                <td>
+                    <a href="<@ofbizUrl>EditProduct?productId=${idProduct.productId}</@ofbizUrl>" class="buttontext">${(idProduct.internalName)?if_exists}</a>
+                    (${uiLabelMap.ProductSearchResultsFound})
+                </td>
+            </tr>
+            </#if>
+            <#list goodIdentifications as goodIdentification>
+                <#-- toggle the row color -->
+                <#if rowClass == "2">
+                  <#assign rowClass = "1">
+                <#else>
+                  <#assign rowClass = "2">
+                </#if>
+                <#assign product = goodIdentification.getRelatedOneCache("Product")/>
+                <#assign goodIdentificationType = goodIdentification.getRelatedOneCache("GoodIdentificationType")/>
+                <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
+                    <td>
+                        ${product.productId}
+                    </td>
+                    <td>&nbsp;&nbsp;</td>
+                    <td>
+                        <a href="<@ofbizUrl>EditProduct?productId=${product.productId}</@ofbizUrl>" class="buttontext">${(product.internalName)?if_exists}</a>
+                        (${uiLabelMap.ProductSearchResultsFound} ${goodIdentificationType.get("description",locale)?default(goodIdentification.goodIdentificationTypeId)}.)
+                    </td>
+                </tr>
+            </#list>
+          </table>
+        </#if>  
     </div>
 </div>
-
-
-<h1>${uiLabelMap.ProductSearchResultsWithIdValue}: [${idValue?if_exists}]</h1>
-
-
-<#if !goodIdentifications?has_content && !idProduct?has_content>
-    <br/>
-    <h2>&nbsp;${uiLabelMap.ProductNoResultsFound}.</h2>
-<#else/>
-  <table cellpadding="2">
-    <#if idProduct?has_content>
-        <td>
-          <div class="tabletext"><b>[${idProduct.productId}]</b></div>
-        </td>
-        <td>&nbsp;&nbsp;</td>
-        <td>
-            <a href="<@ofbizUrl>EditProduct?productId=${idProduct.productId}</@ofbizUrl>" class="buttontext">${(idProduct.internalName)?if_exists}</a>
-            <span class="tabletext">(${uiLabelMap.ProductSearchResultsFound})</span>
-        </td>
-    </#if>
-    <#list goodIdentifications as goodIdentification>
-        <#assign product = goodIdentification.getRelatedOneCache("Product")/>
-        <#assign goodIdentificationType = goodIdentification.getRelatedOneCache("GoodIdentificationType")/>
-        <tr>
-            <td>
-                <div class="tabletext"><b>[${product.productId}]</b></div>
-            </td>
-            <td>&nbsp;&nbsp;</td>
-            <td>
-                <a href="<@ofbizUrl>EditProduct?productId=${product.productId}</@ofbizUrl>" class="buttontext">${(product.internalName)?if_exists}</a>
-                <span class="tabletext">(${uiLabelMap.ProductSearchResultsFound} <b>${goodIdentificationType.get("description",locale)?default(goodIdentification.goodIdentificationTypeId)}</b>.)</span>
-            </td>
-        </tr>
-    </#list>
-  </table>
-</#if>

Modified: ofbiz/trunk/applications/product/webapp/catalog/find/advancedsearch.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/find/advancedsearch.ftl?rev=607133&r1=607132&r2=607133&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/find/advancedsearch.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/find/advancedsearch.ftl Thu Dec 27 14:34:14 2007
@@ -24,7 +24,7 @@
     <form name="advtokeywordsearchform" method="post" action="<@ofbizUrl>keywordsearch</@ofbizUrl>" style="margin: 0;">
       <input type="hidden" name="VIEW_SIZE" value="25"/>
       <input type="hidden" name="PAGING" value="Y"/>
-      <table border="0" width="100%">
+      <table cellspacing="0" class="basic-table">
         <#if searchCategory?has_content>
             <input type="hidden" name="SEARCH_CATEGORY_ID" value="${searchCategoryId?if_exists}"/>
             <tr>
@@ -32,7 +32,7 @@
                 ${uiLabelMap.ProductCategory}:
               </td>
               <td valign="middle">
-                <div class="tabletext">
+                <div>
                   <b>"${(searchCategory.description)?if_exists}" [${(searchCategory.productCategoryId)?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"/>
@@ -45,8 +45,8 @@
                  ${uiLabelMap.ProductCatalog}:
                </td>
                <td valign="middle">
-                 <div class="tabletext">
-                    <select class="selectBox" name="SEARCH_CATALOG_ID">
+                 <div>
+                    <select name="SEARCH_CATALOG_ID">
                       <option value="">- ${uiLabelMap.ProductAnyCatalog} -</option>
                       <#list prodCatalogs as prodCatalog>
                         <#assign displayDesc = prodCatalog.catalogName?default("${uiLabelMap.ProductNoDescription}")>
@@ -64,8 +64,8 @@
                 ${uiLabelMap.ProductCategory}:
               </td>
               <td valign="middle">
-                <div class="tabletext">
-                  <input type="text" class="inputBox" name="SEARCH_CATEGORY_ID" size="20" maxlength="20" value="${requestParameters.SEARCH_CATEGORY_ID?if_exists}"/>
+                <div>
+                  <input type="text" name="SEARCH_CATEGORY_ID" size="20" maxlength="20" value="${requestParameters.SEARCH_CATEGORY_ID?if_exists}"/>
                   <a href="javascript:call_fieldlookup2(document.advtokeywordsearchform.SEARCH_CATEGORY_ID,'LookupProductCategory');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt='Click here For Field Lookup'/></a>
                   ${uiLabelMap.ProductIncludeSubCategories}?
                   ${uiLabelMap.CommonYes}<input type="radio" name="SEARCH_SUB_CATEGORIES" value="Y" checked="checked"/>
@@ -82,8 +82,8 @@
             ${uiLabelMap.ProductKeywords}:
           </td>
           <td valign="middle">
-            <div class="tabletext">
-              <input type="text" class="inputBox" name="SEARCH_STRING" size="40" value="${requestParameters.SEARCH_STRING?if_exists}"/>&nbsp;
+            <div>
+              <input type="text" name="SEARCH_STRING" size="40" value="${requestParameters.SEARCH_STRING?if_exists}"/>&nbsp;
               ${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>
@@ -95,19 +95,19 @@
           </td>
           <td valign="middle">
             <div>
-              <input type="text" class="inputBox" name="SEARCH_PROD_FEAT_CAT1" size="15" value="${requestParameters.SEARCH_PROD_FEAT_CAT1?if_exists}"/>&nbsp;
+              <input type="text" name="SEARCH_PROD_FEAT_CAT1" size="15" value="${requestParameters.SEARCH_PROD_FEAT_CAT1?if_exists}"/>&nbsp;
                   ${uiLabelMap.CommonInclude}<input type="radio" name="SEARCH_PROD_FEAT_CAT_EXC1" value="" checked="checked"/>
                   ${uiLabelMap.CommonExclude}<input type="radio" name="SEARCH_PROD_FEAT_CAT_EXC1" value="Y"/>
                   ${uiLabelMap.CommonAlwaysInclude}<input type="radio" name="SEARCH_PROD_FEAT_CAT_EXC1" value="N"/>
             </div>
             <div>
-              <input type="text" class="inputBox" name="SEARCH_PROD_FEAT_CAT2" size="15" value="${requestParameters.SEARCH_PROD_FEAT_CAT2?if_exists}"/>&nbsp;
+              <input type="text" name="SEARCH_PROD_FEAT_CAT2" size="15" value="${requestParameters.SEARCH_PROD_FEAT_CAT2?if_exists}"/>&nbsp;
                   ${uiLabelMap.CommonInclude}<input type="radio" name="SEARCH_PROD_FEAT_CAT_EXC2" value="" checked="checked"/>
                   ${uiLabelMap.CommonExclude}<input type="radio" name="SEARCH_PROD_FEAT_CAT_EXC2" value="Y"/>
                   ${uiLabelMap.CommonAlwaysInclude}<input type="radio" name="SEARCH_PROD_FEAT_CAT_EXC2" value="N"/>
             </div>
             <div>
-              <input type="text" class="inputBox" name="SEARCH_PROD_FEAT_CAT3" size="15" value="${requestParameters.SEARCH_PROD_FEAT_CAT3?if_exists}"/>&nbsp;
+              <input type="text" name="SEARCH_PROD_FEAT_CAT3" size="15" value="${requestParameters.SEARCH_PROD_FEAT_CAT3?if_exists}"/>&nbsp;
                   ${uiLabelMap.CommonInclude}<input type="radio" name="SEARCH_PROD_FEAT_CAT_EXC3" value="" checked="checked"/>
                   ${uiLabelMap.CommonExclude}<input type="radio" name="SEARCH_PROD_FEAT_CAT_EXC3" value="Y"/>
                   ${uiLabelMap.CommonAlwaysInclude}<input type="radio" name="SEARCH_PROD_FEAT_CAT_EXC3" value="N"/>
@@ -120,19 +120,19 @@
           </td>
           <td valign="middle">
             <div>
-              <input type="text" class="inputBox" name="SEARCH_PROD_FEAT_GRP1" size="15" value="${requestParameters.SEARCH_PROD_FEAT_GRP1?if_exists}"/>&nbsp;
+              <input type="text" name="SEARCH_PROD_FEAT_GRP1" size="15" value="${requestParameters.SEARCH_PROD_FEAT_GRP1?if_exists}"/>&nbsp;
                   ${uiLabelMap.CommonInclude}<input type="radio" name="SEARCH_PROD_FEAT_GRP_EXC1" value="" checked="checked"/>
                   ${uiLabelMap.CommonExclude}<input type="radio" name="SEARCH_PROD_FEAT_GRP_EXC1" value="Y"/>
                   ${uiLabelMap.CommonAlwaysInclude}<input type="radio" name="SEARCH_PROD_FEAT_GRP_EXC1" value="N"/>
             </div>
             <div>
-              <input type="text" class="inputBox" name="SEARCH_PROD_FEAT_GRP2" size="15" value="${requestParameters.SEARCH_PROD_FEAT_GRP2?if_exists}"/>&nbsp;
+              <input type="text" name="SEARCH_PROD_FEAT_GRP2" size="15" value="${requestParameters.SEARCH_PROD_FEAT_GRP2?if_exists}"/>&nbsp;
                   ${uiLabelMap.CommonInclude}<input type="radio" name="SEARCH_PROD_FEAT_GRP_EXC2" value="" checked="checked"/>
                   ${uiLabelMap.CommonExclude}<input type="radio" name="SEARCH_PROD_FEAT_GRP_EXC2" value="Y"/>
                   ${uiLabelMap.CommonAlwaysInclude}<input type="radio" name="SEARCH_PROD_FEAT_GRP_EXC2" value="N"/>
             </div>
             <div>
-              <input type="text" class="inputBox" name="SEARCH_PROD_FEAT_GRP3" size="15" value="${requestParameters.SEARCH_PROD_FEAT_GRP3?if_exists}"/>&nbsp;
+              <input type="text" name="SEARCH_PROD_FEAT_GRP3" size="15" value="${requestParameters.SEARCH_PROD_FEAT_GRP3?if_exists}"/>&nbsp;
                   ${uiLabelMap.CommonInclude}<input type="radio" name="SEARCH_PROD_FEAT_GRP_EXC3" value="" checked="checked"/>
                   ${uiLabelMap.CommonExclude}<input type="radio" name="SEARCH_PROD_FEAT_GRP_EXC3" value="Y"/>
                   ${uiLabelMap.CommonAlwaysInclude}<input type="radio" name="SEARCH_PROD_FEAT_GRP_EXC3" value="N"/>
@@ -146,19 +146,19 @@
           </td>
           <td valign="middle">
             <div>
-              <input type="text" class="inputBox" name="SEARCH_FEAT1" size="15" value="${requestParameters.SEARCH_FEAT1?if_exists}"/>&nbsp;
+              <input type="text" name="SEARCH_FEAT1" size="15" value="${requestParameters.SEARCH_FEAT1?if_exists}"/>&nbsp;
                   ${uiLabelMap.CommonInclude}<input type="radio" name="SEARCH_FEAT_EXC1" value="" checked="checked"/>
                   ${uiLabelMap.CommonExclude}<input type="radio" name="SEARCH_FEAT_EXC1" value="Y"/>
                   ${uiLabelMap.CommonAlwaysInclude}<input type="radio" name="SEARCH_FEAT_EXC1" value="N"/>
             </div>
             <div>
-              <input type="text" class="inputBox" name="SEARCH_FEAT2" size="15" value="${requestParameters.SEARCH_FEAT2?if_exists}"/>&nbsp;
+              <input type="text" name="SEARCH_FEAT2" size="15" value="${requestParameters.SEARCH_FEAT2?if_exists}"/>&nbsp;
                   ${uiLabelMap.CommonInclude}<input type="radio" name="SEARCH_FEAT_EXC2" value="" checked="checked"/>
                   ${uiLabelMap.CommonExclude}<input type="radio" name="SEARCH_FEAT_EXC2" value="Y"/>
                   ${uiLabelMap.CommonAlwaysInclude}<input type="radio" name="SEARCH_FEAT_EXC2" value="N"/>
             </div>
             <div>
-              <input type="text" class="inputBox" name="SEARCH_FEAT3" size="15" value="${requestParameters.SEARCH_FEAT3?if_exists}"/>&nbsp;
+              <input type="text" name="SEARCH_FEAT3" size="15" value="${requestParameters.SEARCH_FEAT3?if_exists}"/>&nbsp;
                   ${uiLabelMap.CommonInclude}<input type="radio" name="SEARCH_FEAT_EXC3" value="" checked="checked"/>
                   ${uiLabelMap.CommonExclude}<input type="radio" name="SEARCH_FEAT_EXC3" value="Y"/>
                   ${uiLabelMap.CommonAlwaysInclude}<input type="radio" name="SEARCH_FEAT_EXC3" value="N"/>
@@ -171,8 +171,8 @@
           </td>
           <td valign="middle">
             <div>
-              <input type="text" class="inputBox" name="LIST_PRICE_LOW" size="8" value="${requestParameters.LIST_PRICE_LOW?if_exists}"/>&nbsp;
-              <input type="text" class="inputBox" name="LIST_PRICE_HIGH" size="8" value="${requestParameters.LIST_PRICE_HIGH?if_exists}"/>&nbsp;
+              <input type="text" name="LIST_PRICE_LOW" size="8" value="${requestParameters.LIST_PRICE_LOW?if_exists}"/>&nbsp;
+              <input type="text" name="LIST_PRICE_HIGH" size="8" value="${requestParameters.LIST_PRICE_HIGH?if_exists}"/>&nbsp;
             </div>  
           </td>
         </tr>
@@ -185,8 +185,8 @@
               ${(productFeatureType.get("description",locale))?if_exists}:
             </td>
             <td valign="middle">
-              <div class="tabletext">
-                <select class="selectBox" name="pft_${productFeatureTypeId}">
+              <div>
+                <select name="pft_${productFeatureTypeId}">
                   <option value="">- ${uiLabelMap.CommonSelectAny} -</option>
                   <#list productFeatures as productFeature>
                   <option value="${productFeature.productFeatureId}">${productFeature.description?default("${uiLabelMap.ProductNoDescription}")} [${productFeature.productFeatureId}]</option>
@@ -201,8 +201,8 @@
             ${uiLabelMap.ProductSupplier}:
           </td>
           <td valign="middle">
-            <div class="tabletext">
-              <select name="SEARCH_SUPPLIER_ID" class="selectBox">
+            <div>
+              <select name="SEARCH_SUPPLIER_ID">
                 <option value="">- ${uiLabelMap.CommonSelectAny} -</option>
                 <#list supplerPartyRoleAndPartyDetails as supplerPartyRoleAndPartyDetail>
                   <option value="${supplerPartyRoleAndPartyDetail.partyId}">${supplerPartyRoleAndPartyDetail.groupName?if_exists} ${supplerPartyRoleAndPartyDetail.firstName?if_exists} ${supplerPartyRoleAndPartyDetail.lastName?if_exists} [${supplerPartyRoleAndPartyDetail.partyId}]</option>
@@ -216,8 +216,8 @@
             ${uiLabelMap.CommonSortedBy}:
           </td>
           <td valign="middle">
-            <div class="tabletext">
-              <select name="sortOrder" class="selectBox">
+            <div>
+              <select name="sortOrder">
                 <option value="SortKeywordRelevancy">${uiLabelMap.ProductKeywordRelevancy}</option>
                 <option value="SortProductField:productName">${uiLabelMap.ProductProductName}</option>
                 <option value="SortProductField:internalName">${uiLabelMap.ProductInternalName}</option>
@@ -240,16 +240,16 @@
             ${uiLabelMap.ProductPrioritizeProductsinCategory}:
           </td>
           <td valign="middle">
-            <input type="text" class="inputBox" name="PRIORITIZE_CATEGORY_ID" size="20" maxlength="20" value="${requestParameters.PRIORITIZE_CATEGORY_ID?if_exists}"/>
+            <input type="text" name="PRIORITIZE_CATEGORY_ID" size="20" maxlength="20" value="${requestParameters.PRIORITIZE_CATEGORY_ID?if_exists}"/>
             <a href="javascript:call_fieldlookup2(document.advtokeywordsearchform.PRIORITIZE_CATEGORY_ID,'LookupProductCategory');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt='Click here For Field Lookup'/></a>
           </td>
         </tr>
         <tr>
           <td class="label">
-            ${uiLabelMap.ProductGoodIdentificationType}
+            ${uiLabelMap.ProductGoodIdentificationType}:
           </td>
           <td>
-            <select name="SEARCH_GOOD_IDENTIFICATION_TYPE" class="selectBox">
+            <select name="SEARCH_GOOD_IDENTIFICATION_TYPE">
               <option value="">- ${uiLabelMap.CommonSelectAny} -</option>
               <#list goodIdentificationTypes as goodIdentificationType>
               <option value="${goodIdentificationType.goodIdentificationTypeId}">${goodIdentificationType.get("description")?if_exists}</option>
@@ -259,25 +259,25 @@
         </tr>
         <tr>
           <td class="label">
-            ${uiLabelMap.ProductGoodIdentificationValue}
+            ${uiLabelMap.ProductGoodIdentificationValue}:
           </td>
           <td>
-            <input type="text" class="inputBox" name="SEARCH_GOOD_IDENTIFICATION_VALUE" size="60" maxlength="60" value="${requestParameters.SEARCH_GOOD_IDENTIFICATION_VALUE?if_exists}"/>
+            <input type="text" name="SEARCH_GOOD_IDENTIFICATION_VALUE" size="60" maxlength="60" value="${requestParameters.SEARCH_GOOD_IDENTIFICATION_VALUE?if_exists}"/>
             ${uiLabelMap.CommonInclude}<input type="radio" name="SEARCH_GOOD_IDENTIFICATION_INCL" value="Y" checked="checked"/>
             ${uiLabelMap.CommonExclude}<input type="radio" name="SEARCH_GOOD_IDENTIFICATION_INCL" value="N"/>
           </td>
         </tr>
         <#if searchConstraintStrings?has_content>
           <tr>
-            <td align="right" valign="top">
-              <div class="tabletext">${uiLabelMap.ProductLastSearch}</div>
+            <td align="right" valign="top" class="label">
+              ${uiLabelMap.ProductLastSearch}
             </td>
             <td valign="top">
                 <#list searchConstraintStrings as searchConstraintString>
-                    <div class="tabletext">&nbsp;-&nbsp;${searchConstraintString}</div>
+                    <div>&nbsp;-&nbsp;${searchConstraintString}</div>
                 </#list>
-                <div class="tabletext">${uiLabelMap.CommonSortedBy}: ${searchSortOrderString}</div>
-                <div class="tabletext">
+                <span class="label">${uiLabelMap.CommonSortedBy}:</span>${searchSortOrderString}
+                <div>
                   ${uiLabelMap.ProductNewSearch}<input type="radio" name="clearSearch" value="Y" checked="checked"/>
                   ${uiLabelMap.ProductRefineSearch}<input type="radio" name="clearSearch" value="N"/>
                 </div>

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=607133&r1=607132&r2=607133&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearch.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearch.ftl Thu Dec 27 14:34:14 2007
@@ -22,10 +22,10 @@
   </div>  
   <div class="screenlet-body">
     <#list searchConstraintStrings as searchConstraintString>
-      <div class="tabletext">&nbsp;<a href="<@ofbizUrl>keywordsearch?removeConstraint=${searchConstraintString_index}&clearSearch=N</@ofbizUrl>" class="buttontext">X</a>&nbsp;${searchConstraintString}</div>
+      <div>&nbsp;<a href="<@ofbizUrl>keywordsearch?removeConstraint=${searchConstraintString_index}&clearSearch=N</@ofbizUrl>" class="buttontext">X</a>&nbsp;${searchConstraintString}</div>
     </#list>
-    <div class="tabletext">${uiLabelMap.CommonSortedBy}: ${searchSortOrderString}</div>
-    <div class="tabletext"><a href="<@ofbizUrl>advancedsearch?SEARCH_CATEGORY_ID=${(requestParameters.SEARCH_CATEGORY_ID)?if_exists}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonRefine} ${uiLabelMap.CommonSearch}</a></div>
+    <span class="label">${uiLabelMap.CommonSortedBy}:</span>${searchSortOrderString}
+    <div><a href="<@ofbizUrl>advancedsearch?SEARCH_CATEGORY_ID=${(requestParameters.SEARCH_CATEGORY_ID)?if_exists}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonRefine} ${uiLabelMap.CommonSearch}</a></div>
     
     <#if !productIds?has_content>
       <br/><h2>&nbsp;${uiLabelMap.ProductNoResultsFound}.</h2>
@@ -67,7 +67,7 @@
         }
     </script>
     
-    <table border="0" width="100%" cellpadding="2">
+    <table cellspacing="0" class="basic-table">
         <tr>
           <td align="left"><input type="checkbox" name="selectAll" value="0" onclick="javascript:toggleAll(this);"> <b>${uiLabelMap.ProductProduct}</b></td>
           <td align="right">
@@ -89,25 +89,33 @@
             </b>
           </td>
         </tr>
-        <tr><td colspan="2"><hr class="sepbar"/></td></tr>
+        <tr><td colspan="2"><hr/></td></tr>
     </table>
     
     <form method="post" name="products">
-      <table width="100%" cellpadding="0" cellspacing="0">
+      <table cellspacing="0" class="basic-table">
         <#assign listIndex = lowIndex>
+        <#assign rowClass = "2">
         <#list productIds as productId><#-- note that there is no boundary range because that is being done before the list is put in the content -->
           <#assign product = delegator.findByPrimaryKey("Product", Static["org.ofbiz.base.util.UtilMisc"].toMap("productId", productId))>
-          <tr>
+          <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
             <td>
               <input type="checkbox" name="selectResult" value="${productId}" onchange="checkProductToBagTextArea(this, '${productId}');"/>
               <a href="<@ofbizUrl>EditProduct?productId=${productId}</@ofbizUrl>" class="buttontext">[${productId}] ${(product.internalName)?if_exists}</a>
             </td>
           </tr>
+          <#-- toggle the row color -->
+          <#if rowClass == "2">
+            <#assign rowClass = "1">
+          <#else>
+            <#assign rowClass = "2">
+          </#if>
         </#list>
       </table>
     <form>
     
-    <table border="0" width="100%" cellpadding="2">
+    <table cellspacing="0" class="basic-table">
+        <tr><td colspan="2"><hr/></td></tr>
         <tr>
           <td align="right">
             <b>

Modified: 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=607133&r1=607132&r2=607133&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearchactions.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearchactions.ftl Thu Dec 27 14:34:14 2007
@@ -18,100 +18,108 @@
 -->
 
 <#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>
-</div>
+    <hr/>
+    <span class="label"><b>${uiLabelMap.ProductNote}:</b></span> ${uiLabelMap.ProductNoteKeywordSearch}
+    <hr/>
+    
+    ${screens.render("component://product/widget/catalog/ProductScreens.xml#CreateVirtualWithVariantsFormInclude")}
+    
+    <hr/>
+    
+    <div>
+        <form method="post" action="<@ofbizUrl>searchRemoveFromCategory</@ofbizUrl>" name="searchRemoveFromCategory">
+          <span class="label">${uiLabelMap.ProductRemoveResultsFrom} ${uiLabelMap.ProductCategory}:</span>
+          <input type="text" 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/>
+    
+    <div>
+        <form method="post" action="<@ofbizUrl>searchExpireFromCategory</@ofbizUrl>" name="searchExpireFromCategory">
+          <span class="label">${uiLabelMap.ProductExpireResultsFrom} ${uiLabelMap.ProductCategory}:</span>
+          <input type="text" 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>
+          <span class="label">${uiLabelMap.CommonThru}</span><input type="text" size="25" name="thruDate"><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/>
+    
+    <div>
+        <form method="post" action="<@ofbizUrl>searchAddToCategory</@ofbizUrl>" name="searchAddToCategory">
+          <span class="label">${uiLabelMap.ProductAddResultsTo} ${uiLabelMap.ProductCategory}:</span>
+          <input type="text" 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>
+          <span class="label">${uiLabelMap.CommonFrom}</span><input type="text" size="25" name="fromDate"><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/>
+    
+    <div>
+        <form method="post" action="<@ofbizUrl>searchAddFeature</@ofbizUrl>" name="searchAddFeature">
+          <span class="label">${uiLabelMap.ProductAddFeatureToResults}:</span><br/>
+          <span class="label">${uiLabelMap.ProductFeatureId}</span><input type="text" size="10" name="productFeatureId" value="">
+          <span class="label">${uiLabelMap.CommonFrom}</span><input type="tex"t size="25" name="fromDate"><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>
+          <span class="label">${uiLabelMap.CommonThru}</span><input type="text" size="25" name="thruDate"><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/>
+          <span class="label">${uiLabelMap.CommonAmount}</span><input type="text" size="5" name="amount" value="">
+          <span class="label">${uiLabelMap.CommonSequence}</span><input type="text" size="5" name="sequenceNum" value="">
+          <span class="label">${uiLabelMap.ProductFeatureApplicationType}</span>
+          <span class="label">${uiLabelMap.ProductCategoryId}:</span>
+          <select name='productFeatureApplTypeId' size='1'>
+               <#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/>
+    
+    <div>
+        <form method="post" action="<@ofbizUrl>searchRemoveFeature</@ofbizUrl>" name="searchRemoveFeature">
+          <span class="label">${uiLabelMap.ProductRemoveFeatureFromResults}:</span><br/>
+          <span class="label">${uiLabelMap.ProductFeatureId}</span><input type="text" size="10" name="productFeatureId" value="">
+          <input type="hidden" name="clearSearch" value="N">
+          <input type="submit" value="${uiLabelMap.ProductRemoveFeature}" class="smallSubmit">
+          <br/>
+        </form>
+    </div>
+    
+    <hr/>
+    
+    <div>
+        <form method="post" action="" name="searchShowParams">
+          <#assign searchParams = Static["org.ofbiz.product.product.ProductSearchSession"].makeSearchParametersString(session)>
+          <span class="label">${uiLabelMap.ProductPlainSearchParameters}:</span><input type="text" size="60" name="searchParameters" value="${searchParams}">
+          <br/>
+          <span class="label">${uiLabelMap.ProductHtmlSearchParameters}:</span><input type="text" size="60" name="searchParameters" value="${searchParams?html}">
+          <input type="hidden" name="clearSearch" value="N">
+        </form>
+    </div>
+    
+    <hr/>
+    
+    <div>
+      <span class="label">${uiLabelMap.ProductSearchExportProductList}:</span><a href="<@ofbizUrl>searchExportProductList?clearSearch=N</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductSearchExport}</a>
+    </div>
 </#if>

Modified: ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearchbox.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearchbox.ftl?rev=607133&r1=607132&r2=607133&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearchbox.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearchbox.ftl Thu Dec 27 14:34:14 2007
@@ -46,35 +46,43 @@
     <div class="screenlet-body">
         <div>
             <form name="keywordsearchform" method="post" action="<@ofbizUrl>keywordsearch?VIEW_SIZE=25&PAGING=Y</@ofbizUrl>" style="margin: 0;">
-              <div class="tabletext">${uiLabelMap.ProductKeywords}: <input type="text" class="inputBox" name="SEARCH_STRING" size="20" maxlength="50" value="${requestParameters.SEARCH_STRING?if_exists}"/></div>
-              <div class="tabletext">
+              <span class="label">${uiLabelMap.ProductKeywords}:</span><input type="text" class="inputBox" name="SEARCH_STRING" size="20" maxlength="50" value="${requestParameters.SEARCH_STRING?if_exists}"/>
+              <span class="label">
                 ${uiLabelMap.ProductCategoryId}:
-                <input type="text" class="inputBox" name="SEARCH_CATEGORY_ID" size="15" maxlength="20" value="${requestParameters.SEARCH_CATEGORY_ID?if_exists}"/><a href="javascript:call_fieldlookup2(document.keywordsearchform.SEARCH_CATEGORY_ID,'LookupProductCategory');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt='Click here For Field Lookup'/></a>
-              </div>
-              <div class="tabletext">
-                ${uiLabelMap.CommonNoContains}<input type="checkbox" name="SEARCH_CONTAINS" value="N" <#if requestParameters.SEARCH_CONTAINS?if_exists == "N">checked="checked"</#if>/>
-                ${uiLabelMap.CommonAny}<input type="radio" name="SEARCH_OPERATOR" value="OR" <#if requestParameters.SEARCH_OPERATOR?if_exists != "AND">checked="checked"</#if>/>
-                ${uiLabelMap.CommonAll}<input type="radio" name="SEARCH_OPERATOR" value="AND" <#if requestParameters.SEARCH_OPERATOR?if_exists == "AND">checked="checked"</#if>/>
-                &nbsp;<a href="javascript:document.keywordsearchform.submit()" class="buttontext">${uiLabelMap.CommonFind}</a>
-              </div>
+              </span>
+              <input type="text" class="inputBox" name="SEARCH_CATEGORY_ID" size="15" maxlength="20" value="${requestParameters.SEARCH_CATEGORY_ID?if_exists}"/><a href="javascript:call_fieldlookup2(document.keywordsearchform.SEARCH_CATEGORY_ID,'LookupProductCategory');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt='Click here For Field Lookup'/></a>
+              <span class="label">
+                ${uiLabelMap.CommonNoContains}
+              </span>
+              <input type="checkbox" name="SEARCH_CONTAINS" value="N" <#if requestParameters.SEARCH_CONTAINS?if_exists == "N">checked="checked"</#if>/>
+              <span class="label">
+                ${uiLabelMap.CommonAny}
+              </span>
+              <input type="radio" name="SEARCH_OPERATOR" value="OR" <#if requestParameters.SEARCH_OPERATOR?if_exists != "AND">checked="checked"</#if>/>
+              <span class="label">  
+                ${uiLabelMap.CommonAll}
+              </span>
+              <input type="radio" name="SEARCH_OPERATOR" value="AND" <#if requestParameters.SEARCH_OPERATOR?if_exists == "AND">checked="checked"</#if>/>
+              &nbsp;
+              <a href="javascript:document.keywordsearchform.submit()" class="buttontext">${uiLabelMap.CommonFind}</a>
             </form>
         </div>
         <div>
             <form name="advancedsearchform" method="post" action="<@ofbizUrl>advancedsearch</@ofbizUrl>" style="margin: 0;">
-              <div class="tabletext">
+              <span class="label">
                 ${uiLabelMap.ProductCategoryId}:
-                <input type="text" class="inputBox" name="SEARCH_CATEGORY_ID" size="15" maxlength="20" value="${requestParameters.SEARCH_CATEGORY_ID?if_exists}"/><a href="javascript:call_fieldlookup2(document.advancedsearchform.SEARCH_CATEGORY_ID,'LookupProductCategory');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt='Click here For Field Lookup'/></a>
-              </div>
-              <div class="tabletext">
+              </span>
+              <input type="text" class="inputBox" name="SEARCH_CATEGORY_ID" size="15" maxlength="20" value="${requestParameters.SEARCH_CATEGORY_ID?if_exists}"/><a href="javascript:call_fieldlookup2(document.advancedsearchform.SEARCH_CATEGORY_ID,'LookupProductCategory');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt='Click here For Field Lookup'/></a>
+              <div>
                 <a href="javascript:document.advancedsearchform.submit()" class="buttontext">${uiLabelMap.ProductAdvancedSearch}</a>
               </div>
             </form>
         </div>
         <div>
             <form name="productjumpform" method="post" action="<@ofbizUrl>EditProduct</@ofbizUrl>" style="margin: 0;">
-                <input type="text" class="inputBox" name="productId" size="10" maxlength="20" value="${requestParameters.productId?if_exists}"/>
+                <input type="text" name="productId" size="10" maxlength="20" value="${requestParameters.productId?if_exists}"/>
                 <a href="javascript:call_fieldlookup2(document.productjumpform.productId,'LookupProduct');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt='Click here For Field Lookup'/></a>
-                <select class="selectBox" name="DUMMYPAGE" onchange="submitProductJump()" style="width: 110px;">
+                <select name="DUMMYPAGE" onchange="submitProductJump()">
                     <option value="<@ofbizUrl>EditProduct</@ofbizUrl>">-${uiLabelMap.ProductProductJump}-</option>
                     <option value="<@ofbizUrl>EditProductQuickAdmin</@ofbizUrl>">${uiLabelMap.ProductQuickAdmin}</option>
                     <option value="<@ofbizUrl>EditProduct</@ofbizUrl>">${uiLabelMap.ProductProduct}</option>

Modified: ofbiz/trunk/applications/product/webapp/catalog/find/miniproductlist.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/find/miniproductlist.ftl?rev=607133&r1=607132&r2=607133&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/find/miniproductlist.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/find/miniproductlist.ftl Thu Dec 27 14:34:14 2007
@@ -38,21 +38,21 @@
                     <a href='<@ofbizUrl>EditProduct?productId=${product.productId}</@ofbizUrl>' class='buttontext'>
                       ${product.internalName?default("${uiLabelMap.CommonNo} ${uiLabelMap.ProductInternalName}")}
                     </a>
-                    <div class='tabletext'>
+                    <div>
                       <b>${product.productId}</b>
                     </div>
                   </div>
               </#list>
               <#if (listSize > viewSize)>
                   <div>
-                    <div class='tabletext'>NOTE: Only showing the first ${viewSize} of ${listSize} products. To view the rest, use the Products tab for this category.</div>
+                    <div>NOTE: Only showing the first ${viewSize} of ${listSize} products. To view the rest, use the Products tab for this category.</div>
                   </div>
               </#if>
           <#else>
-            <div class='tabletext'>${uiLabelMap.ProductNoProductsInCategory}.</div>
+            <div>${uiLabelMap.ProductNoProductsInCategory}.</div>
           </#if>
         <#else>
-            <div class='tabletext'>${uiLabelMap.ProductNoCategorySpecified}.</div>
+            <div>${uiLabelMap.ProductNoCategorySpecified}.</div>
         </#if>
     </div>
 </#if>

Modified: ofbiz/trunk/applications/product/webapp/catalog/main.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/main.ftl?rev=607133&r1=607132&r2=607133&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/main.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/main.ftl Thu Dec 27 14:34:14 2007
@@ -23,43 +23,42 @@
     </div>
     <div class="screenlet-body">
         <#if !sessionAttributes.userLogin?exists>
-          <div class='tabletext'> ${uiLabelMap.ProductGeneralMessage}.</div>
+          <div class='label'> ${uiLabelMap.ProductGeneralMessage}.</div>
         </#if>
         <br/>
         <#if security.hasEntityPermission("CATALOG", "_VIEW", session)>
-          <div class="tabletext"> ${uiLabelMap.ProductEditCatalogWithCatalogId}:</div>
+          <div class="label">${uiLabelMap.ProductEditCatalogWithCatalogId}:</div>
           <form method="post" action="<@ofbizUrl>EditProdCatalog</@ofbizUrl>" style="margin: 0;">
             <input type="text" size="20" maxlength="20" name="prodCatalogId" class="inputBox" value=""/>
             <input type="submit" value=" ${uiLabelMap.ProductEditCatalog}" class="smallSubmit"/>
           </form>
-          <div class="tabletext"> ${uiLabelMap.CommonOr}: <a href="<@ofbizUrl>EditProdCatalog</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductCreateNewCatalog}</a></div>
-        <br/>            
-          <div class="tabletext"> ${uiLabelMap.ProductEditCategoryWithCategoryId}:</div>
+          <div class="label">${uiLabelMap.CommonOr}: <a href="<@ofbizUrl>EditProdCatalog</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductCreateNewCatalog}</a></div>
+          <br/>            
+          <div class="label">${uiLabelMap.ProductEditCategoryWithCategoryId}:</div>
           <form method="post" action="<@ofbizUrl>EditCategory</@ofbizUrl>" style="margin: 0;">
             <input type="text" size="20" maxlength="20" name="productCategoryId" class="inputBox" value=""/>
             <input type="submit" value="${uiLabelMap.ProductEditCategory}" class="smallSubmit"/>
           </form>
-          <div class="tabletext"> ${uiLabelMap.CommonOr}: <a href="<@ofbizUrl>EditCategory</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductCreateNewCategory}</a></div>
-        <br/>
-          <div class="tabletext"> ${uiLabelMap.ProductEditProductWithProductId}:</div>
+          <div class="label">${uiLabelMap.CommonOr}: <a href="<@ofbizUrl>EditCategory</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductCreateNewCategory}</a></div>
+          <br/>
+          <div class="label">${uiLabelMap.ProductEditProductWithProductId}:</div>
           <form method="post" action="<@ofbizUrl>EditProduct</@ofbizUrl>" style="margin: 0;">
             <input type="text" size="20" maxlength="20" name="productId" class="inputBox" value=""/>
             <input type="submit" value=" ${uiLabelMap.ProductEditProduct}" class="smallSubmit"/>
           </form>
-          <div class="tabletext"> ${uiLabelMap.CommonOr}: <a href="<@ofbizUrl>EditProduct</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductCreateNewProduct}</a></div>
-          <div class="tabletext"> ${uiLabelMap.CommonOr}: <a href="<@ofbizUrl>CreateVirtualWithVariantsForm</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductQuickCreateVirtualFromVariants}</a></div>
-        <br/>
-          <div class="tabletext"> ${uiLabelMap.ProductFindProductWithIdValue}:</div>
+          <div class="label">${uiLabelMap.CommonOr}: <a href="<@ofbizUrl>EditProduct</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductCreateNewProduct}</a></div>
+          <br/>
+          <div class="label">${uiLabelMap.CommonOr}: <a href="<@ofbizUrl>CreateVirtualWithVariantsForm</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductQuickCreateVirtualFromVariants}</a></div>
+          <br/>
+          <div class="label">${uiLabelMap.ProductFindProductWithIdValue}:</div>
           <form method="post" action="<@ofbizUrl>FindProductById</@ofbizUrl>" style="margin: 0;">
             <input type="text" size="20" maxlength="20" name="idValue" class="inputBox" value=""/>
             <input type="submit" value=" ${uiLabelMap.ProductFindProduct}" class="smallSubmit"/>
           </form>
-        <br/>
-        <br/>
-        <div><a href="<@ofbizUrl>UpdateAllKeywords</@ofbizUrl>" class="buttontext"> ${uiLabelMap.ProductAutoCreateKeywordsForAllProducts}</a></div>
-        <div><a href="<@ofbizUrl>FastLoadCache</@ofbizUrl>" class="buttontext"> ${uiLabelMap.ProductFastLoadCatalogIntoCache}</a></div>
-        <br/>
+          <br/>
+          <div><a href="<@ofbizUrl>UpdateAllKeywords</@ofbizUrl>" class="buttontext"> ${uiLabelMap.ProductAutoCreateKeywordsForAllProducts}</a></div>
+          <div><a href="<@ofbizUrl>FastLoadCache</@ofbizUrl>" class="buttontext"> ${uiLabelMap.ProductFastLoadCatalogIntoCache}</a></div>
+          <br/>
         </#if>
-        <!--<div class="tabletext"> ${uiLabelMap.ProductCatalogManagerIsFor}.</div>-->
     </div>
 </div>