From 408abb5abe751ad0d0ea44cc78318ac7245e0ff9 Mon Sep 17 00:00:00 2001 From: Martijn Voncken Date: Sat, 21 Jun 2008 09:24:36 +0000 Subject: [PATCH] webui:more cosmetics:details+status --- .../webui/templates/deluge/tab_details.html | 28 +++++++-- .../templates/deluge/tab_statistics.html | 61 +++++++++++++------ deluge/ui/webui/torrent_options.py | 2 +- 3 files changed, 64 insertions(+), 27 deletions(-) diff --git a/deluge/ui/webui/templates/deluge/tab_details.html b/deluge/ui/webui/templates/deluge/tab_details.html index b1baeb2a1..a1e5be09b 100644 --- a/deluge/ui/webui/templates/deluge/tab_details.html +++ b/deluge/ui/webui/templates/deluge/tab_details.html @@ -10,18 +10,34 @@ $def with (torrent) $('Hash'): $torrent.id - $_('Tracker'): - $(crop(torrent.tracker, 200)) - - $_('Tracker Status'): - $(crop(torrent.tracker_status, 200)) - $('Save Path'): $crop_left(torrent.save_path, 200) + + $_('Total Size'): + $fsize(torrent.total_size) + + + + $_('# Of Files'): + $torrent.num_files + + + $_('Tracker Status'): + $(crop(torrent.tracker_status, 200)) + + + $_('Tracker'): + $(crop(torrent.tracker, 200)) + + + + + + $_('Private'): $torrent.private diff --git a/deluge/ui/webui/templates/deluge/tab_statistics.html b/deluge/ui/webui/templates/deluge/tab_statistics.html index b5576378b..efb3ca497 100644 --- a/deluge/ui/webui/templates/deluge/tab_statistics.html +++ b/deluge/ui/webui/templates/deluge/tab_statistics.html @@ -1,13 +1,13 @@ $def with (torrent) - - + +
+
$("%.2f" % torrent.progress) %
+
@@ -17,19 +17,19 @@ $def with (torrent) - - + - - - + + + +
$_('Downloaded'):$fsize(torrent.total_payload_upload)
$_('Seeders'):$torrent.num_seeds ($torrent.total_seeds )
$_('Share Ratio'): $("%.3f" % torrent.ratio)
$_('Pieces'):$torrent.num_pieces x $fsize(torrent.piece_length)
$_('Next Announce'):$torrent.next_announce
-		 + - - - - + + +
$_('Speed'): @@ -38,29 +38,31 @@ $fspeed(torrent.download_payload_rate)
$_('Speed'): $fspeed(torrent.upload_payload_rate)
$_('Peers'):$torrent.num_peers ($torrent.total_peers )
$_('ETA'): $ftime(torrent.eta)
$_('Availability'):$("%.3f" % torrent.distributed_copies)
$_('Pieces'):$torrent.num_pieces x $fsize(torrent.piece_length)
-		 + + + + + + + + + + - - - - - - + +
$_('Seeders'):$torrent.num_seeds ($torrent.total_seeds )
$_('Peers'):$torrent.num_peers ($torrent.total_peers )
$_('Availability'):$("%.3f" % torrent.distributed_copies)
$_('Total Size'):$fsize(torrent.total_size)
$_('# Of Files'):$torrent.num_files
$_('Next Announce'):$torrent.next_announce
$_('Queue Position'): @@ -70,6 +72,21 @@ $else: $(torrent.queue + 1)
+ +		 + + + + + + + + + + + +
$_('Active time'):TODO
$_('Seeding time'):TODO
$_('Seed rank'):TODO
$_('Allocation'): $if torrent.compact: @@ -78,5 +95,9 @@ $else: $_('Full')
- + + diff --git a/deluge/ui/webui/torrent_options.py b/deluge/ui/webui/torrent_options.py index 7e2f3ff75..94934b8b5 100644 --- a/deluge/ui/webui/torrent_options.py +++ b/deluge/ui/webui/torrent_options.py @@ -41,7 +41,7 @@ class torrent_options: aclient.set_torrent_max_download_speed(torrent.id, options['max_download_speed']) aclient.set_torrent_max_upload_slots(torrent.id, options['max_upload_slots']) aclient.set_torrent_max_upload_speed(torrent.id, options['max_upload_speed']) - aclient.set_torrent_private_flag(torrent.id, options['private']) + #aclient.set_torrent_private_flag(torrent.id, options['private']) aclient.force_call()