svn commit: r1836905 - in /ofbiz/ofbiz-framework/trunk/applications: content/template/lookup/ order/template/order/ party/template/party/ product/template/category/ product/template/facility/ product/template/find/ product/template/price/ product/templ...

[Deepak Dixit-5]

Author: deepak
Date: Sat Jul 28 13:27:22 2018
New Revision: 1836905

URL: http://svn.apache.org/viewvc?rev=1836905&view=rev
Log:
Improved: Used input type=submit instead of anchor and javascript code to submit form where applicable.
(OFBIZ-10482)

Modified:
    ofbiz/ofbiz-framework/trunk/applications/content/template/lookup/ContentTreeLookupList.ftl
    ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderShippingInfo.ftl
    ofbiz/ofbiz-framework/trunk/applications/party/template/party/EditContactMech.ftl
    ofbiz/ofbiz-framework/trunk/applications/product/template/category/EditCategoryFeatureCats.ftl
    ofbiz/ofbiz-framework/trunk/applications/product/template/category/EditCategoryParties.ftl
    ofbiz/ofbiz-framework/trunk/applications/product/template/category/EditCategoryProdCatalogs.ftl
    ofbiz/ofbiz-framework/trunk/applications/product/template/facility/EditContactMech.ftl
    ofbiz/ofbiz-framework/trunk/applications/product/template/facility/PicklistManage.ftl
    ofbiz/ofbiz-framework/trunk/applications/product/template/find/AdvancedSearch.ftl
    ofbiz/ofbiz-framework/trunk/applications/product/template/price/EditProductPriceRules.ftl
    ofbiz/ofbiz-framework/trunk/applications/product/template/promo/EditProductPromoRules.ftl
    ofbiz/ofbiz-framework/trunk/applications/product/template/shipment/EditShipmentItems.ftl
    ofbiz/ofbiz-framework/trunk/applications/product/template/shipment/EditShipmentPackages.ftl
    ofbiz/ofbiz-framework/trunk/applications/product/template/shipment/WeightPackage.ftl
    ofbiz/ofbiz-framework/trunk/applications/product/template/store/EditProductStoreSurveys.ftl
    ofbiz/ofbiz-framework/trunk/applications/product/template/store/EditProductStoreWebSites.ftl

Modified: ofbiz/ofbiz-framework/trunk/applications/content/template/lookup/ContentTreeLookupList.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/template/lookup/ContentTreeLookupList.ftl?rev=1836905&r1=1836904&r2=1836905&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/content/template/lookup/ContentTreeLookupList.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/content/template/lookup/ContentTreeLookupList.ftl Sat Jul 28 13:27:22 2018
@@ -85,14 +85,16 @@
              <#assign caFromDate = Static["org.apache.ofbiz.base.util.UtilDateTime"].toDateString(contentData.caFromDate, "dd/MM/yyyy")/>
             </#if>
               <td>${caFromDate!}</td>
-              <td><a href="javascript:document.listDocumentForm_${listcount}.submit()" >${uiLabelMap.CommonDelete}</a></td>
+              <td>
+                <form action="<@ofbizUrl>removeDocumentFromTree</@ofbizUrl>" name="listDocumentForm_${listcount}" method="post">
+                  <input type="hidden" name="contentId" value="${contentData.contentIdStart!}"/>
+                  <input type="hidden" name="contentIdTo" value="${contentData.contentId!}"/>
+                  <input type="hidden" name="contentAssocTypeId" value="${contentData.caContentAssocTypeId!}"/>
+                  <input type="hidden" name="fromDate" value="${contentData.fromDate!}"/>
+                  <input type="submit" value="${uiLabelMap.CommonDelete}"/>
+                </form>
+              </td>
           </tr>
-          <form action="<@ofbizUrl>removeDocumentFromTree</@ofbizUrl>" name="listDocumentForm_${listcount}" method="post">
-            <input type="hidden" name="contentId" value="${contentData.contentIdStart!}"/>
-            <input type="hidden" name="contentIdTo" value="${contentData.contentId!}"/>
-            <input type="hidden" name="contentAssocTypeId" value="${contentData.caContentAssocTypeId!}"/>
-            <input type="hidden" name="fromDate" value="${contentData.fromDate!}"/>
-          </form>
      </#if>
          <#assign alt_row = !alt_row/>
          <#assign listcount=listcount+1>

Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderShippingInfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderShippingInfo.ftl?rev=1836905&r1=1836904&r2=1836905&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderShippingInfo.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderShippingInfo.ftl Sat Jul 28 13:27:22 2018
@@ -517,10 +517,10 @@ under the License.
            <#if OISGAContent.size() == 0>
            <tr>
               <td colspan="3" valign="top" width="100%" align="center">
-                   <a href="javascript:document.deleteOISG_${shipGroup.shipGroupSeqId}.submit()" class="buttontext">${uiLabelMap.DeleteOrderItemShipGroup}</a>
                    <form name="deleteOISG_${shipGroup.shipGroupSeqId}" method="post" action="/ordermgr/control/DeleteOrderItemShipGroup">
                      <input type="hidden" name="orderId" value="${orderId}"/>
                      <input type="hidden" name="shipGroupSeqId" value="${shipGroup.shipGroupSeqId}"/>
+                     <input type="submit" value="${uiLabelMap.DeleteOrderItemShipGroup}"/>
                    </form>
               </td>
            </tr>

Modified: ofbiz/ofbiz-framework/trunk/applications/party/template/party/EditContactMech.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/template/party/EditContactMech.ftl?rev=1836905&r1=1836904&r2=1836905&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/party/template/party/EditContactMech.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/party/template/party/EditContactMech.ftl Sat Jul 28 13:27:22 2018
@@ -84,7 +84,7 @@ under the License.
                          <input type="hidden" name="fromDate" value="${partyContactMechPurpose.fromDate.toString()}" />
                          <input type="hidden" name="DONE_PAGE" value="${donePage?replace("=","%3d")}" />
                          <input type="hidden" name="useValues" value="true" />
-                         <a href="javascript:document.expirePartyContactMechPurpose_${partyContactMechPurpose.contactMechPurposeTypeId}.submit()" class="buttontext">${uiLabelMap.CommonDelete}</a>
+                         <input type="submit" value="${uiLabelMap.CommonDelete}"/>
                        </form>
                     </td>
                   </tr>

Modified: ofbiz/ofbiz-framework/trunk/applications/product/template/category/EditCategoryFeatureCats.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/template/category/EditCategoryFeatureCats.ftl?rev=1836905&r1=1836904&r2=1836905&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/product/template/category/EditCategoryFeatureCats.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/product/template/category/EditCategoryFeatureCats.ftl Sat Jul 28 13:27:22 2018
@@ -58,11 +58,11 @@ under the License.
                         </form>
                     </td>
                     <td align="center">
-                        <a href="javascript:document.removeProductFeatureCatGrpApplForm_${productFeatureCatGrpAppl_index}.submit()" class="buttontext">${uiLabelMap.CommonDelete}</a>
                         <form method="post" action="<@ofbizUrl>removeProductFeatureCatGrpAppl</@ofbizUrl>" name="removeProductFeatureCatGrpApplForm_${productFeatureCatGrpAppl_index}">
                             <input type="hidden" name="productFeatureGroupId" value="${(productFeatureCatGrpAppl.productFeatureGroupId)!}" />
                             <input type="hidden" name="productCategoryId" value="${(productFeatureCatGrpAppl.productCategoryId)!}" />
                             <input type="hidden" name="fromDate" value="${(productFeatureCatGrpAppl.fromDate)!}" />
+                            <input type="submit" value="${uiLabelMap.CommonDelete}"/>
                         </form>
                     </td>
                 </tr>
@@ -137,11 +137,11 @@ under the License.
                         </form>
                     </td>
                     <td align="center">
-                    <a href="javascript:document.removeProductFeatureCategoryApplForm_${productFeatureCategoryAppl_index}.submit()" class="buttontext">${uiLabelMap.CommonDelete}</a>
                     <form method="post" action="<@ofbizUrl>removeProductFeatureCategoryAppl</@ofbizUrl>" name="removeProductFeatureCategoryApplForm_${productFeatureCategoryAppl_index}">
                         <input type="hidden" name="productFeatureCategoryId" value="${(productFeatureCategoryAppl.productFeatureCategoryId)!}" />
                         <input type="hidden" name="productCategoryId" value="${(productFeatureCategoryAppl.productCategoryId)!}" />
                         <input type="hidden" name="fromDate" value="${(productFeatureCategoryAppl.fromDate)!}" />
+                        <input type="submit" value="${uiLabelMap.CommonDelete}"/>
                     </form>
                     </td>
                 </tr>

Modified: ofbiz/ofbiz-framework/trunk/applications/product/template/category/EditCategoryParties.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/template/category/EditCategoryParties.ftl?rev=1836905&r1=1836904&r2=1836905&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/product/template/category/EditCategoryParties.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/product/template/category/EditCategoryParties.ftl Sat Jul 28 13:27:22 2018
@@ -62,7 +62,7 @@ under the License.
                     <input type="hidden" name="partyId" value="${(productCategoryRole.partyId)!}" />
                     <input type="hidden" name="roleTypeId" value="${(productCategoryRole.roleTypeId)!}" />
                     <input type="hidden" name="fromDate" value="${(productCategoryRole.getTimestamp("fromDate"))!}" />
-                    <a href="javascript:document.lineForm_delete${line}.submit()" class="buttontext">${uiLabelMap.CommonDelete}</a>
+                    <input type="submit" value="${uiLabelMap.CommonDelete}" />
                 </form>
             </td>
             </tr>

Modified: ofbiz/ofbiz-framework/trunk/applications/product/template/category/EditCategoryProdCatalogs.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/template/category/EditCategoryProdCatalogs.ftl?rev=1836905&r1=1836904&r2=1836905&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/product/template/category/EditCategoryProdCatalogs.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/product/template/category/EditCategoryProdCatalogs.ftl Sat Jul 28 13:27:22 2018
@@ -65,7 +65,7 @@ under the License.
                     <input type="hidden" name="productCategoryId" value="${(prodCatalogCategory.productCategoryId)!}"/>
                     <input type="hidden" name="prodCatalogCategoryTypeId" value="${prodCatalogCategory.prodCatalogCategoryTypeId}"/>
                     <input type="hidden" name="fromDate" value="${(prodCatalogCategory.fromDate)!}"/>
-                    <a href="javascript:document.lineForm_delete${line}.submit()" class="buttontext">${uiLabelMap.CommonDelete}</a>
+                    <input type="submit" value="${uiLabelMap.CommonDelete}"/>
                   </form>
                 </td>
             </tr>

Modified: ofbiz/ofbiz-framework/trunk/applications/product/template/facility/EditContactMech.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/template/facility/EditContactMech.ftl?rev=1836905&r1=1836904&r2=1836905&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/product/template/facility/EditContactMech.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/product/template/facility/EditContactMech.ftl Sat Jul 28 13:27:22 2018
@@ -102,19 +102,19 @@ under the License.
                       </#if>
                       (${uiLabelMap.CommonSince}: ${facilityContactMechPurpose.fromDate})
                       <#if facilityContactMechPurpose.thruDate?has_content>(${uiLabelMap.CommonExpires}: ${facilityContactMechPurpose.thruDate.toString()}</#if>
-                      <a href="javascript:document.getElementById('deleteFacilityContactMechPurpose_${facilityContactMechPurpose_index}').submit();" class="buttontext">${uiLabelMap.CommonDelete}</a>
+                      <form id="deleteFacilityContactMechPurpose_${facilityContactMechPurpose_index}" method="post" action="<@ofbizUrl>deleteFacilityContactMechPurpose</@ofbizUrl>">
+                        <input type="hidden" name="facilityId" value="${facilityId!}"/>
+                        <input type="hidden" name="contactMechId" value="${contactMechId!}"/>
+                        <input type="hidden" name="contactMechPurposeTypeId" value="${(facilityContactMechPurpose.contactMechPurposeTypeId)!}"/>
+                        <input type="hidden" name="fromDate" value="${(facilityContactMechPurpose.fromDate)!}"/>
+                        <input type="hidden" name="DONE_PAGE" value="${donePage!}"/>
+                        <input type="hidden" name="useValues" value="true"/>
+                        <input type="submit" value="${uiLabelMap.CommonDelete}"/>
+                      </form>
                   </td>
                 </tr>
                 <#-- toggle the row color -->
                 <#assign alt_row = !alt_row>
-                <form id="deleteFacilityContactMechPurpose_${facilityContactMechPurpose_index}" method="post" action="<@ofbizUrl>deleteFacilityContactMechPurpose</@ofbizUrl>">
-                  <input type="hidden" name="facilityId" value="${facilityId!}" />
-                  <input type="hidden" name="contactMechId" value="${contactMechId!}" />
-                  <input type="hidden" name="contactMechPurposeTypeId" value="${(facilityContactMechPurpose.contactMechPurposeTypeId)!}" />
-                  <input type="hidden" name="fromDate" value="${(facilityContactMechPurpose.fromDate)!}" />
-                  <input type="hidden" name="DONE_PAGE" value="${donePage!}" />
-                  <input type="hidden" name="useValues" value="true" />
-                </form>
               </#list>
               </#if>
               <tr>
@@ -128,7 +128,7 @@ under the License.
                         <option value='${contactMechPurposeType.contactMechPurposeTypeId}'>${contactMechPurposeType.get("description",locale)}</option>
                       </#list>
                     </select>
-                    &nbsp;<a href='javascript:document.newpurposeform.submit()' class='buttontext'>${uiLabelMap.PartyAddPurpose}</a>
+                    <input type="submit" value="${uiLabelMap.PartyAddPurpose}"/>
                   </form>
                 </td>
               </tr>

Modified: ofbiz/ofbiz-framework/trunk/applications/product/template/facility/PicklistManage.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/template/facility/PicklistManage.ftl?rev=1836905&r1=1836904&r2=1836905&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/product/template/facility/PicklistManage.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/product/template/facility/PicklistManage.ftl Sat Jul 28 13:27:22 2018
@@ -124,11 +124,13 @@ under the License.
               <span class="label">${uiLabelMap.ProductBinNum}</span> ${picklistBinInfo.picklistBin.binLocationNumber}&nbsp;(${picklistBinInfo.picklistBin.picklistBinId})
               <#if picklistBinInfo.primaryOrderHeader??><span class="label">${uiLabelMap.ProductPrimaryOrderId}</span> ${picklistBinInfo.primaryOrderHeader.orderId}</#if>
               <#if picklistBinInfo.primaryOrderItemShipGroup??><span class="label">${uiLabelMap.ProductPrimaryShipGroupSeqId}</span> ${picklistBinInfo.primaryOrderItemShipGroup.shipGroupSeqId}</#if>
-              <#if !picklistBinInfo.picklistItemInfoList?has_content><a href="javascript:document.DeletePicklistBin_${picklistInfo_index}_${picklistBinInfo_index}.submit()" class="buttontext">${uiLabelMap.CommonDelete}</a></#if>
+              <#if !picklistBinInfo.picklistItemInfoList?has_content>
               <form name="DeletePicklistBin_${picklistInfo_index}_${picklistBinInfo_index}" method="post" action="<@ofbizUrl>deletePicklistBin</@ofbizUrl>">
                 <input type="hidden" name="picklistBinId" value="${picklistBinInfo.picklistBin.picklistBinId}"/>
                 <input type="hidden" name="facilityId" value="${facilityId!}"/>
+                <input type="submit" value="${uiLabelMap.CommonDelete}"/>
               </form>
+              </#if>
             </div>
             <div style="margin-left: 30px;">
               <span class="label">${uiLabelMap.CommonUpdate} ${uiLabelMap.ProductBinNum}</span>
@@ -181,7 +183,7 @@ under the License.
                             <input type="hidden" name="shipGroupSeqId" value="${picklistItemInfo.picklistItem.shipGroupSeqId}"/>
                             <input type="hidden" name="inventoryItemId" value="${picklistItemInfo.picklistItem.inventoryItemId}"/>
                             <input type="hidden" name="facilityId" value="${facilityId!}"/>
-                            <a href='javascript:document.deletePicklistItem_${picklist.picklistId}_${picklistItem.orderId}_${picklistItemInfo_index}.submit()' class='buttontext'>&nbsp;${uiLabelMap.CommonDelete}&nbsp;</a>
+                            <input type="submit" value="${uiLabelMap.CommonDelete}"/>
                           </form>
                         </td>
                       </#if>

Modified: ofbiz/ofbiz-framework/trunk/applications/product/template/find/AdvancedSearch.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/template/find/AdvancedSearch.ftl?rev=1836905&r1=1836904&r2=1836905&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/product/template/find/AdvancedSearch.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/product/template/find/AdvancedSearch.ftl Sat Jul 28 13:27:22 2018
@@ -308,7 +308,7 @@ under the License.
         <tr>
           <td align="center" colspan="2">
             <hr />
-            <a href="javascript:document.advtokeywordsearchform.submit()" class="buttontext">${uiLabelMap.CommonFind}</a>
+            <input type="submit" value="${uiLabelMap.CommonFind}">
           </td>
         </tr>
       </table>

Modified: ofbiz/ofbiz-framework/trunk/applications/product/template/price/EditProductPriceRules.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/template/price/EditProductPriceRules.ftl?rev=1836905&r1=1836904&r2=1836905&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/product/template/price/EditProductPriceRules.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/product/template/price/EditProductPriceRules.ftl Sat Jul 28 13:27:22 2018
@@ -113,7 +113,7 @@ under the License.
                          <form name="deleteProductPriceCond_${productPriceCond_index}" method= "post" action= "<@ofbizUrl>deleteProductPriceCond</@ofbizUrl>">
                            <input type="hidden" name="productPriceRuleId" value="${productPriceCond.productPriceRuleId}" />
                            <input type="hidden" name="productPriceCondSeqId" value="${productPriceCond.productPriceCondSeqId}" />
-                           <a href="javascript:document.deleteProductPriceCond_${productPriceCond_index}.submit()" class="buttontext">${uiLabelMap.CommonDelete}</a>
+                           <input type="submit" value="${uiLabelMap.CommonDelete}"/>
                          </form>
                         </td>
                       </tr>
@@ -184,7 +184,7 @@ under the License.
                           <form name="deleteProductPriceAction_${productPriceAction_index}" method="post" action="<@ofbizUrl>deleteProductPriceAction</@ofbizUrl>">
                             <input type="hidden" name="productPriceRuleId" value="${productPriceAction.productPriceRuleId}" />
                             <input type="hidden" name="productPriceActionSeqId" value="${productPriceAction.productPriceActionSeqId}" />
-                            <a href="javascript:document.deleteProductPriceAction_${productPriceAction_index}.submit()" class="buttontext">${uiLabelMap.CommonDelete}</a>
+                            <input type="submit" value="${uiLabelMap.CommonDelete}" />
                           </form>
                         </td>
                       </tr>

Modified: ofbiz/ofbiz-framework/trunk/applications/product/template/promo/EditProductPromoRules.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/template/promo/EditProductPromoRules.ftl?rev=1836905&r1=1836904&r2=1836905&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/product/template/promo/EditProductPromoRules.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/product/template/promo/EditProductPromoRules.ftl Sat Jul 28 13:27:22 2018
@@ -51,7 +51,7 @@ under the License.
           <form name="deleteProductPromoRule_${productPromoRule_index}" method="post" action="<@ofbizUrl>deleteProductPromoRule</@ofbizUrl>">
             <input type="hidden" name="productPromoId" value="${(productPromoRule.productPromoId)!}" />
             <input type="hidden" name="productPromoRuleId" value="${(productPromoRule.productPromoRuleId)!}" />
-            <a href="javascript:document.deleteProductPromoRule_${productPromoRule_index}.submit()" class="buttontext">${uiLabelMap.CommonDelete}</a>
+            <input type="submit" value="${uiLabelMap.CommonDelete}"/>
           </form>
     </#if>
         </td>
@@ -138,7 +138,7 @@ under the License.
                   <input type="hidden" name="productPromoId" value="${(productPromoCond.productPromoId)!}" />
                   <input type="hidden" name="productPromoRuleId" value="${(productPromoCond.productPromoRuleId)!}" />
                   <input type="hidden" name="productPromoCondSeqId" value="${(productPromoCond.productPromoCondSeqId)!}" />
-                  <a href="javascript:document.deleteProductPromoCondition_${productPromoRule_index}_${productPromoCond_index}.submit()" class="buttontext">${uiLabelMap.CommonDelete}</a>
+                  <input type="submit" value="${uiLabelMap.CommonDelete}"/>
                 </form>
       <#-- ======================= Categories ======================== -->
                 <div class="label">${uiLabelMap.ProductConditionsCategoriesForCondition} ${(productPromoCond.productPromoCondSeqId)!}:</div>
@@ -159,7 +159,7 @@ under the License.
                     <input type="hidden" name="productPromoCondSeqId" value="${(condProductPromoCategory.productPromoCondSeqId)!}" />
                     <input type="hidden" name="productCategoryId" value="${(condProductPromoCategory.productCategoryId)!}" />
                     <input type="hidden" name="andGroupId" value="${(condProductPromoCategory.andGroupId)!}" />
-                    <a href="javascript:document.deleteProductPromoCategoryCondition_${productPromoRule_index}_${condProductPromoCategory_index}_${productPromoCond_index}.submit()" class="buttontext">${uiLabelMap.CommonDelete}</a>
+                    <input type="submit" value="${uiLabelMap.CommonDelete}"/>
                   </form>
                 </div>
       </#list>
@@ -323,7 +323,7 @@ under the License.
                     <input type="hidden" name="productPromoId" value="${(productPromoAction.productPromoId)!}" />
                     <input type="hidden" name="productPromoRuleId" value="${(productPromoAction.productPromoRuleId)!}" />
                     <input type="hidden" name="productPromoActionSeqId" value="${(productPromoAction.productPromoActionSeqId)!}" />
-                    <a href="javascript:document.deleteProductPromoAction_${productPromoRule_index}_${productPromoAction_index}.submit()" class="buttontext">${uiLabelMap.CommonDelete}</a>
+                    <input type="submit" value="${uiLabelMap.CommonDelete}"/>
                   </form>
                 </div>
       <#-- ======================= Categories ======================== -->
@@ -345,7 +345,7 @@ under the License.
                     <input type="hidden" name="productPromoActionSeqId" value="${(actionProductPromoCategory.productPromoActionSeqId)!}" />
                     <input type="hidden" name="productCategoryId" value="${(actionProductPromoCategory.productCategoryId)!}" />
                     <input type="hidden" name="andGroupId" value="${(actionProductPromoCategory.andGroupId)!}" />
-                    <a href="javascript:document.deleteProductPromoCategoryAction_${productPromoRule_index}_${productPromoAction_index}_${actionProductPromoCategory_index}.submit()" class="buttontext">${uiLabelMap.CommonDelete}</a>
+                    <input type="submit" value="${uiLabelMap.CommonDelete}"/>
                   </form>
                 </div>
       </#list>
@@ -389,7 +389,7 @@ under the License.
                     <input type="hidden" name="productPromoCondSeqId" value="${(actionProductPromoProduct.productPromoCondSeqId)!}" />
                     <input type="hidden" name="productPromoActionSeqId" value="${(actionProductPromoProduct.productPromoActionSeqId)!}" />
                     <input type="hidden" name="productId" value="${(actionProductPromoProduct.productId)!}" />
-                    <a href="javascript:document.deleteProductPromoProductAction_${productPromoRule_index}_${productPromoAction_index}_${actionProductPromoProduct_index}.submit()" class="buttontext">${uiLabelMap.CommonDelete}</a>
+                    <input type="submit" value="${uiLabelMap.CommonDelete}"/>
                   </form>
                 </div>
       </#list>
@@ -502,7 +502,7 @@ under the License.
         <input type="hidden" name="productPromoCondSeqId" value="${(promoProductPromoCategory.productPromoCondSeqId)!}" />
         <input type="hidden" name="productCategoryId" value="${(promoProductPromoCategory.productCategoryId)!}" />
         <input type="hidden" name="andGroupId" value="${(promoProductPromoCategory.andGroupId)!}" />
-        <a href="javascript:document.deleteProductPromoCategoryAction_${promoProductPromoCategory_index}.submit()" class="buttontext">${uiLabelMap.CommonDelete}</a>
+        <input type="submit" value="${uiLabelMap.CommonDelete}"/>
       </form>
     </div>
   </#list>
@@ -546,7 +546,7 @@ under the License.
         <input type="hidden" name="productPromoActionSeqId" value="${(promoProductPromoProduct.productPromoActionSeqId)!}" />
         <input type="hidden" name="productPromoCondSeqId" value="${(promoProductPromoProduct.productPromoCondSeqId)!}" />
         <input type="hidden" name="productId" value="${(promoProductPromoProduct.productId)!}" />
-        <a href="javascript:document.deleteProductPromoProductAction_${promoProductPromoProduct_index}.submit()" class="buttontext">${uiLabelMap.CommonDelete}</a>
+        <input type="submit" value="${uiLabelMap.CommonDelete}"/>
       </form>
     </div>
   </#list>

Modified: ofbiz/ofbiz-framework/trunk/applications/product/template/shipment/EditShipmentItems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/template/shipment/EditShipmentItems.ftl?rev=1836905&r1=1836904&r2=1836905&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/product/template/shipment/EditShipmentItems.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/product/template/shipment/EditShipmentItems.ftl Sat Jul 28 13:27:22 2018
@@ -50,12 +50,14 @@ under the License.
                 <td colspan="2">${(product.internalName)!} <a href="/catalog/control/EditProduct?productId=${shipmentItem.productId!}" class="buttontext">${shipmentItem.productId!}</a></td>
                 <td>${shipmentItem.quantity?default("&nbsp;")}</td>
                 <td colspan="2">${shipmentItem.shipmentContentDescription?default("&nbsp;")}</td>
-                <td><a href="javascript:document.deleteShipmentItem${shipmentItemData_index}.submit();" class="buttontext">${uiLabelMap.CommonDelete}</a></td>
+                <td>
+                  <form name="deleteShipmentItem${shipmentItemData_index}" method="post" action="<@ofbizUrl>deleteShipmentItem</@ofbizUrl>">
+                    <input type="hidden" name="shipmentId" value="${shipmentId}"/>
+                    <input type="hidden" name="shipmentItemSeqId" value="${shipmentItem.shipmentItemSeqId}"/>
+                    <input type="submit" value="${uiLabelMap.CommonDelete}"/>
+                  </form>
+                </td>
             </tr>
-            <form name="deleteShipmentItem${shipmentItemData_index}" method="post" action="<@ofbizUrl>deleteShipmentItem</@ofbizUrl>">
-                <input type="hidden" name="shipmentId" value="${shipmentId}"/>
-                <input type="hidden" name="shipmentItemSeqId" value="${shipmentItem.shipmentItemSeqId}"/>
-            </form>
             <#list orderShipments as orderShipment>
                 <tr valign="middle"<#if alt_row> class="alternate-row"</#if>>
                     <td>&nbsp;</td>
@@ -89,13 +91,15 @@ under the License.
                     <#else>
                     <td colspan="2">&nbsp;</td>
                     </#if>
-                    <td><a href="javascript:document.deleteShipmentItemPackageContent${shipmentItemData_index}${shipmentPackageContent_index}.submit();" class="buttontext">${uiLabelMap.CommonDelete}</a></td>
+                    <td>
+                      <form name="deleteShipmentItemPackageContent${shipmentItemData_index}${shipmentPackageContent_index}" method="post"
+                            action="<@ofbizUrl>deleteShipmentItemPackageContent</@ofbizUrl>">
+                        <input type="hidden" name="shipmentId" value="${shipmentId}"/>
+                        <input type="hidden" name="shipmentItemSeqId" value="${shipmentPackageContent.shipmentItemSeqId}"/>
+                        <input type="hidden" name="shipmentPackageSeqId" value="${shipmentPackageContent.shipmentPackageSeqId}"/>
+                        <input type="submit" value="${uiLabelMap.CommonDelete}"/>
+                      </form>
                 </tr>
-                <form name="deleteShipmentItemPackageContent${shipmentItemData_index}${shipmentPackageContent_index}" method="post" action="<@ofbizUrl>deleteShipmentItemPackageContent</@ofbizUrl>">
-                    <input type="hidden" name="shipmentId" value="${shipmentId}"/>
-                    <input type="hidden" name="shipmentItemSeqId" value="${shipmentPackageContent.shipmentItemSeqId}"/>
-                    <input type="hidden" name="shipmentPackageSeqId" value="${shipmentPackageContent.shipmentPackageSeqId}"/>
-                </form>
             </#list>
             <#if (totalQuantityToPackage > 0)>
                 <tr valign="middle"<#if alt_row> class="alternate-row"</#if>>

Modified: ofbiz/ofbiz-framework/trunk/applications/product/template/shipment/EditShipmentPackages.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/template/shipment/EditShipmentPackages.ftl?rev=1836905&r1=1836904&r2=1836905&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/product/template/shipment/EditShipmentPackages.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/product/template/shipment/EditShipmentPackages.ftl Sat Jul 28 13:27:22 2018
@@ -90,17 +90,17 @@ under the License.
                     <div>
                         <span class="label">${uiLabelMap.ProductQuantity}</span>
                         ${shipmentPackageContent.quantity!}
-                        <a href="javascript:document.deleteShipmentPackageContent${shipmentPackageData_index}${shipmentPackageContent_index}.submit();" class="buttontext">${uiLabelMap.CommonDelete}</a>
+                        <form name="deleteShipmentPackageContent${shipmentPackageData_index}${shipmentPackageContent_index}" method="post" action="<@ofbizUrl>deleteShipmentPackageContent</@ofbizUrl>">
+                          <input type="hidden" name="shipmentId" value="${shipmentId}"/>
+                          <input type="hidden" name="shipmentPackageSeqId" value="${shipmentPackageContent.shipmentPackageSeqId}"/>
+                          <input type="hidden" name="shipmentItemSeqId" value="${shipmentPackageContent.shipmentItemSeqId}"/>
+                          <input type="submit" value="${uiLabelMap.CommonDelete}"/>
+                        </form>
                     </div>
                 </td>
                 <td>&nbsp;</td>
                 <td>&nbsp;</td>
             </tr>
-            <form name="deleteShipmentPackageContent${shipmentPackageData_index}${shipmentPackageContent_index}" method="post" action="<@ofbizUrl>deleteShipmentPackageContent</@ofbizUrl>">
-                <input type="hidden" name="shipmentId" value="${shipmentId}"/>
-                <input type="hidden" name="shipmentPackageSeqId" value="${shipmentPackageContent.shipmentPackageSeqId}"/>
-                <input type="hidden" name="shipmentItemSeqId" value="${shipmentPackageContent.shipmentItemSeqId}"/>
-            </form>
         </#list>
             <tr valign="middle"<#if alt_row> class="alternate-row"</#if>>
                 <form name="createShipmentPackageContentForm${shipmentPackageData_index}" method="post" action="<@ofbizUrl>createShipmentPackageContent</@ofbizUrl>">

Modified: ofbiz/ofbiz-framework/trunk/applications/product/template/shipment/WeightPackage.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/template/shipment/WeightPackage.ftl?rev=1836905&r1=1836904&r2=1836905&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/product/template/shipment/WeightPackage.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/product/template/shipment/WeightPackage.ftl Sat Jul 28 13:27:22 2018
@@ -156,7 +156,7 @@ under the License.
                           </#if>
                         </select>
                       </td>
-                      <td align="right"><a href="javascript:document.updateWeightPackageForm_${packedLine.getWeightPackageSeqId()}.submit()" class="buttontext">${uiLabelMap.CommonUpdate}</a></td>
+                      <td align="right"><input type="submit" value="${uiLabelMap.CommonUpdate}" /></td>
                       <td align="right"><a href="javascript:document.updateWeightPackageForm_${packedLine.getWeightPackageSeqId()}.action='<@ofbizUrl>deletePackedLine</@ofbizUrl>';document.updateWeightPackageForm_${packedLine.getWeightPackageSeqId()}.submit();" class="buttontext">${uiLabelMap.CommonDelete}</a></div>
                     </tr>
                   </form>

Modified: ofbiz/ofbiz-framework/trunk/applications/product/template/store/EditProductStoreSurveys.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/template/store/EditProductStoreSurveys.ftl?rev=1836905&r1=1836904&r2=1836905&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/product/template/store/EditProductStoreSurveys.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/product/template/store/EditProductStoreSurveys.ftl Sat Jul 28 13:27:22 2018
@@ -48,7 +48,7 @@ under the License.
                   <form name="deleteProductStoreSurveyAppl_${storeSurvey_index}" method="post" action="<@ofbizUrl>deleteProductStoreSurveyAppl</@ofbizUrl>">
                     <input type="hidden" name="productStoreId" value="${productStoreId}" />
                     <input type="hidden" name="productStoreSurveyId" value="${storeSurvey.productStoreSurveyId}" />
-                    <a href="javascript:document.deleteProductStoreSurveyAppl_${storeSurvey_index}.submit()" class="buttontext">${uiLabelMap.CommonDelete}</a>
+                    <input type="submit" value="${uiLabelMap.CommonDelete}"/>
                   </form>
                 </td>
               </tr>

Modified: ofbiz/ofbiz-framework/trunk/applications/product/template/store/EditProductStoreWebSites.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/template/store/EditProductStoreWebSites.ftl?rev=1836905&r1=1836904&r2=1836905&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/product/template/store/EditProductStoreWebSites.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/product/template/store/EditProductStoreWebSites.ftl Sat Jul 28 13:27:22 2018
@@ -37,11 +37,11 @@ under the License.
                   <td>${webSite.httpHost?default('&nbsp;')}</td>
                   <td>${webSite.httpPort?default('&nbsp;')}</td>
                   <td align="center">
-                    <a href="javascript:document.storeUpdateWebSite_${webSite_index}.submit();" class="buttontext">${uiLabelMap.CommonDelete}</a>
                     <form name="storeUpdateWebSite_${webSite_index}" method="post" action="<@ofbizUrl>storeUpdateWebSite</@ofbizUrl>">
                         <input type="hidden" name="viewProductStoreId" value="${productStoreId}"/>
                         <input type="hidden" name="productStoreId" value=""/>
                         <input type="hidden" name="webSiteId" value="${webSite.webSiteId}"/>
+                        <input type="submit" value="${uiLabelMap.CommonDelete}"/>
                     </form>                      
                   </td>
                 </tr>