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/base.html | 99 +++++++++++++++++++++++++++++ module/web/templates/default/downloads.html | 16 +++++ module/web/templates/default/home.html | 1 + module/web/templates/default/login.html | 35 ++++++++++ module/web/templates/default/logout.html | 9 +++ module/web/templates/default/logs.html | 16 +++++ module/web/templates/default/queue.html | 16 +++++ module/web/templates/default/window.html | 28 ++++++++ 8 files changed, 220 insertions(+) create mode 100644 module/web/templates/default/base.html create mode 100644 module/web/templates/default/downloads.html create mode 100644 module/web/templates/default/home.html create mode 100644 module/web/templates/default/login.html create mode 100644 module/web/templates/default/logout.html create mode 100644 module/web/templates/default/logs.html create mode 100644 module/web/templates/default/queue.html create mode 100644 module/web/templates/default/window.html (limited to 'module/web/templates/default') diff --git a/module/web/templates/default/base.html b/module/web/templates/default/base.html new file mode 100644 index 000000000..096692a3c --- /dev/null +++ b/module/web/templates/default/base.html @@ -0,0 +1,99 @@ + + + + + + + +{% block head %} +{% endblock %} +{% block title %}pyLoad Webinterface{% endblock %} + + + + +
+ +
+ +{% if user.is_authenticated %} +User:{{user.username}} + +{% else %} + Please Login! +{% endif %} + +
+ + + +
+ +
+ +
+
+ + + +
+ +
+ +

pyLoad — Webinterface +

+ +{% block statusbar %} +{% endblock %} + + +
+ +
+
+ +{% for message in messages %} +

{{message}}

 +{% endfor %} + +{% block content %} +{% endblock content %} + +
+ + +
+ + diff --git a/module/web/templates/default/downloads.html b/module/web/templates/default/downloads.html new file mode 100644 index 000000000..3c9bb5df4 --- /dev/null +++ b/module/web/templates/default/downloads.html @@ -0,0 +1,16 @@ +{% extends 'default/base.html' %} + +{% block title %}Downloads - {{block.super}} {% endblock %} + +{% block menu %} +
  • + Home +
    • +
  • + Queue
    • +
  • + Downloads
    • +
  • + Logs +
    • +{% endblock %} \ No newline at end of file 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 diff --git a/module/web/templates/default/login.html b/module/web/templates/default/login.html new file mode 100644 index 000000000..851802c4f --- /dev/null +++ b/module/web/templates/default/login.html @@ -0,0 +1,35 @@ +{% extends 'default/base.html' %} + +{% block title %}Login - {{block.super}} {% endblock %} + +{% block content %} + +
    +
    +
    + +
    + Login + +
    + +
    + +
    +
    +
    + +{% if form.errors %} +

    Your username and password didn't match. Please try again.

    +{% endif %} + +
    +
    + +{% endblock %} \ No newline at end of file diff --git a/module/web/templates/default/logout.html b/module/web/templates/default/logout.html new file mode 100644 index 000000000..4d00bf6d5 --- /dev/null +++ b/module/web/templates/default/logout.html @@ -0,0 +1,9 @@ +{% extends 'default/base.html' %} + +{% block head %} + +{% endblock %} + +{% block content %} +

    You were successfully logged out.

    +{% endblock %} \ No newline at end of file diff --git a/module/web/templates/default/logs.html b/module/web/templates/default/logs.html new file mode 100644 index 000000000..d6f392f58 --- /dev/null +++ b/module/web/templates/default/logs.html @@ -0,0 +1,16 @@ +{% extends 'default/base.html' %} + +{% block title %}Logs - {{block.super}} {% endblock %} + +{% block menu %} +
  • + Home +
    • +
  • + Queue
    • +
  • + Downloads
    • +
  • + Logs +
    • +{% endblock %} \ No newline at end of file diff --git a/module/web/templates/default/queue.html b/module/web/templates/default/queue.html new file mode 100644 index 000000000..b6a185b19 --- /dev/null +++ b/module/web/templates/default/queue.html @@ -0,0 +1,16 @@ +{% extends 'default/base.html' %} + +{% block title %}Queue - {{block.super}} {% endblock %} + +{% block menu %} +
  • + Home +
    • +
  • + Queue
    • +
  • + Downloads
    • +
  • + Logs +
    • +{% endblock %} \ No newline at end of file diff --git a/module/web/templates/default/window.html b/module/web/templates/default/window.html new file mode 100644 index 000000000..f756c4352 --- /dev/null +++ b/module/web/templates/default/window.html @@ -0,0 +1,28 @@ + \ No newline at end of file -- cgit v1.2.3 From fe85f003f3adfb568c8b1a650035128c183a739d Mon Sep 17 00:00:00 2001 From: RaNaN Date: Wed, 16 Dec 2009 17:09:14 +0100 Subject: some Webinterface Json Code --- module/web/templates/default/base.html | 9 +++++---- module/web/templates/default/downloads.html | 8 ++++---- module/web/templates/default/logs.html | 8 ++++---- module/web/templates/default/queue.html | 8 ++++---- 4 files changed, 17 insertions(+), 16 deletions(-) (limited to 'module/web/templates/default') diff --git a/module/web/templates/default/base.html b/module/web/templates/default/base.html index 096692a3c..27aa72b9f 100644 --- a/module/web/templates/default/base.html +++ b/module/web/templates/default/base.html @@ -6,6 +6,7 @@ + {% block head %} {% endblock %} {% block title %}pyLoad Webinterface{% endblock %} @@ -40,14 +41,14 @@ {% block menu %}
  • - Home + Home
  • - Queue
    • + Queue
  • - Downloads
    • + Downloads
  • - Logs + Logs
    • {% endblock %} diff --git a/module/web/templates/default/downloads.html b/module/web/templates/default/downloads.html index 3c9bb5df4..202965b3c 100644 --- a/module/web/templates/default/downloads.html +++ b/module/web/templates/default/downloads.html @@ -4,13 +4,13 @@ {% block menu %}
  • - Home + Home
  • - Queue
    • + Queue
  • - Downloads
    • + Downloads
  • - Logs + Logs
    • {% endblock %} \ No newline at end of file diff --git a/module/web/templates/default/logs.html b/module/web/templates/default/logs.html index d6f392f58..39f4b8660 100644 --- a/module/web/templates/default/logs.html +++ b/module/web/templates/default/logs.html @@ -4,13 +4,13 @@ {% block menu %}
  • - Home + Home
  • - Queue
    • + Queue
  • - Downloads
    • + Downloads
  • - Logs + Logs
    • {% endblock %} \ No newline at end of file diff --git a/module/web/templates/default/queue.html b/module/web/templates/default/queue.html index b6a185b19..8c582c5d0 100644 --- a/module/web/templates/default/queue.html +++ b/module/web/templates/default/queue.html @@ -4,13 +4,13 @@ {% block menu %}
  • - Home + Home
  • - Queue
    • + Queue
  • - Downloads
    • + Downloads
  • - Logs + Logs
    • {% endblock %} \ No newline at end of file -- cgit v1.2.3 From ce746b8d0ee022b8926538ceed6ec19d4e3ee8e8 Mon Sep 17 00:00:00 2001 From: Wugy Date: Wed, 16 Dec 2009 22:03:32 +0100 Subject: add some class's --- module/web/templates/default/base.html | 211 +++++++++++++++++---------------- 1 file changed, 111 insertions(+), 100 deletions(-) (limited to 'module/web/templates/default') diff --git a/module/web/templates/default/base.html b/module/web/templates/default/base.html index 27aa72b9f..9095d802a 100644 --- a/module/web/templates/default/base.html +++ b/module/web/templates/default/base.html @@ -1,100 +1,111 @@ - - - - - - - - -{% block head %} -{% endblock %} -{% block title %}pyLoad Webinterface{% endblock %} - - - - -
    - -
    - -{% if user.is_authenticated %} -User:{{user.username}} - -{% else %} - Please Login! -{% endif %} - -
    - - - -
    - -
    - -
    -
    - - - -
    - -
    - -

    pyLoad — Webinterface -

    - -{% block statusbar %} -{% endblock %} - - -
    - -
    -
    - -{% for message in messages %} -

    {{message}}

     -{% endfor %} - -{% block content %} -{% endblock content %} - -
    - - -
    - - + + + + + + + + +{% block head %} +{% endblock %} +{% block title %}pyLoad Webinterface{% endblock %} + + + + + +
    + +
    + +{% if user.is_authenticated %} +User:{{user.username}} + +{% else %} + Please Login! +{% endif %} + +
    + + + +
    + +
    + +
    +
    + + + + + + + +{% block statusbar %} +{% endblock %} + + +
    + +
    +
    + +{% for message in messages %} +

    {{message}}

     +{% endfor %} + +{% block content %} +{% endblock content %} + +
    + + +
    + + -- 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/base.html | 10 +++++++--- module/web/templates/default/home.html | 6 +++++- 2 files changed, 12 insertions(+), 4 deletions(-) (limited to 'module/web/templates/default') diff --git a/module/web/templates/default/base.html b/module/web/templates/default/base.html index 9095d802a..5d79e8b6a 100644 --- a/module/web/templates/default/base.html +++ b/module/web/templates/default/base.html @@ -12,7 +12,7 @@ {% block title %}pyLoad Webinterface{% endblock %} @@ -63,23 +63,27 @@ $(document).ready(function(){
    +{% if perms.pyload.can_change_status %} +{% endif %} +{% if perms.pyload.can_see_dl %} +{% endif %} - + Date: Thu, 17 Dec 2009 00:25:59 +0100 Subject: new images, status ajax, add jquery --- module/web/templates/default/base.html | 57 ++++++++++++++++++++++++++-------- 1 file changed, 44 insertions(+), 13 deletions(-) (limited to 'module/web/templates/default') diff --git a/module/web/templates/default/base.html b/module/web/templates/default/base.html index 5d79e8b6a..ef2685a83 100644 --- a/module/web/templates/default/base.html +++ b/module/web/templates/default/base.html @@ -6,13 +6,48 @@ - + {% block head %} {% endblock %} {% block title %}pyLoad Webinterface{% endblock %} @@ -63,27 +98,23 @@ $(document).ready(function(){
    -{% if perms.pyload.can_change_status %} -{% endif %} -{% if perms.pyload.can_see_dl %} -{% endif %} +
    -

    pyLoad — Webinterface -

    Queue {% block statusbar %} {% endblock %} -- 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/base.html | 6 +++++- module/web/templates/default/downloads.html | 28 ++++++++++++++++++++++++++++ module/web/templates/default/home.html | 6 +++++- 3 files changed, 38 insertions(+), 2 deletions(-) (limited to 'module/web/templates/default') diff --git a/module/web/templates/default/base.html b/module/web/templates/default/base.html index ef2685a83..46e9caa11 100644 --- a/module/web/templates/default/base.html +++ b/module/web/templates/default/base.html @@ -98,23 +98,27 @@ $(document).ready(function(){
    +{% if perms.pyload.can_change_status %} +{% endif %} +{% if perms.pyload.can_see_dl %}
    +{% endif %}
    -

    Queue

    +

    {% block subtitle %}pyLoad - Webinterface{% endblock %}

    {% block statusbar %} {% endblock %} diff --git a/module/web/templates/default/downloads.html b/module/web/templates/default/downloads.html index 202965b3c..3f07bec47 100644 --- a/module/web/templates/default/downloads.html +++ b/module/web/templates/default/downloads.html @@ -13,4 +13,32 @@
  • Logs
    • +{% endblock %} + +{% block subtitle %} +Downloads +{% endblock %} + +{% block content %} + +It's recommend not to download Files bigger than ~10MB from here. + +
      + {% for folder in files.folder %} +
    • + {{ folder.name }} +
        + {% for file in folder.files %} +
      • {{ file }}
        • + {% endfor %} +
      +
      • + {% endfor %} + + {% for file in files.files %} +
    • {{ file }}
      • + {% endfor %} + +
    + {% endblock %} \ No newline at end of file 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 adcc953b4dd2dce1f91bd7cd11105e9f0653f704 Mon Sep 17 00:00:00 2001 From: RaNaN Date: Sat, 19 Dec 2009 15:13:10 +0100 Subject: fixed reconnect --- module/web/templates/default/base.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'module/web/templates/default') diff --git a/module/web/templates/default/base.html b/module/web/templates/default/base.html index 46e9caa11..307dd821a 100644 --- a/module/web/templates/default/base.html +++ b/module/web/templates/default/base.html @@ -108,8 +108,8 @@ $(document).ready(function(){ {% if perms.pyload.can_see_dl %}
    {% endif %} -- 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/base.html | 151 +++++++++++++++++++++++++++++++-- module/web/templates/default/home.html | 29 +++++-- 2 files changed, 166 insertions(+), 14 deletions(-) (limited to 'module/web/templates/default') diff --git a/module/web/templates/default/base.html b/module/web/templates/default/base.html index 307dd821a..f9ea8c3a2 100644 --- a/module/web/templates/default/base.html +++ b/module/web/templates/default/base.html @@ -11,10 +11,133 @@ {% endblock %} {% block title %}pyLoad Webinterface{% endblock %} 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 fc5ae79bf0e0fc2c43b9b748c4d00037077f21a6 Mon Sep 17 00:00:00 2001 From: Wugy Date: Sat, 19 Dec 2009 19:27:42 +0100 Subject: webinterface - activ Downloads List - Code completed --- module/web/templates/default/base.html | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) (limited to 'module/web/templates/default') diff --git a/module/web/templates/default/base.html b/module/web/templates/default/base.html index f9ea8c3a2..73846b0d6 100644 --- a/module/web/templates/default/base.html +++ b/module/web/templates/default/base.html @@ -132,8 +132,25 @@ sprintfWrapper = { } } } - sprintf = sprintfWrapper.init; + +//var SetInver = new Array(); + +function HumanFileSize(size) +{ + var filesizename = new Array("KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"); + var loga = Math.log(size)/Math.log(1024); + var i = Math.floor(loga); + var a = Math.pow(1024, i); + return Math.round( size / a , 2) + " " + filesizename[i]; +} + +/*function UpdateLinks( SetInver, index ) +{ + $("#aktiv_percent").text(parseInt($("#aktiv_percent").text)+1) + setTimeout( UpdateLinks( SetInver, index+1 ), SetInver[index]*1000); +}*/ + function LoadJsonToContent(data) { JSONDATA = data; @@ -161,8 +178,15 @@ function LinksToContent(data) $("#LinksAktiv").text(''); $.each(data, function(i,item) { - $("#LinksAktiv").append(''+item.name+''+item.status+''+Math.round(item.speed*100)/100+'@'+SecToRightTime(item.eta)+''+item.size+' MB'+item.percent+'% / '+item.kbleft+' MB'); + $("#LinksAktiv").append(''+item.name+''+item.status+''+Math.round(item.speed*100)/100+'@'+SecToRightTime(item.eta)+''+HumanFileSize(item.size)+''+item.percent+'% / '+HumanFileSize(item.size-item.kbleft)+''); + //SetInver[i] = (item.size / 100 ) / item.speed ; + //window.setInterval( $("#aktiv_percent").text(parseInt($("#aktiv_percent").text)+1), ((item.size / 100 ) / item.speed)*100); }); + //UpdateLinks(SetInver, 0); + setTimeout(function() + { + $.getJSON('/json/links', LinksToContent ); + }, 4000); } function SecToRightTime(sek) @@ -248,7 +272,7 @@ $(document).ready(function(){ {% if perms.pyload.can_see_dl %}
    {% endif %} -- 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/base.html | 13 +++++++------ module/web/templates/default/home.html | 19 +++++++++---------- 2 files changed, 16 insertions(+), 16 deletions(-) (limited to 'module/web/templates/default') diff --git a/module/web/templates/default/base.html b/module/web/templates/default/base.html index 73846b0d6..4036180bf 100644 --- a/module/web/templates/default/base.html +++ b/module/web/templates/default/base.html @@ -156,7 +156,7 @@ function LoadJsonToContent(data) JSONDATA = data; $("#speed").text(Math.round(data.speed*100)/100); $("#aktiv").text(data.queue); - $("#aktiv_from").text(data.total); + $("#queue").text(data.total); /*if( data.pause == false ) { @@ -178,9 +178,10 @@ function LinksToContent(data) $("#LinksAktiv").text(''); $.each(data, function(i,item) { - $("#LinksAktiv").append(''+item.name+''+item.status+''+Math.round(item.speed*100)/100+'@'+SecToRightTime(item.eta)+''+HumanFileSize(item.size)+''+item.percent+'% / '+HumanFileSize(item.size-item.kbleft)+''); + $("#LinksAktiv").append(''+item.name+''+item.status+''+SecToRightTime(item.eta)+' @ '+Math.round(item.speed*100)/100+' kb/s'+HumanFileSize(item.size)+''+item.percent+'% / '+HumanFileSize(item.size-item.kbleft)+''); //SetInver[i] = (item.size / 100 ) / item.speed ; //window.setInterval( $("#aktiv_percent").text(parseInt($("#aktiv_percent").text)+1), ((item.size / 100 ) / item.speed)*100); + $("#LinksAktiv").append('
     
    '); }); //UpdateLinks(SetInver, 0); setTimeout(function() @@ -264,15 +265,15 @@ $(document).ready(function(){ {% if perms.pyload.can_change_status %} {% endif %} {% if perms.pyload.can_see_dl %}
    {% endif %} 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 8be39a4ac3563b3ac4abd8824ac775710fd4c4f6 Mon Sep 17 00:00:00 2001 From: Wugy Date: Sun, 20 Dec 2009 20:20:52 +0100 Subject: webinterface - design 70% --- module/web/templates/default/base.html | 1 + 1 file changed, 1 insertion(+) (limited to 'module/web/templates/default') diff --git a/module/web/templates/default/base.html b/module/web/templates/default/base.html index 4036180bf..c43d5223c 100644 --- a/module/web/templates/default/base.html +++ b/module/web/templates/default/base.html @@ -182,6 +182,7 @@ function LinksToContent(data) //SetInver[i] = (item.size / 100 ) / item.speed ; //window.setInterval( $("#aktiv_percent").text(parseInt($("#aktiv_percent").text)+1), ((item.size / 100 ) / item.speed)*100); $("#LinksAktiv").append('
     
    '); + $(".progress_bar").animate({ width: "100%"}, (item.size / item.speed)*1000, "linear" ); }); //UpdateLinks(SetInver, 0); setTimeout(function() -- 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/base.html | 2 +- module/web/templates/default/home.html | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) (limited to 'module/web/templates/default') diff --git a/module/web/templates/default/base.html b/module/web/templates/default/base.html index c43d5223c..657bdcf09 100644 --- a/module/web/templates/default/base.html +++ b/module/web/templates/default/base.html @@ -274,7 +274,7 @@ $(document).ready(function(){ {% if perms.pyload.can_see_dl %}
    {% endif %} 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/add.html | 12 ++ module/web/templates/default/base.html | 198 +++++---------------------------- module/web/templates/default/home.html | 10 +- 3 files changed, 45 insertions(+), 175 deletions(-) create mode 100644 module/web/templates/default/add.html (limited to 'module/web/templates/default') diff --git a/module/web/templates/default/add.html b/module/web/templates/default/add.html new file mode 100644 index 000000000..525cb99bd --- /dev/null +++ b/module/web/templates/default/add.html @@ -0,0 +1,12 @@ +{% extends 'default/base.html' %} + +{% block subtitle %} +Add Links / Container +{% endblock %} + + + +{% block content %} + + +{% endblock %} \ No newline at end of file diff --git a/module/web/templates/default/base.html b/module/web/templates/default/base.html index 657bdcf09..94d8c3dd2 100644 --- a/module/web/templates/default/base.html +++ b/module/web/templates/default/base.html @@ -6,144 +6,23 @@ - + + + + + + {% block head %} {% endblock %} {% block title %}pyLoad Webinterface{% endblock %} + @@ -250,6 +106,8 @@ $(document).ready(function(){
  • Queue
    • +
  • + Add
  • Downloads
  • @@ -274,7 +132,7 @@ $(document).ready(function(){ {% if perms.pyload.can_see_dl %}
    {% endif %} 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/base.html | 4 ++-- module/web/templates/default/home.html | 7 +++++-- module/web/templates/default/logs.html | 9 +++++++++ 3 files changed, 16 insertions(+), 4 deletions(-) (limited to 'module/web/templates/default') diff --git a/module/web/templates/default/base.html b/module/web/templates/default/base.html index 94d8c3dd2..98858b9df 100644 --- a/module/web/templates/default/base.html +++ b/module/web/templates/default/base.html @@ -8,7 +8,7 @@ - + @@ -67,7 +67,7 @@ function LinksToContent(data) setTimeout(function() { $.getJSON('/json/links', LinksToContent ); - }, 4000); + }, 1000); } 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 diff --git a/module/web/templates/default/logs.html b/module/web/templates/default/logs.html index 39f4b8660..f9b0504d9 100644 --- a/module/web/templates/default/logs.html +++ b/module/web/templates/default/logs.html @@ -13,4 +13,13 @@
  • Logs
    • +{% endblock %} + +{% block content %} +
      +{% for line in log %} +
    • {{line.line}}: {{line.content}}
      • +{% endfor %} +
    +<< Start < prev next > {% 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') 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 ++- module/web/templates/default/queue.html | 19 ++--------- module/web/templates/default/window.html | 58 +++++++++++++++++--------------- 3 files changed, 36 insertions(+), 45 deletions(-) (limited to 'module/web/templates/default') 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 diff --git a/module/web/templates/default/queue.html b/module/web/templates/default/queue.html index 8c582c5d0..3995d0390 100644 --- a/module/web/templates/default/queue.html +++ b/module/web/templates/default/queue.html @@ -1,16 +1,3 @@ -{% extends 'default/base.html' %} - -{% block title %}Queue - {{block.super}} {% endblock %} - -{% block menu %} -
  • - Home -
    • -
  • - Queue
    • -
  • - Downloads
    • -
  • - Logs -
    • -{% endblock %} \ No newline at end of file +{% extends 'default/base.html' %} + +{% block title %}Queue - {{block.super}} {% endblock %} diff --git a/module/web/templates/default/window.html b/module/web/templates/default/window.html index f756c4352..f364f2338 100644 --- a/module/web/templates/default/window.html +++ b/module/web/templates/default/window.html @@ -1,28 +1,30 @@ - \ No newline at end of file +{% block content %} + +{% block content %} \ 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/base.html | 42 +++++-------------------- module/web/templates/default/home.html | 54 +++++++++++++++++++++++++++----- module/web/templates/default/queue.html | 13 ++++++++ module/web/templates/default/window.html | 14 ++++----- 4 files changed, 73 insertions(+), 50 deletions(-) (limited to 'module/web/templates/default') diff --git a/module/web/templates/default/base.html b/module/web/templates/default/base.html index 98858b9df..ecaec98f2 100644 --- a/module/web/templates/default/base.html +++ b/module/web/templates/default/base.html @@ -12,14 +12,12 @@ -{% block head %} -{% endblock %} + {% block title %}pyLoad Webinterface{% endblock %} - + + +{% block head %} +{% endblock %} @@ -106,8 +79,6 @@ function LinksToContent(data)
  • Queue
    • -
  • - Add
  • Downloads
  • @@ -169,5 +140,6 @@ function LinksToContent(data)
    • - + +{% include "default/window.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 diff --git a/module/web/templates/default/queue.html b/module/web/templates/default/queue.html index 3995d0390..b4f1cb278 100644 --- a/module/web/templates/default/queue.html +++ b/module/web/templates/default/queue.html @@ -1,3 +1,16 @@ {% extends 'default/base.html' %} {% block title %}Queue - {{block.super}} {% endblock %} + +{% block menu %} +
  • + Home +
    • +
  • + Queue
    • +
  • + Downloads
    • +
  • + Logs +
    • +{% endblock %} \ No newline at end of file diff --git a/module/web/templates/default/window.html b/module/web/templates/default/window.html index f364f2338..602622719 100644 --- a/module/web/templates/default/window.html +++ b/module/web/templates/default/window.html @@ -1,19 +1,18 @@ -{% block content %} -