From f78d794079c7e7199c64e2a202b7ae96ad1e5f7f Mon Sep 17 00:00:00 2001
From: Martijn Voncken <mvoncken@gmail.com>
Date: Tue, 18 Mar 2008 17:08:30 +0000
Subject: [PATCH] fix webpy022 import for /lib/

---
 deluge/ui/webui/config_forms.py              | 2 --
 deluge/ui/webui/config_tabs_deluge.py        | 3 ---
 deluge/ui/webui/deluge_webserver.py          | 2 --
 deluge/ui/webui/lib/newforms_plus.py         | 2 +-
 deluge/ui/webui/lib/static_handler.py        | 4 ++--
 deluge/ui/webui/templates/deluge/config.html | 7 ++++++-
 deluge/ui/webui/web.py                       | 2 --
 7 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/deluge/ui/webui/config_forms.py b/deluge/ui/webui/config_forms.py
index 7ae53a95f..7cc48c554 100644
--- a/deluge/ui/webui/config_forms.py
+++ b/deluge/ui/webui/config_forms.py
@@ -29,8 +29,6 @@
 #  this exception statement from your version. If you delete this exception
 #  statement from all source files in the program, then also delete it here.
 
-#TODO: rename to config_manager.py
-
 import lib.newforms_plus as forms
 import page_decorators as deco
 import web
diff --git a/deluge/ui/webui/config_tabs_deluge.py b/deluge/ui/webui/config_tabs_deluge.py
index 170178374..66ccca875 100644
--- a/deluge/ui/webui/config_tabs_deluge.py
+++ b/deluge/ui/webui/config_tabs_deluge.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
 # deluge_webserver.py
@@ -39,7 +38,6 @@ from deluge import component
 
 config_page = component.get("ConfigPageManager")
 
-
 class NetworkPorts(config_forms.CfgForm ):
     title = _("Ports")
     info = _("Restart daemon after changing these values.")
@@ -106,7 +104,6 @@ class BandwithTorrent(config_forms.CfgForm):
 
 config_page.register('bandwidth','torrent', BandwithTorrent)
 
-
 class Download(config_forms.CfgForm):
     title = _("Download")
     download_location = forms.ServerFolder(_("Store all downoads in"))
diff --git a/deluge/ui/webui/deluge_webserver.py b/deluge/ui/webui/deluge_webserver.py
index ea4ff8a01..b3f5ad039 100644
--- a/deluge/ui/webui/deluge_webserver.py
+++ b/deluge/ui/webui/deluge_webserver.py
@@ -1,6 +1,4 @@
 #
-# webserver_framework.py
-#
 # Copyright (C) Martijn Voncken 2007 <mvoncken@gmail.com>
 #
 # This program is free software; you can redistribute it and/or modify
diff --git a/deluge/ui/webui/lib/newforms_plus.py b/deluge/ui/webui/lib/newforms_plus.py
index ae55664d7..272867387 100644
--- a/deluge/ui/webui/lib/newforms_plus.py
+++ b/deluge/ui/webui/lib/newforms_plus.py
@@ -10,7 +10,7 @@ from newforms.forms import BoundField
 
 import sys, os
 
-import web
+import webpy022 as web
 
 #Form
 class FilteredForm(newforms.Form):
diff --git a/deluge/ui/webui/lib/static_handler.py b/deluge/ui/webui/lib/static_handler.py
index 98322a9ea..3cf76554e 100644
--- a/deluge/ui/webui/lib/static_handler.py
+++ b/deluge/ui/webui/lib/static_handler.py
@@ -6,8 +6,8 @@
 static fileserving for web.py
 without the need for wsgi wrapper magic.
 """
-import web
-from web import seeother, url
+import webpy022 as web
+from webpy022 import seeother, url
 
 import posixpath
 import urlparse
diff --git a/deluge/ui/webui/templates/deluge/config.html b/deluge/ui/webui/templates/deluge/config.html
index a5f2d3671..8a4012c25 100644
--- a/deluge/ui/webui/templates/deluge/config.html
+++ b/deluge/ui/webui/templates/deluge/config.html
@@ -23,13 +23,18 @@ $for group in groups:
 <form method="POST">
 <table id="config_table">
 $:form.as_table()
+<tr>
+    <td></td>
+    <td><input type="submit" name="submit" id="submit" value='$_("Save")'></td>
+</tr>
+
 </table>
 $if message:
     <div id="message">$message</div>
 $if error:
     <div class="error">$error</div>
 
-<input type="submit" name="submit" id="submit" value='$_("Save")'>
+
 
 </form>
 
diff --git a/deluge/ui/webui/web.py b/deluge/ui/webui/web.py
index c1fca2b54..da5155e11 100644
--- a/deluge/ui/webui/web.py
+++ b/deluge/ui/webui/web.py
@@ -1,4 +1,2 @@
 #compatibility: use the included version/release of web.py.
 from lib.webpy022 import *
-print 'tpl=',template
-print list(sorted(globals().keys()))