Merge pull request phpbb#5256 from senky/ticket/13043

[ticket/13043] Improve HTML5 * github.com:/phpbb/phpbb: [ticket/13043] Improve HTML5
fededj · Jul 8, 2018 · e7a1e16 · e7a1e16
2 parents e7ad97d + 4c3cb4b
commit e7a1e16
Show file tree

Hide file tree

Showing 11 changed files with 16 additions and 38 deletions.
diff --git a/phpBB/styles/prosilver/template/mcp_ban.html b/phpBB/styles/prosilver/template/mcp_ban.html
@@ -1,8 +1,6 @@
 <!-- INCLUDE mcp_header.html -->
 
-<script type="text/javascript">
-// <![CDATA[
-
+<script>
 	var ban_length = new Array();
 		ban_length[-1] = '';
 	var ban_reason = new Array();
@@ -34,8 +32,6 @@
 			document.getElementById('unbangivereason').innerHTML = '';
 		}
 	}
-
-// ]]>
 </script>
 
 <form id="mcp_ban" method="post" action="{U_ACTION}">

diff --git a/phpBB/styles/prosilver/template/overall_footer.html b/phpBB/styles/prosilver/template/overall_footer.html
@@ -63,13 +63,13 @@ <h3 class="alert_title">&nbsp;</h3><p class="alert_text"></p>
 	<!-- IF not S_IS_BOT -->{RUN_CRON_TASK}<!-- ENDIF -->
 </div>
 
-<script type="text/javascript" src="{T_JQUERY_LINK}"></script>
-<!-- IF S_ALLOW_CDN --><script type="text/javascript">window.jQuery || document.write('\x3Cscript src="{T_ASSETS_PATH}/javascript/jquery.min.js?assets_version={T_ASSETS_VERSION}">\x3C/script>');</script><!-- ENDIF -->
-<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
+<script src="{T_JQUERY_LINK}"></script>
+<!-- IF S_ALLOW_CDN --><script>window.jQuery || document.write('\x3Cscript src="{T_ASSETS_PATH}/javascript/jquery.min.js?assets_version={T_ASSETS_VERSION}">\x3C/script>');</script><!-- ENDIF -->
+<script src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
 <!-- INCLUDEJS forum_fn.js -->
 <!-- INCLUDEJS ajax.js -->
 <!-- IF S_ALLOW_CDN -->
-	<script type="text/javascript">
+	<script>
 		(function($){
 			var $fa_cdn = $('head').find('link[rel="stylesheet"]').first(),
 				$span = $('<span class="fa" style="display:none"></span>').appendTo('body');

diff --git a/phpBB/styles/prosilver/template/plupload.html b/phpBB/styles/prosilver/template/plupload.html
@@ -1,5 +1,4 @@
-<script type="text/javascript">
-//<![CDATA[
+<script>
 phpbb.plupload = {
 	i18n: {
 		'b': '{LA_BYTES_SHORT}',
@@ -63,7 +62,6 @@
 	maxFiles: {MAX_ATTACHMENTS},
 	data: {S_ATTACH_DATA},
 }
-//]]>
 </script>
 <!-- INCLUDEJS {T_ASSETS_PATH}/plupload/plupload.full.min.js -->
 <!-- INCLUDEJS {T_ASSETS_PATH}/javascript/plupload.js -->
diff --git a/phpBB/styles/prosilver/template/posting_buttons.html b/phpBB/styles/prosilver/template/posting_buttons.html
@@ -1,6 +1,5 @@
 
-<script type="text/javascript">
-// <![CDATA[
+<script>
 	var form_name = 'postform';
 	var text_name = <!-- IF $SIG_EDIT -->'signature'<!-- ELSE -->'message'<!-- ENDIF -->;
 	var load_draft = false;
@@ -46,8 +45,6 @@
 			document.getElementById('bbpalette').value = '{LA_FONT_COLOR}';
 		}
 	}
-
-// ]]>
 </script>
 <!-- INCLUDEJS {T_ASSETS_PATH}/javascript/editor.js -->
 

diff --git a/phpBB/styles/prosilver/template/posting_smilies.html b/phpBB/styles/prosilver/template/posting_smilies.html
@@ -1,10 +1,8 @@
 <!-- INCLUDE simple_header.html -->
 
-<script type="text/javascript">
-// <![CDATA[
+<script>
 	var form_name = opener.form_name;
 	var text_name = opener.text_name;
-// ]]>
 </script>
 <!-- INCLUDEJS {T_ASSETS_PATH}/javascript/editor.js -->
 

diff --git a/phpBB/styles/prosilver/template/posting_topic_review.html b/phpBB/styles/prosilver/template/posting_topic_review.html
@@ -5,10 +5,8 @@ <h3 id="review" class="review">
 </h3>
 
 <div id="topicreview" class="topicreview">
-<script type="text/javascript">
-// <![CDATA[
+<script>
 	bbcodeEnabled = {S_BBCODE_ALLOWED};
-// ]]>
 </script>
 	<!-- BEGIN topic_review_row -->
 

diff --git a/phpBB/styles/prosilver/template/simple_footer.html b/phpBB/styles/prosilver/template/simple_footer.html
@@ -24,9 +24,9 @@ <h3 class="alert_title"></h3><p class="alert_text"></p>
 	</div>
 </div>
 
-<script type="text/javascript" src="{T_JQUERY_LINK}"></script>
-<!-- IF S_ALLOW_CDN --><script type="text/javascript">window.jQuery || document.write('\x3Cscript src="{T_ASSETS_PATH}/javascript/jquery.min.js?assets_version={T_ASSETS_VERSION}">\x3C/script>');</script><!-- ENDIF -->
-<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
+<script src="{T_JQUERY_LINK}"></script>
+<!-- IF S_ALLOW_CDN --><script>window.jQuery || document.write('\x3Cscript src="{T_ASSETS_PATH}/javascript/jquery.min.js?assets_version={T_ASSETS_VERSION}">\x3C/script>');</script><!-- ENDIF -->
+<script src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
 <!-- INCLUDEJS forum_fn.js -->
 <!-- INCLUDEJS ajax.js -->
 

diff --git a/phpBB/styles/prosilver/template/ucp_agreement.html b/phpBB/styles/prosilver/template/ucp_agreement.html
@@ -3,8 +3,7 @@
 <!-- IF S_SHOW_COPPA or S_REGISTRATION -->
 
 <!-- IF S_LANG_OPTIONS -->
-<script type="text/javascript">
-// <![CDATA[
+<script>
 	/**
 	* Change language
 	*/
@@ -14,8 +13,6 @@
 		document.forms['register'].change_lang.value = lang_iso;
 		document.forms['register'].submit();
 	}
-
-// ]]>
 </script>
 
 	<form method="post" action="{S_UCP_ACTION}" id="register">

diff --git a/phpBB/styles/prosilver/template/ucp_pm_history.html b/phpBB/styles/prosilver/template/ucp_pm_history.html
@@ -6,10 +6,8 @@ <h3 id="review" class="review">
 
 <!-- EVENT ucp_pm_history_review_before -->
 <div id="topicreview" class="topicreview">
-	<script type="text/javascript">
-	// <![CDATA[
+	<script>
 		bbcodeEnabled = {S_BBCODE_ALLOWED};
-	// ]]>
 	</script>
 	<!-- BEGIN history_row -->
 	<div class="post <!-- IF history_row.S_ROW_COUNT is even -->bg1<!-- ELSE -->bg2<!-- ENDIF -->">

diff --git a/phpBB/styles/prosilver/template/ucp_prefs_personal.html b/phpBB/styles/prosilver/template/ucp_prefs_personal.html
@@ -85,8 +85,7 @@ <h2>{L_TITLE}</h2>
 </fieldset>
 </form>
 
-<script type="text/javascript">
-// <![CDATA[
+<script>
 	var date_format = '{A_DATE_FORMAT}';
 	var default_dateformat = '{A_DEFAULT_DATEFORMAT}';
 
@@ -118,7 +117,6 @@ <h2>{L_TITLE}</h2>
 	}
 
 	window.onload = customDates;
-// ]]>
 </script>
 
 <!-- INCLUDE ucp_footer.html -->
diff --git a/phpBB/styles/prosilver/template/ucp_register.html b/phpBB/styles/prosilver/template/ucp_register.html
@@ -1,7 +1,6 @@
 <!-- INCLUDE overall_header.html -->
 
-<script type="text/javascript">
-// <![CDATA[
+<script>
 	/**
 	* Change language
 	*/
@@ -11,7 +10,6 @@
 		document.forms['register'].change_lang.value = lang_iso;
 		document.forms['register'].submit.click();
 	}
-// ]]>
 </script>
 
 <form id="register" method="post" action="{S_UCP_ACTION}"{S_FORM_ENCTYPE}>