-
+
diff --git a/src/webui/www/public/about.html b/src/webui/www/public/about.html
index c5c39d5dd..ec816d3f2 100644
--- a/src/webui/www/public/about.html
+++ b/src/webui/www/public/about.html
@@ -1,7 +1,10 @@
-
qBittorrent ${VERSION} QBT_TR(Web UI)QBT_TR
+
qBittorrent ${VERSION} QBT_TR(Web UI)QBT_TR
+
QBT_TR(An advanced BitTorrent client programmed in C++, based on Qt toolkit and libtorrent-rasterbar.)QBT_TR
Copyright (c) 2011-2015 The qBittorrent project
QBT_TR(Home Page: )QBT_TR http://www.qbittorrent.org
-
+
QBT_TR(Bug Tracker: )QBT_TR http://bugs.qbittorrent.org
+
QBT_TR(Forum: )QBT_TR http://forum.qbittorrent.org
+
QBT_TR(IRC: #qbittorrent on Freenode)QBT_TR
QBT_TR(Original authors)QBT_TR
Ishan Arora,
Ankit Gupta,
Chandan Shikhar Dua and
Swapnil Kumar.
diff --git a/src/webui/www/public/scripts/client.js b/src/webui/www/public/scripts/client.js
index 4461d771f..f2db50cc0 100644
--- a/src/webui/www/public/scripts/client.js
+++ b/src/webui/www/public/scripts/client.js
@@ -218,10 +218,12 @@ window.addEvent('load', function () {
myTable.columns['priority'].force_hide = !queueing_enabled;
myTable.updateColumn('priority');
if (queueing_enabled) {
+ $('queueingLinks').removeClass('invisible');
$('queueingButtons').removeClass('invisible');
$('queueingMenuItems').removeClass('invisible');
}
else {
+ $('queueingLinks').addClass('invisible');
$('queueingButtons').addClass('invisible');
$('queueingMenuItems').addClass('invisible');
}
diff --git a/src/webui/www/public/scripts/dynamicTable.js b/src/webui/www/public/scripts/dynamicTable.js
index e3e827631..28828d8fb 100644
--- a/src/webui/www/public/scripts/dynamicTable.js
+++ b/src/webui/www/public/scripts/dynamicTable.js
@@ -49,9 +49,9 @@ var dynamicTable = new Class({
},
initColumns : function () {
+ this.newColumn('priority', 'width: 30px; cursor: pointer', '#');
this.newColumn('state_icon', 'width: 16px', '');
this.newColumn('name', 'min-width: 200px; cursor: pointer', 'QBT_TR(Name)QBT_TR');
- this.newColumn('priority', 'width: 90px; cursor: pointer', '#');
this.newColumn('size', 'width: 100px; cursor: pointer', 'QBT_TR(Size)QBT_TR');
this.newColumn('progress', 'width: 80px; cursor: pointer', 'QBT_TR(Done)QBT_TR');
this.newColumn('num_seeds', 'width: 100px; cursor: pointer', 'QBT_TR(Seeds)QBT_TR');
@@ -507,6 +507,10 @@ var dynamicTable = new Class({
state = "queued";
else if (state == "checkingUP" || state == "checkingDL")
state = "checking";
+ else if (state == "forcedDL" || state == "metaDL")
+ state = "downloading";
+ else if (state == "forcedUP")
+ state = "uploading";
var img_path = 'images/skin/' + state + '.png';
@@ -522,12 +526,6 @@ var dynamicTable = new Class({
}));
};
- // name
-
- this.columns['name'].updateTd = function (td, row) {
- td.set('html', escapeHtml(this.getRowValue(row)));
- };
-
// priority
this.columns['priority'].updateTd = function (td, row) {
@@ -548,6 +546,12 @@ var dynamicTable = new Class({
else return 0;
};
+ // name
+
+ this.columns['name'].updateTd = function (td, row) {
+ td.set('html', escapeHtml(this.getRowValue(row)));
+ };
+
// size
this.columns['size'].updateTd = function (td, row) {
diff --git a/src/webui/www/public/scripts/mocha-init.js b/src/webui/www/public/scripts/mocha-init.js
index 8c9c0cf9a..f1205049f 100644
--- a/src/webui/www/public/scripts/mocha-init.js
+++ b/src/webui/www/public/scripts/mocha-init.js
@@ -366,8 +366,8 @@ initializeWindows = function() {
title: 'QBT_TR(About)QBT_TR',
loadMethod: 'xhr',
contentURL: 'about.html',
- width: 650,
- height: 200,
+ width: 550,
+ height: 290,
padding: 10
});
});
@@ -385,13 +385,15 @@ initializeWindows = function() {
addClickEvent('shutdown', function(e) {
new Event(e).stop();
- new Request({
- url: 'command/shutdown',
- onSuccess: function() {
- document.write("
QBT_TR(qBittorrent has been shutdown.)QBT_TRQBT_TR(qBittorrent has been shutdown.)QBT_TR
");
- stop();
- }
- }).send();
+ if (confirm('QBT_TR(Are you sure you want to quit qBittorrent?)QBT_TR')) {
+ new Request({
+ url: 'command/shutdown',
+ onSuccess: function() {
+ document.write("
QBT_TR(qBittorrent has been shutdown.)QBT_TRQBT_TR(qBittorrent has been shutdown.)QBT_TR
");
+ stop();
+ }
+ }).send();
+ }
});
// Deactivate menu header links
QBT_TR(Visit &Website)QBT_TR