diff --git a/deluge/ui/webui/pages.py b/deluge/ui/webui/pages.py index e594b8f16..4a55fb65e 100644 --- a/deluge/ui/webui/pages.py +++ b/deluge/ui/webui/pages.py @@ -144,6 +144,9 @@ reg_torrents_POST("recheck", "force_recheck") reg_torrents_POST("reannounce", "force_reannounce") reg_torrents_POST("queue/up", "queue_up") reg_torrents_POST("queue/down", "queue_down") +reg_torrents_POST("queue/top", "queue_top") +reg_torrents_POST("queue/bottom", "queue_bottom") + class torrent_info: @deco.deluge_page diff --git a/deluge/ui/webui/register_menu.py b/deluge/ui/webui/register_menu.py index 552f6eccc..2f73c096c 100644 --- a/deluge/ui/webui/register_menu.py +++ b/deluge/ui/webui/register_menu.py @@ -52,8 +52,10 @@ menu.register_toolbar_item("add", _("Add"), "list-add.png" , TB.generic, "GET"," menu.register_toolbar_item("delete",_("Delete"), "list-remove.png" ,TB.torrent_list, "GET","/torrent/delete/" , True) menu.register_toolbar_item("stop",_("Stop"), "pause.png" ,TB.torrent_list, "POST","/torrent/stop/", True) menu.register_toolbar_item("start",_("Start"), "start.png" ,TB.torrent_list, "POST","/torrent/start/", True) -menu.register_toolbar_item("queue_up",_("Up"), "queue-up.png" ,TB.torrent_list, "POST","/torrent/queue/up/", True) -menu.register_toolbar_item("queue_down",_("Down"), "queue-down.png" ,TB.torrent_list, "POST","/torrent/queue/down/", True) +menu.register_toolbar_item("queue_up",_("Queue Up"), "queue-up.png" ,TB.torrent_list, "POST","/torrent/queue/up/", True) +menu.register_toolbar_item("queue_down",_("Queue Down"), "queue-down.png" ,TB.torrent_list, "POST","/torrent/queue/down/", True) +menu.register_toolbar_item("queue_top",_("Queue Top"), "go-top.png" ,TB.torrent_list, "POST","/torrent/queue/top/", True) +menu.register_toolbar_item("queue_bottom",_("Queue Down"), "go-bottom.png" ,TB.torrent_list, "POST","/torrent/queue/bottom/", True) menu.register_toolbar_item("details",_("Details"), "details.png" ,TB.torrent, "GET","/torrent/info/", True) menu.register_toolbar_item("move",_("Move"), "move.png" ,TB.torrent_list,"POST","/torrent/move/", True) menu.register_toolbar_item("reannounce",_("Reannounce"), "view-refresh.png" ,TB.torrent_list, "POST","/torrent/reannounce/", False) diff --git a/deluge/ui/webui/static/images/tango/go-bottom.png b/deluge/ui/webui/static/images/tango/go-bottom.png new file mode 100644 index 000000000..2c5a80385 Binary files /dev/null and b/deluge/ui/webui/static/images/tango/go-bottom.png differ diff --git a/deluge/ui/webui/static/images/tango/go-top.png b/deluge/ui/webui/static/images/tango/go-top.png new file mode 100644 index 000000000..70f2c996c Binary files /dev/null and b/deluge/ui/webui/static/images/tango/go-top.png differ diff --git a/deluge/ui/webui/torrent_move.py b/deluge/ui/webui/torrent_move.py index 9110e2bdb..5c321adbd 100644 --- a/deluge/ui/webui/torrent_move.py +++ b/deluge/ui/webui/torrent_move.py @@ -72,7 +72,7 @@ class torrent_move: print self.move_page(name, error = _("Error in Path.")) return save_path = form.cleaned_data["save_path"] - proxy.move_torrent(torrent_ids, save_path) + proxy.move_storage(torrent_ids, save_path) utils.do_redirect() def register():