From 95d09b338ac7aed2b387bf143a5cfd1c4b29f612 Mon Sep 17 00:00:00 2001 From: RaNaN Date: Tue, 15 Dec 2009 17:48:30 +0100 Subject: new Django webinterface(in development), small fixes --- module/web/templates/default/home.html | 1 + 1 file changed, 1 insertion(+) create mode 100644 module/web/templates/default/home.html (limited to 'module/web/templates/default/home.html') diff --git a/module/web/templates/default/home.html b/module/web/templates/default/home.html new file mode 100644 index 000000000..895302e61 --- /dev/null +++ b/module/web/templates/default/home.html @@ -0,0 +1 @@ +{% extends 'default/base.html' %} \ No newline at end of file -- cgit v1.2.3 From 3db583f5f10a72e53ecd8d282ec5db1e3f4cd4dd Mon Sep 17 00:00:00 2001 From: RaNaN Date: Wed, 16 Dec 2009 22:49:20 +0100 Subject: Webinterface authsystem --- module/web/templates/default/home.html | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'module/web/templates/default/home.html') diff --git a/module/web/templates/default/home.html b/module/web/templates/default/home.html index 895302e61..40f124712 100644 --- a/module/web/templates/default/home.html +++ b/module/web/templates/default/home.html @@ -1 +1,5 @@ -{% extends 'default/base.html' %} \ No newline at end of file +{% extends 'default/base.html' %} + +{% block content %} + +{% endblock %} \ No newline at end of file -- cgit v1.2.3 From 511ae48877f8f3fae2a3ba282d979c33f2ea5491 Mon Sep 17 00:00:00 2001 From: RaNaN Date: Thu, 17 Dec 2009 16:14:26 +0100 Subject: webinterface: config working, downloadable files --- module/web/templates/default/home.html | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'module/web/templates/default/home.html') diff --git a/module/web/templates/default/home.html b/module/web/templates/default/home.html index 40f124712..fac4b6e63 100644 --- a/module/web/templates/default/home.html +++ b/module/web/templates/default/home.html @@ -1,5 +1,9 @@ {% extends 'default/base.html' %} -{% block content %} +{% block subtitle %} +Active Downloads +{% endblock %} + +{% block content %} {% endblock %} \ No newline at end of file -- cgit v1.2.3 From 2b6db7950916f29eea39224104fed284ad4222c7 Mon Sep 17 00:00:00 2001 From: Wugy Date: Sat, 19 Dec 2009 17:14:05 +0100 Subject: active download list 40% --- module/web/templates/default/home.html | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) (limited to 'module/web/templates/default/home.html') diff --git a/module/web/templates/default/home.html b/module/web/templates/default/home.html index fac4b6e63..ac9c5d25c 100644 --- a/module/web/templates/default/home.html +++ b/module/web/templates/default/home.html @@ -1,9 +1,22 @@ -{% extends 'default/base.html' %} - -{% block subtitle %} -Active Downloads -{% endblock %} - - -{% block content %} +{% extends 'default/base.html' %} + +{% block subtitle %} +Active Downloads +{% endblock %} + + + +{% block content %} + + + + + + + + + + +
+ {% endblock %} \ No newline at end of file -- cgit v1.2.3 From 04c80ef15db0f553d330c3bd760956c5debc7833 Mon Sep 17 00:00:00 2001 From: Wugy Date: Sun, 20 Dec 2009 19:35:02 +0100 Subject: webinterface - activ download - design 60% --- module/web/templates/default/home.html | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'module/web/templates/default/home.html') diff --git a/module/web/templates/default/home.html b/module/web/templates/default/home.html index ac9c5d25c..8124902db 100644 --- a/module/web/templates/default/home.html +++ b/module/web/templates/default/home.html @@ -7,16 +7,15 @@ Active Downloads {% block content %} - - - - - - - - +
+ + + + + + - + +
NameStatusInfosSizeProgress
- {% endblock %} \ No newline at end of file -- cgit v1.2.3 From 62965d0668e81fc801c4be2d61c1a0b64b0edca8 Mon Sep 17 00:00:00 2001 From: RaNaN Date: Sun, 20 Dec 2009 23:43:21 +0100 Subject: cli + web fixes --- module/web/templates/default/home.html | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'module/web/templates/default/home.html') diff --git a/module/web/templates/default/home.html b/module/web/templates/default/home.html index 8124902db..43cf16ae0 100644 --- a/module/web/templates/default/home.html +++ b/module/web/templates/default/home.html @@ -16,6 +16,21 @@ Active Downloads Progress + + {% for link in content %} + + {{ link.name }} + {{ link.status }} + {{ content.eta }} @ {{content.speed }} + {{ link.kbleft }} + {{ link.percent }}% / {{ link.size }} + + + + + + + {% endfor %} {% endblock %} \ No newline at end of file -- cgit v1.2.3 From 7dd0c96037b0f91f761126d20e477e0e83e20825 Mon Sep 17 00:00:00 2001 From: Wugy Date: Mon, 21 Dec 2009 18:15:56 +0100 Subject: total progressbar bullshit --- module/web/templates/default/home.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'module/web/templates/default/home.html') diff --git a/module/web/templates/default/home.html b/module/web/templates/default/home.html index 43cf16ae0..acc185444 100644 --- a/module/web/templates/default/home.html +++ b/module/web/templates/default/home.html @@ -21,13 +21,13 @@ Active Downloads {{ link.name }} {{ link.status }} - {{ content.eta }} @ {{content.speed }} - {{ link.kbleft }} - {{ link.percent }}% / {{ link.size }} + {{ link.info }} + {{ link.size }} + {{ link.percent }}% / {{ link.kbleft }}load - - + + {% endfor %} -- cgit v1.2.3 From 9453269684b8d17411d8bbc4ecd0c7958670ff42 Mon Sep 17 00:00:00 2001 From: RaNaN Date: Mon, 21 Dec 2009 19:59:59 +0100 Subject: log view, progressbar test --- module/web/templates/default/home.html | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'module/web/templates/default/home.html') diff --git a/module/web/templates/default/home.html b/module/web/templates/default/home.html index acc185444..58c2c5c79 100644 --- a/module/web/templates/default/home.html +++ b/module/web/templates/default/home.html @@ -26,11 +26,14 @@ Active Downloads {{ link.percent }}% / {{ link.kbleft }}load - - + + {% endfor %} + + 75% + {% endblock %} \ No newline at end of file -- cgit v1.2.3 From 5bd5ffbaf7de6436f8648591b9430dad1e3c1eef Mon Sep 17 00:00:00 2001 From: Wugy Date: Wed, 6 Jan 2010 14:22:31 +0100 Subject: default Dir in module/web/media/ --- module/web/templates/default/home.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'module/web/templates/default/home.html') diff --git a/module/web/templates/default/home.html b/module/web/templates/default/home.html index 58c2c5c79..bd2955038 100644 --- a/module/web/templates/default/home.html +++ b/module/web/templates/default/home.html @@ -23,16 +23,16 @@ Active Downloads {{ link.status }} {{ link.info }} {{ link.size }} - {{ link.percent }}% / {{ link.kbleft }}load + {{ link.percent }}% / {{ link.kbleft }}load - + {% endfor %} - 75% + -- cgit v1.2.3 From a7f1ce4e269b0b4eacd56b4ffe0e4cc572ae5d81 Mon Sep 17 00:00:00 2001 From: Wugy Date: Wed, 6 Jan 2010 15:38:47 +0100 Subject: Webinterface --- module/web/templates/default/home.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'module/web/templates/default/home.html') diff --git a/module/web/templates/default/home.html b/module/web/templates/default/home.html index bd2955038..16526341e 100644 --- a/module/web/templates/default/home.html +++ b/module/web/templates/default/home.html @@ -36,4 +36,6 @@ Active Downloads -{% endblock %} \ No newline at end of file +{% endblock %} + +{% include "default/window.html" %} \ No newline at end of file -- cgit v1.2.3 From f2d387f8a2915d7be11fe8741fe3b45a0252aa9d Mon Sep 17 00:00:00 2001 From: RaNaN Date: Wed, 6 Jan 2010 15:58:35 +0100 Subject: webinterface fix --- module/web/templates/default/home.html | 54 +++++++++++++++++++++++++++++----- 1 file changed, 47 insertions(+), 7 deletions(-) (limited to 'module/web/templates/default/home.html') diff --git a/module/web/templates/default/home.html b/module/web/templates/default/home.html index 16526341e..12fa55539 100644 --- a/module/web/templates/default/home.html +++ b/module/web/templates/default/home.html @@ -1,11 +1,55 @@ {% extends 'default/base.html' %} +{% block head %} + + + +{% endblock %} + {% block subtitle %} Active Downloads {% endblock %} - - {% block content %} @@ -32,10 +76,6 @@ Active Downloads {% endfor %} - -
-{% endblock %} - -{% include "default/window.html" %} \ No newline at end of file +{% endblock %} \ No newline at end of file -- cgit v1.2.3 From 9dc2f58872b9f170621bd583f73f9fe144238972 Mon Sep 17 00:00:00 2001 From: Wugy Date: Wed, 6 Jan 2010 22:14:56 +0100 Subject: Webinterface - AddBox --- module/web/templates/default/home.html | 4 ---- 1 file changed, 4 deletions(-) (limited to 'module/web/templates/default/home.html') diff --git a/module/web/templates/default/home.html b/module/web/templates/default/home.html index 12fa55539..49633f94a 100644 --- a/module/web/templates/default/home.html +++ b/module/web/templates/default/home.html @@ -3,10 +3,6 @@ {% block head %} {% endblock %} @@ -51,6 +180,7 @@ Active Downloads {% block content %} + @@ -58,6 +188,7 @@ Active Downloads + {% for link in content %} @@ -66,11 +197,11 @@ Active Downloads - + - - + {% endfor %} -- cgit v1.2.3 From 9cce347134cffb8e3e920d94768306c2156dddee Mon Sep 17 00:00:00 2001 From: RaNaN Date: Wed, 13 Jan 2010 21:23:05 +0100 Subject: some webinterface improvements, closed #40 --- module/web/templates/default/home.html | 38 +++++++++++++++++++++++++++------- 1 file changed, 30 insertions(+), 8 deletions(-) (limited to 'module/web/templates/default/home.html') diff --git a/module/web/templates/default/home.html b/module/web/templates/default/home.html index 02681a23d..4d499f6fe 100644 --- a/module/web/templates/default/home.html +++ b/module/web/templates/default/home.html @@ -19,6 +19,8 @@ var EntryManager = new Class({ initialize: function(){ this.json = new Request.JSON({ url: "json/links", + secure: false, + async: true, onSuccess: this.update.bind(this), initialDelay: 0, delay: 2500, @@ -59,8 +61,8 @@ var EntryManager = new Class({ },data).each(function(id){ index = this.ids.indexOf(id); this.entries[index].remove(); - this.entries = this.entries.remove(index); - this.ids = this.ids.remove(index); + this.entries = this.entries.filter(function(item){return item.id != this},id); + this.ids = this.ids.erase(id) }, this); data.links.each(function(link, i){ @@ -97,6 +99,7 @@ var LinkEntry = new Class({ info: $("link_{id}_info".substitute({id: this.id})), kbleft: $("link_{id}_kbleft".substitute({id: this.id})), percent: $("link_{id}_percent".substitute({id: this.id})), + remove: $("link_{id}_remove".substitute({id: this.id})), pgbTr: $("link_{id}_pgb_tr".substitute({id: this.id})), pgb: $("link_{id}_pgb".substitute({id: this.id})) } @@ -104,7 +107,7 @@ var LinkEntry = new Class({ }, insert: function(item){ try{ - info = SecToRightTime(item.eta)+' @ '+Math.round(item.speed*100)/100+' kb/s' ; + info = SecToRightTime(item.eta) +' @ '+ Math.round(item.speed*100)/100+' kb/s' ; this.elements = { tr: new Element('tr', { @@ -125,9 +128,20 @@ var LinkEntry = new Class({ kbleft: new Element('td', { 'html': HumanFileSize(item.size) }), - percent: new Element('td', { + percent: new Element('font', { 'html': item.percent+ '% / '+ HumanFileSize(item.size-item.kbleft) }), + remove: new Element('img',{ + 'html': '', + 'src': 'media/default/img/control_cancel.png', + 'styles':{ + 'vertical-align': 'middle', + 'margin-right': '-20px', + 'margin-left': '5px', + 'margin-top': '-2px', + 'cursor': 'pointer' + } + }), pgbTr: new Element('tr', { 'html':'' }), @@ -136,12 +150,12 @@ var LinkEntry = new Class({ 'styles':{ 'height': '4px', 'width': item.percent+'%', - 'background-color': '#ddd' + 'background-color': '#ddd', } }) } - this.elements.tr.adopt(this.elements.name,this.elements.status,this.elements.info,this.elements.kbleft,this.elements.percent); + this.elements.tr.adopt(this.elements.name,this.elements.status,this.elements.info,this.elements.kbleft,new Element('td').adopt(this.elements.percent,this.elements.remove)); this.elements.pgbTr.adopt(new Element('td',{'colspan':5}).adopt(this.elements.pgb)); this.initEffects(); }catch(e){ @@ -149,9 +163,14 @@ var LinkEntry = new Class({ } }, initEffects: function(){ - this.bar = new Fx.Morph(this.elements.pgb, {unit: '%', duration: 3000, link: 'chain', fps:30}); + this.bar = new Fx.Morph(this.elements.pgb, {unit: '%', duration: 5000, link: 'link', fps:30}); this.fade = new Fx.Tween(this.elements.tr); 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(); + }.bind(this)); + }, update: function(item){ this.elements.name.set('text', item.name); @@ -197,7 +216,10 @@ Active Downloads - + - -- cgit v1.2.3
Name StatusSize Progress
- +
+ {{ link.percent }}% /{{ link.kbleft }} + +