svn commit: r932733 - in /ofbiz/trunk/framework: base/config/ common/webcommon/WEB-INF/ common/webcommon/includes/ images/webapp/images/ webtools/webapp/webtools/entit
Locked
 
|
Author: buscob
Date: Sat Apr 10 14:35:07 2010 New Revision: 932733 URL: http://svn.apache.org/viewvc?rev=932733&view=rev Log: A patch from Blas Rodriguez Somoza OFBIZ-3637 - XHTML validation errors (framework excluding widget) round 2 https://issues.apache.org/jira/browse/OFBIZ-3637 XHTML validation errors * Unclosed tags INPUT, IMG, BR... * attributes without values (checked, selected, disabled, etc) * attribute values without " * required attributes not included (alt in img, type in style, type in script etc) * Uppercase tags or attributes. * Unencoded entities (ampersands). Other changes: selectall.js line 333. ajaxAutoCompleter must work with unenconded or encoded ampersands. EntityRefMain.ftl line 176. <div> must be </div> Modified: ofbiz/trunk/framework/base/config/log4j.xml ofbiz/trunk/framework/common/webcommon/WEB-INF/geolocation.ftl ofbiz/trunk/framework/common/webcommon/includes/htmlTemplate.ftl ofbiz/trunk/framework/images/webapp/images/selectall.js ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityRef.ftl ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityRefList.ftl ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityRefMain.ftl ofbiz/trunk/framework/webtools/webapp/webtools/entity/ViewGeneric.ftl ofbiz/trunk/framework/webtools/webapp/webtools/labelmanager/SearchLabels.ftl Modified: ofbiz/trunk/framework/base/config/log4j.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/config/log4j.xml?rev=932733&r1=932732&r2=932733&view=diff ============================================================================== --- ofbiz/trunk/framework/base/config/log4j.xml (original) +++ ofbiz/trunk/framework/base/config/log4j.xml Sat Apr 10 14:35:07 2010 @@ -61,7 +61,7 @@ <param name="File" value="runtime/logs/ofbiz.html"/> <param name="threshold" value="info"/> <layout class="org.apache.log4j.PatternLayout"> - <param name="ConversionPattern" value="<div class=%p>%d (%t) [%24F:%-3L:%-5p]%x %m </div>%n"/> + <param name="ConversionPattern" value="<div class="%p">%d (%t) [%24F:%-3L:%-5p]%x %m </div>%n"/> </layout> </appender> Modified: ofbiz/trunk/framework/common/webcommon/WEB-INF/geolocation.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/WEB-INF/geolocation.ftl?rev=932733&r1=932732&r2=932733&view=diff ============================================================================== --- ofbiz/trunk/framework/common/webcommon/WEB-INF/geolocation.ftl (original) +++ ofbiz/trunk/framework/common/webcommon/WEB-INF/geolocation.ftl Sat Apr 10 14:35:07 2010 @@ -18,10 +18,10 @@ under the License. --> <#if geoPoint?has_content> <#if geoPoint.latitude?has_content && geoPoint.longitude?has_content> - ${uiLabelMap.CommonLatitude}${geoPoint.latitude}<br> + ${uiLabelMap.CommonLatitude}${geoPoint.latitude}<br/> ${uiLabelMap.CommonLongitude}${geoPoint.longitude} <#if geoPoint.elevation?has_content> - <br>${uiLabelMap.CommonElevation}${geoPoint.elevation} ${elevationUomAbbr?if_exists} + <br/>${uiLabelMap.CommonElevation}${geoPoint.elevation} ${elevationUomAbbr?if_exists} </#if> <#if geoPoint.dataSourceId?has_content> <#if geoPoint.dataSourceId == "GEOPT_GOOGLE"> Modified: ofbiz/trunk/framework/common/webcommon/includes/htmlTemplate.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/htmlTemplate.ftl?rev=932733&r1=932732&r2=932733&view=diff ============================================================================== --- ofbiz/trunk/framework/common/webcommon/includes/htmlTemplate.ftl (original) +++ ofbiz/trunk/framework/common/webcommon/includes/htmlTemplate.ftl Sat Apr 10 14:35:07 2010 @@ -31,7 +31,7 @@ under the License. </#if> <#if (!ajaxUrl?has_content)> <#local ajaxUrl = requestAttributes._REQUEST_HANDLER_.makeLink(request, response, fieldFormName)/> - <#local ajaxUrl = id + "," + ajaxUrl + ",ajaxLookup=Y&searchValueField=" + name /> + <#local ajaxUrl = id + "," + ajaxUrl + ",ajaxLookup=Y&searchValueField=" + name /> </#if> <@renderLookupField className alert name value size maxlength id event action disabled autocomplete descriptionFieldName formName fieldFormName targetParameterIter imgSrc ajaxUrl ajaxEnabled presentation width height position fadeBackground clearText /> </#macro> Modified: ofbiz/trunk/framework/images/webapp/images/selectall.js URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/selectall.js?rev=932733&r1=932732&r2=932733&view=diff ============================================================================== --- ofbiz/trunk/framework/images/webapp/images/selectall.js (original) +++ ofbiz/trunk/framework/images/webapp/images/selectall.js Sat Apr 10 14:35:07 2010 @@ -330,7 +330,7 @@ function ajaxSubmitFormUpdateAreas(form, * form of: areaId, target, target parameters [, areaId, target, target parameters...]. */ function ajaxAutoCompleter(areaCsvString) { - var areaArray = areaCsvString.split(","); + var areaArray = areaCsvString.replace('&','&').split(","); var numAreas = parseInt(areaArray.length / 3); for (var i = 0; i < numAreas * 3; i = i + 3) { var optionsDivId = areaArray[i] + "_autoCompleterOptions"; Modified: ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityRef.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityRef.ftl?rev=932733&r1=932732&r2=932733&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityRef.ftl (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityRef.ftl Sat Apr 10 14:35:07 2010 @@ -21,8 +21,8 @@ under the License. <title>${uiLabelMap.WebtoolsEntityReferenceChart}</title> </head> <frameset cols="30%,70%"> - <frame src="${encodeUrlList}" name="entityListFrame"> - <frame src="${encodeUrlMain}" name="entityFrame"> + <frame src="${encodeUrlList}" name="entityListFrame"/> + <frame src="${encodeUrlMain}" name="entityFrame"/> </frameset> <noframes> <h2>${uiLabelMap.CommonFrameAlert1}</h2> Modified: ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityRefList.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityRefList.ftl?rev=932733&r1=932732&r2=932733&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityRefList.ftl (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityRefList.ftl Sat Apr 10 14:35:07 2010 @@ -24,7 +24,7 @@ under the License. <html lang="${docLangAttr}" dir="${langDir}" xmlns="http://www.w3.org/1999/xhtml"> <head> <title>${uiLabelMap.WebtoolsEntityReference}</title> - <style> + <style type="text/css"> body, textarea, input, select {font-family: Helvetica, sans-serif; background-color: #ffffff; text-decoration: none;} .section-header {font-size: 10pt; font-weight: bold; color: #000000; padding-bottom: 10;} .listtext {font-size: 10pt; font-weight: bold; color: blue;} @@ -35,19 +35,19 @@ under the License. <body> <div class='listtext'> <#if !forstatic> - <a href="<@ofbizUrl>main</@ofbizUrl>" target='main'>${uiLabelMap.WebtoolsPopupWebToolsMain}</A><BR> - <a href="<@ofbizUrl>view/entityref_main</@ofbizUrl>" target="entityFrame">${uiLabelMap.WebtoolsEntityReferenceMainPage}</A><BR> - <a href="<@ofbizUrl>view/checkdb</@ofbizUrl>" target="entityFrame">${uiLabelMap.WebtoolsCheckUpdateDatabase}</A> + <a href="<@ofbizUrl>main</@ofbizUrl>" target='main'>${uiLabelMap.WebtoolsPopupWebToolsMain}</a><br/> + <a href="<@ofbizUrl>view/entityref_main</@ofbizUrl>" target="entityFrame">${uiLabelMap.WebtoolsEntityReferenceMainPage}</a><br/> + <a href="<@ofbizUrl>view/checkdb</@ofbizUrl>" target="entityFrame">${uiLabelMap.WebtoolsCheckUpdateDatabase}</a> <hr /> <#-- want to leave these out because they are only working so-so, and cause people more problems that they solve, IMHO - <a href="<@ofbizUrl>ModelWriter</@ofbizUrl>" target='_blank'>Generate Entity Model XML (all in one)</A><BR> - <a href="<@ofbizUrl>ModelWriter?savetofile=true</@ofbizUrl>" target='_blank'>Save Entity Model XML to Files</A><BR> + <a href="<@ofbizUrl>ModelWriter</@ofbizUrl>" target='_blank'>Generate Entity Model XML (all in one)</a><br/> + <a href="<@ofbizUrl>ModelWriter?savetofile=true</@ofbizUrl>" target='_blank'>Save Entity Model XML to Files</a><br/> --> <#-- this is not working now anyway... - <a href="<@ofbizUrl>ModelGroupWriter</@ofbizUrl>" target='_blank'>Generate Entity Group XML</A><BR> - <a href="<@ofbizUrl>ModelGroupWriter?savetofile=true</@ofbizUrl>" target='_blank'>Save Entity Group XML to File</A><BR> + <a href="<@ofbizUrl>ModelGroupWriter</@ofbizUrl>" target='_blank'>Generate Entity Group XML</a><br/> + <a href="<@ofbizUrl>ModelGroupWriter?savetofile=true</@ofbizUrl>" target='_blank'>Save Entity Group XML to File</a><br/> --> - <a href="<@ofbizUrl>view/ModelInduceFromDb</@ofbizUrl>" target='_blank'>${uiLabelMap.WebtoolsInduceModelXMLFromDatabase}</A><BR> + <a href="<@ofbizUrl>view/ModelInduceFromDb</@ofbizUrl>" target='_blank'>${uiLabelMap.WebtoolsInduceModelXMLFromDatabase}</a><br/> </#if> <#if packageNames?has_content> <hr /> Modified: ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityRefMain.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityRefMain.ftl?rev=932733&r1=932732&r2=932733&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityRefMain.ftl (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityRefMain.ftl Sat Apr 10 14:35:07 2010 @@ -28,7 +28,7 @@ under the License. <html lang="${docLangAttr}" dir="${langDir}" xmlns="http://www.w3.org/1999/xhtml"> <head> <title>${uiLabelMap.WebtoolsEntityReference}</title> - <style> + <style type="text/css"> body, textarea, input, select {font-family: Helvetica, sans-serif; background-color: #ffffff;} .packagetext {font-size: 18pt; font-weight: bold; text-align: center} .toptext {font-size: 16pt; font-weight: bold; text-align: center} @@ -173,6 +173,6 @@ under the License. <div align="center"> <br /><br /> ${uiLabelMap.WebtoolsEntityDisplayed}: ${numberShowed} - <div> + </div> </body> </html> Modified: ofbiz/trunk/framework/webtools/webapp/webtools/entity/ViewGeneric.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/entity/ViewGeneric.ftl?rev=932733&r1=932732&r2=932733&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/entity/ViewGeneric.ftl (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/entity/ViewGeneric.ftl Sat Apr 10 14:35:07 2010 @@ -132,10 +132,10 @@ function ShowTab(lname) { <td> <#if field.fieldType == 'DateTime'> DateTime(YYYY-MM-DD HH:mm:SS.sss):<input type="text" name="${field.name}" size="24" value="${field.value}" /> - <a href="javascript:call_cal(document.updateForm.${field.name}, '${field.value}');" onmouseover="window.status='Date Picker';return true;" onmouseout="window.status='';return true;"><img src='/images/cal.gif' width='16' height='16' border='0' alt='Click here For Calendar'></a> + <a href="javascript:call_cal(document.updateForm.${field.name}, '${field.value}');" onmouseover="window.status='Date Picker';return true;" onmouseout="window.status='';return true;"><img src='/images/cal.gif' width='16' height='16' border='0' alt='Click here For Calendar' /></a> <#elseif field.fieldType == 'Date'> Date(YYYY-MM-DD):<input type="text" name="${field.name}" size="11" value="${field.value}" /> - <a href="javascript:call_cal(document.updateForm.${field.name}, '${field.value}');" onmouseover="window.status='Date Picker';return true;" onmouseout="window.status='';return true;"><img src='/images/cal.gif' width='16' height='16' border='0' alt='Click here For Calendar'></a> + <a href="javascript:call_cal(document.updateForm.${field.name}, '${field.value}');" onmouseover="window.status='Date Picker';return true;" onmouseout="window.status='';return true;"><img src='/images/cal.gif' width='16' height='16' border='0' alt='Click here For Calendar' /></a> <#elseif field.fieldType == 'Time'> Time(HH:mm:SS.sss):<input type="text" size="6" maxlength="10" name="${field.name}" value="${field.value}" /> <#elseif field.fieldType == 'Integer'> @@ -174,10 +174,10 @@ function ShowTab(lname) { <td> <#if field.fieldType == 'DateTime'> DateTime(YYYY-MM-DD HH:mm:SS.sss):<input type="text" name="${field.name}" size="24" value="${field.value}" /> - <a href="javascript:call_cal(document.updateForm.${field.name}, '${field.value}');" onmouseover="window.status='Date Picker';return true;" onmouseout="window.status='';return true;"><img src='/images/cal.gif' width='16' height='16' border='0' alt='Click here For Calendar'></a> + <a href="javascript:call_cal(document.updateForm.${field.name}, '${field.value}');" onmouseover="window.status='Date Picker';return true;" onmouseout="window.status='';return true;"><img src='/images/cal.gif' width='16' height='16' border='0' alt='Click here For Calendar' /></a> <#elseif field.fieldType == 'Date'> Date(YYYY-MM-DD):<input type="text" name="${field.name}" size="11" value="${field.value}" /> - <a href="javascript:call_cal(document.updateForm.${field.name}, '${field.value}');" onmouseover="window.status='Date Picker';return true;" onmouseout="window.status='';return true;"><img src='/images/cal.gif' width='16' height='16' border='0' alt='Click here For Calendar'></a> + <a href="javascript:call_cal(document.updateForm.${field.name}, '${field.value}');" onmouseover="window.status='Date Picker';return true;" onmouseout="window.status='';return true;"><img src='/images/cal.gif' width='16' height='16' border='0' alt='Click here For Calendar' /></a> <#elseif field.fieldType == 'Time'> Time(HH:mm:SS.sss):<input type="text" size="6" maxlength="10" name="${field.name}" value="${field.value}" /> <#elseif field.fieldType == 'Integer'> Modified: ofbiz/trunk/framework/webtools/webapp/webtools/labelmanager/SearchLabels.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/labelmanager/SearchLabels.ftl?rev=932733&r1=932732&r2=932733&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/labelmanager/SearchLabels.ftl (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/labelmanager/SearchLabels.ftl Sat Apr 10 14:35:07 2010 @@ -93,7 +93,7 @@ under the License. <b>${uiLabelMap.WebtoolsLabelManagerWarningMessage} (${duplicatedLocalesLabels})</b> <br /> <#list duplicatedLocalesLabelsList as duplicatedLocalesLabel> - <br>${duplicatedLocalesLabel.labelKey} + <br/>${duplicatedLocalesLabel.labelKey} </#list> <br /><br />${uiLabelMap.WebtoolsLabelManagerClearCacheAfterFixingDuplicateLabels} <#else> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |