Merge pull request #13336 from Chocobo1/webui

Minor WebUI improvements
4 years ago · c967bf31ff
9 changed files with 10 additions and 10 deletions
--- a/src/base/http/types.h
+++ b/src/base/http/types.h
@ -63,7 +63,7 @@ namespace Http
				@@ -63,7 +63,7 @@ namespace Http

    const char CONTENT_TYPE_HTML[] = "text/html";
    const char CONTENT_TYPE_CSS[] = "text/css";
-    const char CONTENT_TYPE_TXT[] = "text/plain";
+    const char CONTENT_TYPE_TXT[] = "text/plain; charset=UTF-8";
    const char CONTENT_TYPE_JS[] = "application/javascript";
    const char CONTENT_TYPE_JSON[] = "application/json";
    const char CONTENT_TYPE_GIF[] = "image/gif";
--- a/src/gui/gpl.html
+++ b/src/gui/gpl.html
@ -1,7 +1,7 @@
				@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <meta charset="utf-8">
+    <meta charset="UTF-8">
    <title>License</title>
 </head>
 <body>
--- a/src/gui/thanks.html
+++ b/src/gui/thanks.html
@ -1,7 +1,7 @@
				@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <meta charset="utf-8">
+    <meta charset="UTF-8">
    <title>Thanks</title>
 </head>
 <body>
--- a/src/gui/translators.html
+++ b/src/gui/translators.html
@ -1,7 +1,7 @@
				@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <meta charset="utf-8">
+    <meta charset="UTF-8">
    <title>Translators</title>
 </head>
 <body>
--- a/src/webui/api/torrentscontroller.cpp
+++ b/src/webui/api/torrentscontroller.cpp
@ -601,9 +601,9 @@ void TorrentsController::addAction()
				@@ -601,9 +601,9 @@ void TorrentsController::addAction()
    }

    if (partialSuccess)
-        setResult("Ok.");
+        setResult(QLatin1String("Ok."));
    else
-        setResult("Fails.");
+        setResult(QLatin1String("Fails."));
 }

 void TorrentsController::addTrackersAction()
--- a/src/webui/www/private/download.html
+++ b/src/webui/www/private/download.html
@ -13,7 +13,7 @@
				@@ -13,7 +13,7 @@
 </head>

 <body>
-    <iframe id="download_frame" name="download_frame" class="invisible" src="javascript:false;"></iframe>
+    <iframe id="download_frame" name="download_frame" class="invisible" src="about:blank"></iframe>
    <form action="api/v2/torrents/add" enctype="multipart/form-data" method="post" id="downloadForm" style="text-align: center;" target="download_frame" autocorrect="off" autocapitalize="none">
        <div style="text-align: center;">
            <br/>
--- a/src/webui/www/private/scripts/mocha-init.js
+++ b/src/webui/www/private/scripts/mocha-init.js
@ -1025,7 +1025,7 @@ const initializeWindows = function() {
				@@ -1025,7 +1025,7 @@ const initializeWindows = function() {
            new Request({
                url: 'api/v2/app/shutdown',
                onSuccess: function() {
-                    document.write('<!doctype html><html lang="${LANG}"><head> <meta charset="utf-8"> <title>QBT_TR(qBittorrent has been shutdown)QBT_TR[CONTEXT=HttpServer]</title></head><body> <h1 style="text-align: center;">QBT_TR(qBittorrent has been shutdown)QBT_TR[CONTEXT=HttpServer]</h1></body></html>');
+                    document.write('<!doctype html><html lang="${LANG}"><head> <meta charset="UTF-8"> <title>QBT_TR(qBittorrent has been shutdown)QBT_TR[CONTEXT=HttpServer]</title></head><body> <h1 style="text-align: center;">QBT_TR(qBittorrent has been shutdown)QBT_TR[CONTEXT=HttpServer]</h1></body></html>');
                    document.close();
                    stop();
                }
--- a/src/webui/www/private/upload.html
+++ b/src/webui/www/private/upload.html
@ -11,7 +11,7 @@
				@@ -11,7 +11,7 @@
 </head>

 <body>
-    <iframe id="upload_frame" name="upload_frame" class="invisible" src="javascript:false;"></iframe>
+    <iframe id="upload_frame" name="upload_frame" class="invisible" src="about:blank"></iframe>
    <form action="api/v2/torrents/add" enctype="multipart/form-data" method="post" id="uploadForm" style="text-align: center;" target="upload_frame" autocorrect="off" autocapitalize="none">
        <div style="margin-top: 25px; display: inline-block; border: 1px solid lightgrey; border-radius: 4px;">
            <input type="file" id="fileselect" name="fileselect[]" multiple="multiple" />
--- a/src/webui/www/public/scripts/login.js
+++ b/src/webui/www/public/scripts/login.js
@ -42,7 +42,7 @@ function submitLoginForm() {
				@@ -42,7 +42,7 @@ function submitLoginForm() {

    const xhr = new XMLHttpRequest();
    xhr.open('POST', 'api/v2/auth/login', true);
-    xhr.setRequestHeader('Content-type', 'application/x-www-form-urlencoded; charset=utf-8');
+    xhr.setRequestHeader('Content-type', 'application/x-www-form-urlencoded; charset=UTF-8');
    xhr.addEventListener('readystatechange', function() {
        if (xhr.readyState === 4) { // DONE state
            if ((xhr.status === 200) && (xhr.responseText === "Ok."))