From ed03456999121e6f5ea0cb0c02cb37a3711c6271 Mon Sep 17 00:00:00 2001
From: Chocobo1 <Chocobo1@users.noreply.github.com>
Date: Wed, 21 Mar 2018 14:34:37 +0800
Subject: [PATCH] Update WebUI to be more compliant with HTML5 standard

Use modern and shorter "charset" attribute.
Remove "type", "charset" attributes in script/style tags, these are redundant in HTML5.
---
 src/webui/www/private/addtrackers.html        | 10 ++++----
 src/webui/www/private/confirmdeletion.html    |  8 +++----
 src/webui/www/private/download.html           | 10 ++++----
 src/webui/www/private/downloadlimit.html      | 14 +++++------
 src/webui/www/private/filters.html            |  2 +-
 src/webui/www/private/index.html              | 24 +++++++++----------
 src/webui/www/private/newcategory.html        |  8 +++----
 src/webui/www/private/preferences.html        | 14 +++++------
 .../www/private/preferences_content.html      |  2 +-
 src/webui/www/private/properties_content.html |  2 +-
 src/webui/www/private/rename.html             | 10 ++++----
 src/webui/www/private/setlocation.html        |  8 +++----
 src/webui/www/private/transferlist.html       |  2 +-
 src/webui/www/private/upload.html             | 10 ++++----
 src/webui/www/private/uploadlimit.html        | 14 +++++------
 src/webui/www/public/login.html               |  6 ++---
 16 files changed, 72 insertions(+), 72 deletions(-)
diff --git a/src/webui/www/private/addtrackers.html b/src/webui/www/private/addtrackers.html
index a12141ff2..ec31a5286 100644
--- a/src/webui/www/private/addtrackers.html
+++ b/src/webui/www/private/addtrackers.html
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <html lang="${LANG}">
 <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-        <title>QBT_TR(Trackers addition dialog)QBT_TR[CONTEXT=TrackersAdditionDlg]</title>
+    <meta charset="UTF-8" />
+    <title>QBT_TR(Trackers addition dialog)QBT_TR[CONTEXT=TrackersAdditionDlg]</title>
     <link rel="stylesheet" href="css/style.css" type="text/css" />
-    <script type="text/javascript" src="scripts/mootools-1.2-core-yc.js" charset="utf-8"></script>
-    <script type="text/javascript" src="scripts/mootools-1.2-more.js" charset="utf-8"></script>
-    <script type="text/javascript">
+    <script src="scripts/mootools-1.2-core-yc.js"></script>
+    <script src="scripts/mootools-1.2-more.js"></script>
+    <script>
         window.addEvent('domready', function(){
             $('trackersUrls').focus();
             $('addTrackersButton').addEvent('click', function(e){
diff --git a/src/webui/www/private/confirmdeletion.html b/src/webui/www/private/confirmdeletion.html
index 2f5e9faea..8a16b7954 100644
--- a/src/webui/www/private/confirmdeletion.html
+++ b/src/webui/www/private/confirmdeletion.html
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <html lang="${LANG}">
 <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <meta charset="UTF-8" />
     <title>QBT_TR(Deletion confirmation - qBittorrent)QBT_TR[CONTEXT=confirmDeletionDlg]</title>
     <link rel="stylesheet" href="css/style.css" type="text/css" />
-    <script type="text/javascript" src="scripts/mootools-1.2-core-yc.js" charset="utf-8"></script>
-    <script type="text/javascript" src="scripts/mootools-1.2-more.js" charset="utf-8"></script>
-    <script type="text/javascript">
+    <script src="scripts/mootools-1.2-core-yc.js"></script>
+    <script src="scripts/mootools-1.2-more.js"></script>
+    <script>
         var hashes = new URI().getData('hashes').split('|');
         window.addEvent('domready', function(){
             $('cancelBtn').focus();
diff --git a/src/webui/www/private/download.html b/src/webui/www/private/download.html
index c42cb1f46..c91acee8f 100644
--- a/src/webui/www/private/download.html
+++ b/src/webui/www/private/download.html
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <html lang="${LANG}">
 <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <meta charset="UTF-8" />
     <title>QBT_TR(Add Torrent Links)QBT_TR[CONTEXT=downloadFromURL]</title>
     <link rel="stylesheet" href="css/style.css" type="text/css" />
-        <link rel="stylesheet" href="css/Window.css" type="text/css" />
-    <script type="text/javascript" src="scripts/mootools-1.2-core-yc.js" charset="utf-8"></script>
-    <script type="text/javascript" src="scripts/download.js" charset="utf-8"></script>
+    <link rel="stylesheet" href="css/Window.css" type="text/css" />
+    <script src="scripts/mootools-1.2-core-yc.js"></script>
+    <script src="scripts/download.js"></script>
 </head>
 <body>
 <iframe id="download_frame" name="download_frame" class="invisible" src="javascript:false;"></iframe>
@@ -68,7 +68,7 @@
 </fieldset>
 </div>
 </form>
-<script type="text/javascript">
+<script>
 
 var submitted = false;
 
diff --git a/src/webui/www/private/downloadlimit.html b/src/webui/www/private/downloadlimit.html
index 0f8baa3e4..39ed632ff 100644
--- a/src/webui/www/private/downloadlimit.html
+++ b/src/webui/www/private/downloadlimit.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <html lang="${LANG}">
 <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <meta charset="UTF-8" />
     <title>QBT_TR(Torrent Download Speed Limiting)QBT_TR[CONTEXT=TransferListWidget]</title>
     <link rel="stylesheet" href="css/style.css" type="text/css" />
-    <script type="text/javascript" src="scripts/mootools-1.2-core-yc.js" charset="utf-8"></script>
-    <script type="text/javascript" src="scripts/mootools-1.2-more.js" charset="utf-8"></script>
-    <script type="text/javascript" src="scripts/mocha-yc.js" charset="utf-8"></script>
-    <script type="text/javascript" src="scripts/parametrics.js" charset="utf-8"></script>
+    <script src="scripts/mootools-1.2-core-yc.js"></script>
+    <script src="scripts/mootools-1.2-more.js"></script>
+    <script src="scripts/mocha-yc.js"></script>
+    <script src="scripts/parametrics.js"></script>
 </head>
 <body>
 <div style="width: 100%; text-align: center; margin: 0 auto; overflow: hidden">
@@ -19,7 +19,7 @@
     </div>
     <div class="clear"></div>
 </div>
-<script type="text/javascript">
+<script>
     var hashes = new URI().getData('hashes').split('|');
     setDlLimit = function() {
         var limit = $("dllimitUpdatevalue").value.toInt() * 1024;
@@ -54,7 +54,7 @@
 <input type="button" value="QBT_TR(Apply)QBT_TR[CONTEXT=HttpServer]" onclick="setDlLimit()"/>
 </div>
 
-<script type="text/javascript">
+<script>
     MochaUI.addDlLimitSlider(hashes);
 </script>
 
diff --git a/src/webui/www/private/filters.html b/src/webui/www/private/filters.html
index 89c585794..3a9729277 100644
--- a/src/webui/www/private/filters.html
+++ b/src/webui/www/private/filters.html
@@ -15,7 +15,7 @@
 <ul id="filterCategoryList" class="filterList">
 </ul>
 
-<script type="text/javascript">
+<script>
     var categoriesFilterContextMenu = new CategoriesFilterContextMenu({
         targets : '.categoriesFilterContextMenuTarget',
         menu : 'categoriesFilterMenu',
diff --git a/src/webui/www/private/index.html b/src/webui/www/private/index.html
index 76b66e527..6e3e93a21 100644
--- a/src/webui/www/private/index.html
+++ b/src/webui/www/private/index.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="${LANG}">
 <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <meta charset="UTF-8" />
     <meta http-equiv="X-UA-Compatible" content="IE=10" />
     <title>qBittorrent ${VERSION} QBT_TR(Web UI)QBT_TR[CONTEXT=OptionsDialog]</title>
     <link rel="icon" type="image/png" href="images/skin/qbittorrent16.png" />
@@ -12,19 +12,19 @@
     <link rel="stylesheet" type="text/css" href="css/Layout.css" />
     <link rel="stylesheet" type="text/css" href="css/Window.css" />
     <link rel="stylesheet" type="text/css" href="css/Tabs.css" />
-    <script type="text/javascript" src="scripts/mootools-1.2-core-yc.js" charset="utf-8"></script>
-    <script type="text/javascript" src="scripts/mootools-1.2-more.js" charset="utf-8"></script>
+    <script src="scripts/mootools-1.2-core-yc.js"></script>
+    <script src="scripts/mootools-1.2-more.js"></script>
     <!--[if IE]>
-        <script type="text/javascript" src="scripts/excanvas-compressed.js"></script>
+        <script src="scripts/excanvas-compressed.js"></script>
     <![endif]-->
-    <script type="text/javascript" src="scripts/mocha-yc.js"></script>
-    <script type="text/javascript" src="scripts/mocha-init.js"></script>
-    <script type="text/javascript" src="scripts/clipboard.min.js"></script>
-    <script type="text/javascript" src="scripts/misc.js"></script>
-    <script type="text/javascript" src="scripts/progressbar.js"></script>
-    <script type="text/javascript" src="scripts/dynamicTable.js" charset="utf-8"></script>
-    <script type="text/javascript" src="scripts/client.js" charset="utf-8"></script>
-    <script type="text/javascript" src="scripts/contextmenu.js" charset="utf-8"></script>
+    <script src="scripts/mocha-yc.js"></script>
+    <script src="scripts/mocha-init.js"></script>
+    <script src="scripts/clipboard.min.js"></script>
+    <script src="scripts/misc.js"></script>
+    <script src="scripts/progressbar.js"></script>
+    <script src="scripts/dynamicTable.js"></script>
+    <script src="scripts/client.js"></script>
+    <script src="scripts/contextmenu.js"></script>
 </head>
 <body>
     <div id="desktop">
diff --git a/src/webui/www/private/newcategory.html b/src/webui/www/private/newcategory.html
index 242821149..839fccbfb 100644
--- a/src/webui/www/private/newcategory.html
+++ b/src/webui/www/private/newcategory.html
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <html lang="${LANG}">
 <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <meta charset="UTF-8" />
     <title>QBT_TR(New Category)QBT_TR[CONTEXT=TransferListWidget]</title>
     <link rel="stylesheet" href="css/style.css" type="text/css" />
-    <script type="text/javascript" src="scripts/mootools-1.2-core-yc.js" charset="utf-8"></script>
-    <script type="text/javascript" src="scripts/mootools-1.2-more.js" charset="utf-8"></script>
-    <script type="text/javascript">
+    <script src="scripts/mootools-1.2-core-yc.js"></script>
+    <script src="scripts/mootools-1.2-more.js"></script>
+    <script>
         var newCategoryKeyboardEvents = new Keyboard({
             defaultEventType: 'keydown',
             events: {
diff --git a/src/webui/www/private/preferences.html b/src/webui/www/private/preferences.html
index 27dade07c..b077e00fb 100644
--- a/src/webui/www/private/preferences.html
+++ b/src/webui/www/private/preferences.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <html lang="${LANG}">
 <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-        <title>QBT_TR(Download from URLs)QBT_TR[CONTEXT=downloadFromURL]</title>
+    <meta charset="UTF-8" />
+    <title>QBT_TR(Download from URLs)QBT_TR[CONTEXT=downloadFromURL]</title>
     <link rel="stylesheet" href="css/style.css" type="text/css" />
-        <link rel="stylesheet" href="css/Tabs.css" type="text/css" />
-    <script type="text/javascript" src="scripts/mootools-1.2-core-yc.js" charset="utf-8"></script>
-        <script type="text/javascript" src="scripts/mootools-1.2-more.js" charset="utf-8"></script>
-        <script type="text/javascript" src="scripts/mocha-yc.js" charset="utf-8"></script>
+    <link rel="stylesheet" href="css/Tabs.css" type="text/css" />
+    <script src="scripts/mootools-1.2-core-yc.js"></script>
+    <script src="scripts/mootools-1.2-more.js"></script>
+    <script src="scripts/mocha-yc.js"></script>
 </head>
 <body style="padding: 5px;">
 <!-- preferences -->
@@ -22,7 +22,7 @@
     <div class="clear"></div>
 </div>
 
-<script type="text/javascript">
+<script>
 // Tabs
 MochaUI.initializeTabs('preferencesTabs');
 
diff --git a/src/webui/www/private/preferences_content.html b/src/webui/www/private/preferences_content.html
index 3c28f8320..872c8e1be 100644
--- a/src/webui/www/private/preferences_content.html
+++ b/src/webui/www/private/preferences_content.html
@@ -479,7 +479,7 @@
 <br/>
 <div style="text-align: center;"><input type="button" value="QBT_TR(Save)QBT_TR[CONTEXT=HttpServer]" onclick="applyPreferences();"/></div>
 
-<script type="text/javascript">
+<script>
 // Downloads tab
 var WatchedFoldersTable = new HtmlTable($("watched_folders_tab"));
 
diff --git a/src/webui/www/private/properties_content.html b/src/webui/www/private/properties_content.html
index b0e978b93..9362d3f91 100644
--- a/src/webui/www/private/properties_content.html
+++ b/src/webui/www/private/properties_content.html
@@ -115,7 +115,7 @@
     </div>
 </div>
 
-<script type="text/javascript">
+<script>
     torrentPeersTable.setup('torrentPeersTableDiv', 'torrentPeersTableFixedHeaderDiv', null);
     $(getLocalStorageItem('selected_tab', 'PropGeneralLink')).click();
 </script>
diff --git a/src/webui/www/private/rename.html b/src/webui/www/private/rename.html
index b6f3ee3e9..88f59d7ba 100644
--- a/src/webui/www/private/rename.html
+++ b/src/webui/www/private/rename.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <html lang="${LANG}">
 <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <meta charset="UTF-8" />
     <title>QBT_TR(Rename)QBT_TR[CONTEXT=TransferListWidget]</title>
     <link rel="stylesheet" href="css/style.css" type="text/css" />
-    <script type="text/javascript" src="scripts/mootools-1.2-core-yc.js" charset="utf-8"></script>
-    <script type="text/javascript" src="scripts/mootools-1.2-more.js" charset="utf-8"></script>
-    <script type="text/javascript" src="scripts/misc.js"></script>
-    <script type="text/javascript">
+    <script src="scripts/mootools-1.2-core-yc.js"></script>
+    <script src="scripts/mootools-1.2-more.js"></script>
+    <script src="scripts/misc.js"></script>
+    <script>
         var renameKeyboardEvents = new Keyboard({
             defaultEventType: 'keydown',
             events: {
diff --git a/src/webui/www/private/setlocation.html b/src/webui/www/private/setlocation.html
index ef769d80a..c169fbbda 100644
--- a/src/webui/www/private/setlocation.html
+++ b/src/webui/www/private/setlocation.html
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <html lang="${LANG}">
 <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <meta charset="UTF-8" />
     <title>QBT_TR(Set location)QBT_TR[CONTEXT=HttpServer]</title>
     <link rel="stylesheet" href="css/style.css" type="text/css" />
-    <script type="text/javascript" src="scripts/mootools-1.2-core-yc.js" charset="utf-8"></script>
-    <script type="text/javascript" src="scripts/mootools-1.2-more.js" charset="utf-8"></script>
-    <script type="text/javascript">
+    <script src="scripts/mootools-1.2-core-yc.js"></script>
+    <script src="scripts/mootools-1.2-more.js"></script>
+    <script>
         var setLocationKeyboardEvents = new Keyboard({
             defaultEventType: 'keydown',
             events: {
diff --git a/src/webui/www/private/transferlist.html b/src/webui/www/private/transferlist.html
index 59e98a0b1..6a9353d46 100644
--- a/src/webui/www/private/transferlist.html
+++ b/src/webui/www/private/transferlist.html
@@ -15,7 +15,7 @@
     </table>
 </div>
 
-<script type="text/javascript">
+<script>
 
     //create a context menu
     var torrentsTableContextMenu = new TorrentsTableContextMenu({
diff --git a/src/webui/www/private/upload.html b/src/webui/www/private/upload.html
index 2c1519916..db5d798fa 100644
--- a/src/webui/www/private/upload.html
+++ b/src/webui/www/private/upload.html
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <html lang="${LANG}">
 <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-        <title>QBT_TR(Upload local torrent)QBT_TR[CONTEXT=HttpServer]</title>
+    <meta charset="UTF-8" />
+    <title>QBT_TR(Upload local torrent)QBT_TR[CONTEXT=HttpServer]</title>
     <link rel="stylesheet" href="css/style.css" type="text/css" />
     <link rel="stylesheet" href="css/Window.css" type="text/css" />
-    <script type="text/javascript" src="scripts/mootools-1.2-core-yc.js" charset="utf-8"></script>
-    <script type="text/javascript" src="scripts/download.js" charset="utf-8"></script>
+    <script src="scripts/mootools-1.2-core-yc.js"></script>
+    <script src="scripts/download.js"></script>
 </head>
 <body>
 <iframe id="upload_frame" name="upload_frame" class="invisible" src="javascript:false;"></iframe>
@@ -61,7 +61,7 @@
 </div>
 </fieldset>
 </form>
-<script type="text/javascript">
+<script>
 
 var submitted = false;
 
diff --git a/src/webui/www/private/uploadlimit.html b/src/webui/www/private/uploadlimit.html
index c00406c41..c8684aac6 100644
--- a/src/webui/www/private/uploadlimit.html
+++ b/src/webui/www/private/uploadlimit.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <html lang="${LANG}">
 <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <meta charset="UTF-8" />
     <title>QBT_TR(Torrent Upload Speed Limiting)QBT_TR[CONTEXT=TransferListWidget]</title>
     <link rel="stylesheet" href="css/style.css" type="text/css" />
-    <script type="text/javascript" src="scripts/mootools-1.2-core-yc.js" charset="utf-8"></script>
-    <script type="text/javascript" src="scripts/mootools-1.2-more.js" charset="utf-8"></script>
-    <script type="text/javascript" src="scripts/mocha-yc.js" charset="utf-8"></script>
-    <script type="text/javascript" src="scripts/parametrics.js" charset="utf-8"></script>
+    <script src="scripts/mootools-1.2-core-yc.js"></script>
+    <script src="scripts/mootools-1.2-more.js"></script>
+    <script src="scripts/mocha-yc.js"></script>
+    <script src="scripts/parametrics.js"></script>
 </head>
 <body>
 <div style="width: 100%; text-align: center; margin: 0 auto; overflow: hidden">
@@ -19,7 +19,7 @@
     </div>
     <div class="clear"></div>
 </div>
-<script type="text/javascript">
+<script>
     var hashes = new URI().getData('hashes').split('|');
     setUpLimit = function() {
         var limit = $("uplimitUpdatevalue").value.toInt() * 1024;
@@ -54,7 +54,7 @@
 <input type="button" value="QBT_TR(Apply)QBT_TR[CONTEXT=HttpServer]" onclick="setUpLimit()"/>
 </div>
 
-<script type="text/javascript">
+<script>
     MochaUI.addUpLimitSlider(hashes);
 </script>
 
diff --git a/src/webui/www/public/login.html b/src/webui/www/public/login.html
index 91c54de91..3e10f6f1c 100644
--- a/src/webui/www/public/login.html
+++ b/src/webui/www/public/login.html
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <html lang="${LANG}">
 <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <meta charset="UTF-8" />
     <title>qBittorrent QBT_TR(Web UI)QBT_TR[CONTEXT=OptionsDialog]</title>
     <link rel="icon" type="image/png" href="images/skin/qbittorrent16.png" />
     <link rel="stylesheet" type="text/css" href="css/style.css" />
-    <script type="text/javascript" src="scripts/mootools-1.2-core-yc.js" charset="utf-8"></script>
-    <script type="text/javascript">
+    <script src="scripts/mootools-1.2-core-yc.js" charset="utf-8"></script>
+    <script>
       window.onload = function() {
         $('username').focus();
         $('username').select();
