svn commit: r812400 - in /ofbiz/trunk: framework/common/webcommon/includes/insertDropDown.ftl themes/flatgrey/includes/header.ftl

[lektran]

Author: lektran
Date: Tue Sep  8 08:59:58 2009
New Revision: 812400

URL: http://svn.apache.org/viewvc?rev=812400&view=rev
Log:
Fix some html validation errors

Modified:
    ofbiz/trunk/framework/common/webcommon/includes/insertDropDown.ftl
    ofbiz/trunk/themes/flatgrey/includes/header.ftl

Modified: ofbiz/trunk/framework/common/webcommon/includes/insertDropDown.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/insertDropDown.ftl?rev=812400&r1=812399&r2=812400&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/includes/insertDropDown.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/includes/insertDropDown.ftl Tue Sep  8 08:59:58 2009
@@ -17,10 +17,10 @@
 under the License.
 -->
 
-<form method="post"  action="<@ofbizUrl>${topLine.action}</@ofbizUrl>"  onSubmit="javascript:submitFormDisableSubmits(this)" name="${topLine.action}" id="${topLine.action}">
 ${StringUtil.wrapString(topLine.textBegin?if_exists)}
 <#assign listSize = topLine.dropDownList.size()>
-  <#if topLine.dropDownList.size() gt 1>
+<#if topLine.dropDownList.size() gt 1>
+<form method="post" action="<@ofbizUrl>${topLine.action}</@ofbizUrl>" onsubmit="javascript:submitFormDisableSubmits(this)" name="${topLine.action}" id="${topLine.action}">
   <#if topLine.hiddenFieldList?exists>
     <#list topLine.hiddenFieldList as field>
       <input type="hidden" name="${field.name}" value="${field.value}"/>
@@ -31,8 +31,8 @@
       <option <#if option.key == topLine.selectedKey >selected="selected"</#if> value="${option.key?if_exists}">${option.value?if_exists}</option>
     </#list>
   </select>
+</form>
 <#else>
   ${topLine.dropDownList[0].value?if_exists}
 </#if>
 ${StringUtil.wrapString(topLine.textEnd?if_exists)}
-</form>

Modified: ofbiz/trunk/themes/flatgrey/includes/header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/flatgrey/includes/header.ftl?rev=812400&r1=812399&r2=812400&view=diff
==============================================================================
--- ofbiz/trunk/themes/flatgrey/includes/header.ftl (original)
+++ ofbiz/trunk/themes/flatgrey/includes/header.ftl Tue Sep  8 08:59:58 2009
@@ -136,7 +136,7 @@
         <#if headerImageUrl?exists>
           <li class="logo-area"><a href="<@ofbizUrl>${logoLinkURL}</@ofbizUrl>"><img alt="${layoutSettings.companyName}" src="<@ofbizContentUrl>${StringUtil.wrapString(headerImageUrl)}</@ofbizContentUrl>"/></a></li>
         </#if>
-        <li width=20/>
+        <li/>
         <#if layoutSettings.middleTopMessage1?has_content && layoutSettings.middleTopMessage1 != " ">
           <li class=h4>
           <div class="divHidden">
@@ -152,16 +152,16 @@
             <p class="expanded">
               <a href="<@ofbizUrl>logout</@ofbizUrl>">${uiLabelMap.CommonLogout}</a>&nbsp;&nbsp;
               <a href="javascript:document.setUserPreferenceCompactHeaderY.submit()">&nbsp;&nbsp;</a>
-              <form name="setUserPreferenceCompactHeaderY" method="post" action="<@ofbizUrl>setUserPreference</@ofbizUrl>" onSubmit="javascript:submitFormDisableSubmits(this)">
-                <input name="userPrefGroupTypeId" value="GLOBAL_PREFERENCES" type="hidden"/>
-                <input name="userPrefTypeId" value="COMPACT_HEADER" type="hidden"/>
-                <input name="userPrefValue" value="Y" type="hidden"/>
-              </form>
            </p>
+           <form name="setUserPreferenceCompactHeaderY" method="post" action="<@ofbizUrl>setUserPreference</@ofbizUrl>" onsubmit="javascript:submitFormDisableSubmits(this)">
+             <input name="userPrefGroupTypeId" value="GLOBAL_PREFERENCES" type="hidden"/>
+             <input name="userPrefTypeId" value="COMPACT_HEADER" type="hidden"/>
+             <input name="userPrefValue" value="Y" type="hidden"/>
+           </form>
             <#if layoutSettings.topLines?has_content>
               <#list layoutSettings.topLines as topLine>
               <#if topLine.text?exists>
-                <p>${topLine.text}<a href="${topLine.url?if_exists}&externalLoginKey=${externalLoginKey}">${topLine.urlText?if_exists}</a></p>
+                <p>${topLine.text}<a href="${StringUtil.wrapString(topLine.url?if_exists)}&amp;externalLoginKey=${externalLoginKey}">${topLine.urlText?if_exists}</a></p>
               <#elseif topLine.dropDownList?exists>
                 <p><#include "component://common/webcommon/includes/insertDropDown.ftl"/></p>
               <#else>
@@ -183,7 +183,7 @@
             <#if webSiteId?exists && requestAttributes._CURRENT_VIEW_?exists>
               <#include "component://common/webcommon/includes/helplink.ftl" />
               <#if helpContent?has_content ||  helpTopic == "navigateHelp" || (parameters.portalPageId?exists && helpTopic == "MYPORTAL_showPortalP")>
-                <li><a href="javascript:lookup_popup2('showHelp?helpTopic=${helpTopic}&portalPageId=${parameters.portalPageId?if_exists}','help' ,500,500);">${uiLabelMap.CommonHelp}</a></li>
+                <li><a href="javascript:lookup_popup2('showHelp?helpTopic=${helpTopic}&amp;portalPageId=${parameters.portalPageId?if_exists}','help' ,500,500);">${uiLabelMap.CommonHelp}</a></li>
               <#else>
                 <li><a href="${helpUrlPrefix}${helpUrlTopic}${helpUrlSuffix}" target="_blank">${uiLabelMap.CommonHelp}</a></li>
               </#if>