Author: buscob
Date: Wed Apr 7 20:47:17 2010
New Revision: 931680
URL: http://svn.apache.org/viewvc?rev=931680&view=rev
Log:
A patch from Blas Rodriguez Somoza
OFBIZ-3606 - XHTML validation errors (marketing)
XHTML validation errors
* Unclosed INPUT
* attributes without values (checked, selected, disabled, etc)
* attribute values without "
* Uppercase tags or attributes.
* Unencoded ampersands in urls.
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=931680&r1=931679&r2=931680&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/webapp/sfa/contact/mergeContacts.ftl
(original)
+++ ofbiz/trunk/applications/marketing/webapp/sfa/contact/mergeContacts.ftl Wed
Apr 7 20:47:17 2010
@@ -23,16 +23,16 @@ under the License.
<#if contactInfoList?has_content >
<#assign contactInfo1 = contactInfoList[0]/>
<#assign contactInfo2 = contactInfoList[1]/>
- <input type="hidden" name="partyIdTo"
value="${contactInfo1.partyId?if_exists}">
- <input type="hidden" name="partyId"
value="${contactInfo2.partyId?if_exists}">
+ <input type="hidden" name="partyIdTo"
value="${contactInfo1.partyId?if_exists}" />
+ <input type="hidden" name="partyId"
value="${contactInfo2.partyId?if_exists}" />
- <input type="hidden" name="addrContactMechIdTo"
value="${contactInfo1.addrContactMechId?if_exists}">
- <input type="hidden" name="phoneContactMechIdTo"
value="${contactInfo1.phoneContactMechId?if_exists}">
- <input type="hidden" name="emailContactMechIdTo"
value="${contactInfo1.emailContactMechId?if_exists}">
+ <input type="hidden" name="addrContactMechIdTo"
value="${contactInfo1.addrContactMechId?if_exists}" />
+ <input type="hidden" name="phoneContactMechIdTo"
value="${contactInfo1.phoneContactMechId?if_exists}" />
+ <input type="hidden" name="emailContactMechIdTo"
value="${contactInfo1.emailContactMechId?if_exists}" />
- <input type="hidden" name="addrContactMechId"
value="${contactInfo2.addrContactMechId?if_exists}">
- <input type="hidden" name="phoneContactMechId"
value="${contactInfo2.phoneContactMechId?if_exists}">
- <input type="hidden" name="emailContactMechId"
value="${contactInfo2.emailContactMechId?if_exists}">
+ <input type="hidden" name="addrContactMechId"
value="${contactInfo2.addrContactMechId?if_exists}" />
+ <input type="hidden" name="phoneContactMechId"
value="${contactInfo2.phoneContactMechId?if_exists}" />
+ <input type="hidden" name="emailContactMechId"
value="${contactInfo2.emailContactMechId?if_exists}" />
<table >
<tr width="100%">
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=931680&r1=931679&r2=931680&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/webapp/sfa/lead/mergeLeads.ftl (original)
+++ ofbiz/trunk/applications/marketing/webapp/sfa/lead/mergeLeads.ftl Wed Apr
7 20:47:17 2010
@@ -27,16 +27,16 @@ under the License.
<#if contactInfoList?has_content >
<#assign contactInfo1 = contactInfoList[0]/>
<#assign contactInfo2 = contactInfoList[1]/>
- <input type="hidden" name="partyIdTo"
value="${contactInfo1.partyId?if_exists}">
- <input type="hidden" name="partyId"
value="${contactInfo2.partyId?if_exists}">
+ <input type="hidden" name="partyIdTo"
value="${contactInfo1.partyId?if_exists}" />
+ <input type="hidden" name="partyId"
value="${contactInfo2.partyId?if_exists}" />
- <input type="hidden" name="addrContactMechIdTo"
value="${contactInfo1.addrContactMechId?if_exists}">
- <input type="hidden" name="phoneContactMechIdTo"
value="${contactInfo1.phoneContactMechId?if_exists}">
- <input type="hidden" name="emailContactMechIdTo"
value="${contactInfo1.emailContactMechId?if_exists}">
+ <input type="hidden" name="addrContactMechIdTo"
value="${contactInfo1.addrContactMechId?if_exists}" />
+ <input type="hidden" name="phoneContactMechIdTo"
value="${contactInfo1.phoneContactMechId?if_exists}" />
+ <input type="hidden" name="emailContactMechIdTo"
value="${contactInfo1.emailContactMechId?if_exists}" />
- <input type="hidden" name="addrContactMechId"
value="${contactInfo2.addrContactMechId?if_exists}">
- <input type="hidden" name="phoneContactMechId"
value="${contactInfo2.phoneContactMechId?if_exists}">
- <input type="hidden" name="emailContactMechId"
value="${contactInfo2.emailContactMechId?if_exists}">
+ <input type="hidden" name="addrContactMechId"
value="${contactInfo2.addrContactMechId?if_exists}" />
+ <input type="hidden" name="phoneContactMechId"
value="${contactInfo2.phoneContactMechId?if_exists}" />
+ <input type="hidden" name="emailContactMechId"
value="${contactInfo2.emailContactMechId?if_exists}" />
<table >
<tr width="100%">
