diff --git a/deluge/ui/webui/pages.py b/deluge/ui/webui/pages.py index cf1f1c6e7..658822bc9 100644 --- a/deluge/ui/webui/pages.py +++ b/deluge/ui/webui/pages.py @@ -131,9 +131,7 @@ def reg_torrents_POST(url_name, proxy_command): def POST(self, torrent_ids): getattr(proxy, proxy_command)(torrent_ids) do_redirect() - _page_class.__name__ = "TORRENTS_POST:" + proxy_command - route("/torrent/%s/(.*)" % url_name, _page_class) reg_torrents_POST("start", "resume_torrent") diff --git a/deluge/ui/webui/register_menu.py b/deluge/ui/webui/register_menu.py index 222133c3b..74c56e99c 100644 --- a/deluge/ui/webui/register_menu.py +++ b/deluge/ui/webui/register_menu.py @@ -45,6 +45,7 @@ menu.register_detail_tab("details", _("Details"), "tab_meta") menu.register_detail_tab("files", _("Files"), "tab_files") menu.register_detail_tab("options", _("Options"), "tab_options") menu.register_detail_tab("trackers", _("Trackers"), "tab_trackers") +menu.register_detail_tab("peers", _("Peers"), "tab_peers") menu.register_toolbar_item("add", _("Add"), "list-add.png" , TB.generic, "GET","/torrent/add/", True) menu.register_toolbar_item("delete",_("Delete"), "list-remove.png" ,TB.torrent_list, "GET","/torrent/delete/" , True) diff --git a/deluge/ui/webui/templates/deluge/tab_peers.html b/deluge/ui/webui/templates/deluge/tab_peers.html new file mode 100644 index 000000000..a0c0c2023 --- /dev/null +++ b/deluge/ui/webui/templates/deluge/tab_peers.html @@ -0,0 +1,27 @@ +$def with (torrent) + +
+ + + +$altrow(True) + + + + + + + + +$for peer in torrent.peers: + + + + + + + + +
$_("Ip")$_("Up Speed")$_("Down Speed")$_("Country")$_("Client")$_("progress")
$peer['ip']$fspeed(peer['up_speed'])$fspeed(peer['down_speed'])$peer['country']$peer['client']$peer['progress']%
+
+ diff --git a/deluge/ui/webui/torrent_add.py b/deluge/ui/webui/torrent_add.py index 2eea3971b..61d29edf3 100644 --- a/deluge/ui/webui/torrent_add.py +++ b/deluge/ui/webui/torrent_add.py @@ -130,4 +130,4 @@ class torrent_add: return def register(): - component.get("PageManager").register_page("/torrent/add/(.*)",torrent_add) \ No newline at end of file + component.get("PageManager").register_page("/torrent/add(.*)",torrent_add) \ No newline at end of file diff --git a/deluge/ui/webui/webserver_common.py b/deluge/ui/webui/webserver_common.py index 7a79a21f7..66e4b88d5 100644 --- a/deluge/ui/webui/webserver_common.py +++ b/deluge/ui/webui/webserver_common.py @@ -54,7 +54,7 @@ TORRENT_KEYS = ['name', 'total_size', 'num_files', 'num_pieces', 'piece_length', 'total_wanted', 'tracker', 'trackers', 'tracker_status', 'save_path', 'files', 'file_priorities', 'compact', 'max_connections', 'max_upload_slots', 'max_download_speed', 'prioritize_first_last', - 'private','max_upload_speed','queue', + 'private','max_upload_speed','queue','peers', #builtin plugins: 'tracker_name' #organize-plugin ]