svn commit: r931854 [1/2] - in /ofbiz/trunk: applications/content/webapp/content/cms/ applications/content/webapp/content/survey/ applications/humanres/webapp/humanres/humanres/ applications/manufacturing/webapp/manufacturing/bom/ applications/manufact...

Author: jleroux
Date: Thu Apr  8 10:19:38 2010
New Revision: 931854

URL: http://svn.apache.org/viewvc?rev=931854&view=rev
Log:
Closes "Using Widgets html form templates in FTL files" (https://issues.apache.org/jira/browse/OFBIZ-3541) - OFBIZ-3541

This concerns the lookups which are now rendered the same in ftl files and widget forms

Modified:
    ofbiz/trunk/applications/content/webapp/content/cms/CMSContentEdit.ftl
    ofbiz/trunk/applications/content/webapp/content/survey/EditSurveyResponse.ftl
    ofbiz/trunk/applications/humanres/webapp/humanres/humanres/findEmployee.ftl
    ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl
    ofbiz/trunk/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl
    ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditRoutingTaskAssoc.ftl
    ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcart.ftl
    ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkinits.ftl
    ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderagreements.ftl
    ofbiz/trunk/applications/order/webapp/ordermgr/entry/setAdditionalParty.ftl
    ofbiz/trunk/applications/order/webapp/ordermgr/entry/shipsettings.ftl
    ofbiz/trunk/applications/order/webapp/ordermgr/order/appendorderitem.ftl
    ofbiz/trunk/applications/order/webapp/ordermgr/order/findOrders.ftl
    ofbiz/trunk/applications/order/webapp/ordermgr/return/returnHeader.ftl
    ofbiz/trunk/applications/party/webapp/partymgr/party/linkparty.ftl
    ofbiz/trunk/applications/product/webapp/catalog/category/EditCategory.ftl
    ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProducts.ftl
    ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryRollup.ftl
    ofbiz/trunk/applications/product/webapp/catalog/find/advancedsearch.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/product/EditProductAssoc.ftl
    ofbiz/trunk/applications/product/webapp/catalog/product/EditProductFeatures.ftl
    ofbiz/trunk/applications/product/webapp/catalog/product/EditProductParties.ftl
    ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl
    ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreSurveys.ftl
    ofbiz/trunk/applications/product/webapp/facility/facility/EditFacility.ftl
    ofbiz/trunk/applications/product/webapp/facility/facility/FindFacilityLocation.ftl
    ofbiz/trunk/applications/product/webapp/facility/facility/PickMoveStock.ftl
    ofbiz/trunk/applications/product/webapp/facility/inventory/TransferInventoryItem.ftl
    ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl
    ofbiz/trunk/applications/product/webapp/facility/returns/receiveReturn.ftl
    ofbiz/trunk/applications/product/webapp/facility/shipment/AddItemsFromInventory.ftl
    ofbiz/trunk/applications/product/webapp/facility/shipment/AddItemsFromOrder.ftl
    ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentItems.ftl
    ofbiz/trunk/applications/product/webapp/facility/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl
    ofbiz/trunk/applications/workeffort/webapp/workeffort/find/WorkEffortSearchOptions.ftl
    ofbiz/trunk/specialpurpose/ebay/webapp/ebay/find/EbayAdvancedSearch.ftl
    ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/store/ebayApiKeywordSearch.ftl
    ofbiz/trunk/specialpurpose/googlebase/webapp/googlebase/find/GoogleBaseAdvancedSearch.ftl
    ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/edittaskandassoc.ftl

Modified: ofbiz/trunk/applications/content/webapp/content/cms/CMSContentEdit.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/cms/CMSContentEdit.ftl?rev=931854&r1=931853&r2=931854&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/cms/CMSContentEdit.ftl (original)
+++ ofbiz/trunk/applications/content/webapp/content/cms/CMSContentEdit.ftl Thu Apr  8 10:19:38 2010
@@ -140,10 +140,8 @@ ${menuWrapper.renderMenuString()}
                     </#list>
                     <tr>
                       <td valign="middle">
-                        <div class="boxhead"><input type="text" name="fieldValue0_o_${rowCount}" value=""/>
-                          <a href="javascript:call_fieldlookup3('<@ofbizUrl>LookupFeature</@ofbizUrl>')">
-                            <img src="<@ofbizContentUrl>/images/fieldlookup.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="${uiLabelMap.CommonClickHereForFieldLookup}">
-                          </a>
+                        <div class="boxhead">
+                          <@htmlTemplate.lookupField3 formName="updatefeatures" name="fieldValue0_o_${rowCount}" id="fieldValue0_o_${rowCount}" fieldFormName="LookupFeature"/>
                         </div>
                       </td>
                           <input type="hidden" name="fieldName0_o_${rowCount}" value="productFeatureId"/>

Modified: ofbiz/trunk/applications/content/webapp/content/survey/EditSurveyResponse.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/survey/EditSurveyResponse.ftl?rev=931854&r1=931853&r2=931854&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/survey/EditSurveyResponse.ftl (original)
+++ ofbiz/trunk/applications/content/webapp/content/survey/EditSurveyResponse.ftl Thu Apr  8 10:19:38 2010
@@ -20,7 +20,7 @@ under the License.
 <#-- Render the survey -->
 <#if surveyString?has_content>
   <form method="post" enctype="multipart/form-data" action="<@ofbizUrl>updateSurveyResponse</@ofbizUrl>" name="EditSurveyResponseForm" style="margin: 0;">
-    <div class="tabletext">${uiLabelMap.PartyPartyId}: <input type="text" size="15" name="partyId" value="${userLogin.partyId}" class="inputBox"/><a href="javascript:call_fieldlookup2(document.EditSurveyResponseForm.partyId, 'LookupPartyName');"><img src="<@ofbizContentUrl>/images/fieldlookup.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="${uiLabelMap.CommonClickHereForFieldLookup}"/></a></div>
+    <div class="tabletext">${uiLabelMap.PartyPartyId}: <@htmlTemplate.lookupField value="${userLogin.partyId}" formName="EditSurveyResponseForm" name="partyId" id="partyId" lookupFieldFormName="LookupPartyName"/>
     <#-- pass through the dataResourceId so the response can be associated with it -->
     <input type="hidden" name="dataResourceId" value="${parameters.dataResourceId?if_exists}"/>
     <input type="hidden" name="rootContentId" value="${parameters.rootContentId?if_exists}"/>

Modified: ofbiz/trunk/applications/humanres/webapp/humanres/humanres/findEmployee.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/webapp/humanres/humanres/findEmployee.ftl?rev=931854&r1=931853&r2=931854&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/webapp/humanres/humanres/findEmployee.ftl (original)
+++ ofbiz/trunk/applications/humanres/webapp/humanres/humanres/findEmployee.ftl Thu Apr  8 10:19:38 2010
@@ -54,10 +54,9 @@ under the License.
                     </td>
                 </tr>
                 <tr><td class='label'>${uiLabelMap.PartyPartyId}</td>
-                    <td><input type='text' name='partyId' value='${requestParameters.partyId?if_exists}'/>
-                    <a href="javascript:call_fieldlookup2(document.lookupparty.partyId,'LookupPerson');">
-                        <img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt="${uiLabelMap.CommonClickHereForFieldLookup}"/>
-                    </a></td>
+                    <td>
+                      <@htmlTemplate.lookupField value='${requestParameters.partyId?if_exists}' formName="lookupparty" name="partyId" id="partyId" fieldFormName="LookupPerson"/>
+                    </td>
                 </tr>
                 <tr><td class="label">${uiLabelMap.PartyUserLogin}</td>
                     <td><input type="text" name="userLoginId" value="${parameters.userLoginId?if_exists}"/></td>

Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl?rev=931854&r1=931853&r2=931854&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl Thu Apr  8 10:19:38 2010
@@ -63,8 +63,7 @@ function lookupBom() {
             <td align="right">${uiLabelMap.ProductProductId}</td>
             <td>&nbsp;</td>
             <td>
-                <input type="text" name="productId" size="20" maxlength="40" value="${productId?if_exists}"/>
-                <a href="javascript:call_fieldlookup2(document.searchform.productId,'LookupProduct');"><img src="<@ofbizContentUrl>/images/fieldlookup.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="${uiLabelMap.CommonClickHereForFieldLookup}"/></a>
+                <@htmlTemplate.lookupField value="${productId?if_exists}" formName="searchform" name="productId" id="productId" fieldFormName="LookupProduct"/>
                 <span><a href="javascript:document.searchform.submit();" class="buttontext">${uiLabelMap.ManufacturingShowBOMAssocs}</a></span>
             </td>
         </tr>
@@ -75,8 +74,7 @@ function lookupBom() {
             <td align="right">${uiLabelMap.ManufacturingCopyToProductId}</td>
             <td>&nbsp;</td>
             <td>
-                <input type="text" name="copyToProductId" size="20" maxlength="40" value=""/>
-                <a href="javascript:call_fieldlookup2(document.searchform.copyToProductId,'LookupProduct');"><img src="<@ofbizContentUrl>/images/fieldlookup.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="${uiLabelMap.CommonClickHereForFieldLookup}"/></a>
+                <@htmlTemplate.lookupField formName="searchform" name="copyToProductId" id="copyToProductId" fieldFormName="LookupProduct"/>
                 <span><a href="javascript:document.searchform.UPDATE_MODE.value='COPY';document.searchform.submit();" class="buttontext">${uiLabelMap.ManufacturingCopyBOMAssocs}</a></span>
             </td>
         </tr>
@@ -109,16 +107,14 @@ function lookupBom() {
             <td align="right">${uiLabelMap.ProductProductId}</td>
             <td>&nbsp;</td>
             <td>
-                <input type="text" name="productId" size="20" maxlength="40" value="${productId?if_exists}"/>
-                <a href="javascript:call_fieldlookup2(document.editProductAssocForm.productId,'LookupProduct');"><img src="<@ofbizContentUrl>/images/fieldlookup.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="${uiLabelMap.CommonClickHereForFieldLookup}"/></a>
+                <@htmlTemplate.lookupField value="${productId?if_exists}" formName="editProductAssocForm" name="productId" id="productId" fieldFormName="LookupProduct"/>
             </td>
           </tr>
           <tr>
             <td align="right">${uiLabelMap.ManufacturingProductIdTo}</td>
             <td>&nbsp;</td>
             <td>
-                <input type="text" name="productIdTo" size="20" maxlength="40" value="${productIdTo?if_exists}"/>
-                <a href="javascript:call_fieldlookup2(document.editProductAssocForm.productIdTo,'LookupProduct');"><img src="<@ofbizContentUrl>/images/fieldlookup.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="${uiLabelMap.CommonClickHereForFieldLookup}"/></a>
+                <@htmlTemplate.lookupField value="${productIdTo?if_exists}" formName="editProductAssocForm" name="productIdTo" id="productIdTo" fieldFormName="LookupProduct"/>
             </td>
           </tr>
           <tr>
@@ -214,8 +210,16 @@ function lookupBom() {
         <td width="26%" align="right">${uiLabelMap.ManufacturingRoutingTask}</td>
         <td>&nbsp;</td>
         <td width="74%">
-            <input type="text" name="routingWorkEffortId" <#if useValues>value="${(productAssoc.routingWorkEffortId)?if_exists}"<#else>value="${(request.getParameter("routingWorkEffortId"))?if_exists}"</#if> size="10" maxlength="15"/>
-            <a href="javascript:call_fieldlookup(document.editProductAssocForm.routingWorkEffortId,'<@ofbizUrl>LookupRoutingTask</@ofbizUrl>','none',640,460);"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt="${uiLabelMap.CommonClickHereForFieldLookup}"/></a>
+          <#if useValues>
+            <#assign value = productAssoc.routingWorkEffortId?if_exists>
+          <#else>
+            <#assign value = request.getParameter("routingWorkEffortId")?if_exists>
+          </#if>
+          <#if value?has_content>
+            <@htmlTemplate.lookupField value="${value}" formName="editProductAssocForm" name="routingWorkEffortId" id="routingWorkEffortId" fieldFormName="LookupRoutingTask"/>
+          <#else>
+            <@htmlTemplate.lookupField formName="editProductAssocForm" name="routingWorkEffortId" id="routingWorkEffortId" fieldFormName="LookupRoutingTask"/>
+          </#if>
         </td>
     </tr>
     <tr>

Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl?rev=931854&r1=931853&r2=931854&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl Thu Apr  8 10:19:38 2010
@@ -63,13 +63,10 @@ function lookupInventory() {
                     <td width='20%' align='right' class="label">${uiLabelMap.ManufacturingProductId}</td>
                     <td width='5%'>&nbsp;</td>
                     <td>
-                        <input type='text' size='25' name='productId' value='${requestParameters.productId?if_exists}'/>
-                        <span>
-                          <a href="javascript:call_fieldlookup2(document.lookupinventory.productId,'LookupProduct');">
-                            <img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt="${uiLabelMap.CommonClickHereForFieldLookup}"/>
-                          </a>
-                        </span>
-                        <input type='text' size='25' readonly="readonly" name='productId_description' value=''/>${uiLabelMap.CommonDescription}
+                      <span>
+                        <@htmlTemplate.lookupField value='${requestParameters.productId?if_exists}' formName="lookupinventory" name="productId" id="productId" fieldFormName="LookupProduct"/>
+                      </span>
+                      <input type='text' size='25' readonly name='productId_description' value=''/>${uiLabelMap.CommonDescription}
                      </td>
                   </tr>
                   <tr>

Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditRoutingTaskAssoc.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditRoutingTaskAssoc.ftl?rev=931854&r1=931853&r2=931854&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditRoutingTaskAssoc.ftl (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditRoutingTaskAssoc.ftl Thu Apr  8 10:19:38 2010
@@ -42,8 +42,7 @@ function addRoutingTask() {
                 ${uiLabelMap.ManufacturingRoutingTaskId}
             </th>
             <td>
-                <input type="text" name="workEffortIdTo" size="20"/>
-                <a href="javascript:call_fieldlookup(document.addtaskassocform.workEffortIdTo,'<@ofbizUrl>LookupRoutingTask</@ofbizUrl>', 'vide',540,450);"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt="${uiLabelMap.CommonClickHereForFieldLookup}" /></a>
+                <@htmlTemplate.lookupField formName="addtaskassocform" name="workEffortIdTo" id="workEffortIdTo" fieldFormName="LookupRoutingTask"/>
             </td>
             <th align="right">
                 ${uiLabelMap.CommonFromDate}

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcart.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcart.ftl?rev=931854&r1=931853&r2=931854&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcart.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcart.ftl Thu Apr  8 10:19:38 2010
@@ -84,6 +84,17 @@ under the License.
                       <a href="javascript:call_fieldlookup2(document.quickaddform.add_product_id,'<@ofbizUrl><#if orderType=="PURCHASE_ORDER">LookupSupplierProduct?partyId=${partyId?if_exists}<#else>LookupProduct</#if></@ofbizUrl>');">
                         <img src="<@ofbizContentUrl>/images/fieldlookup.gif</@ofbizContentUrl>" width="15" height="14" border="0" alt="${uiLabelMap.CommonClickHereForFieldLookup}"/>
                       </a>
+                      <#-- FIXME Problem here: the input field is shared -->
+                      <#--if orderType=="PURCHASE_ORDER">                        
+                        <#if partyId?has_content>                                              
+                          <#assign fieldFormName="LookupSupplierProduct?partyId=${partyId}">
+                        <#else>
+                          <#assign fieldFormName="LookupSupplierProduct">
+                        </#if>
+                      <#else>
+                        <#assign fieldFormName="LookupProduct">
+                      </#if>
+                      <@htmlTemplate.lookupField formName="quickaddform" name="add_product_id" id="add_product_id" fieldFormName="${fieldFormName}"/-->
                       <a href="javascript:quicklookupGiftCertificate()" class="buttontext">${uiLabelMap.OrderAddGiftCertificate}</a>
                       <#if "PURCHASE_ORDER" == shoppingCart.getOrderType()>
                         <a href="javascript:showQohAtp()" class="buttontext">${uiLabelMap.ProductAtpQoh}</a>
@@ -164,8 +175,8 @@ under the License.
             <form method="post" action="<@ofbizUrl>additem</@ofbizUrl>" name="bulkworkaddform" style="margin: 0;">
                 <div>
                     ${uiLabelMap.OrderOrderItemType}:&nbsp;<select name="add_item_type"><option value="BULK_ORDER_ITEM">${uiLabelMap.ProductBulkItem}</option><option value="WORK_ORDER_ITEM">${uiLabelMap.ProductWorkItem}</option></select>
-                    <br>${uiLabelMap.ProductProductCategory}:&nbsp;<input type="text" name="add_category_id" size="20" maxlength="20" value="${requestParameters.add_category_id?if_exists}"/>
-                    <a href="javascript:call_fieldlookup2(document.bulkworkaddform.add_category_id,'LookupProductCategory');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt="${uiLabelMap.CommonClickHereForFieldLookup}"/></a>
+                    <br>${uiLabelMap.ProductProductCategory}:&nbsp;
+                    <@htmlTemplate.lookupField formName="bulkworkaddform" value="${requestParameters.add_category_id?if_exists}" name="add_category_id" id="add_category_id" fieldFormName="LookupProductCategory"/>
                 </div>
                 <div>
                     ${uiLabelMap.CommonDescription}:&nbsp;<input type="text" size="25" name="add_item_description" value=""/>

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkinits.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkinits.ftl?rev=931854&r1=931853&r2=931854&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkinits.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkinits.ftl Thu Apr  8 10:19:38 2010
@@ -101,10 +101,7 @@ under the License.
           <td>&nbsp;</td>
           <td valign='middle'>
             <div class='tabletext'>
-              <input type="text" name="userLoginId" value="${parameters.userLogin.userLoginId}"/>
-              <a href="javascript:call_fieldlookup2(document.salesentryform.userLoginId,'LookupUserLoginAndPartyDetails');">
-                <img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt="${uiLabelMap.CommonClickHereForFieldLookup}"/>
-              </a>
+              <@htmlTemplate.lookupField value="${parameters.userLogin.userLoginId}" formName="salesentryform" name="userLoginId" id="userLoginId" fieldFormName="LookupUserLoginAndPartyDetails"/>
             </div>
           </td>
         </tr>
@@ -114,10 +111,7 @@ under the License.
           <td>&nbsp;</td>
           <td valign='middle'>
             <div class='tabletext'>
-              <input type='text' class='inputBox' name='partyId' value='${thisPartyId?if_exists}'/>
-              <a href="javascript:call_fieldlookup2(document.salesentryform.partyId,'LookupCustomerName');">
-                <img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt="${uiLabelMap.CommonClickHereForFieldLookup}"/>
-              </a>
+              <@htmlTemplate.lookupField value='${thisPartyId?if_exists}' formName="salesentryform" name="partyId" id="partyId" fieldFormName="LookupCustomerName"/>
             </div>
           </td>
         </tr>
@@ -174,10 +168,7 @@ under the License.
           <td>&nbsp;</td>
           <td valign='middle'>
             <div class='tabletext'>
-              <input type='text' class='inputBox' name='userLoginId' value='${parameters.userLogin.userLoginId}'/>
-              <a href="javascript:call_fieldlookup2(document.poentryform.userLoginId,'LookupUserLoginAndPartyDetails');">
-                <img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt="${uiLabelMap.CommonClickHereForFieldLookup}"/>
-              </a>
+              <@htmlTemplate.lookupField value='${parameters.userLogin.userLoginId}'formName="poentryform" name="userLoginId" id="userLoginId" fieldFormName="LookupUserLoginAndPartyDetails"/>
             </div>
           </td>
         </tr>

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderagreements.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderagreements.ftl?rev=931854&r1=931853&r2=931854&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderagreements.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderagreements.ftl Thu Apr  8 10:19:38 2010
@@ -158,8 +158,7 @@ under the License.
         </td>
         <td>&nbsp;</td>
         <td>
-          <input type="text" name="workEffortId" size="15"/>
-          <a href="javascript:call_fieldlookup2(document.agreementForm.workEffortId,'LookupWorkEffort');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt="${uiLabelMap.CommonClickHereForFieldLookup}"/></a>
+          <@htmlTemplate.lookupField formName="agreementForm" name="workEffortId" id="workEffortId" fieldFormName="LookupWorkEffort"/>
         </td>
       </tr>
 

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/setAdditionalParty.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/setAdditionalParty.ftl?rev=931854&r1=931853&r2=931854&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/setAdditionalParty.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/setAdditionalParty.ftl Thu Apr  8 10:19:38 2010
@@ -83,10 +83,7 @@ under the License.
             <div>${uiLabelMap.CommonIdentifier} :</div>
           </td>
           <td>
-            <input type="text" name="additionalPartyId" value="${additionalPartyId?if_exists}" onchange="javascript:document.quickAddPartyForm.submit()" />
-          </td>
-          <td>
-            <a href="javascript:document.quickAddPartyForm.additionalPartyId.focus();call_fieldlookup2(document.quickAddPartyForm.additionalPartyId, '${lookupPartyView}');"><img src="<@ofbizContentUrl>/images/fieldlookup.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="${uiLabelMap.CommonClickHereForFieldLookup}"></a>
+            <@htmlTemplate.lookupField value="${additionalPartyId?if_exists}" formName="quickAddPartyForm" name="additionalPartyId" id="additionalPartyId" fieldFormName="${lookupPartyView}"/>
           </td>
           <td>
             &nbsp;<a href="javascript:document.quickAddPartyForm.submit()" class="buttontext">${uiLabelMap.CommonApply}</a>

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/shipsettings.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/shipsettings.ftl?rev=931854&r1=931853&r2=931854&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/shipsettings.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/shipsettings.ftl Thu Apr  8 10:19:38 2010
@@ -255,9 +255,7 @@ under the License.
               <td>&nbsp;</td>
               <td valign='middle'>
                 <div class='tabletext'>
-                  <input type='text' class='inputBox' name='shipToPartyId' value='${thisPartyId?if_exists}'/>
-                  <a href="javascript:call_fieldlookup2(document.partyshipform.shipToPartyId,'LookupPartyName');">
-                  <img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt="${uiLabelMap.CommonClickHereForFieldLookup}"/></a>
+                  <@htmlTemplate.lookupField value='${thisPartyId?if_exists}' formName="partyshipform" name="shipToPartyId" id="shipToPartyId" fieldFormName="LookupPartyName"/>
                   <input type="submit" class="smallSubmit" value="Continue" />
                 </div>
               </td>

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/appendorderitem.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/appendorderitem.ftl?rev=931854&r1=931853&r2=931854&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/appendorderitem.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/appendorderitem.ftl Thu Apr  8 10:19:38 2010
@@ -59,7 +59,8 @@ under the License.
                       <#if "PURCHASE_ORDER" == orderHeader.orderTypeId>
                           <a href="javascript:quicklookup(document.appendItemForm.orderId)" class="buttontext">${uiLabelMap.OrderQuickLookup}</a>
                       </#if>
-                      <a href="javascript:call_fieldlookup2(document.appendItemForm.productId,'LookupProduct');">
+                      <#-- FIXME Problem here: the input field is shared -->
+                      <@htmlTemplate.lookupField formName="appendItemForm" name="productId" id="productId" fieldFormName="LookupProduct"/>
                         <img src="<@ofbizContentUrl>/images/fieldlookup.gif</@ofbizContentUrl>" width="15" height="14" border="0" alt="${uiLabelMap.CommonClickHereForFieldLookup}"/>
                       </a>
                   </td>

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/findOrders.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/findOrders.ftl?rev=931854&r1=931853&r2=931854&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/findOrders.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/findOrders.ftl Thu Apr  8 10:19:38 2010
@@ -201,10 +201,7 @@ function toggleOrderIdList() {
                 <td width='25%' align='right' class='label'>${uiLabelMap.PartyPartyId}</td>
                 <td width='5%'>&nbsp;</td>
                 <td align='left'>
-                  <input type='text' name='partyId' value='${requestParameters.partyId?if_exists}'/>
-                  <a href="javascript:call_fieldlookup2(document.lookuporder.partyId,'LookupPartyName');">
-                    <img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt="${uiLabelMap.CommonClickHereForFieldLookup}"/>
-                  </a>
+                  <@htmlTemplate.lookupField value='${requestParameters.partyId?if_exists}' formName="lookuporder" name="partyId" id="partyId" fieldFormName="LookupPartyName"/>
                 </td>
               </tr>
               <tr>

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/return/returnHeader.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/return/returnHeader.ftl?rev=931854&r1=931853&r2=931854&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/return/returnHeader.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/return/returnHeader.ftl Thu Apr  8 10:19:38 2010
@@ -86,10 +86,7 @@ under the License.
             <td width='6%' align='right' nowrap="nowrap" class="label">${uiLabelMap.OrderReturnFromParty}</td>
             <td width='6%'>&nbsp;</td>
             <td width='74%'>
-              <input type='text' size='20' name='fromPartyId' value='${returnInfo.fromPartyId?if_exists}' />
-              <a href="javascript:call_fieldlookup2(document.returnhead.fromPartyId,'LookupPartyName');">
-                <img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt="${uiLabelMap.CommonClickHereForFieldLookup}"/>
-              </a>
+              <@htmlTemplate.lookupField value='${returnInfo.fromPartyId?if_exists}' formName="returnhead" name="fromPartyId" id="fromPartyId" fieldFormName="LookupPartyName"/>
             </td>
           </tr>
           <tr>

Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/linkparty.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/linkparty.ftl?rev=931854&r1=931853&r2=931854&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/linkparty.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/linkparty.ftl Thu Apr  8 10:19:38 2010
@@ -71,13 +71,10 @@ under the License.
           <form name="linkpartycnf" method="post" action="<@ofbizUrl>linkparty</@ofbizUrl>">
             <div>
               <span class="label">${uiLabelMap.PartyLink}</span>
-              <input type="text" name="partyId" value="${partyId?if_exists}"/>
-              <a href="javascript:call_fieldlookup2(document.linkpartycnf.partyId,'LookupPartyName');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt="${uiLabelMap.CommonClickHereForFieldLookup}"/></a>
+              <@htmlTemplate.lookupField value="${partyId?if_exists}" formName="linkpartycnf" name="partyId" id="partyId" fieldFormName="LookupPartyName"/>
               &nbsp;
               <span class="label">${uiLabelMap.CommonTo}</span>
-              <input type="text" name="partyIdTo" value="${partyIdTo?if_exists}"/>
-              <a href="javascript:call_fieldlookup2(document.linkpartycnf.partyIdTo,'LookupPartyName');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt="${uiLabelMap.CommonClickHereForFieldLookup}"/></a>
-              <a href="javascript:document.linkpartycnf.submit()" class="smallSubmit">${uiLabelMap.CommonLink}</a>
+              <@htmlTemplate.lookupField value="${partyIdTo?if_exists}" formName="linkpartycnf" name="partyIdTo" id="partyIdTo" fieldFormName="LookupPartyName"/>
             </div>
           </form>
         </#if>

Modified: ofbiz/trunk/applications/product/webapp/catalog/category/EditCategory.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/category/EditCategory.ftl?rev=931854&r1=931853&r2=931854&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/category/EditCategory.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/category/EditCategory.ftl Thu Apr  8 10:19:38 2010
@@ -182,8 +182,7 @@ function insertImageName(type,nameValue)
                     <td width="26%" align="right" class="label">${uiLabelMap.ProductPrimaryParentCategory}</td>
                     <td>&nbsp;</td>
                     <td width="74%">
-                        <input type="text" name="primaryParentCategoryId" size="20" maxlength="20" value="${(productCategory.primaryParentCategoryId)?default('')}"/>
-                        <a href="javascript:call_fieldlookup2(document.productCategoryForm.primaryParentCategoryId,'LookupProductCategory');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt="${uiLabelMap.CommonClickHereForFieldLookup}"/></a>
+                        <@htmlTemplate.lookupField value="${(productCategory.primaryParentCategoryId)?default('')}" formName="productCategoryForm" name="primaryParentCategoryId" id="primaryParentCategoryId" fieldFormName="LookupProductCategory"/>
                     </td>
                 </tr>
                 <tr>

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=931854&r1=931853&r2=931854&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProducts.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProducts.ftl Thu Apr  8 10:19:38 2010
@@ -147,8 +147,8 @@ under the License.
                     <input type="hidden" name="productCategoryId" value="${productCategoryId?if_exists}" />
                     <input type="hidden" name="activeOnly" value="${activeOnly.toString()}" />
                     <div>
-                        <span class="label">${uiLabelMap.ProductProductId}</span> <input type="text" size="20" name="productId" />
-                        <a href="javascript:call_fieldlookup2(document.addProductCategoryMemberForm.productId, 'LookupProduct');"><img src="<@ofbizContentUrl>/images/fieldlookup.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="${uiLabelMap.CommonClickHereForFieldLookup}"></a>
+                        <span class="label">${uiLabelMap.ProductProductId}</span>
+                        <@htmlTemplate.lookupField formName="addProductCategoryMemberForm" name="productId" id="productId" lookupFieldFormName="LookupProduct"/>
                         <span class="label">${uiLabelMap.CommonFromDate}</span> <input type="text" size="22" name="fromDate" />
                         <a href="javascript:call_cal(document.addProductCategoryMemberForm.fromDate, '${nowTimestamp?string}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a>
                           <br />
@@ -172,8 +172,7 @@ under the License.
                     <input type="hidden" name="activeOnly" value="${activeOnly.toString()}" />
                     <div>
                         <span class="label">${uiLabelMap.ProductTargetProductCategory}</span>
-                        <input type="text" 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="${uiLabelMap.CommonClickHereForFieldLookup}"/></a>
+                        <@htmlTemplate.lookupField formName="copyCategoryProductMembersForm" name="productCategoryIdTo" id="productCategoryIdTo" fieldFormName="LookupProductCategory"/>
                         <br />
                         <span class="label">${uiLabelMap.ProductOptionalFilterWithDate}</span> <input type="text" size="20" name="validDate" />
                         <a href="javascript:call_cal(document.copyCategoryProductMembersForm.validDate, '${nowTimestamp?string}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a>

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=931854&r1=931853&r2=931854&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryRollup.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryRollup.ftl Thu Apr  8 10:19:38 2010
@@ -98,8 +98,7 @@ under the License.
                 <form method="post" action="<@ofbizUrl>addProductCategoryToCategory</@ofbizUrl>" style="margin: 0;" name="addParentForm">
                     <input type="hidden" name="productCategoryId" value="${productCategoryId}" />
                     <input type="hidden" name="showProductCategoryId" value="${productCategoryId}" />
-                    <input type="text" 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="${uiLabelMap.CommonClickHereForFieldLookup}"/></a>
+                    <@htmlTemplate.lookupField value="${requestParameters.SEARCH_CATEGORY_ID?if_exists}" formName="addParentForm" name="parentProductCategoryId" id="parentProductCategoryId" fieldFormName="LookupProductCategory"/>
                     <input type="text" size="25" name="fromDate" />
                     <a href="javascript:call_cal(document.addParentForm.fromDate, null);"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a>
                     <input type="submit" value="${uiLabelMap.CommonAdd}" />
@@ -189,8 +188,7 @@ under the License.
                 <form method="post" action="<@ofbizUrl>addProductCategoryToCategory</@ofbizUrl>" style="margin: 0;" name="addChildForm">
                     <input type="hidden" name="showProductCategoryId" value="${productCategoryId}" />
                     <input type="hidden" name="parentProductCategoryId" value="${productCategoryId}" />
-                    <input type="text" 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="${uiLabelMap.CommonClickHereForFieldLookup}"/></a>
+                    <@htmlTemplate.lookupField value="${requestParameters.SEARCH_CATEGORY_ID?if_exists}" formName="addChildForm" name="productCategoryId" id="productCategoryId" fieldFormName="LookupProductCategory"/>
                     <input type="text" size="25" name="fromDate" />
                     <a href="javascript:call_cal(document.addChildForm.fromDate, null);"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a>
                     <input type="submit" value="${uiLabelMap.CommonAdd}" />

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=931854&r1=931853&r2=931854&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/find/advancedsearch.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/find/advancedsearch.ftl Thu Apr  8 10:19:38 2010
@@ -66,8 +66,7 @@ under the License.
               </td>
               <td valign="middle">
                 <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="${uiLabelMap.CommonClickHereForFieldLookup}"/></a>
+                  <@htmlTemplate.lookupField value="${requestParameters.SEARCH_CATEGORY_ID?if_exists}" formName="advtokeywordsearchform" name="SEARCH_CATEGORY_ID" id="SEARCH_CATEGORY_ID" fieldFormName="LookupProductCategory"/>
                   ${uiLabelMap.ProductIncludeSubCategories}?
                   ${uiLabelMap.CommonYes}<input type="radio" name="SEARCH_SUB_CATEGORIES" value="Y" checked="checked"/>
                   ${uiLabelMap.CommonNo}<input type="radio" name="SEARCH_SUB_CATEGORIES" value="N"/>
@@ -261,8 +260,7 @@ under the License.
             ${uiLabelMap.ProductPrioritizeProductsInCategory}:
           </td>
           <td valign="middle">
-            <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="${uiLabelMap.CommonClickHereForFieldLookup}"/></a>
+            <@htmlTemplate.lookupField value="${requestParameters.PRIORITIZE_CATEGORY_ID?if_exists}" formName="advtokeywordsearchform" name="PRIORITIZE_CATEGORY_ID" id="PRIORITIZE_CATEGORY_ID" fieldFormName="LookupProductCategory"/>
           </td>
         </tr>
         <tr>

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=931854&r1=931853&r2=931854&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearchactions.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearchactions.ftl Thu Apr  8 10:19:38 2010
@@ -29,8 +29,7 @@ under the License.
     <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="${uiLabelMap.CommonClickHereForFieldLookup}"/></a>
+          <@htmlTemplate.lookupField formName="searchRemoveFromCategory" name="SE_SEARCH_CATEGORY_ID" id="SE_SEARCH_CATEGORY_ID" fieldFormName="LookupProductCategory"/>
           <input type="hidden" name="clearSearch" value="N" />
           <input type="submit" value="${uiLabelMap.CommonRemove}" class="smallSubmit" />
           <br />
@@ -42,8 +41,7 @@ under the License.
     <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="${uiLabelMap.CommonClickHereForFieldLookup}"/></a>
+          <@htmlTemplate.lookupField formName="searchExpireFromCategory" name="SE_SEARCH_CATEGORY_ID" id="SE_SEARCH_CATEGORY_ID" fieldFormName="LookupProductCategory"/>
           <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" />
@@ -56,8 +54,7 @@ under the License.
     <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="${uiLabelMap.CommonClickHereForFieldLookup}"/></a>
+          <@htmlTemplate.lookupField formName="searchAddToCategory" name="SE_SEARCH_CATEGORY_ID" id="SE_SEARCH_CATEGORY_ID" fieldFormName="LookupProductCategory"/>
           <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" />

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=931854&r1=931853&r2=931854&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearchbox.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearchbox.ftl Thu Apr  8 10:19:38 2010
@@ -41,7 +41,7 @@ under the License.
     </div>
     <div>
       <label for="keywordSearchCategoryId">${uiLabelMap.ProductCategoryId}:</label>
-      <input type="text" name="SEARCH_CATEGORY_ID" id="keywordSearchCategoryId" size="15" maxlength="20" value="${requestParameters.SEARCH_CATEGORY_ID?if_exists}"/><a href="javascript:call_fieldlookup2($('keywordSearchCategoryId'),'LookupProductCategory');"><img src='/images/fieldlookup.gif' width='15' height='14' alt="${uiLabelMap.CommonClickHereForFieldLookup}" /></a>
+      <@htmlTemplate.lookupField value="${requestParameters.SEARCH_CATEGORY_ID?if_exists}" formName="keywordsearchform" name="SEARCH_CATEGORY_ID" id="keywordSearchCategoryId" fieldFormName="LookupProductCategory"/>
     </div>
     <div>
       <label for="keywordSearchCointains">${uiLabelMap.CommonNoContains}</label>
@@ -60,8 +60,7 @@ under the License.
   <fieldset>
     <div>
       <label for="searchCategoryId">${uiLabelMap.ProductCategoryId}:</label>
-      <input type="text" name="SEARCH_CATEGORY_ID" id="searchCategoryId" size="15" maxlength="20" value="${requestParameters.SEARCH_CATEGORY_ID?if_exists}"/>
-      <a href="javascript:call_fieldlookup2($('searchCategoryId'),'LookupProductCategory');"><img src='/images/fieldlookup.gif' width='15' height='14' alt="${uiLabelMap.CommonClickHereForFieldLookup}" /></a>
+      <@htmlTemplate.lookupField value="${requestParameters.SEARCH_CATEGORY_ID?if_exists}" formName="advancedsearchform" name="SEARCH_CATEGORY_ID" id="searchCategoryId" fieldFormName="LookupProductCategory"/>
     </div>
     <div>
     <a href="javascript:$('advancedSearchForm').submit()" class="buttontext">${uiLabelMap.ProductAdvancedSearch}</a>
@@ -70,10 +69,9 @@ under the License.
 </form>
 <form name="productjumpform" id="productJumpForm" method="post" action="<@ofbizUrl>EditProduct</@ofbizUrl>">
   <fieldset>
-    <input type="text" name="productId" id="productJumpFormProductId" size="10" maxlength="20" value="${requestParameters.productId?if_exists}" />
     <input type="hidden" name="viewSize" value="20" />
     <input type="hidden" name="viewIndex" value="1" />
-    <a href="javascript:call_fieldlookup2($('productJumpFormProductId'),'LookupProduct');"><img src='/images/fieldlookup.gif' width='15' height='14' alt="${uiLabelMap.CommonClickHereForFieldLookup}" /></a>
+    <@htmlTemplate.lookupField value="${requestParameters.productId?if_exists}" formName="productjumpform" name="productId" id="productJumpFormProductId" fieldFormName="LookupProductCategory"/>
     <select name="DUMMYPAGE" id="dummyPage" onchange="submitProductJump()">
         <option value="<@ofbizUrl>EditProduct</@ofbizUrl>">-${uiLabelMap.ProductProductJump}-</option>
         <option value="<@ofbizUrl>EditProductQuickAdmin</@ofbizUrl>">${uiLabelMap.ProductQuickAdmin}</option>

Modified: ofbiz/trunk/applications/product/webapp/catalog/product/EditProductAssoc.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/EditProductAssoc.ftl?rev=931854&r1=931853&r2=931854&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/product/EditProductAssoc.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/product/EditProductAssoc.ftl Thu Apr  8 10:19:38 2010
@@ -78,8 +78,9 @@ under the License.
                 <tr>
                 <td align="right" class="label">${uiLabelMap.ProductProductIdTo}</td>
                 <td>&nbsp;</td>
-                <td><input type="text" name="PRODUCT_ID_TO" size="20" maxlength="40" value="${productIdTo?if_exists}" />
-                <a href="javascript:call_fieldlookup2(document.editProductAssocForm.PRODUCT_ID_TO,'LookupProduct');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt="${uiLabelMap.CommonClickHereForFieldLookup}"/></a></td>
+                <td>
+                  <@htmlTemplate.lookupField formName="editProductAssocForm" name="PRODUCT_ID_TO" id="PRODUCT_ID_TO" fieldFormName="LookupProduct"/>
+                </td>
                 </tr>
                 <tr>
                 <td align="right" class="label">${uiLabelMap.ProductAssociationTypeId}</td>

Modified: ofbiz/trunk/applications/product/webapp/catalog/product/EditProductFeatures.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/EditProductFeatures.ftl?rev=931854&r1=931853&r2=931854&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/product/EditProductFeatures.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/product/EditProductFeatures.ftl Thu Apr  8 10:19:38 2010
@@ -178,11 +178,8 @@ under the License.
     <form method="post" action="<@ofbizUrl>ApplyFeatureToProduct</@ofbizUrl>" name="addFeatureById">
       <input type="hidden" name="productId" value="${productId}"/>
       <span class="label">${uiLabelMap.CommonId}: </span>
-      <input type="text" size="10" name="productFeatureId" value=""/>
       <span class='label'>
-        <a href="javascript:call_fieldlookup2(document.addFeatureById.productFeatureId,'LookupProductFeature');">
-          <img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt="${uiLabelMap.CommonClickHereForFieldLookup}"/>
-        </a>
+        <@htmlTemplate.lookupField formName="addFeatureById" name="productFeatureId" id="productFeatureId" fieldFormName="LookupProductFeature"/>
       </span>
       <span class="label">${uiLabelMap.ProductFeatureApplicationType}: </span>
       <select name="productFeatureApplTypeId" size="1">

Modified: ofbiz/trunk/applications/product/webapp/catalog/product/EditProductParties.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/EditProductParties.ftl?rev=931854&r1=931853&r2=931854&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/product/EditProductParties.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/product/EditProductParties.ftl Thu Apr  8 10:19:38 2010
@@ -72,12 +72,10 @@ under the License.
   <h2>${uiLabelMap.ProductAssociatePartyToProduct}:</h2>
   <br />
   <form method="post" action="<@ofbizUrl>addPartyToProduct</@ofbizUrl>" name="addNewForm">
-    <input type="hidden" name="productId" value="${productId}" />
-    <input type="text" size="20" maxlength="20" name="partyId" value="" />
+    <input type="hidden" name="productId" value="${productId}">
     <#-- TODO: Add PartyId lookup screen
-    <a href="javascript:call_fieldlookup2(document.addNewForm.partyId,'LookupCustomerName');">
-      <img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt='Click here For Field Lookup'/>
-    </a> -->
+    <@htmlTemplate.lookupField formName="addNewForm" name="partyId" id="partyId" fieldFormName="LookupCustomerName"/>
+    -->
     <select name="roleTypeId" size="1">
     <#list roleTypes as roleType>
         <option value="${(roleType.roleTypeId)?if_exists}" <#if roleType.roleTypeId.equals("_NA_")> ${uiLabelMap.ProductSelected}</#if>>${(roleType.get("description",locale))?if_exists}</option>

Modified: ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl?rev=931854&r1=931853&r2=931854&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl Thu Apr  8 10:19:38 2010
@@ -150,8 +150,7 @@ under the License.
                                             <input type="hidden" name="productPromoRuleId" value="${productPromoCond.productPromoRuleId}" />
                                             <input type="hidden" name="productPromoActionSeqId" value="_NA_" />
                                             <input type="hidden" name="productPromoCondSeqId" value="${productPromoCond.productPromoCondSeqId}" />
-                                            <input type="text" name="productCategoryId" size="20" maxlength="20"/>
-                                            <a href="javascript:call_fieldlookup2(document.createProductPromoCategoryConditions.productCategoryId,'LookupProductCategory');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt="${uiLabelMap.CommonClickHereForFieldLookup}"/></a>
+                                            <@htmlTemplate.lookupField formName="createProductPromoCategoryConditions" name="productCategoryId" id="productCategoryId" fieldFormName="LookupProductCategory"/>
                                             <select name="productPromoApplEnumId">
                                                 <#list productPromoApplEnums as productPromoApplEnum>
                                                     <option value="${productPromoApplEnum.enumId}">${productPromoApplEnum.get("description",locale)}</option>
@@ -311,8 +310,7 @@ under the License.
                                             <input type="hidden" name="productPromoRuleId" value="${productPromoAction.productPromoRuleId}" />
                                             <input type="hidden" name="productPromoActionSeqId" value="${productPromoAction.productPromoActionSeqId}" />
                                             <input type="hidden" name="productPromoCondSeqId" value="_NA_" />
-                                            <input type="text" name="productCategoryId" size="20" maxlength="20"/>
-                                            <a href="javascript:call_fieldlookup2(document.createProductPromoCategoryActions.productCategoryId,'LookupProductCategory');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt="${uiLabelMap.CommonClickHereForFieldLookup}"/></a>
+                                            <@htmlTemplate.lookupField formName="createProductPromoCategoryActions" name="productCategoryId" id="productCategoryId" fieldFormName="LookupProductCategory"/>
                                             <select name="productPromoApplEnumId">
                                                 <#list productPromoApplEnums as productPromoApplEnum>
                                                     <option value="${productPromoApplEnum.enumId}">${productPromoApplEnum.get("description",locale)}</option>
@@ -459,8 +457,7 @@ under the License.
                     <input type="hidden" name="productPromoRuleId" value="_NA_" />
                     <input type="hidden" name="productPromoActionSeqId" value="_NA_" />
                     <input type="hidden" name="productPromoCondSeqId" value="_NA_" />
-                    <input type="text" name="productCategoryId" size="20" maxlength="20"/>
-                    <a href="javascript:call_fieldlookup2(document.createProductPromoCategoryPromotions.productCategoryId,'LookupProductCategory');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt="${uiLabelMap.CommonClickHereForFieldLookup}"/></a>
+                    <@htmlTemplate.lookupField formName="createProductPromoCategoryPromotions" name="productCategoryId" id="productCategoryId" fieldFormName="LookupProductCategory"/>
                     <select name="productPromoApplEnumId">
                         <#list productPromoApplEnums as productPromoApplEnum>
                             <option value="${productPromoApplEnum.enumId}">${productPromoApplEnum.get("description",locale)}</option>
@@ -504,7 +501,7 @@ under the License.
                     <input type="hidden" name="productPromoRuleId" value="_NA_" />
                     <input type="hidden" name="productPromoActionSeqId" value="_NA_" />
                     <input type="hidden" name="productPromoCondSeqId" value="_NA_" />
-                    <span class="label">${uiLabelMap.ProductProductId}</span><input type="text" size="20" maxlength="20" name="productId" value=""/>*<a href="javascript:call_fieldlookup2(document.createpromoproductform.productId,'LookupProduct');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt="${uiLabelMap.CommonClickHereForFieldLookup}"/></a>
+                    <span class="label">${uiLabelMap.ProductProductId}</span>*<@htmlTemplate.lookupField formName="createpromoproductform" name="productId" id="productId" fieldFormName="LookupProduct"/>
                     <select name="productPromoApplEnumId">
                         <#list productPromoApplEnums as productPromoApplEnum>
                             <option value="${productPromoApplEnum.enumId}">${productPromoApplEnum.get("description",locale)}</option>

Modified: ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreSurveys.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreSurveys.ftl?rev=931854&r1=931853&r2=931854&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreSurveys.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreSurveys.ftl Thu Apr  8 10:19:38 2010
@@ -100,8 +100,7 @@ under the License.
               <tr>
                 <td class="label">${uiLabelMap.ProductCategoryId}</td>
                 <td>
-                  <input type="text" name="productCategoryId" size="20" maxlength="20"/>
-                  <a href="javascript:call_fieldlookup2(document.addSurvey.productCategoryId,'LookupProductCategory');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt="${uiLabelMap.CommonClickHereForFieldLookup}"/></a>
+                  <@htmlTemplate.lookupField formName="addSurvey" name="productCategoryId" id="productCategoryId" fieldFormName="LookupProductCategory"/>
                 </td>
               </tr>
               <tr>

Modified: ofbiz/trunk/applications/product/webapp/facility/facility/EditFacility.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/EditFacility.ftl?rev=931854&r1=931853&r2=931854&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/facility/EditFacility.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/facility/EditFacility.ftl Thu Apr  8 10:19:38 2010
@@ -49,19 +49,13 @@ under the License.
   <tr>
     <td class="label">${uiLabelMap.FormFieldTitle_parentFacilityId}</td>
     <td>
-      <input type="text" name="parentFacilityId" value="${facility.parentFacilityId?if_exists}"/>
-      <a href="javascript:call_fieldlookup2(document.EditFacilityForm.parentFacilityId,'LookupFacility');" title="${uiLabelMap.CommonFieldLookup}">
-        <img src="<@ofbizContentUrl>/images/fieldlookup.gif</@ofbizContentUrl>" width="15" height="14" border="0" alt="${uiLabelMap.CommonFieldLookup}"/>
-      </a>
+      <@htmlTemplate.lookupField value="${facility.parentFacilityId?if_exists}" formName="EditFacilityForm" name="parentFacilityId" id="parentFacilityId" fieldFormName="LookupFacility"/>
     </td>
   </tr>
   <tr>
     <td class="label">${uiLabelMap.ProductFacilityOwner}</td>
     <td>
-      <input type="text" class="required" name="ownerPartyId" value="${facility.ownerPartyId?if_exists}"/>
-      <a href="javascript:call_fieldlookup2(document.EditFacilityForm.ownerPartyId,'LookupPartyName');" title="${uiLabelMap.CommonFieldLookup}">
-        <img src="<@ofbizContentUrl>/images/fieldlookup.gif</@ofbizContentUrl>" width="15" height="14" border="0" alt="${uiLabelMap.CommonFieldLookup}"/>
-      </a>
+      <@htmlTemplate.lookupField value="${facility.ownerPartyId?if_exists}" formName="EditFacilityForm" name="ownerPartyId" id="ownerPartyId" fieldFormName="LookupPartyName"/>
       <span class="tooltip">${uiLabelMap.CommonRequired}</span>
     </td>
   </tr>

Modified: ofbiz/trunk/applications/product/webapp/facility/facility/FindFacilityLocation.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/FindFacilityLocation.ftl?rev=931854&r1=931853&r2=931854&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/facility/FindFacilityLocation.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/facility/FindFacilityLocation.ftl Thu Apr  8 10:19:38 2010
@@ -35,10 +35,7 @@ under the License.
         <tr>
             <td class="label">${uiLabelMap.ProductLocationSeqId}</td>
             <td>
-                <input type="text" name="locationSeqId" value="" size="19" maxlength="20">
-                <a href="javascript:call_fieldlookup2(document.findFacilityLocation.locationSeqId,'LookupFacilityLocation<#if (facilityId?exists)>?facilityId=${facilityId}</#if>');">
-                    <img src="<@ofbizContentUrl>/images/fieldlookup.gif</@ofbizContentUrl>" width="15" height="14" border="0" alt="${uiLabelMap.CommonClickHereForFieldLookup}"/>
-                </a>
+                <@htmlTemplate.lookupField formName="findFacilityLocation" name="locationSeqId" id="locationSeqId" fieldFormName="LookupFacilityLocation<#if (facilityId?exists)>?facilityId=${facilityId}</#if>"/>
             </td>
         </tr>
         <tr>

Modified: ofbiz/trunk/applications/product/webapp/facility/facility/PickMoveStock.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/PickMoveStock.ftl?rev=931854&r1=931853&r2=931854&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/facility/PickMoveStock.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/facility/PickMoveStock.ftl Thu Apr  8 10:19:38 2010
@@ -161,28 +161,22 @@ under the License.
                     <td>${uiLabelMap.ProductMoveQuantity}</td>
                     <td>&nbsp;</td>
                 </tr>
-                    <td>
-                        <input type="text" size="20" name="productId" maxlength="20" />
-                        <a href="javascript:call_fieldlookup2(document.quickStockMove.productId,'LookupProduct');">
-                            <img src="<@ofbizContentUrl>/images/fieldlookup.gif</@ofbizContentUrl>" width="15" height="14" border="0" alt="${uiLabelMap.CommonClickHereForFieldLookup}"/>
-                        </a>
-                    </td>
-                    <td>
-                        <input type="text" size="20" name="locationSeqId" maxlength="20" />
-                        <a href="javascript:quicklookup('call_fieldlookup2', document.quickStockMove.locationSeqId, document.quickStockMove.facilityId, document.quickStockMove.productId)">
-                            <img src="<@ofbizContentUrl>/images/fieldlookup.gif</@ofbizContentUrl>" width="15" height="14" border="0" alt="${uiLabelMap.CommonClickHereForFieldLookup}"/>
-                        </a>    
-                    <td>
-                        <input type="text" size="20" name="targetLocationSeqId" maxlength="20" />
-                        <a href="javascript:call_fieldlookup2(document.quickStockMove.targetLocationSeqId,'LookupFacilityLocation?facilityId=${facilityId}&amp;locationTypeEnumId=FLT_PICKLOC');">
-                            <img src="<@ofbizContentUrl>/images/fieldlookup.gif</@ofbizContentUrl>" width="15" height="14" border="0" alt="${uiLabelMap.CommonClickHereForFieldLookup}"/>
-                        </a>
-                    </td>
-                    <td><input type="text" name="quantityMoved" size="6" /></td>
+                  <td>
+                    <@htmlTemplate.lookupField formName="quickStockMove" name="productId" id="productId" fieldFormName="LookupProduct"/>
+                  </td>
+                  <td>
+                    <input type="text" size="20" name="locationSeqId" maxlength="20">
+                    <a href="javascript:quicklookup('call_fieldlookup2', document.quickStockMove.locationSeqId, document.quickStockMove.facilityId, document.quickStockMove.productId)">
+                      <img src="<@ofbizContentUrl>/images/fieldlookup.gif</@ofbizContentUrl>" width="15" height="14" border="0" alt="${uiLabelMap.CommonClickHereForFieldLookup}"/>
+                    </a>    
+                  <td>
+                    <@htmlTemplate.lookupField formName="quickStockMove" name="targetLocationSeqId" id="targetLocationSeqId" fieldFormName="LookupFacilityLocation?facilityId=${facilityId}&locationTypeEnumId=FLT_PICKLOC"/>
+                  </td>
+                  <td><input type="text" name="quantityMoved" size="6"></td>
                 <tr>
-                    <td colspan="13" align="right">
-                        <a href="javascript:document.quickStockMove.submit();" class="buttontext">${uiLabelMap.ProductQuickStockMove}</a>
-                    </td>
+                  <td colspan="13" align="right">
+                    <a href="javascript:document.quickStockMove.submit();" class="buttontext">${uiLabelMap.ProductQuickStockMove}</a>
+                  </td>
                 </tr>
             </table>
         </form>

Modified: ofbiz/trunk/applications/product/webapp/facility/inventory/TransferInventoryItem.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/inventory/TransferInventoryItem.ftl?rev=931854&r1=931853&r2=931854&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/inventory/TransferInventoryItem.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/inventory/TransferInventoryItem.ftl Thu Apr  8 10:19:38 2010
@@ -161,10 +161,7 @@ under the License.
                 <td width="6%" align="right" nowrap="nowrap"><span class="label">${uiLabelMap.ProductToLocation}</span></td>
                 <td width="6%">&nbsp;</td>
                 <td width="74%">
-                    <input type="text" size="20" name="locationSeqIdTo" value="${(inventoryTransfer.locationSeqIdTo)?if_exists}" maxlength="20" />
-                    <a href="javascript:call_fieldlookup2(document.transferform.locationSeqIdTo,'LookupFacilityLocation');">
-                        <img src="<@ofbizContentUrl>/images/fieldlookup.gif</@ofbizContentUrl>" width="15" height="14" border="0" alt="${uiLabelMap.CommonClickHereForFieldLookup}"/>
-                    </a>
+                  <@htmlTemplate.lookupField value="${(inventoryTransfer.locationSeqIdTo)?if_exists}" formName="transferform" name="locationSeqIdTo" id="locationSeqIdTo" fieldFormName="LookupFacilityLocation"/>
                 </td>
             </tr>
             <tr>
@@ -212,10 +209,7 @@ under the License.
                 <td width="6%" align="right" nowrap="nowrap"><span class="label">${uiLabelMap.ProductToLocation}</span></td>
                 <td width="6%">&nbsp;</td>
                 <td width="74%">
-                <input type="text" size="20" name="locationSeqIdTo" value="${(inventoryTransfer.locationSeqIdTo)?if_exists}" maxlength="20" />
-                    <a href="javascript:call_fieldlookup2(document.transferform.locationSeqIdTo,'LookupFacilityLocation?facilityId=${inventoryTransfer.facilityIdTo}');">
-                        <img src="<@ofbizContentUrl>/images/fieldlookup.gif</@ofbizContentUrl>" width="15" height="14" border="0" alt="${uiLabelMap.CommonClickHereForFieldLookup}"/>
-                    </a>
+                  <@htmlTemplate.lookupField value="${(inventoryTransfer.locationSeqIdTo)?if_exists}" formName="transferform" name="locationSeqIdTo" id="locationSeqIdTo" fieldFormName="LookupFacilityLocation?facilityId=${inventoryTransfer.facilityIdTo}"/>
                 </td>
             </tr>
             <tr>

Modified: ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl?rev=931854&r1=931853&r2=931854&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl Thu Apr  8 10:19:38 2010
@@ -154,8 +154,7 @@ under the License.
                 <td width="6%" align="right" nowrap="nowrap" class="label">${uiLabelMap.ProductFacilityOwner}</td>
                 <td width="6%">&nbsp;</td>
                 <td width="74%">
-                    <input type="text" name="ownerPartyId" value="" size="20" maxlength="20" />
-                    <a href="javascript:call_fieldlookup2(document.selectAllForm.ownerPartyId, 'LookupPartyName');"><img src="<@ofbizContentUrl>/images/fieldlookup.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="${uiLabelMap.CommonClickHereForFieldLookup}"/></a>
+                  <@htmlTemplate.lookupField formName="selectAllForm" name="ownerPartyId" id="ownerPartyId" lookupFieldFormName="LookupPartyName"/><img src="<@ofbizContentUrl>/images/fieldlookup.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="${uiLabelMap.CommonClickHereForFieldLookup}"/></a>
                 </td>
               </tr>
               <tr>
@@ -186,10 +185,7 @@ under the License.
                       <option value="">${uiLabelMap.ProductNoLocation}</option>
                     </select>
                   <#else>
-                    <input type="text" name="locationSeqId" size="20" maxlength="20"/>
-                        <a href="javascript:call_fieldlookup2(document.selectAllForm.locationSeqId,'LookupFacilityLocation<#if parameters.facilityId?exists>?facilityId=${facilityId}</#if>');">
-                            <img src="<@ofbizContentUrl>/images/fieldlookup.gif</@ofbizContentUrl>" width="15" height="14" border="0" alt="${uiLabelMap.CommonClickHereForFieldLookup}"/>
-                        </a>
+                      <@htmlTemplate.lookupField formName="selectAllForm" name="locationSeqId" id="locationSeqId" fieldFormName="LookupFacilityLocation<#if parameters.facilityId?exists>?facilityId=${facilityId}</#if>"/>
                   </#if>
                 </td>
               </tr>
@@ -391,10 +387,7 @@ under the License.
                                 <option value="">${uiLabelMap.ProductNoLocation}</option>
                               </select>
                             <#else>
-                              <input type="text" name="locationSeqId_o_${rowCount}" size="12"/>
-                                  <a href="javascript:call_fieldlookup2(document.selectAllForm.locationSeqId_o_${rowCount},'LookupFacilityLocation<#if parameters.facilityId?exists>?facilityId=${facilityId}</#if>');">
-                                      <img src="<@ofbizContentUrl>/images/fieldlookup.gif</@ofbizContentUrl>" width="15" height="14" border="0" alt=${uiLabelMap.CommonClickHereForFieldLookup}/>
-                                  </a>
+                              <@htmlTemplate.lookupField formName="selectAllForm" name="locationSeqId_o_${rowCount}" id="locationSeqId_o_${rowCount}" fieldFormName="LookupFacilityLocation<#if parameters.facilityId?exists>?facilityId=${facilityId}</#if>"/>
                             </#if>
                           </td>
                           <td align="right">${uiLabelMap.ProductQtyReceived} :</td>
@@ -507,21 +500,15 @@ under the License.
               <tr>
                 <td class="label">${uiLabelMap.ProductPurchaseOrderNumber}</td>
                 <td>
-                  <input type="text" name="purchaseOrderId" size="20" maxlength="20" value="${requestParameters.purchaseOrderId?if_exists}" />
-                    <a href="javascript:call_fieldlookup2(document.selectAllForm.purchaseOrderId,'LookupPurchaseOrderHeaderAndShipInfo');">
-                      <img src="<@ofbizContentUrl>/images/fieldlookup.gif</@ofbizContentUrl>" width="15" height="14" border="0" alt="${uiLabelMap.CommonClickHereForFieldLookup}"/>
-                    </a>
+                    <@htmlTemplate.lookupField value="${requestParameters.purchaseOrderId?if_exists}" formName="selectAllForm" name="purchaseOrderId" id="purchaseOrderId" fieldFormName="LookupPurchaseOrderHeaderAndShipInfo"/>
                     <span class="tooltip">${uiLabelMap.ProductLeaveSingleProductReceiving}</span>
                 </td>
               </tr>
               <tr>
                 <td class="label">${uiLabelMap.ProductProductId}</td>
                 <td>
-                  <input type="text" name="productId" size="20" maxlength="20" value="${requestParameters.productId?if_exists}"/>
-                    <a href="javascript:call_fieldlookup2(document.selectAllForm.productId,'LookupProduct');">
-                      <img src="<@ofbizContentUrl>/images/fieldlookup.gif"</@ofbizContentUrl>" width="15" height="14" border="0" alt="${uiLabelMap.CommonClickHereForFieldLookup}"/>
-                    </a>
-                    <span class="tooltip">${uiLabelMap.ProductLeaveEntirePoReceiving}</span>
+                  <@htmlTemplate.lookupField value="${requestParameters.productId?if_exists}" formName="selectAllForm" name="productId" id="productId" fieldFormName="LookupProduct"/>
+                  <span class="tooltip">${uiLabelMap.ProductLeaveEntirePoReceiving}</span>
                 </td>
               </tr>
               <tr>

Modified: ofbiz/trunk/applications/product/webapp/facility/returns/receiveReturn.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/returns/receiveReturn.ftl?rev=931854&r1=931853&r2=931854&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/returns/receiveReturn.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/returns/receiveReturn.ftl Thu Apr  8 10:19:38 2010
@@ -149,11 +149,8 @@ under the License.
                                 <option value="">${uiLabelMap.ProductNoLocation}</option>
                               </select>
                             <#else>
-                              <input type="text" name="locationSeqId_o_${rowCount}" size="12"/>
                               <span>
-                                  <a href="javascript:call_fieldlookup2(document.selectAllForm.locationSeqId_o_${rowCount},'LookupFacilityLocation<#if parameters.facilityId?exists>?facilityId=${facilityId}</#if>');">
-                                      <img src="<@ofbizContentUrl>/images/fieldlookup.gif</@ofbizContentUrl>" width="15" height="14" border="0" alt="${uiLabelMap.CommonClickHereForFieldLookup}"/>
-                                  </a>
+                                <@htmlTemplate.lookupField formName="selectAllForm" name="locationSeqId_o_${rowCount}" id="locationSeqId_o_${rowCount}" fieldFormName="LookupFacilityLocation<#if parameters.facilityId?exists>?facilityId=${facilityId}</#if>"/>
                               </span>
                             </#if>
                           </td>

Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/AddItemsFromInventory.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/AddItemsFromInventory.ftl?rev=931854&r1=931853&r2=931854&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/shipment/AddItemsFromInventory.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/shipment/AddItemsFromInventory.ftl Thu Apr  8 10:19:38 2010
@@ -58,10 +58,7 @@ under the License.
                   <input type="hidden" name="shipmentItemSeqId" value="${item.shipmentItemSeqId}"/>
                   <input type="hidden" name="totalIssuedQty" value="${item.totalQtyIssued}"/>
                   <span>
-                    <input type="text" size="5" name="inventoryItemId"/>
-                    <a href="javascript:call_fieldlookup2(document.issueInventoryItemToShipment_${item_index}.inventoryItemId,'LookupInventoryItem?orderId=${item.orderId}&amp;partyId=${item.partyId}&amp;productId=${item.productId}');">
-                      <img src="/images/fieldlookup.gif" width="15" height="14" border="0" alt="${uiLabelMap.CommonClickHereForFieldLookup}">
-                    </a>
+                    <@htmlTemplate.lookupField formName="issueInventoryItemToShipment_${item_index}" name="inventoryItemId" id="inventoryItemId" fieldFormName="LookupInventoryItem?orderId=${item.orderId}&amp;partyId=${item.partyId}&amp;productId=${item.productId}"/>
                   </span>
                   <input type="text" size="5" name="quantity"/>
                   <input type="submit" value="${uiLabelMap.CommonSubmit}" class="smallSubmit"/>

Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/AddItemsFromOrder.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/AddItemsFromOrder.ftl?rev=931854&r1=931853&r2=931854&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/shipment/AddItemsFromOrder.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/shipment/AddItemsFromOrder.ftl Thu Apr  8 10:19:38 2010
@@ -29,11 +29,8 @@ under the License.
             <input type="hidden" name="shipmentId" value="${shipmentId}"/>
             <div>
                 <span class="label">${uiLabelMap.ProductOrderId}</span>
-                <input type="text" size="20" name="orderId" value="${orderId?if_exists}"/>
                 <span>
-                    <a href="javascript:call_fieldlookup2(document.additemsfromorder.orderId,'LookupOrderHeaderAndShipInfo');">
-                        <img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt="${uiLabelMap.CommonClickHereForFieldLookup}">
-                    </a>
+                  <@htmlTemplate.lookupField value="${orderId?if_exists}" formName="additemsfromorder" name="orderId" id="orderId" fieldFormName="LookupOrderHeaderAndShipInfo"/>
                 </span>
                 <span class="label">${uiLabelMap.ProductOrderShipGroupId}</span>
                 <input type="text" size="20" name="shipGroupSeqId" value="${shipGroupSeqId?if_exists}"/>

Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentItems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentItems.ftl?rev=931854&r1=931853&r2=931854&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentItems.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentItems.ftl Thu Apr  8 10:19:38 2010
@@ -132,10 +132,7 @@ under the License.
                 <input type="hidden" name="shipmentId" value="${shipmentId}"/>
                 <td><span class="label">${uiLabelMap.ProductNewItem}</span></td>
                 <td colspan="2"><span class="label">${uiLabelMap.ProductProductId}</span>
-                  <input type="text" id="productId" name="productId" size="15" maxlength="20" />
-                  <a href="javascript:call_fieldlookup2($('productId'),'LookupProduct');">
-                    <img src="<@ofbizContentUrl>/images/fieldlookup.gif"</@ofbizContentUrl>" width="15" height="14" alt="${uiLabelMap.CommonClickHereForFieldLookup}" />
-                  </a>
+                  <@htmlTemplate.lookupField formName="createShipmentItemForm" name="productId" id="productId" fieldFormName="LookupProduct"/>
                 </td>
                 <td><input type="text" name="quantity" size="5" value="0"/></td>
                 <td colspan="2"><span class="label">${uiLabelMap.ProductProductDescription}</span> <input name="shipmentContentDescription" size="30" maxlength="255"/></td>

Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl?rev=931854&r1=931853&r2=931854&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl Thu Apr  8 10:19:38 2010
@@ -76,11 +76,9 @@ under the License.
     <input type="hidden" name="clearAll" value="Y"/>
     <div>
         <span class="label">${uiLabelMap.ProductShipmentId}</span>&nbsp;<input type="text" size="20" name="shipmentId" value="${shipmentId?if_exists}"/>
-        <span class="label">${uiLabelMap.ProductOrderId}</span>&nbsp;<input type="text" size="20" name="purchaseOrderId" value="${orderId?if_exists}"/>
+        <span class="label">${uiLabelMap.ProductOrderId}</span>&nbsp;
         <span>
-            <a href="javascript:call_fieldlookup2(document.ReceiveInventoryAgainstPurchaseOrder.purchaseOrderId,'LookupOrderHeaderAndShipInfo');">
-                <img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt="${uiLabelMap.CommonClickHereForFieldLookup}">
-            </a>
+            <@htmlTemplate.lookupField value="${orderId?if_exists}" formName="ReceiveInventoryAgainstPurchaseOrder" name="purchaseOrderId" id="purchaseOrderId" fieldFormName="LookupOrderHeaderAndShipInfo"/>
         </span>
         <span class="label">${uiLabelMap.ProductOrderShipGroupId}</span>&nbsp;<input type="text" size="20" name="shipGroupSeqId" value="${shipGroupSeqId?if_exists}"/>
         <input type="submit" value="${uiLabelMap.CommonSelect}" class="smallSubmit"/>

Modified: ofbiz/trunk/applications/workeffort/webapp/workeffort/find/WorkEffortSearchOptions.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/webapp/workeffort/find/WorkEffortSearchOptions.ftl?rev=931854&r1=931853&r2=931854&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/webapp/workeffort/find/WorkEffortSearchOptions.ftl (original)
+++ ofbiz/trunk/applications/workeffort/webapp/workeffort/find/WorkEffortSearchOptions.ftl Thu Apr  8 10:19:38 2010
@@ -46,8 +46,7 @@ under the License.
           <td align="right" valign="middle" class="label">${uiLabelMap.FormFieldTitle_workEffortId}</td>
           <td valign="middle">
             <div>
-              <input type="text" name="SEARCH_WORK_EFFORT_ID" size="40" value="${requestParameters.SEARCH_WORK_EFFORT_ID?if_exists}"/>&nbsp;
-              <a href="javascript:call_fieldlookup2(document.advToKeyWordSearchForm.SEARCH_WORK_EFFORT_ID,'LookupWorkEffort');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt="${uiLabelMap.CommonClickHereForFieldLookup}"/></a>
+              <@htmlTemplate.lookupField value="${requestParameters.SEARCH_WORK_EFFORT_ID?if_exists}" formName="advToKeyWordSearchForm" name="SEARCH_WORK_EFFORT_ID" id="SEARCH_WORK_EFFORT_ID" fieldFormName="LookupWorkEffort"/>
             </div>
           </td>
         </tr>
@@ -71,8 +70,7 @@ under the License.
           <td align="right" valign="middle" class="label">${uiLabelMap.PartyPartyId}</td>
           <td valign="middle">
             <div>
-              <input type="text" name="partyId" size="40" value="${requestParameters.partyId?if_exists}"/>&nbsp;
-              <a href="javascript:call_fieldlookup2(document.advToKeyWordSearchForm.partyId,'LookupPartyName');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt="${uiLabelMap.CommonClickHereForFieldLookup}"/></a>
+              <@htmlTemplate.lookupField value="${requestParameters.partyId?if_exists}" formName="advToKeyWordSearchForm" name="partyId" id="partyId" fieldFormName="LookupPartyName"/>
             </div>
           </td>
         </tr>
@@ -93,8 +91,7 @@ under the License.
           <td align="right" valign="middle" class="label">${uiLabelMap.WorkEffortProductId1}</td>
           <td valign="middle">
             <div>
-              <input type="text" name="productId_1" size="40" value="${requestParameters.productId_1?if_exists}"/>&nbsp;
-              <a href="javascript:call_fieldlookup2(document.advToKeyWordSearchForm.productId_1,'LookupProduct');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt="${uiLabelMap.CommonClickHereForFieldLookup}"/></a>
+              <@htmlTemplate.lookupField value="${requestParameters.productId_1?if_exists}" formName="advToKeyWordSearchForm" name="productId_1" id="productId_1" fieldFormName="LookupProduct"/>
             </div>
           </td>
         </tr>
@@ -102,8 +99,7 @@ under the License.
           <td align="right" valign="middle" class="label">${uiLabelMap.WorkEffortProductId2}</td>
           <td valign="middle">
             <div>
-              <input type="text" name="productId_2" size="40" value="${requestParameters.productId_2?if_exists}"/>&nbsp;
-              <a href="javascript:call_fieldlookup2(document.advToKeyWordSearchForm.productId_2,'LookupProduct');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt="${uiLabelMap.CommonClickHereForFieldLookup}"/></a>
+              <@htmlTemplate.lookupField value="${requestParameters.productId_2?if_exists}" formName="advToKeyWordSearchForm" name="productId_2" id="productId_2" fieldFormName="LookupProduct"/>
             </div>
           </td>
         </tr>