OFBiz › OFBiz - Commits

svn commit: r1836886 [2/2] - in /ofbiz/ofbiz-framework/trunk: applications/accounting/template/ap/invoices/ applications/accounting/template/ar/invoice/ applications/accounting/template/ar/payment/ applications/accounting/template/finaccounttrans/ appl...

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

Deepak Dixit-5

svn commit: r1836886 [2/2] - in /ofbiz/ofbiz-framework/trunk: applications/accounting/template/ap/invoices/ applications/accounting/template/ar/invoice/ applications/accounting/template/ar/payment/ applications/accounting/template/finaccounttrans/ appl...

Modified: ofbiz/ofbiz-framework/trunk/applications/product/template/store/ProductStoreGroupTree.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/template/store/ProductStoreGroupTree.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/product/template/store/ProductStoreGroupTree.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/product/template/store/ProductStoreGroupTree.ftl Sat Jul 28 10:51:52 2018
@@ -17,7 +17,7 @@ specific language governing permissions
under the License.
-->

-<script type="text/javascript">
+<script type="application/javascript">
<#-- some labels are not unescaped in the JSON object so we have to do this manualy -->
function unescapeHtmlText(text) {
return jQuery('<div />').html(text).text()

Modified: ofbiz/ofbiz-framework/trunk/framework/webtools/template/entity/CheckDb.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webtools/template/entity/CheckDb.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/webtools/template/entity/CheckDb.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/framework/webtools/template/entity/CheckDb.ftl Sat Jul 28 10:51:52 2018
@@ -55,7 +55,7 @@ under the License.
</table>
</form>
<p>${uiLabelMap.WebtoolsNoteUseAtYourOwnRisk}</p>
-<script type="text/javascript">
+<script type="application/javascript">
function enableTablesRemove() {
document.forms["TablesRemoveForm"].elements["TablesRemoveButton"].disabled=false;
}

Modified: ofbiz/ofbiz-framework/trunk/framework/webtools/template/entity/ViewGeneric.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webtools/template/entity/ViewGeneric.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/webtools/template/entity/ViewGeneric.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/framework/webtools/template/entity/ViewGeneric.ftl Sat Jul 28 10:51:52 2018
@@ -18,7 +18,7 @@ under the License.
-->

<#assign enableEdit = parameters.enableEdit?default("false")>
-<script type="text/javascript">
+<script type="application/javascript">
var numTabs=${(entity.getRelationsSize()+1)};
function ShowTab(lname) {
for(inc=1; inc <= numTabs; inc++) {

Modified: ofbiz/ofbiz-framework/trunk/framework/webtools/template/labelmanager/UpdateLabel.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webtools/template/labelmanager/UpdateLabel.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/webtools/template/labelmanager/UpdateLabel.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/framework/webtools/template/labelmanager/UpdateLabel.ftl Sat Jul 28 10:51:52 2018
@@ -16,7 +16,7 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
-<script type="text/javascript">
+<script type="application/javascript">
function updateAndSaveLabel() {
document.UpdateLabelForm.action="<@ofbizUrl>SaveLabelsToXmlFile</@ofbizUrl>";
document.UpdateLabelForm.submit();

Modified: ofbiz/ofbiz-framework/trunk/framework/webtools/template/service/SetServiceParameterSync.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webtools/template/service/SetServiceParameterSync.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/webtools/template/service/SetServiceParameterSync.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/framework/webtools/template/service/SetServiceParameterSync.ftl Sat Jul 28 10:51:52 2018
@@ -31,7 +31,7 @@ under the License.
<#if "N" == serviceParameter.optional><span class="tooltip">${uiLabelMap.CommonRequired}</span></#if>
<#if serviceParameter.defaultValue?has_content>${uiLabelMap.WebtoolsServiceDefault} ${serviceParameter.defaultValue?string}</#if>
<#if serviceParameter_index == 0>
- <script type="text/javascript">
+ <script type="application/javascript">
document.scheduleForm.${serviceParameter.name}.focus();
</script>
</#if>

Modified: ofbiz/ofbiz-framework/trunk/themes/bluelight/template/AppBarClose.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/bluelight/template/AppBarClose.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/bluelight/template/AppBarClose.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/themes/bluelight/template/AppBarClose.ftl Sat Jul 28 10:51:52 2018
@@ -31,7 +31,7 @@ under the License.
</div>

<#if userLogin??>
-<script type="text/javascript">
+<script type="application/javascript">
var mainmenu = new DropDownMenu(jQuery('#main-navigation'));
var appmenu = new DropDownMenu(jQuery('#app-navigation'));
</script>

Modified: ofbiz/ofbiz-framework/trunk/themes/bluelight/template/Header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/bluelight/template/Header.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/bluelight/template/Header.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/themes/bluelight/template/Header.ftl Sat Jul 28 10:51:52 2018
@@ -39,7 +39,7 @@ under the License.
</#if>
<#if layoutSettings.VT_HDR_JAVASCRIPT?has_content>
<#list layoutSettings.VT_HDR_JAVASCRIPT as javaScript>
- <script src="<@ofbizContentUrl>${StringUtil.wrapString(javaScript)}</@ofbizContentUrl>" type="text/javascript"></script>
+ <script src="<@ofbizContentUrl>${StringUtil.wrapString(javaScript)}</@ofbizContentUrl>" type="application/javascript"></script>
</#list>
</#if>
<#if layoutSettings.javaScripts?has_content>
@@ -49,7 +49,7 @@ under the License.
<#list layoutSettings.javaScripts as javaScript>
<#if javaScriptsSet.contains(javaScript)>
<#assign nothing = javaScriptsSet.remove(javaScript)/>
- <script src="<@ofbizContentUrl>${StringUtil.wrapString(javaScript)}</@ofbizContentUrl>" type="text/javascript"></script>
+ <script src="<@ofbizContentUrl>${StringUtil.wrapString(javaScript)}</@ofbizContentUrl>" type="application/javascript"></script>
</#if>
</#list>
</#if>
@@ -82,7 +82,7 @@ under the License.
</#list>
</#if>
<#if layoutSettings.WEB_ANALYTICS?has_content>
- <script type="text/javascript">
+ <script type="application/javascript">
<#list layoutSettings.WEB_ANALYTICS as webAnalyticsConfig>
${StringUtil.wrapString(webAnalyticsConfig.webAnalyticsCode!)}
</#list>

Modified: ofbiz/ofbiz-framework/trunk/themes/common-theme/template/ChangePassword.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common-theme/template/ChangePassword.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/common-theme/template/ChangePassword.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/themes/common-theme/template/ChangePassword.ftl Sat Jul 28 10:51:52 2018
@@ -82,6 +82,6 @@ under the License.
</div>
</center>

-<script type="text/javascript">
+<script type="application/javascript">
document.loginform.PASSWORD.focus();
</script>

Modified: ofbiz/ofbiz-framework/trunk/themes/common-theme/template/Login.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common-theme/template/Login.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/common-theme/template/Login.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/themes/common-theme/template/Login.ftl Sat Jul 28 10:51:52 2018
@@ -66,7 +66,7 @@ under the License.
</div>
</center>

-<script type="text/javascript">
+<script type="application/javascript">
document.loginform.JavaScriptEnabled.value = "Y";
<#if focusName>
document.loginform.USERNAME.focus();

Modified: ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/AjaxAutocompleteOptions.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/AjaxAutocompleteOptions.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/AjaxAutocompleteOptions.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/AjaxAutocompleteOptions.ftl Sat Jul 28 10:51:52 2018
@@ -32,7 +32,7 @@ under the License.
</#list>
</#if>
<#else>
-<script type="text/javascript">
+<script type="application/javascript">
var autocomp = [
<#if autocompleteOptions?has_content>
<#list autocompleteOptions as autocompleteOption>

Modified: ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/GeoLocation.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/GeoLocation.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/GeoLocation.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/GeoLocation.ftl Sat Jul 28 10:51:52 2018
@@ -41,12 +41,12 @@ under the License.
style="border:1px solid #979797; background-color:#e5e3df; width:${geoChart.width}; height:${geoChart.height}; margin:2em auto;">
<div style="padding:1em; color:gray;">${uiLabelMap.CommonLoading}</div>
</div>
- <script src="https://maps.googleapis.com/maps/api/js?sensor=false" type="text/javascript"></script>
+ <script src="https://maps.googleapis.com/maps/api/js?sensor=false" type="application/javascript"></script>
</#if>

<#-- ========================== Here we go with different types of maps renderer ===========================-->
<#if "GEOPT_GOOGLE" == geoChart.dataSourceId>
- <script type="text/javascript">
+ <script type="application/javascript">
function showAllMarkers(map, points) {
if (points.length > 1) {
var latlngbounds = new google.maps.LatLngBounds();
@@ -90,7 +90,7 @@ under the License.
<#elseif "GEOPT_MICROSOFT" == geoChart.dataSourceId>
<#elseif "GEOPT_MAPTP" == geoChart.dataSourceId>
<#elseif "GEOPT_ADDRESS_GOOGLE" == geoChart.dataSourceId>
- <script type="text/javascript">
+ <script type="application/javascript">
var geocoder = new google.maps.Geocoder();
var map = new google.maps.Map(document.getElementById("${id}"),
{
@@ -118,7 +118,7 @@ under the License.
due to https://github.com/openlayers/openlayers/issues/1025
rather use a local version loaded by framework/common/widget/CommonScreens.xml -->
<#-- script src="//www.openlayers.org/api/OpenLayers.js"></script-->
- <script type="text/javascript">
+ <script type="application/javascript">
map = new OpenLayers.Map("${id}");
map.addLayer(new OpenLayers.Layer.OSM());
var zoom = ${zoom};

Modified: ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/GoogleGeoLocation.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/GoogleGeoLocation.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/GoogleGeoLocation.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/GoogleGeoLocation.ftl Sat Jul 28 10:51:52 2018
@@ -17,8 +17,8 @@ specific language governing permissions
under the License.
-->

-<script src="https://maps.googleapis.com/maps/api/js?sensor=false" type="text/javascript"></script>
-<script type="text/javascript">
+<script src="https://maps.googleapis.com/maps/api/js?sensor=false" type="application/javascript"></script>
+<script type="application/javascript">
function load() {
var geocoder = new google.maps.Geocoder();
var center = new google.maps.LatLng(${latitude!38}, ${longitude!15});

Modified: ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/ListVisualThemes.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/ListVisualThemes.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/ListVisualThemes.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/ListVisualThemes.ftl Sat Jul 28 10:51:52 2018
@@ -24,10 +24,10 @@ margin: 1em;
</style>
-->

-<script type="text/javascript" src="/common/js/jquery/plugins/fancybox/jquery.fancybox-3.2.3.min.js"></script>
+<script type="application/javascript" src="/common/js/jquery/plugins/fancybox/jquery.fancybox-3.2.3.min.js"></script>
<link rel="stylesheet" href="/common/js/jquery/plugins/fancybox/jquery.fancybox-3.2.3.min.css" type="text/css" media="screen"/>

-<script type="text/javascript">
+<script type="application/javascript">
$(document).ready(function () {
$("a#single_image").fancybox();
$("a#inline").fancybox({

Modified: ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/Lookup.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/Lookup.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/Lookup.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/Lookup.ftl Sat Jul 28 10:51:52 2018
@@ -28,7 +28,7 @@ under the License.
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<title>${title!}</title>
<#-- the trick "<scr" + "ipt below is because browsers should not parse the contents of CDATA elements, but apparently they do. -->
- <script type="text/javascript">//<![CDATA[
+ <script type="application/javascript">//<![CDATA[
var jQueryLibLoaded = false;
function initJQuery() {
if (typeof(jQuery) == 'undefined') {
@@ -45,7 +45,7 @@ under the License.
//]]>
</script>
<script src="<@ofbizContentUrl>/common/js/util/OfbizUtil.js</@ofbizContentUrl>"
- type="text/javascript"></script>
+ type="application/javascript"></script>
<#if layoutSettings.javaScripts?has_content>
<#--layoutSettings.javaScripts is a list of java scripts. -->
<#-- use a Set to make sure each javascript is declared only once, but iterate the list to maintain the correct order -->
@@ -54,7 +54,7 @@ under the License.
<#if javaScriptsSet.contains(javaScript)>
<#assign nothing = javaScriptsSet.remove(javaScript)/>
<script src="<@ofbizContentUrl>${StringUtil.wrapString(javaScript)}</@ofbizContentUrl>"
- type="text/javascript"></script>
+ type="application/javascript"></script>
</#if>
</#list>
</#if>
@@ -84,7 +84,7 @@ under the License.
</#list>
</#if>

- <script type="text/javascript">
+ <script type="application/javascript">
// This code inserts the value lookedup by a popup window back into the associated form element
var re_id = new RegExp('id=(\\d+)');
var num_id = (re_id.exec(String(window.location))

Modified: ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/ServerHour24HourFormatJs.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/ServerHour24HourFormatJs.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/ServerHour24HourFormatJs.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/ServerHour24HourFormatJs.ftl Sat Jul 28 10:51:52 2018
@@ -16,7 +16,7 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
-<script type="text/javascript">
+<script type="application/javascript">
jQuery(document).ready(function () {
window.setInterval(function () {
clock()

Modified: ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/SetDependentDropdownValuesJs.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/SetDependentDropdownValuesJs.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/SetDependentDropdownValuesJs.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/SetDependentDropdownValuesJs.ftl Sat Jul 28 10:51:52 2018
@@ -17,7 +17,7 @@ specific language governing permissions
under the License.
-->
<#assign requestName><@ofbizUrl>${requestName}</@ofbizUrl></#assign>
-<script type="text/javascript">
+<script type="application/javascript">
jQuery(document).ready(function () {
if (jQuery('#${dependentForm}_${mainId}').length) {
jQuery('#${dependentForm}_${mainId}').change(function (e, data) {

Modified: ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/SetMultipleSelectJs.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/SetMultipleSelectJs.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/SetMultipleSelectJs.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/SetMultipleSelectJs.ftl Sat Jul 28 10:51:52 2018
@@ -17,7 +17,7 @@ specific language governing permissions
under the License.
-->
<#if asm_multipleSelect??> <#-- we check only this var and suppose the others are also present -->
-<script type="text/javascript">
+<script type="application/javascript">
jQuery(document).ready(function () {
multiple = jQuery("#${asm_multipleSelect!}");

Modified: ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/SetMultipleSelectJsList.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/SetMultipleSelectJsList.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/SetMultipleSelectJsList.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/SetMultipleSelectJsList.ftl Sat Jul 28 10:51:52 2018
@@ -19,7 +19,7 @@ under the License.
<#if asm_listField??> <#-- we check only this var and suppose the others are also present -->
<#list asm_listField as row>
<#if row.asm_multipleSelect??>
- <script type="text/javascript">
+ <script type="application/javascript">
jQuery(document).ready(function () {
multiple = jQuery("#${row.asm_multipleSelect!}");

Modified: ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/Simple.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/Simple.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/Simple.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/Simple.ftl Sat Jul 28 10:51:52 2018
@@ -34,7 +34,7 @@ under the License.
<#if layoutSettings.javaScripts?has_content>
<#--layoutSettings.javaScripts is a list of java scripts. -->
<#list layoutSettings.javaScripts as javaScript>
- <script src="<@ofbizContentUrl>${javaScript}</@ofbizContentUrl>" type="text/javascript"></script>
+ <script src="<@ofbizContentUrl>${javaScript}</@ofbizContentUrl>" type="application/javascript"></script>
</#list>
</#if>
<#if layoutSettings.styleSheets?has_content>

Modified: ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/TimeDuration.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/TimeDuration.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/TimeDuration.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/TimeDuration.ftl Sat Jul 28 10:51:52 2018
@@ -16,7 +16,7 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
-<script type="text/javascript">
+<script type="application/javascript">
function setTimeDuration() {
var years = window.document.getElementsByName("years")[0].value;
var weeks = window.document.getElementsByName("weeks")[0].value;

Modified: ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/flotCharts/Bars.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/flotCharts/Bars.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/flotCharts/Bars.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/flotCharts/Bars.ftl Sat Jul 28 10:51:52 2018
@@ -16,12 +16,12 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
-<script type="text/javascript" src="<@ofbizContentUrl>/common/js/jquery/plugins/flot/excanvas.min.js</@ofbizContentUrl>"></script>
-<script type="text/javascript" src="<@ofbizContentUrl>/common/js/jquery/plugins/flot/jquery.flot.js</@ofbizContentUrl>"></script>
+<script type="application/javascript" src="<@ofbizContentUrl>/common/js/jquery/plugins/flot/excanvas.min.js</@ofbizContentUrl>"></script>
+<script type="application/javascript" src="<@ofbizContentUrl>/common/js/jquery/plugins/flot/jquery.flot.js</@ofbizContentUrl>"></script>

<div id="${chartId}Div" style="width:600px;height:300px;"></div>

-<script type="text/javascript">
+<script type="application/javascript">
jQuery(document).ready( function() {
/* Code Example: How should a chart Data Object look like */
/*var d1 = [[0, Math.ceil(Math.random()*40)]];

Modified: ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/flotCharts/Pie.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/flotCharts/Pie.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/flotCharts/Pie.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/flotCharts/Pie.ftl Sat Jul 28 10:51:52 2018
@@ -16,14 +16,14 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
-<script type="text/javascript" src="<@ofbizContentUrl>/common/js/jquery/plugins/flot/excanvas.min.js</@ofbizContentUrl>"></script>
-<script type="text/javascript" src="<@ofbizContentUrl>/common/js/jquery/plugins/flot/jquery.flot.js</@ofbizContentUrl>"></script>
-<script type="text/javascript" src="<@ofbizContentUrl>/common/js/jquery/plugins/flot/jquery.flot.pie.js</@ofbizContentUrl>"></script>
+<script type="application/javascript" src="<@ofbizContentUrl>/common/js/jquery/plugins/flot/excanvas.min.js</@ofbizContentUrl>"></script>
+<script type="application/javascript" src="<@ofbizContentUrl>/common/js/jquery/plugins/flot/jquery.flot.js</@ofbizContentUrl>"></script>
+<script type="application/javascript" src="<@ofbizContentUrl>/common/js/jquery/plugins/flot/jquery.flot.pie.js</@ofbizContentUrl>"></script>

<div id="${chartId}Div" style="width:800px;height:300px;"></div>

-<script type="text/javascript">
+<script type="application/javascript">
jQuery(document).ready( function(){
/* Code Example: How should a chart Data Object look like */
/*var d1 = [[0, Math.ceil(Math.random()*40)]];

Modified: ofbiz/ofbiz-framework/trunk/themes/common-theme/template/macro/HtmlFormMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common-theme/template/macro/HtmlFormMacroLibrary.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/common-theme/template/macro/HtmlFormMacroLibrary.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/themes/common-theme/template/macro/HtmlFormMacroLibrary.ftl Sat Jul 28 10:51:52 2018
@@ -62,7 +62,7 @@ under the License.
<#if ajaxEnabled?has_content && ajaxEnabled>
<#assign defaultMinLength = modelTheme.getAutocompleterDefaultMinLength()>
<#assign defaultDelay = modelTheme.getAutocompleterDefaultDelay()>
- <script type="text/javascript">ajaxAutoCompleter('${ajaxUrl!}', false, ${defaultMinLength!2}, ${defaultDelay!300});</script><#lt/>
+ <script type="application/javascript">ajaxAutoCompleter('${ajaxUrl!}', false, ${defaultMinLength!2}, ${defaultDelay!300});</script><#lt/>
</#if>
</#macro>

@@ -102,7 +102,7 @@ under the License.
<#if maxlength?has_content> maxlength="${maxlength}"</#if>
<#if id?has_content> id="${id}"</#if>/><#rt/>
<#if dateType!="time" >
- <script type="text/javascript">
+ <script type="application/javascript">
<#-- If language specific lib is found, use date / time converter else just copy the value fields -->
if (Date.CultureInfo != undefined) {
var initDate = <#if value?has_content>jQuery("#${id}").val()<#else>""</#if>;
@@ -243,7 +243,7 @@ under the License.
</#if>

<#if ajaxEnabled>
- <script type="text/javascript">
+ <script type="application/javascript">
ajaxAutoCompleteDropDown();
jQuery(function() {
jQuery("#${id}").combobox();
@@ -476,7 +476,7 @@ under the License.
<span class="view-calendar">
<input id="${name?html}_fld0_value" type="text" <@renderClass className alert /><#if name?has_content> name="${name?html}_fld0_value"</#if><#if localizedInputTitle?has_content> title="${localizedInputTitle}"</#if><#if value?has_content> value="${value}"</#if><#if size?has_content> size="${size}"</#if><#if maxlength?has_content> maxlength="${maxlength}"</#if>/><#if tabindex?has_content> tabindex="${tabindex}"</#if><#rt/>
<#if dateType != "time">
- <script type="text/javascript">
+ <script type="application/javascript">
<#if "date" == dateType>
jQuery("#${name?html}_fld0_value").datepicker({
<#else>
@@ -513,7 +513,7 @@ under the License.
<#rt/>
<input id="${name?html}_fld1_value" type="text" <@renderClass className alert /><#if name?has_content> name="${name}_fld1_value"</#if><#if localizedInputTitle??> title="${localizedInputTitle?html}"</#if><#if value2?has_content> value="${value2}"</#if><#if size?has_content> size="${size}"</#if><#if maxlength?has_content> maxlength="${maxlength}"</#if>/><#rt/>
<#if dateType != "time">
- <script type="text/javascript">
+ <script type="application/javascript">
<#if "date" == dateType>
jQuery("#${name?html}_fld1_value").datepicker({
<#else>

Modified: ofbiz/ofbiz-framework/trunk/themes/common-theme/template/macro/HtmlScreenMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common-theme/template/macro/HtmlScreenMacroLibrary.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/common-theme/template/macro/HtmlScreenMacroLibrary.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/themes/common-theme/template/macro/HtmlScreenMacroLibrary.ftl Sat Jul 28 10:51:52 2018
@@ -38,7 +38,7 @@ under the License.

<#macro renderContainerBegin id autoUpdateInterval style="" autoUpdateLink="">
<#if autoUpdateLink?has_content>
-<script type="text/javascript">ajaxUpdateAreaPeriodic('${id}', '${autoUpdateLink}', '', '${autoUpdateInterval}');</script>
+<script type="application/javascript">ajaxUpdateAreaPeriodic('${id}', '${autoUpdateLink}', '', '${autoUpdateInterval}');</script>
</#if>
<div<#if id?has_content> id="${id}"</#if><#if style?has_content> class="${style}"</#if>>
</#macro>
@@ -185,7 +185,7 @@ ${menuString}
<#macro renderPortalPageColumnBegin originalPortalPageId portalPageId columnSeqId confMode="false" width="auto" delColumnLabel="Delete column" delColumnHint="Delete this column" addPortletLabel="Add portlet" addPortletHint="Add a new portlet to this column" colWidthLabel="Col. width:" setColumnSizeHint="Set column size">
<#assign columnKey = portalPageId+columnSeqId>
<#assign columnKeyFields = '<input name="portalPageId" value="' + portalPageId + '" type="hidden"/><input name="columnSeqId" value="' + columnSeqId + '" type="hidden"/>'>
- <script type="text/javascript">
+ <script type="application/javascript">
if (typeof SORTABLE_COLUMN_LIST != "undefined") {
if (SORTABLE_COLUMN_LIST == null) {
SORTABLE_COLUMN_LIST = "#portalColumn_${columnSeqId}";

Modified: ofbiz/ofbiz-framework/trunk/themes/common-theme/webapp/common/js/util/OfbizUtil.js
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common-theme/webapp/common/js/util/OfbizUtil.js?rev=1836886&r1=1836885&r2=1836886&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/common-theme/webapp/common/js/util/OfbizUtil.js (original)
+++ ofbiz/ofbiz-framework/trunk/themes/common-theme/webapp/common/js/util/OfbizUtil.js Sat Jul 28 10:51:52 2018
@@ -659,7 +659,7 @@ function setLookDescription(textFieldId,
if (lookupWrapperEl.length) {
if (start == -1 && showDescription) {
var start = description.indexOf(' ');
- if (start != -1 && description.indexOf('<script type="text/javascript">') == -1) {
+ if (start != -1 && description.indexOf('<script type="application/javascript">') == -1) {
description = description.substring(start);
}
}

Modified: ofbiz/ofbiz-framework/trunk/themes/flatgrey/template/Footer.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/flatgrey/template/Footer.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/flatgrey/template/Footer.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/themes/flatgrey/template/Footer.ftl Sat Jul 28 10:51:52 2018
@@ -38,7 +38,7 @@ under the License.
</div>
<#if layoutSettings.VT_FTR_JAVASCRIPT?has_content>
<#list layoutSettings.VT_FTR_JAVASCRIPT as javaScript>
- <script type="text/javascript" src="<@ofbizContentUrl>${StringUtil.wrapString(javaScript)}</@ofbizContentUrl>" type="text/javascript"></script>
+ <script type="application/javascript" src="<@ofbizContentUrl>${StringUtil.wrapString(javaScript)}</@ofbizContentUrl>" type="application/javascript"></script>
</#list>
</#if>
</body>

Modified: ofbiz/ofbiz-framework/trunk/themes/flatgrey/template/Header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/flatgrey/template/Header.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/flatgrey/template/Header.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/themes/flatgrey/template/Header.ftl Sat Jul 28 10:51:52 2018
@@ -35,7 +35,7 @@ under the License.
</#if>
<#if layoutSettings.VT_HDR_JAVASCRIPT?has_content>
<#list layoutSettings.VT_HDR_JAVASCRIPT as javaScript>
- <script src="<@ofbizContentUrl>${StringUtil.wrapString(javaScript)}</@ofbizContentUrl>" type="text/javascript"></script>
+ <script src="<@ofbizContentUrl>${StringUtil.wrapString(javaScript)}</@ofbizContentUrl>" type="application/javascript"></script>
</#list>
</#if>
<#if layoutSettings.javaScripts?has_content>
@@ -45,7 +45,7 @@ under the License.
<#list layoutSettings.javaScripts as javaScript>
<#if javaScriptsSet.contains(javaScript)>
<#assign nothing = javaScriptsSet.remove(javaScript)/>
- <script src="<@ofbizContentUrl>${StringUtil.wrapString(javaScript)}</@ofbizContentUrl>" type="text/javascript"></script>
+ <script src="<@ofbizContentUrl>${StringUtil.wrapString(javaScript)}</@ofbizContentUrl>" type="application/javascript"></script>
</#if>
</#list>
</#if>
@@ -79,7 +79,7 @@ under the License.
</#if>
<#if lastParameters??><#assign parametersURL = "&" + lastParameters></#if>
<#if layoutSettings.WEB_ANALYTICS?has_content>
- <script type="text/javascript">
+ <script type="application/javascript">
<#list layoutSettings.WEB_ANALYTICS as webAnalyticsConfig>
${StringUtil.wrapString(webAnalyticsConfig.webAnalyticsCode!)}
</#list>

Modified: ofbiz/ofbiz-framework/trunk/themes/rainbowstone/template/ChangePassword.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/rainbowstone/template/ChangePassword.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/rainbowstone/template/ChangePassword.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/themes/rainbowstone/template/ChangePassword.ftl Sat Jul 28 10:51:52 2018
@@ -80,6 +80,6 @@ under the License.
</div>
</center>

-<script type="text/javascript">
+<script type="application/javascript">
document.loginform.PASSWORD.focus();
</script>

Modified: ofbiz/ofbiz-framework/trunk/themes/rainbowstone/template/Login.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/rainbowstone/template/Login.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/rainbowstone/template/Login.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/themes/rainbowstone/template/Login.ftl Sat Jul 28 10:51:52 2018
@@ -67,7 +67,7 @@ under the License.
</div>
</center>

-<script type="text/javascript">
+<script type="application/javascript">
document.loginform.JavaScriptEnabled.value = "Y";
<#if focusName>
document.loginform.USERNAME.focus();

Modified: ofbiz/ofbiz-framework/trunk/themes/rainbowstone/template/includes/Footer.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/rainbowstone/template/includes/Footer.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/rainbowstone/template/includes/Footer.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/themes/rainbowstone/template/includes/Footer.ftl Sat Jul 28 10:51:52 2018
@@ -30,7 +30,7 @@ under the License.
</div>
<#if layoutSettings.VT_FTR_JAVASCRIPT?has_content>
<#list layoutSettings.VT_FTR_JAVASCRIPT as javaScript>
- <script type="text/javascript" src="<@ofbizContentUrl>${StringUtil.wrapString(javaScript)}</@ofbizContentUrl>"></script>
+ <script type="application/javascript" src="<@ofbizContentUrl>${StringUtil.wrapString(javaScript)}</@ofbizContentUrl>"></script>
</#list>
</#if>
</body>

Modified: ofbiz/ofbiz-framework/trunk/themes/rainbowstone/template/includes/Header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/rainbowstone/template/includes/Header.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/rainbowstone/template/includes/Header.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/themes/rainbowstone/template/includes/Header.ftl Sat Jul 28 10:51:52 2018
@@ -41,7 +41,7 @@ under the License.
<link rel="stylesheet/less" href="<@ofbizContentUrl>/rainbowstone/${visualTheme.visualThemeId?replace("_","-")?lower_case}.less</@ofbizContentUrl>"/>
<#if layoutSettings.VT_HDR_JAVASCRIPT?has_content>
<#list layoutSettings.VT_HDR_JAVASCRIPT as javaScript>
- <script src="<@ofbizContentUrl>${StringUtil.wrapString(javaScript)}</@ofbizContentUrl>" type="text/javascript"></script>
+ <script src="<@ofbizContentUrl>${StringUtil.wrapString(javaScript)}</@ofbizContentUrl>" type="application/javascript"></script>
</#list>
</#if>
<#if layoutSettings.javaScripts?has_content>
@@ -51,7 +51,7 @@ under the License.
<#list layoutSettings.javaScripts as javaScript>
<#if javaScriptsSet.contains(javaScript)>
<#assign nothing = javaScriptsSet.remove(javaScript)/>
- <script src="<@ofbizContentUrl>${StringUtil.wrapString(javaScript)}</@ofbizContentUrl>" type="text/javascript"></script>
+ <script src="<@ofbizContentUrl>${StringUtil.wrapString(javaScript)}</@ofbizContentUrl>" type="application/javascript"></script>
</#if>
</#list>
</#if>
@@ -85,7 +85,7 @@ under the License.
</#if>
<#if lastParameters??><#assign parametersURL = "&" + lastParameters></#if>
<#if layoutSettings.WEB_ANALYTICS?has_content>
- <script type="text/javascript">
+ <script type="application/javascript">
<#list layoutSettings.WEB_ANALYTICS as webAnalyticsConfig>
${StringUtil.wrapString(webAnalyticsConfig.webAnalyticsCode!)}
</#list>

Modified: ofbiz/ofbiz-framework/trunk/themes/rainbowstone/template/includes/HomeMenu.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/rainbowstone/template/includes/HomeMenu.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/rainbowstone/template/includes/HomeMenu.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/themes/rainbowstone/template/includes/HomeMenu.ftl Sat Jul 28 10:51:52 2018
@@ -29,7 +29,7 @@ under the License.
<#assign avatarDetail = EntityQuery.use(delegator).from("PartyContentDetail").where("partyId", person.partyId!, "contentId", avatar.contentId!).queryFirst()!>
</#if>
<body onpageshow="showHideFavorites()">
-<script type="text/javascript">
+<script type="application/javascript">
function showHideFavorites() {
var showHideStatus = document.getElementById("showHideBtn");
var normalItems = document.getElementsByClassName("normalItem");

Modified: ofbiz/ofbiz-framework/trunk/themes/tomahawk/template/AppBarClose.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/tomahawk/template/AppBarClose.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/tomahawk/template/AppBarClose.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/themes/tomahawk/template/AppBarClose.ftl Sat Jul 28 10:51:52 2018
@@ -106,7 +106,7 @@ under the License.
</div>

<#if userLogin??>
-<script type="text/javascript">
+<script type="application/javascript">
var mainmenu = new DropDownMenu(jQuery('#main-navigation'));
var appmenu = new DropDownMenu(jQuery('#app-navigation'));
</script>

Modified: ofbiz/ofbiz-framework/trunk/themes/tomahawk/template/Footer.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/tomahawk/template/Footer.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/tomahawk/template/Footer.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/themes/tomahawk/template/Footer.ftl Sat Jul 28 10:51:52 2018
@@ -36,7 +36,7 @@ under the License.

<#if layoutSettings.VT_FTR_JAVASCRIPT?has_content>
<#list layoutSettings.VT_FTR_JAVASCRIPT as javaScript>
- <script src="<@ofbizContentUrl>${StringUtil.wrapString(javaScript)}</@ofbizContentUrl>" type="text/javascript"></script>
+ <script src="<@ofbizContentUrl>${StringUtil.wrapString(javaScript)}</@ofbizContentUrl>" type="application/javascript"></script>
</#list>
</#if>

Modified: ofbiz/ofbiz-framework/trunk/themes/tomahawk/template/Header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/tomahawk/template/Header.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/tomahawk/template/Header.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/themes/tomahawk/template/Header.ftl Sat Jul 28 10:51:52 2018
@@ -40,7 +40,7 @@ under the License.

<#if layoutSettings.VT_HDR_JAVASCRIPT?has_content>
<#list layoutSettings.VT_HDR_JAVASCRIPT as javaScript>
- <script src="<@ofbizContentUrl>${StringUtil.wrapString(javaScript)}</@ofbizContentUrl>" type="text/javascript"></script>
+ <script src="<@ofbizContentUrl>${StringUtil.wrapString(javaScript)}</@ofbizContentUrl>" type="application/javascript"></script>
</#list>
</#if>
<#if layoutSettings.javaScripts?has_content>
@@ -50,7 +50,7 @@ under the License.
<#list layoutSettings.javaScripts as javaScript>
<#if javaScriptsSet.contains(javaScript)>
<#assign nothing = javaScriptsSet.remove(javaScript)/>
- <script src="<@ofbizContentUrl>${StringUtil.wrapString(javaScript)}</@ofbizContentUrl>" type="text/javascript"></script>
+ <script src="<@ofbizContentUrl>${StringUtil.wrapString(javaScript)}</@ofbizContentUrl>" type="application/javascript"></script>
</#if>
</#list>
</#if>
@@ -83,7 +83,7 @@ under the License.
</#list>
</#if>
<#if layoutSettings.WEB_ANALYTICS?has_content>
- <script type="text/javascript">
+ <script type="application/javascript">
<#list layoutSettings.WEB_ANALYTICS as webAnalyticsConfig>
${StringUtil.wrapString(webAnalyticsConfig.webAnalyticsCode!)}
</#list>