From a69ed83e25075594cf9bce207a4ebca9ddd24a8e Mon Sep 17 00:00:00 2001 From: Damien Churchill Date: Thu, 25 Feb 2010 19:43:01 +0000 Subject: [PATCH 1/2] begin adding support for a base config parameter --- deluge/ui/web/index.html | 10 +++++----- deluge/ui/web/server.py | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/deluge/ui/web/index.html b/deluge/ui/web/index.html index d0fed9d63..41663937d 100644 --- a/deluge/ui/web/index.html +++ b/deluge/ui/web/index.html @@ -3,23 +3,23 @@ Deluge: Web UI ${version} - - + + % for stylesheet in stylesheets: - + % endfor % for script in scripts: - + % endfor -
+
diff --git a/deluge/ui/web/server.py b/deluge/ui/web/server.py index a6c1152fd..a71268b12 100644 --- a/deluge/ui/web/server.py +++ b/deluge/ui/web/server.py @@ -450,7 +450,6 @@ class TopLevel(resource.Resource): return resource.Resource.getChild(self, path, request) def render(self, request): - debug = False if 'debug' in request.args: debug_arg = request.args.get('debug')[-1] @@ -474,9 +473,10 @@ class TopLevel(resource.Resource): else: scripts = self.scripts[:] + base = request.args.get('base', [''])[-1] template = Template(filename=rpath("index.html")) request.setHeader("content-type", "text/html; charset=utf-8") - return template.render(scripts=scripts, stylesheets=self.stylesheets, debug=debug) + return template.render(scripts=scripts, stylesheets=self.stylesheets, debug=debug, base=base) class ServerContextFactory: From 3a86fd706895dfb6b1530cd9bbbf49d073edbf5f Mon Sep 17 00:00:00 2001 From: Damien Churchill Date: Mon, 1 Mar 2010 22:45:35 +0000 Subject: [PATCH 2/2] give the fileuploadfield a width so the text field expands correctly --- deluge/ui/web/js/deluge-all/Deluge.Add.File.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/deluge/ui/web/js/deluge-all/Deluge.Add.File.js b/deluge/ui/web/js/deluge-all/Deluge.Add.File.js index 072268148..31bf844dc 100644 --- a/deluge/ui/web/js/deluge-all/Deluge.Add.File.js +++ b/deluge/ui/web/js/deluge-all/Deluge.Add.File.js @@ -57,12 +57,13 @@ Ext.deluge.add.FileWindow = Ext.extend(Ext.deluge.add.Window, { this.form = this.add({ xtype: 'form', baseCls: 'x-plain', - labelWidth: 55, + labelWidth: 35, autoHeight: true, fileUpload: true, items: [{ xtype: 'fileuploadfield', id: 'torrentFile', + width: 280, emptyText: _('Select a torrent'), fieldLabel: _('File'), name: 'file',