diff options
| author |  RaNaN <Mast3rRaNaN@hotmail.de>
| 2011-07-13 00:08:40 +0200 |
|---|---|---|
| committer | RaNaN <Mast3rRaNaN@hotmail.de>
| 2011-07-13 00:08:40 +0200 |
| commit | 3f23a2c814bffea6bb6709928dd2174452644943 (patch) | |
| tree | 5d71913392f49333a82d199854f25dcfeaa83981 /module | |
| parent | removed server_methods, please test everything entirely (diff) | |
| download | pyload-3f23a2c814bffea6bb6709928dd2174452644943.tar.xz | |
fixes for last commit
Diffstat (limited to 'module')
| -rw-r--r-- | module/Api.py | 2 | ||||
| -rw-r--r-- | module/plugins/hooks/IRCInterface.py | 2 | ||||
| -rw-r--r-- | module/web/templates/default/base.html | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/module/Api.py b/module/Api.py index 5328fb617..1440f485e 100644 --- a/module/Api.py +++ b/module/Api.py @@ -159,7 +159,7 @@ class Api(Iface): not self.core.threadManager.pause and self.isTimeDownload(), self.core.config['reconnect']['activated'] and self.isTimeReconnect()) - for pyfile in [x.active for x in self.core.threadManager.threads if x.active and isinstance(x, PyFile)]: + for pyfile in [x.active for x in self.core.threadManager.threads if x.active and isinstance(x.active, PyFile)]: serverStatus.speed += pyfile.getSpeed() #bytes/s return serverStatus diff --git a/module/plugins/hooks/IRCInterface.py b/module/plugins/hooks/IRCInterface.py index ae0a51385..5259d8ccb 100644 --- a/module/plugins/hooks/IRCInterface.py +++ b/module/plugins/hooks/IRCInterface.py @@ -53,7 +53,7 @@ class IRCInterface(Thread, Hook): Thread.__init__(self) Hook.__init__(self, core, manager) self.setDaemon(True) - #self.sm = core.server_methods + # self.sm = core.server_methods self.api = core.api #todo, only use api def coreReady(self): diff --git a/module/web/templates/default/base.html b/module/web/templates/default/base.html index 13538cf08..c247a7dc8 100644 --- a/module/web/templates/default/base.html +++ b/module/web/templates/default/base.html @@ -85,7 +85,7 @@ document.addEvent("domready", function(){ function LoadJsonToContent(data)
{
- $("speed").set('text', Math.round(data.speed*100)/100);
+ $("speed").set('text', humanFileSize(data.speed)+"/s");
$("aktiv").set('text', data.active);
$("aktiv_from").set('text', data.queue);
$("aktiv_total").set('text', data.total);
@@ -256,7 +256,7 @@ function AddBox(){ <ul id="page-actions">
<li><span class="time">{{_("Download:")}}</span><a id="time" style=" background-color: {% if status.download %}#8ffc25{% else %} #fc6e26{% endif %}; padding-left: 0cm; padding-right: 0.1cm; "> {% if status.download %}{{_("on")}}{% else %}{{_("off")}}{% endif %}</a></li>
<li><span class="reconnect">{{_("Reconnect:")}}</span><a id="reconnect" style=" background-color: {% if status.reconnect %}#8ffc25{% else %} #fc6e26{% endif %}; padding-left: 0cm; padding-right: 0.1cm; "> {% if status.reconnect %}{{_("on")}}{% else %}{{_("off")}}{% endif %}</a></li>
- <li><a class="action backlink">{{_("Speed:")}} <b id="speed">{{ status.speed }}</b> kb/s</a></li>
+ <li><a class="action backlink">{{_("Speed:")}} <b id="speed">{{ status.speed }}</b></a></li>
<li><a class="action cog">{{_("Active:")}} <b id="aktiv">{{ status.active }}</b> / <b id="aktiv_from">{{ status.queue }}</b> / <b id="aktiv_total">{{ status.total }}</b></a></li>
<li><a href="" class="action revisions" accesskey="o" rel="nofollow">{{_("Reload page")}}</a></li>
</ul>
|