Browse Source

Merge pull request #11566 from Chocobo1/webui

Fixes for WebUI
adaptive-webui-19844
Mike Tzou 5 years ago committed by GitHub
parent
commit
7a657eb5d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      src/base/search/searchpluginmanager.cpp
  2. 8
      src/webui/www/private/scripts/dynamicTable.js
  3. 4
      src/webui/www/private/views/search.html

2
src/base/search/searchpluginmanager.cpp

@ -318,7 +318,7 @@ SearchHandler *SearchPluginManager::startSearch(const QString &pattern, const QS
QString SearchPluginManager::categoryFullName(const QString &categoryName) QString SearchPluginManager::categoryFullName(const QString &categoryName)
{ {
static const QHash<QString, QString> categoryTable { const QHash<QString, QString> categoryTable {
{"all", tr("All categories")}, {"all", tr("All categories")},
{"movies", tr("Movies")}, {"movies", tr("Movies")},
{"tv", tr("TV shows")}, {"tv", tr("TV shows")},

8
src/webui/www/private/scripts/dynamicTable.js

@ -1602,14 +1602,14 @@ window.qBittorrent.DynamicTable = (function() {
this.columns['enabled'].updateTd = function(td, row) { this.columns['enabled'].updateTd = function(td, row) {
const value = this.getRowValue(row); const value = this.getRowValue(row);
if (value) { if (value) {
td.set('text', "Yes"); td.set('text', 'QBT_TR(Yes)QBT_TR[CONTEXT=SearchPluginsTable]');
td.set('title', "Yes"); td.set('title', 'QBT_TR(Yes)QBT_TR[CONTEXT=SearchPluginsTable]');
td.getParent("tr").addClass("green"); td.getParent("tr").addClass("green");
td.getParent("tr").removeClass("red"); td.getParent("tr").removeClass("red");
} }
else { else {
td.set('text', "No"); td.set('text', 'QBT_TR(No)QBT_TR[CONTEXT=SearchPluginsTable]');
td.set('title', "No"); td.set('title', 'QBT_TR(No)QBT_TR[CONTEXT=SearchPluginsTable]');
td.getParent("tr").addClass("red"); td.getParent("tr").addClass("red");
td.getParent("tr").removeClass("green"); td.getParent("tr").removeClass("green");
} }

4
src/webui/www/private/views/search.html

@ -11,17 +11,14 @@
#categorySelect { #categorySelect {
width: 150px; width: 150px;
height: 20px;
} }
#pluginsSelect { #pluginsSelect {
width: 150px; width: 150px;
height: 20px;
} }
#startSearchButton { #startSearchButton {
width: 90px; width: 90px;
height: 20px;
} }
#searchResultsNoPlugins { #searchResultsNoPlugins {
@ -49,7 +46,6 @@
} }
#manageSearchPlugins { #manageSearchPlugins {
line-height: 1.5em;
float: right; float: right;
} }

Loading…
Cancel
Save