From 49d3b7bf304a60ffc49d74d02927d4c694a6d11b Mon Sep 17 00:00:00 2001 From: Thomas Piccirello Date: Tue, 26 Dec 2017 18:55:13 -0500 Subject: [PATCH 1/2] Right-align stat values --- src/webui/www/public/css/style.css | 5 ++++ src/webui/www/public/scripts/client.js | 24 ++++++++-------- src/webui/www/public/statistics.html | 38 +++++++++++++++++--------- 3 files changed, 42 insertions(+), 25 deletions(-) diff --git a/src/webui/www/public/css/style.css b/src/webui/www/public/css/style.css index f8c19ac85..87f6a60ca 100644 --- a/src/webui/www/public/css/style.css +++ b/src/webui/www/public/css/style.css @@ -479,3 +479,8 @@ td.statusBarSeparator { background-position: center 1px; background-size: 2px 18px; } + +/* Statistics */ +.statisticsValue { + text-align: right; +} diff --git a/src/webui/www/public/scripts/client.js b/src/webui/www/public/scripts/client.js index 7d9cd9f26..2e880dd89 100644 --- a/src/webui/www/public/scripts/client.js +++ b/src/webui/www/public/scripts/client.js @@ -381,18 +381,18 @@ window.addEvent('load', function () { // Statistics dialog if (document.getElementById("statisticspage")) { - $('AlltimeDL').set('html', 'QBT_TR(Alltime download:)QBT_TR[CONTEXT=StatsDialog]' + " " + friendlyUnit(serverState.alltime_dl, false)); - $('AlltimeUL').set('html', 'QBT_TR(Alltime upload:)QBT_TR[CONTEXT=StatsDialog]' + " " + friendlyUnit(serverState.alltime_ul, false)); - $('TotalWastedSession').set('html', 'QBT_TR(Total wasted (this session):)QBT_TR[CONTEXT=StatsDialog]' + " " + friendlyUnit(serverState.total_wasted_session, false)); - $('GlobalRatio').set('html', 'QBT_TR(Global ratio:)QBT_TR[CONTEXT=StatsDialog]' + " " + serverState.global_ratio); - $('TotalPeerConnections').set('html', 'QBT_TR(Total peer connections:)QBT_TR[CONTEXT=StatsDialog]' + " " + serverState.total_peer_connections); - $('ReadCacheHits').set('html', 'QBT_TR(Read cache hits:)QBT_TR[CONTEXT=StatsDialog]' + " " + serverState.read_cache_hits); - $('TotalBuffersSize').set('html', 'QBT_TR(Total buffers size:)QBT_TR[CONTEXT=StatsDialog]' + " " + friendlyUnit(serverState.total_buffers_size, false)); - $('WriteCacheOverload').set('html', 'QBT_TR(Write cache overload:)QBT_TR[CONTEXT=StatsDialog]' + " " + serverState.write_cache_overload); - $('ReadCacheOverload').set('html', 'QBT_TR(Read cache overload:)QBT_TR[CONTEXT=StatsDialog]' + " " + serverState.read_cache_overload); - $('QueuedIOJobs').set('html', 'QBT_TR(Queued I/O jobs:)QBT_TR[CONTEXT=StatsDialog]' + " " + serverState.queued_io_jobs); - $('AverageTimeInQueue').set('html', 'QBT_TR(Average time in queue:)QBT_TR[CONTEXT=StatsDialog]' + " " + serverState.average_time_queue); - $('TotalQueuedSize').set('html', 'QBT_TR(Total queued size:)QBT_TR[CONTEXT=StatsDialog]' + " " + friendlyUnit(serverState.total_queued_size, false)); + $('AlltimeDL').set('html', friendlyUnit(serverState.alltime_dl, false)); + $('AlltimeUL').set('html', friendlyUnit(serverState.alltime_ul, false)); + $('TotalWastedSession').set('html', friendlyUnit(serverState.total_wasted_session, false)); + $('GlobalRatio').set('html', serverState.global_ratio); + $('TotalPeerConnections').set('html', serverState.total_peer_connections); + $('ReadCacheHits').set('html', serverState.read_cache_hits); + $('TotalBuffersSize').set('html', friendlyUnit(serverState.total_buffers_size, false)); + $('WriteCacheOverload').set('html', serverState.write_cache_overload); + $('ReadCacheOverload').set('html', serverState.read_cache_overload); + $('QueuedIOJobs').set('html', serverState.queued_io_jobs); + $('AverageTimeInQueue').set('html', serverState.average_time_queue); + $('TotalQueuedSize').set('html', friendlyUnit(serverState.total_queued_size, false)); } if (serverState.connection_status == "connected") diff --git a/src/webui/www/public/statistics.html b/src/webui/www/public/statistics.html index bf98848c8..c94763808 100644 --- a/src/webui/www/public/statistics.html +++ b/src/webui/www/public/statistics.html @@ -1,47 +1,59 @@

QBT_TR(User statistics)QBT_TR[CONTEXT=StatsDialog]

- + + - + + - + + - + + - + +
QBT_TR(Alltime download:)QBT_TR[CONTEXT=StatsDialog]
QBT_TR(Alltime upload:)QBT_TR[CONTEXT=StatsDialog]
QBT_TR(Total wasted (this session):)QBT_TR[CONTEXT=StatsDialog]
QBT_TR(Global ratio:)QBT_TR[CONTEXT=StatsDialog]
QBT_TR(Total peer connections:)QBT_TR[CONTEXT=StatsDialog]

QBT_TR(Cache statistics)QBT_TR[CONTEXT=StatsDialog]

- + + - + +
QBT_TR(Read cache hits:)QBT_TR[CONTEXT=StatsDialog]
QBT_TR(Total buffers size:)QBT_TR[CONTEXT=StatsDialog]

QBT_TR(Performance statistics)QBT_TR[CONTEXT=StatsDialog]

- + + - + + - + + - + + - - + + +
QBT_TR(Write cache overload:)QBT_TR[CONTEXT=StatsDialog]
QBT_TR(Read cache overload:)QBT_TR[CONTEXT=StatsDialog]
QBT_TR(Queued I/O jobs:)QBT_TR[CONTEXT=StatsDialog]
QBT_TR(Average time in queue:)QBT_TR[CONTEXT=StatsDialog]
QBT_TR(Total queued size:)QBT_TR[CONTEXT=StatsDialog]
From 9b919b6c344e52b7140f21e4f6f0aa3673da8a95 Mon Sep 17 00:00:00 2001 From: Thomas Piccirello Date: Tue, 26 Dec 2017 19:05:29 -0500 Subject: [PATCH 2/2] Add missing units --- src/webui/www/public/scripts/client.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/webui/www/public/scripts/client.js b/src/webui/www/public/scripts/client.js index 2e880dd89..1baeb18dd 100644 --- a/src/webui/www/public/scripts/client.js +++ b/src/webui/www/public/scripts/client.js @@ -388,10 +388,10 @@ window.addEvent('load', function () { $('TotalPeerConnections').set('html', serverState.total_peer_connections); $('ReadCacheHits').set('html', serverState.read_cache_hits); $('TotalBuffersSize').set('html', friendlyUnit(serverState.total_buffers_size, false)); - $('WriteCacheOverload').set('html', serverState.write_cache_overload); - $('ReadCacheOverload').set('html', serverState.read_cache_overload); + $('WriteCacheOverload').set('html', serverState.write_cache_overload + "%"); + $('ReadCacheOverload').set('html', serverState.read_cache_overload + "%"); $('QueuedIOJobs').set('html', serverState.queued_io_jobs); - $('AverageTimeInQueue').set('html', serverState.average_time_queue); + $('AverageTimeInQueue').set('html', serverState.average_time_queue + " ms"); $('TotalQueuedSize').set('html', friendlyUnit(serverState.total_queued_size, false)); }