diff options
Diffstat (limited to 'module/web')
| -rw-r--r-- | module/web/WebServer.py | 2 | ||||
| -rw-r--r-- | module/web/static/default/home.js | 20 | ||||
| -rw-r--r-- | module/web/templates/default.tpl | 7 |
3 files changed, 22 insertions, 7 deletions
diff --git a/module/web/WebServer.py b/module/web/WebServer.py index 483d28db3..94d00e168 100644 --- a/module/web/WebServer.py +++ b/module/web/WebServer.py @@ -277,7 +277,7 @@ class WebServer(threading.Thread): bottle.debug(False) #@TODO remove - TIME = time.strftime("%a, %d %b %Y %H:%M:%S +0000", time.localtime()) + #TIME = time.strftime("%a, %d %b %Y %H:%M:%S +0000", time.localtime()) bottle.TEMPLATE_PATH.append('./module/web/templates/%s.tpl') diff --git a/module/web/static/default/home.js b/module/web/static/default/home.js index 8a6586b33..0d74aa17a 100644 --- a/module/web/static/default/home.js +++ b/module/web/static/default/home.js @@ -96,13 +96,23 @@ function renderTable(data){ div.getChildren("b")[0].textContent = dl.name - size = Math.round((dl.size - dl.kbleft) / 1024) + "/" + Math.round(dl.size / 1024) + " MB" - div.getChildren(".dlsize")[0].textContent = size + if (dl.status == "downloading"){ - speed = Math.round(dl.speed) + " kb/s" - div.getChildren(".dlspeed")[0].textContent = speed + size = Math.round((dl.size - dl.kbleft) / 1024) + "/" + Math.round(dl.size / 1024) + " MB" + speed = Math.round(dl.speed) + " kb/s" + eta = dl.eta + + + }else if (dl.status == "waiting"){ - div.getChildren(".dltime")[0].textContent = dl.eta + size = "waiting "+ dl.wait + speed = "" + eta = "" + + } + div.getChildren(".dlsize")[0].textContent = size + div.getChildren(".dlspeed")[0].textContent = speed + div.getChildren(".dltime")[0].textContent = eta }else{ diff --git a/module/web/templates/default.tpl b/module/web/templates/default.tpl index 9bd9b71fb..13be260b6 100644 --- a/module/web/templates/default.tpl +++ b/module/web/templates/default.tpl @@ -201,13 +201,18 @@ this.morph({'color': '#000'}); %for id in links['order']: - <li>{{links[id].url}}</li> %end </ul> +Currently in Development + +%elif page=="downloads": + +Currently in Development + %end <hr style="clear: both;" /> |