d4708
/
qBittorrent
mirror of https://github.com/d47081/qBittorrent.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge pull request #13336 from Chocobo1/webui 

Minor WebUI improvements
adaptive-webui-19844
Mike Tzou 4 years ago committed by GitHub
parent
6e971c47e7 5677ce1cc9
commit
c967bf31ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 10 additions and 10 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/base/http/types.h
  2. 2
      src/gui/gpl.html
  3. 2
      src/gui/thanks.html
  4. 2
      src/gui/translators.html
  5. 4
      src/webui/api/torrentscontroller.cpp
  6. 2
      src/webui/www/private/download.html
  7. 2
      src/webui/www/private/scripts/mocha-init.js
  8. 2
      src/webui/www/private/upload.html
  9. 2
      src/webui/www/public/scripts/login.js

2
src/base/http/types.h
Unescape View File

@ -63,7 +63,7 @@ namespace Http
const char CONTENT_TYPE_HTML[] = "text/html"; const char CONTENT_TYPE_HTML[] = "text/html";
const char CONTENT_TYPE_CSS[] = "text/css"; 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_JS[] = "application/javascript";
const char CONTENT_TYPE_JSON[] = "application/json"; const char CONTENT_TYPE_JSON[] = "application/json";
const char CONTENT_TYPE_GIF[] = "image/gif"; const char CONTENT_TYPE_GIF[] = "image/gif";

2
src/gui/gpl.html
Unescape View File

@ -1,7 +1,7 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<meta charset="utf-8"> <meta charset="UTF-8">
<title>License</title> <title>License</title>
</head> </head>
<body> <body>

2
src/gui/thanks.html
Unescape View File

@ -1,7 +1,7 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<meta charset="utf-8"> <meta charset="UTF-8">
<title>Thanks</title> <title>Thanks</title>
</head> </head>
<body> <body>

2
src/gui/translators.html
Unescape View File

@ -1,7 +1,7 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<meta charset="utf-8"> <meta charset="UTF-8">
<title>Translators</title> <title>Translators</title>
</head> </head>
<body> <body>

4
src/webui/api/torrentscontroller.cpp
Unescape View File

@ -601,9 +601,9 @@ void TorrentsController::addAction()
} }
if (partialSuccess) if (partialSuccess)
setResult("Ok."); setResult(QLatin1String("Ok."));
else else
setResult("Fails."); setResult(QLatin1String("Fails."));
} }
void TorrentsController::addTrackersAction() void TorrentsController::addTrackersAction()

2
src/webui/www/private/download.html
Unescape View File

@ -13,7 +13,7 @@
</head> </head>
<body> <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"> <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;"> <div style="text-align: center;">
<br/> <br/>

2
src/webui/www/private/scripts/mocha-init.js
Unescape View File

@ -1025,7 +1025,7 @@ const initializeWindows = function() {
new Request({ new Request({
url: 'api/v2/app/shutdown', url: 'api/v2/app/shutdown',
onSuccess: function() { 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(); document.close();
stop(); stop();
} }

2
src/webui/www/private/upload.html
Unescape View File

@ -11,7 +11,7 @@
</head> </head>
<body> <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"> <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;"> <div style="margin-top: 25px; display: inline-block; border: 1px solid lightgrey; border-radius: 4px;">
<input type="file" id="fileselect" name="fileselect[]" multiple="multiple" /> <input type="file" id="fileselect" name="fileselect[]" multiple="multiple" />

2
src/webui/www/public/scripts/login.js
Unescape View File

@ -42,7 +42,7 @@ function submitLoginForm() {
const xhr = new XMLHttpRequest(); const xhr = new XMLHttpRequest();
xhr.open('POST', 'api/v2/auth/login', true); 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() { xhr.addEventListener('readystatechange', function() {
if (xhr.readyState === 4) { // DONE state if (xhr.readyState === 4) { // DONE state
if ((xhr.status === 200) && (xhr.responseText === "Ok.")) if ((xhr.status === 200) && (xhr.responseText === "Ok."))

Write Preview
Loading…
Cancel
Save