svn commit: r941446 - in /ofbiz/trunk/applications/marketing/webapp/sfa: contact/mergeContacts.ftl lead/mergeLeads.ftl

Author: jleroux
Date: Wed May  5 19:43:16 2010
New Revision: 941446

URL: http://svn.apache.org/viewvc?rev=941446&view=rev
Log:
A part of a patch from Blas Rodriguez Somoza " Internal error when rendering SFA -> Merge contacts and SFA->Merge Lead (Ofbiz Demo)" (https://issues.apache.org/jira/browse/OFBIZ-3642) - OFBIZ-3642

xhtml validation for

MergeContacts.ftl
Lines 38,45,51 : attribute width not allowed in tr
Lines 40,41 : invalid b close without open
Lines 43,56,97 : invalid br directly inside table
Line 60 : tr close needed

MergeLeads.ftl
Lines 42,49,55 : attribute width not allowed in tr
Lines 44,45 : invalid b close without open
Lines 47,60,101 : invalid br directly inside table
Line 64 : tr close needed

Modified:
    ofbiz/trunk/applications/marketing/webapp/sfa/contact/mergeContacts.ftl
    ofbiz/trunk/applications/marketing/webapp/sfa/lead/mergeLeads.ftl

Modified: ofbiz/trunk/applications/marketing/webapp/sfa/contact/mergeContacts.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/sfa/contact/mergeContacts.ftl?rev=941446&r1=941445&r2=941446&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/webapp/sfa/contact/mergeContacts.ftl (original)
+++ ofbiz/trunk/applications/marketing/webapp/sfa/contact/mergeContacts.ftl Wed May  5 19:43:16 2010
@@ -35,28 +35,28 @@ under the License.
           <input type="hidden" name="emailContactMechId" value="${contactInfo2.emailContactMechId?if_exists}" />
 
           <table  >
-            <tr width="100%">
+            <tr>
               <td width="20%" ></td>
-              <td width="30%"><h2>${uiLabelMap.SfaFirstContact}</h2><br /></b></td>
-              <td width="30%"><h2>${uiLabelMap.SfaSecondContact}</h2><br /></b></td>
-              <td width="20%"><h2>${uiLabelMap.CommonSelect}</h2></td>
-              <br /><br />
+              <td width="30%"><h2>${uiLabelMap.SfaFirstContact}</h2><br /></td>
+              <td width="30%"><h2>${uiLabelMap.SfaSecondContact}</h2><br /></td>
+              <td width="20%"><h2>${uiLabelMap.CommonSelect}</h2><br /></td>
             </tr>
-            <tr width="100%">
+            <tr>
               <td width="20%">${uiLabelMap.PartyFirstName}</td>
               <td width="30%"><h3>${contactInfo1.firstName?if_exists}</h3></td>
               <td width="30%"><h3>${contactInfo2.firstName?if_exists}</h3></td>
               <td width="20%"></td>
             </tr>
-            <tr width="100%">
+            <tr>
               <td width="20%">${uiLabelMap.PartyLastName}</td>
               <td width="30%"><h3>${contactInfo1.lastName?if_exists}</h3></td>
               <td width="30%"><h3>${contactInfo2.lastName?if_exists}</h3></td>
               <td width="20%"></td>
-            </tr><br />
+            </tr>
             <tr>
               <td width="30"><br /><h3>${uiLabelMap.PartyGeneralCorrespondenceAddress}</h3></td>
               <td width="30"></td>
+            </tr>
             <tr>
               <td width="20%" >${uiLabelMap.PartyAddressLine1}</td>
               <td width="30%">${contactInfo1.address1?if_exists}</td>
@@ -94,7 +94,7 @@ under the License.
               <td width="30%">${contactInfo1.country?if_exists}</td>
               <td width="30%">${contactInfo2.country?if_exists}</td>
               <td width="20%"></td>
-            </tr><br />
+            </tr>
             <tr><td><br /><h3>${uiLabelMap.PartyPrimaryPhone}</h3></td></tr>
             <tr>
               <td width="20%">${uiLabelMap.PartyCountryCode}</td>

Modified: ofbiz/trunk/applications/marketing/webapp/sfa/lead/mergeLeads.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/sfa/lead/mergeLeads.ftl?rev=941446&r1=941445&r2=941446&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/webapp/sfa/lead/mergeLeads.ftl (original)
+++ ofbiz/trunk/applications/marketing/webapp/sfa/lead/mergeLeads.ftl Wed May  5 19:43:16 2010
@@ -39,28 +39,28 @@ under the License.
           <input type="hidden" name="emailContactMechId" value="${contactInfo2.emailContactMechId?if_exists}" />
 
           <table  >
-            <tr width="100%">
+            <tr>
               <td width="20%" ></td>
-              <td width="30%"><h2>${uiLabelMap.SfaFirstContact}</h2><br /></b></td>
-              <td width="30%"><h2>${uiLabelMap.SfaSecondContact}</h2><br /></b></td>
-              <td width="20%"><h2>${uiLabelMap.CommonSelect}</h2></td>
-              <br /><br />
+              <td width="30%"><h2>${uiLabelMap.SfaFirstContact}</h2><br /></td>
+              <td width="30%"><h2>${uiLabelMap.SfaSecondContact}</h2><br /></td>
+              <td width="20%"><h2>${uiLabelMap.CommonSelect}</h2><br /></td>
             </tr>
-            <tr width="100%">
+            <tr>
               <td width="20%">${uiLabelMap.PartyFirstName}</td>
               <td width="30%"><h3>${contactInfo1.firstName?if_exists}</h3></td>
               <td width="30%"><h3>${contactInfo2.firstName?if_exists}</h3></td>
               <td width="20%"></td>
             </tr>
-            <tr width="100%">
+            <tr>
               <td width="20%">${uiLabelMap.PartyLastName}</td>
               <td width="30%"><h3>${contactInfo1.lastName?if_exists}</h3></td>
               <td width="30%"><h3>${contactInfo2.lastName?if_exists}</h3></td>
               <td width="20%"></td>
-            </tr><br />
+            </tr>
             <tr>
               <td width="30"><br /><h3>${uiLabelMap.PartyGeneralCorrespondenceAddress}</h3></td>
               <td width="30"></td>
+            </tr>
             <tr>
               <td width="20%" >${uiLabelMap.PartyAddressLine1}</td>
               <td width="30%">${contactInfo1.address1?if_exists}</td>
@@ -98,7 +98,7 @@ under the License.
               <td width="30%">${contactInfo1.country?if_exists}</td>
               <td width="30%">${contactInfo2.country?if_exists}</td>
               <td width="20%"></td>
-            </tr><br />
+            </tr>
             <tr><td><br /><h3>${uiLabelMap.PartyPrimaryPhone}</h3></td></tr>
             <tr>
               <td width="20%">${uiLabelMap.PartyCountryCode}</td>