summaryrefslogtreecommitdiffstats
path: root/module/web
diff options
context:
space:
mode:
authorGravatar RaNaN <Mast3rRaNaN@hotmail.de> 2011-01-30 16:20:37 +0100
committerGravatar RaNaN <Mast3rRaNaN@hotmail.de> 2011-01-30 16:20:37 +0100
commitf96a5a1cf8800edc2f6a6d73316f7d7c67f32e29 (patch)
tree3081be7874ac1594e1ab4b9c58f2de503acac0b5 /module/web
parentfixed ssl xmlrpc backend (diff)
downloadpyload-f96a5a1cf8800edc2f6a6d73316f7d7c67f32e29.tar.xz
cleanup code
Diffstat (limited to 'module/web')
-rw-r--r--module/web/media/default/js/status.js10
-rw-r--r--module/web/pyload/views.py6
-rw-r--r--module/web/templates/default/settings.html2
3 files changed, 9 insertions, 9 deletions
diff --git a/module/web/media/default/js/status.js b/module/web/media/default/js/status.js
index 3923e80ca..d4ac97528 100644
--- a/module/web/media/default/js/status.js
+++ b/module/web/media/default/js/status.js
@@ -46,7 +46,7 @@ window.addEvent('domready', function(){
}).send('links='+document.id('linkarea').value+"&name="+document.id('pname').value)
- })
+ });
$$('.statusbutton').each(function(item){
@@ -56,7 +56,7 @@ window.addEvent('domready', function(){
this.tween('opacity',0.01)
}
)
- })
+ });
fx_reveal = new Fx.Reveal($('addlinks'));
//fx_reveal.dissolve()
@@ -74,8 +74,8 @@ window.addEvent('domready', function(){
$$('.statusbutton')[2].addEvent('click',function(e){
- $('addlinks').setStyle('top', e.page.y + 5)
- $('addlinks').setStyle('left', e.page.x + 5)
+ $('addlinks').setStyle('top', e.page.y + 5);
+ $('addlinks').setStyle('left', e.page.x + 5);
fx_reveal.reveal()
@@ -87,7 +87,7 @@ window.addEvent('domready', function(){
'url' : '/json/play',
'method' : 'get'
}).send()
- })
+ });
$$('.statusbutton')[1].addEvent('click', function(e){
diff --git a/module/web/pyload/views.py b/module/web/pyload/views.py
index 76f991921..8e72402a4 100644
--- a/module/web/pyload/views.py
+++ b/module/web/pyload/views.py
@@ -265,10 +265,10 @@ def logs(request, item=-1):
item = counter #found our datetime
if item >= 0:
data.append({'line': counter, 'date': date+" "+time, 'level':level, 'message': message})
- perpagecheck = perpagecheck +1
+ perpagecheck += 1
if fro is None and dtime is not None: #if fro not set set it to first showed line
fro = dtime
- if perpagecheck >= perpage and perpage > 0:
+ if perpagecheck >= perpage > 0:
break
if fro is None: #still not set, empty log?
@@ -295,7 +295,7 @@ def collector(request):
def config(request):
conf = settings.PYLOAD.get_config()
plugin = settings.PYLOAD.get_plugin_config()
- accs = settings.PYLOAD.get_accounts()
+ accs = settings.PYLOAD.get_accounts(False, False)
messages = []
for section in chain(conf.itervalues(), plugin.itervalues()):
diff --git a/module/web/templates/default/settings.html b/module/web/templates/default/settings.html
index af87d632c..0ef9ce9f4 100644
--- a/module/web/templates/default/settings.html
+++ b/module/web/templates/default/settings.html
@@ -34,7 +34,7 @@
});
$$('#toptabs a')[0].set('class', 'selected');
- $$('#tabs span')[0].set('class', 'selected')
+ $$('#tabs span')[0].set('class', 'selected');
var firstsel = $$('#tabs span.selected a')[0];
firstsel.fireEvent('click', {target: firstsel});