From 07f280a220ab5bc5c3fb510ea00aecedfcec7564 Mon Sep 17 00:00:00 2001 From: RaNaN Date: Wed, 20 Jan 2010 19:41:43 +0100 Subject: queue page fully functional, some fixes --- module/web/templates/default/base.html | 8 +-- module/web/templates/default/home.html | 4 +- module/web/templates/default/queue.html | 106 ++++++++++++++++++++++++++++--- module/web/templates/default/window.html | 2 +- 4 files changed, 104 insertions(+), 16 deletions(-) (limited to 'module/web/templates') diff --git a/module/web/templates/default/base.html b/module/web/templates/default/base.html index 692a951bc..2a2490088 100644 --- a/module/web/templates/default/base.html +++ b/module/web/templates/default/base.html @@ -36,7 +36,7 @@ document.addEvent("domready", function(){ }); var jsonStatus = new Request.JSON({ - url: "json/status", + url: "/json/status", onSuccess: LoadJsonToContent, secure: false, async: true, @@ -46,17 +46,17 @@ document.addEvent("domready", function(){ }) $('action_play').addEvent('click', function(){ - new Request({method: 'get', url: 'json/unpause'}).send(); + new Request({method: 'get', url: '/json/unpause'}).send(); }); $('action_cancel').addEvent('click', function(){ - new Request({method: 'get', url: 'json/cancel'}).send(); + new Request({method: 'get', url: '/json/cancel'}).send(); }); $('action_stop').addEvent('click', function(){ - new Request({method: 'get', url: 'json/pause'}).send(); + new Request({method: 'get', url: '/json/pause'}).send(); }); jsonStatus.startTimer(); diff --git a/module/web/templates/default/home.html b/module/web/templates/default/home.html index 4d499f6fe..ab2135800 100644 --- a/module/web/templates/default/home.html +++ b/module/web/templates/default/home.html @@ -168,7 +168,7 @@ var LinkEntry = new Class({ this.fadeBar = new Fx.Tween(this.elements.pgbTr); this.elements.remove.addEvent('click', function(){ - new Request({method: 'get', url: 'json/remove_link/'+this.id}).send(); + new Request({method: 'get', url: '/json/abort_link/'+this.id}).send(); }.bind(this)); }, @@ -222,7 +222,7 @@ Active Downloads - + diff --git a/module/web/templates/default/queue.html b/module/web/templates/default/queue.html index 7c78ac45b..aa21390a0 100644 --- a/module/web/templates/default/queue.html +++ b/module/web/templates/default/queue.html @@ -1,5 +1,76 @@ {% extends 'default/base.html' %} +{% block head %} + +{% endblock %} + {% block title %}Queue - {{block.super}} {% endblock %} {% block menu %} @@ -11,17 +82,34 @@ {% block content %} {% for package in content %} -
{{ package.package_name }}    
-
+
+
+ {{ package.package_name }} +    + +    + +
+ +
{% endfor %}
-
+

Add Package

Paste your links or upload a container.