Author: buscob
Date: Fri Apr 30 17:46:49 2010
New Revision: 939757
URL: http://svn.apache.org/viewvc?rev=939757&view=rev
Log:
A patch from Blas Rodriguez Somoza
OFBIZ-3732 - XHTML validation errors round 2++ (framework excluding widgets)
https://issues.apache.org/jira/browse/OFBIZ-3732
geolocation.ftl
Script content need to be inside markup comment to avoid character encoding
issues.
EntityImport.ftl
attributes without values
EntityImportDir.ftl
attributes without values
EntityImportReaders.ftl
attributes without values
Modified:
ofbiz/trunk/framework/common/webcommon/includes/geolocation.ftl
ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityImport.ftl
ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityImportDir.ftl
ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityImportReaders.ftl
Modified: ofbiz/trunk/framework/common/webcommon/includes/geolocation.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/geolocation.ftl?rev=939757&r1=939756&r2=939757&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/includes/geolocation.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/includes/geolocation.ftl Fri Apr 30
17:46:49 2010
@@ -25,7 +25,7 @@ under the License.
<#assign defaultUrl = "https." + request.getServerName()>
<#assign defaultGogleMapKey =
Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue("general.properties",
defaultUrl)>
<script
src="http://maps.google.com/maps?file=api&v=2&key=${defaultGogleMapKey}";
type="text/javascript"></script>
- <script type="text/javascript">
+ <script type="text/javascript"><!--
if (GBrowserIsCompatible()) {
var map = new GMap2(document.getElementById("<#if
geoChart.id?has_content>${geoChart.id}<#else>map_canvas</#if>"));
<#if geoChart.center?has_content>
@@ -65,7 +65,7 @@ under the License.
</#list>
</#if>
}
- </script>
+ --></script>
<#elseif geoChart.dataSourceId == "GEOPT_YAHOO">
<#elseif geoChart.dataSourceId == "GEOPT_MICROSOFT">
<#elseif geoChart.dataSourceId == "GEOPT_MAPTP">
@@ -76,7 +76,7 @@ under the License.
<#assign defaultUrl = "https." + request.getServerName()>
<#assign defaultGogleMapKey =
Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue("general.properties",
defaultUrl)>
<script
src="http://maps.google.com/maps?file=api&v=2&key=${defaultGogleMapKey}";
type="text/javascript"></script>
- <script type="text/javascript">
+ <script type="text/javascript"><!--
if (GBrowserIsCompatible()) {
var geocoder = new GClientGeocoder();
var map = new GMap2(document.getElementById("<#if
geoChart.id?has_content>${geoChart.id}<#else>map_canvas</#if>"));
@@ -87,7 +87,7 @@ under the License.
map.addOverlay(new GMarker(point));
});
}
- </script>
+ --></script>
</#if>
</#if>
<#else>
Modified: ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityImport.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityImport.ftl?rev=939757&r1=939756&r2=939757&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityImport.ftl
(original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityImport.ftl Fri
Apr 30 17:46:49 2010
@@ -29,11 +29,11 @@ under the License.
<input type="text" size="60" name="filename"
value="${filename?if_exists}"/><br />
${uiLabelMap.WebtoolsAbsoluteFTLFilename}:<br />
<input type="text" size="40" name="fmfilename"
value="${fmfilename?if_exists}"/><br />
- <input type="checkbox" name="isUrl" <#if
isUrl?exists>"checked"</#if>/>${uiLabelMap.WebtoolsIsURL}<br />
- <input type="checkbox" name="mostlyInserts" <#if
mostlyInserts?exists>"checked"</#if>/>${uiLabelMap.WebtoolsMostlyInserts}<br />
- <input type="checkbox" name="maintainTimeStamps" <#if
keepStamps?exists>"checked"</#if>/>${uiLabelMap.WebtoolsMaintainTimestamps}<br
/>
- <input type="checkbox" name="createDummyFks" <#if
createDummyFks?exists>"checked"</#if>/>${uiLabelMap.WebtoolsCreateDummyFks}<br
/>
- <input type="checkbox" name="checkDataOnly" <#if
checkDataOnly?exists>"checked"</#if>/>${uiLabelMap.WebtoolsCheckDataOnly}<br />
+ <input type="checkbox" name="isUrl" <#if
isUrl?exists>checked="checked"</#if>/>${uiLabelMap.WebtoolsIsURL}<br />
+ <input type="checkbox" name="mostlyInserts" <#if
mostlyInserts?exists>checked="checked"</#if>/>${uiLabelMap.WebtoolsMostlyInserts}<br
/>
+ <input type="checkbox" name="maintainTimeStamps" <#if
keepStamps?exists>checked="checked"</#if>/>${uiLabelMap.WebtoolsMaintainTimestamps}<br
/>
+ <input type="checkbox" name="createDummyFks" <#if
createDummyFks?exists>checked="checked"</#if>/>${uiLabelMap.WebtoolsCreateDummyFks}<br
/>
+ <input type="checkbox" name="checkDataOnly" <#if
checkDataOnly?exists>checked="checked"</#if>/>${uiLabelMap.WebtoolsCheckDataOnly}<br
/>
${uiLabelMap.WebtoolsTimeoutSeconds}:<input type="text" size="6"
value="${txTimeoutStr?default("7200")}" name="txTimeout"/><br />
<div class="button-bar"><input type="submit"
value="${uiLabelMap.WebtoolsImportFile}"/></div>
</form>
Modified:
ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityImportDir.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityImportDir.ftl?rev=939757&r1=939756&r2=939757&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityImportDir.ftl
(original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityImportDir.ftl
Fri Apr 30 17:46:49 2010
@@ -30,7 +30,7 @@ under the License.
<input type="checkbox" name="maintainTimeStamps" <#if
keepStamps?exists>checked="checked"</#if>/>${uiLabelMap.WebtoolsMaintainTimestamps}<br
/>
<input type="checkbox" name="createDummyFks" <#if
createDummyFks?exists>checked="checked"</#if>/>${uiLabelMap.WebtoolsCreateDummyFks}<br
/>
<input type="checkbox" name="deleteFiles" <#if
(deleteFiles?exists)>checked="checked"</#if>/>${uiLabelMap.WebtoolsDeleteFiles}<br
/>
- <input type="checkbox" name="checkDataOnly" <#if
checkDataOnly?exists>"checked"</#if>/>${uiLabelMap.WebtoolsCheckDataOnly}<br />
+ <input type="checkbox" name="checkDataOnly" <#if
checkDataOnly?exists>checked="checked"</#if>/>${uiLabelMap.WebtoolsCheckDataOnly}<br
/>
${uiLabelMap.WebtoolsTimeoutSeconds}:<input type="text" size="6"
value="${txTimeoutStr?default("7200")}" name="txTimeout"/><br />
${uiLabelMap.WebtoolsPause}:<input type="text" size="6"
value="${filePauseStr?default("0")}" name="filePause"/><br />
<div class="button-bar"><input type="submit"
value="${uiLabelMap.WebtoolsImportFile}"/></div>
Modified:
ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityImportReaders.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityImportReaders.ftl?rev=939757&r1=939756&r2=939757&view=diff
==============================================================================
---
ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityImportReaders.ftl
(original)
+++
ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityImportReaders.ftl
Fri Apr 30 17:46:49 2010
@@ -26,10 +26,10 @@ under the License.
<form method="post" action="<@ofbizUrl>entityImportReaders</@ofbizUrl>">
Enter Readers (comma separated, no spaces; from entityengine.xml and
ofbiz-component.xml files; common ones include seed,ext,demo):<br />
<input type="text" size="60" name="readers"
value="${readers?default("seed")}"/><br />
- <input type="checkbox" name="mostlyInserts" <#if
mostlyInserts?exists>"checked"</#if>
value="true"/>${uiLabelMap.WebtoolsMostlyInserts}<br />
- <input type="checkbox" name="maintainTimeStamps" <#if
keepStamps?exists>"checked"</#if>
value="true"/>${uiLabelMap.WebtoolsMaintainTimestamps}<br />
- <input type="checkbox" name="createDummyFks" <#if
createDummyFks?exists>"checked"</#if>
value="true"/>${uiLabelMap.WebtoolsCreateDummyFks}<br />
- <input type="checkbox" name="checkDataOnly" <#if
checkDataOnly?exists>"checked"</#if>
value="true"/>${uiLabelMap.WebtoolsCheckDataOnly}<br />
+ <input type="checkbox" name="mostlyInserts" <#if
mostlyInserts?exists>checked="checked"</#if>
value="true"/>${uiLabelMap.WebtoolsMostlyInserts}<br />
+ <input type="checkbox" name="maintainTimeStamps" <#if
keepStamps?exists>checked="checked"</#if>
value="true"/>${uiLabelMap.WebtoolsMaintainTimestamps}<br />
+ <input type="checkbox" name="createDummyFks" <#if
createDummyFks?exists>checked="checked"</#if>
value="true"/>${uiLabelMap.WebtoolsCreateDummyFks}<br />
+ <input type="checkbox" name="checkDataOnly" <#if
checkDataOnly?exists>checked="checked"</#if>
value="true"/>${uiLabelMap.WebtoolsCheckDataOnly}<br />
${uiLabelMap.WebtoolsTimeoutSeconds}:<input type="text" size="6"
value="${txTimeoutStr?default("7200")}" name="txTimeout"/><br />
<div class="button-bar"><input type="submit"
value="${uiLabelMap.WebtoolsImport}"/></div>
</form>
