svn commit: r931671 - in /ofbiz/trunk/applications/commonext: webapp/ofbizsetup/organization/viewcontact.ftl widget/CommonScreens.xml

[buscob]

Author: buscob
Date: Wed Apr  7 20:33:17 2010
New Revision: 931671

URL: http://svn.apache.org/viewvc?rev=931671&view=rev
Log:
A patch from Blas Rodriguez Somoza
OFBIZ-3603 - XHTML validation errors (commonext)
XHTML validation errors

    * Unclosed INPUT
    * attributes without values (checked, selected, disabled, etc)
    * attribute values without "
    * Uppercase tags or attributes.
    * Unencoded ampersands in urls.

Other errors:

CommonScreens.xml
Ampersands in links needs double encoding

Modified:
    
ofbiz/trunk/applications/commonext/webapp/ofbizsetup/organization/viewcontact.ftl
    ofbiz/trunk/applications/commonext/widget/CommonScreens.xml

Modified: 
ofbiz/trunk/applications/commonext/webapp/ofbizsetup/organization/viewcontact.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/webapp/ofbizsetup/organization/viewcontact.ftl?rev=931671&r1=931670&r2=931671&view=diff
==============================================================================
--- 
ofbiz/trunk/applications/commonext/webapp/ofbizsetup/organization/viewcontact.ftl
 (original)
+++ 
ofbiz/trunk/applications/commonext/webapp/ofbizsetup/organization/viewcontact.ftl
 Wed Apr  7 20:33:17 2010
@@ -104,7 +104,7 @@ under the License.
                 <#elseif "EMAIL_ADDRESS" = contactMech.contactMechTypeId>
                   <div>
                     ${contactMech.infoString?if_exists}
-                    <#--a 
href="<@ofbizUrl>EditCommunicationEvent?partyIdFrom=${userLogin.partyId}&partyIdTo=${partyId}&communicationEventTypeId=EMAIL_COMMUNICATION&contactMechIdTo=${contactMech.contactMechId}&contactMechTypeId=EMAIL_ADDRESS<#if
 
thisUserPrimaryEmail?has_content>&contactMechIdFrom=${thisUserPrimaryEmail.contactMechId}</#if></@ofbizUrl>"
 class="buttontext">${uiLabelMap.CommonSendEmail}</a-->
+                    <#--a 
href="<@ofbizUrl>EditCommunicationEvent?partyIdFrom=${userLogin.partyId}&amp;partyIdTo=${partyId}&amp;communicationEventTypeId=EMAIL_COMMUNICATION&amp;contactMechIdTo=${contactMech.contactMechId}&amp;contactMechTypeId=EMAIL_ADDRESS<#if
 
thisUserPrimaryEmail?has_content>&amp;contactMechIdFrom=${thisUserPrimaryEmail.contactMechId}</#if></@ofbizUrl>"
 class="buttontext">${uiLabelMap.CommonSendEmail}</a-->
                   </div>
                 <#elseif "WEB_ADDRESS" = contactMech.contactMechTypeId>
                   <div>
@@ -136,7 +136,7 @@ under the License.
               <td 
valign="top"><b>(${partyContactMech.allowSolicitation?if_exists})</b></td>
               <td class="button-col">
                 <#--if security.hasEntityPermission("PARTYMGR", "_UPDATE", 
session) || userLogin.partyId == partyId>
-                  <a 
href="<@ofbizUrl>editcontactmech?partyId=${partyId}&contactMechId=${contactMech.contactMechId}</@ofbizUrl>">${uiLabelMap.CommonUpdate}</a>
+                  <a 
href="<@ofbizUrl>editcontactmech?partyId=${partyId}&amp;contactMechId=${contactMech.contactMechId}</@ofbizUrl>">${uiLabelMap.CommonUpdate}</a>
                 </#if>
                 <#if security.hasEntityPermission("PARTYMGR", "_DELETE", 
session) || userLogin.partyId == partyId>
                   <form name="partyDeleteContact" method="post" 
action="<@ofbizUrl>deleteContactMech</@ofbizUrl>" 
onSubmit="javascript:submitFormDisableSubmits(this)">

Modified: ofbiz/trunk/applications/commonext/widget/CommonScreens.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/widget/CommonScreens.xml?rev=931671&r1=931670&r2=931671&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/commonext/widget/CommonScreens.xml Wed Apr  7 
20:33:17 2010
@@ -42,11 +42,11 @@ under the License.
                 <set field="linkStart" 
value="/myportal/control/showPortletMainDecorator?portalPortletId="/>
                 <set field="layoutSettings.middleTopHeader" value="---------- 
${uiLabelMap.CommonLastSytemNotes} ----------"/>
                 <set field="layoutSettings.middleTopMessage1" 
value="${groovy:resultNote.lastSystemInfoNote1!=null?resultNote.lastSystemInfoNote1.noteDateTime.toString().substring(0,16)
 + &quot; &quot; + resultNote.lastSystemInfoNote1.noteInfo:&quot;&quot;}"/>
-                <set field="layoutSettings.middleTopLink1" 
value="${linkStart}${resultNote.lastSystemInfoNote1.moreInfoPortletId}&amp;id=${resultNote.lastSystemInfoNote1.moreInfoItemId}"/>
+                <set field="layoutSettings.middleTopLink1" 
value="${linkStart}${resultNote.lastSystemInfoNote1.moreInfoPortletId}&amp;amp;id=${resultNote.lastSystemInfoNote1.moreInfoItemId}"/>
                 <set field="layoutSettings.middleTopMessage2" 
value="${groovy:resultNote.lastSystemInfoNote2!=null?resultNote.lastSystemInfoNote2.noteDateTime.toString().substring(0,16)
 + &quot; &quot; + resultNote.lastSystemInfoNote2.noteInfo:&quot;&quot;}"/>
-                <set field="layoutSettings.middleTopLink2" 
value="${linkStart}${resultNote.lastSystemInfoNote2.moreInfoPortletId}&amp;id=${resultNote.lastSystemInfoNote2.moreInfoItemId}"/>
+                <set field="layoutSettings.middleTopLink2" 
value="${linkStart}${resultNote.lastSystemInfoNote2.moreInfoPortletId}&amp;amp;id=${resultNote.lastSystemInfoNote2.moreInfoItemId}"/>
                 <set field="layoutSettings.middleTopMessage3" 
value="${groovy:resultNote.lastSystemInfoNote3!=null?resultNote.lastSystemInfoNote3.noteDateTime.toString().substring(0,16)
 + &quot; &quot; + resultNote.lastSystemInfoNote3.noteInfo:&quot;&quot;}"/>
-                <set field="layoutSettings.middleTopLink3" 
value="${linkStart}${resultNote.lastSystemInfoNote3.moreInfoPortletId}&amp;id=${resultNote.lastSystemInfoNote3.moreInfoItemId}"/>
+                <set field="layoutSettings.middleTopLink3" 
value="${linkStart}${resultNote.lastSystemInfoNote3.moreInfoPortletId}&amp;amp;id=${resultNote.lastSystemInfoNote3.moreInfoItemId}"/>
             </actions>
             <widgets>
                 <section>