diff --git a/deluge/ui/webui/templates/classic/tab_details.html b/deluge/ui/webui/templates/classic/tab_details.html index a1e5be09b..266f4bfec 100644 --- a/deluge/ui/webui/templates/classic/tab_details.html +++ b/deluge/ui/webui/templates/classic/tab_details.html @@ -12,7 +12,7 @@ $def with (torrent) - $('Save Path'): + $('Path'): $crop_left(torrent.save_path, 200) @@ -33,15 +33,12 @@ $def with (torrent) $_('Tracker'): $(crop(torrent.tracker, 200)) - - - - - $_('Private'): $torrent.private + + diff --git a/deluge/ui/webui/templates/classic/tab_statistics.html b/deluge/ui/webui/templates/classic/tab_statistics.html index b41fed559..eef3677b4 100644 --- a/deluge/ui/webui/templates/classic/tab_statistics.html +++ b/deluge/ui/webui/templates/classic/tab_statistics.html @@ -63,13 +63,12 @@ $fspeed(torrent.download_payload_rate) - -$_('Queue Position'): +$_('Auto Managed'): -$if (torrent.queue == -1): - ∞ +$if torrent.is_auto_managed: + $_('True') $else: - $(torrent.queue + 1) + $_('False') @@ -79,20 +78,21 @@ $else: - + - + - + - + +
$_('Active time'):TODO$ftime(torrent.active_time)
$_('Seeding time'):TODO$ftime(torrent.seeding_time)
$_('Seed rank'):TODO$(torrent.seed_rank)
$_('Allocation'):
$_('Queue Position'): -$if torrent.compact: - $_('Compact') +$if (torrent.queue == -1): + ∞ $else: - $_('Full') + $(torrent.queue + 1)
diff --git a/deluge/ui/webui/webserver_common.py b/deluge/ui/webui/webserver_common.py index 30a756d1a..3f43c3120 100644 --- a/deluge/ui/webui/webserver_common.py +++ b/deluge/ui/webui/webserver_common.py @@ -44,8 +44,7 @@ TORRENT_KEYS = ['name', 'total_size', 'num_files', 'num_pieces', 'piece_length', 'files', 'file_priorities', 'compact', 'max_connections', 'max_upload_slots', 'max_download_speed', 'prioritize_first_last', 'private','max_upload_speed','queue','peers', - #builtin plugins: - 'tracker_name', #organize-plugin + "active_time", "seeding_time", "seed_rank", "is_auto_managed", #stats 'tracker_host', 'label' #label-plugin ]