svn commit: r946320 - in /ofbiz/trunk/applications/party/webapp/partymgr/party: addressMatchMap.ftl editcontactmech.ftl editcreditcard.ftl editeftaccount.ftl editgiftcard.ftl

[erwan]

Author: erwan
Date: Wed May 19 18:09:10 2010
New Revision: 946320

URL: http://svn.apache.org/viewvc?rev=946320&view=rev
Log:
XHTML validation errors round 2++ (party) OFBIZ-3752 https://issues.apache.org/jira/browse/OFBIZ-3752

Modified:
    ofbiz/trunk/applications/party/webapp/partymgr/party/addressMatchMap.ftl
    ofbiz/trunk/applications/party/webapp/partymgr/party/editcontactmech.ftl
    ofbiz/trunk/applications/party/webapp/partymgr/party/editcreditcard.ftl
    ofbiz/trunk/applications/party/webapp/partymgr/party/editeftaccount.ftl
    ofbiz/trunk/applications/party/webapp/partymgr/party/editgiftcard.ftl

Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/addressMatchMap.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/addressMatchMap.ftl?rev=946320&r1=946319&r2=946320&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/addressMatchMap.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/addressMatchMap.ftl Wed May 19 18:09:10 2010
@@ -26,8 +26,8 @@ under the License.
     <br class="clear"/>
   </div>
   <div class="screenlet-body">
+    <form name="addaddrmap" method="post" action="<@ofbizUrl>createAddressMatchMap</@ofbizUrl>">
     <table class="basic-table" cellspacing="0">
-      <form name="addaddrmap" method="post" action="<@ofbizUrl>createAddressMatchMap</@ofbizUrl>">
         <tr>
           <td class="label">${uiLabelMap.PartyAddressMatchKey}</td>
           <td><input type="text" name="mapKey"/></td>
@@ -44,18 +44,20 @@ under the License.
           <td></td>
           <td><a href="javascript:document.addaddrmap.submit()" class="smallSubmit">${uiLabelMap.CommonCreate}</a></td>
         </tr>
-      </form>
+    </table>
+    </form>
+    <table class="basic-table" cellspacing="0">
       <tr><td colspan="2">&nbsp;</td></tr>
-      <form name="importaddrmap"method="post" enctype="multipart/form-data" action="<@ofbizUrl>importAddressMatchMapCsv</@ofbizUrl>">
         <tr>
           <td></td>
           <td>
+            <form name="importaddrmap" method="post" enctype="multipart/form-data" action="<@ofbizUrl>importAddressMatchMapCsv</@ofbizUrl>">
             <input type="file" name="uploadedFile" size="14"/>
             <input type="submit" value="${uiLabelMap.CommonUpload} CSV"/>
             <p>${uiLabelMap.PartyAddressMatchMessage1}</p>
+            </form>
           </td>
         </tr>
-      </form>
     </table>
   </div>
 </div>

Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/editcontactmech.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/editcontactmech.ftl?rev=946320&r1=946319&r2=946320&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/editcontactmech.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/editcontactmech.ftl Wed May 19 18:09:10 2010
@@ -26,7 +26,7 @@ under the License.
         <tr>
           <td class="label">${uiLabelMap.PartySelectContactType}</td>
           <td>
-            <select name="preContactMechTypeId"">
+            <select name="preContactMechTypeId">
               <#list mechMap.contactMechTypes as contactMechType>
                 <option value="${contactMechType.contactMechTypeId}">${contactMechType.get("description",locale)}</option>
               </#list>

Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/editcreditcard.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/editcreditcard.ftl?rev=946320&r1=946319&r2=946320&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/editcreditcard.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/editcreditcard.ftl Wed May 19 18:09:10 2010
@@ -22,11 +22,8 @@ under the License.
   <div class="screenlet-title-bar">
     <#if !creditCard?exists>
       <h3>${uiLabelMap.AccountingAddNewCreditCard}</h3>
-      <form method="post" action="<@ofbizUrl>createCreditCard?DONE_PAGE=${donePage}</@ofbizUrl>" name="editcreditcardform" style="margin: 0;">
     <#else>
       <h3>${uiLabelMap.AccountingEditCreditCard}</h3>
-      <form method="post" action="<@ofbizUrl>updateCreditCard?DONE_PAGE=${donePage}</@ofbizUrl>" name="editcreditcardform" style="margin: 0;">
-        <input type="hidden" name="paymentMethodId" value="${paymentMethodId}" />
     </#if>
   </div>
   <div class="screenlet-body">
@@ -34,6 +31,12 @@ under the License.
           <a href="<@ofbizUrl>${donePage}?partyId=${partyId}</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonCancelDone}</a>
           <a href="javascript:document.editcreditcardform.submit()" class="smallSubmit">${uiLabelMap.CommonSave}</a>
         </div>
+    <#if !creditCard?exists>
+      <form method="post" action="<@ofbizUrl>createCreditCard?DONE_PAGE=${donePage}</@ofbizUrl>" name="editcreditcardform" style="margin: 0;">
+    <#else>
+      <form method="post" action="<@ofbizUrl>updateCreditCard?DONE_PAGE=${donePage}</@ofbizUrl>" name="editcreditcardform" style="margin: 0;">
+        <input type="hidden" name="paymentMethodId" value="${paymentMethodId}" />
+    </#if>
         <input type="hidden" name="partyId" value="${partyId}"/>
         <table class="basic-table" cellspacing="0">
 

Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/editeftaccount.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/editeftaccount.ftl?rev=946320&r1=946319&r2=946320&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/editeftaccount.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/editeftaccount.ftl Wed May 19 18:09:10 2010
@@ -22,11 +22,8 @@ under the License.
   <div class="screenlet-title-bar">
     <#if !eftAccount?exists>
       <h3>${uiLabelMap.AccountingAddNewEftAccount}</h3>
-      <form method="post" action='<@ofbizUrl>createEftAccount?DONE_PAGE=${donePage}</@ofbizUrl>' name="editeftaccountform" style='margin: 0;'>
     <#else>
       <h3>${uiLabelMap.PageTitleEditEftAccount}</h3>
-      <form method="post" action='<@ofbizUrl>updateEftAccount?DONE_PAGE=${donePage}</@ofbizUrl>' name="editeftaccountform" style='margin: 0;'>
-        <input type="hidden" name='paymentMethodId' value='${paymentMethodId}' />
     </#if>
   </div>
   <div class="screenlet-body">
@@ -34,6 +31,12 @@ under the License.
           <a href="<@ofbizUrl>${donePage}?partyId=${partyId}</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonCancelDone}</a>
           <a href="javascript:document.editeftaccountform.submit()" class="smallSubmit">${uiLabelMap.CommonSave}</a>
         </div>
+    <#if !eftAccount?exists>
+      <form method="post" action='<@ofbizUrl>createEftAccount?DONE_PAGE=${donePage}</@ofbizUrl>' name="editeftaccountform" style='margin: 0;'>
+    <#else>
+      <form method="post" action='<@ofbizUrl>updateEftAccount?DONE_PAGE=${donePage}</@ofbizUrl>' name="editeftaccountform" style='margin: 0;'>
+        <input type="hidden" name='paymentMethodId' value='${paymentMethodId}' />
+    </#if>
         <input type="hidden" name="partyId" value="${partyId}"/>
         <table class="basic-table" cellspacing="0">
         <tr>

Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/editgiftcard.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/editgiftcard.ftl?rev=946320&r1=946319&r2=946320&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/editgiftcard.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/editgiftcard.ftl Wed May 19 18:09:10 2010
@@ -22,14 +22,17 @@ under the License.
   <div class="screenlet-title-bar">
     <#if !giftCard?exists>
       <h3>${uiLabelMap.AccountingCreateNewGiftCard}</h3>
-      <form method="post" action="<@ofbizUrl>createGiftCard?DONE_PAGE=${donePage}</@ofbizUrl>" name="editgiftcardform" style="margin: 0;">
     <#else>
       <h3>${uiLabelMap.AccountingEditGiftCard}</h3>
-      <form method="post" action="<@ofbizUrl>updateGiftCard?DONE_PAGE=${donePage}</@ofbizUrl>" name="editgiftcardform" style="margin: 0;">
-        <input type="hidden" name="paymentMethodId" value="${paymentMethodId}" />
     </#if>
   </div>
   <div class="screenlet-body">
+    <#if !giftCard?exists>
+      <form method="post" action="<@ofbizUrl>createGiftCard?DONE_PAGE=${donePage}</@ofbizUrl>" name="editgiftcardform" style="margin: 0;">
+    <#else>
+      <form method="post" action="<@ofbizUrl>updateGiftCard?DONE_PAGE=${donePage}</@ofbizUrl>" name="editgiftcardform" style="margin: 0;">
+        <input type="hidden" name="paymentMethodId" value="${paymentMethodId}" />
+    </#if>
         <input type="hidden" name="partyId" value="${partyId}"/>
         <div class="button-bar">
           <a href="<@ofbizUrl>${donePage}?partyId=${partyId}</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonCancelDone}</a>