From eb034e731f610705c10f4b182772183fdefd8e28 Mon Sep 17 00:00:00 2001 From: RaNaN Date: Sun, 2 Oct 2011 16:50:03 +0200 Subject: closed #365, #396, #397 --- module/web/pyload_app.py | 3 ++- module/web/templates/default/base.html | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'module/web') diff --git a/module/web/pyload_app.py b/module/web/pyload_app.py index 553eeaa57..0370e19cb 100644 --- a/module/web/pyload_app.py +++ b/module/web/pyload_app.py @@ -470,7 +470,8 @@ def logs(item=-1): @route("/admin", method="POST") @login_required("ADMIN") def admin(): - user = PYLOAD.getAllUserData() + # convert to dict + user = dict([(name, toDict(y)) for name, y in PYLOAD.getAllUserData().iteritems()]) perms = permlist() for data in user.itervalues(): diff --git a/module/web/templates/default/base.html b/module/web/templates/default/base.html index 2987cf081..c7014e6b6 100644 --- a/module/web/templates/default/base.html +++ b/module/web/templates/default/base.html @@ -148,7 +148,9 @@ function out(){ function show_cap(){ bg_show(); $("cap_box").setStyle('display', 'block'); - cap_box.start('opacity',1) + cap_box.start('opacity',1).chain(function(){ + $('cap_result').focus(); + }); } function hide_cap(){ -- cgit v1.2.3