From cb323f8ae8d603e62857908cf9570a8b67df72b7 Mon Sep 17 00:00:00 2001
From: Ben Kurtovic <ben.kurtovic@verizon.net>
Date: Tue, 24 Jul 2012 00:27:35 -0400
Subject: [PATCH] Some cleanup

---
 pages/debug.mako       |  4 ++--
 pages/settings.mako    | 37 ++++++++++++++++++++++---------------
 static/css/main.css    |  2 +-
 toolserver/settings.py |  2 +-
 4 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/pages/debug.mako b/pages/debug.mako
index 1891a15..f6a11a9 100644
--- a/pages/debug.mako
+++ b/pages/debug.mako
@@ -2,9 +2,9 @@
         <ul>
         % for key, value in environ.items():
             % if key not in ["wsgi.input", "wsgi.errors", "PATH"]:
-                <li><b>${key}</b>: ${value}</li>
+                <li><b>${key}</b>: ${value | h}</li>
             % elif key == "wsgi.input":
-                <li><b>${key}</b>: ${value.read(environ.get("CONTENT_LENGTH", 0))}</li>
+                <li><b>${key}</b>: ${value.read(environ.get("CONTENT_LENGTH", 0)) | h}</li>
             % endif
         % endfor
         </ul>
diff --git a/pages/settings.mako b/pages/settings.mako
index bdd7825..ff5729d 100644
--- a/pages/settings.mako
+++ b/pages/settings.mako
@@ -45,23 +45,30 @@
             </form>
             <h2>Cookies</h2>
             % if cookies:
-                <ul>
+                <table>
                 % for cookie in cookies.itervalues():
-                    <li>
-                        <tt>${cookie.key | h}</tt>: <tt>${cookie.value | h}</tt>
-                        <form action="${environ['PATH_INFO']}" method="post">
-                            <input type="hidden" name="action" value="delete">
-                            <input type="hidden" name="cookie" value="${cookie.key | h}">
-                            <button type="submit">Delete</button>
-                        </form>
-                    </li>
+                    <tr>
+                        <td><b><tt>${cookie.key | h}</tt></b></td>
+                        <td><tt>${cookie.value | h}</tt></td>
+                        <td>
+                            <form action="${environ['PATH_INFO']}" method="post">
+                                <input type="hidden" name="action" value="delete">
+                                <input type="hidden" name="cookie" value="${cookie.key | h}">
+                                <button type="submit">Delete</button>
+                            </form>
+                        </td>
+                    </tr>
                 % endfor
-                </ul>
-                <form action="${environ['PATH_INFO']}" method="post">
-                    <input type="hidden" name="action" value="delete">
-                    <input type="hidden" name="all" value="1">
-                    <button type="submit">Delete all</button>
-                </form>
+                    <tr>
+                        <td>
+                            <form action="${environ['PATH_INFO']}" method="post">
+                                <input type="hidden" name="action" value="delete">
+                                <input type="hidden" name="all" value="1">
+                                <button type="submit">Delete all</button>
+                            </form>
+                        </td>
+                    </tr>
+                </table>
             % else:
                 <p>No cookies!</p>
             % endif
diff --git a/static/css/main.css b/static/css/main.css
index d50540d..3ae9777 100644
--- a/static/css/main.css
+++ b/static/css/main.css
@@ -28,7 +28,7 @@ div#container {
 div#footer {
     position: fixed;
     width: 100%;
-    height: 70px;
+    height: 50px;
     bottom: 0;
     font-size: 12px;
     text-align: center;
diff --git a/toolserver/settings.py b/toolserver/settings.py
index 07b1be7..cc42ab8 100644
--- a/toolserver/settings.py
+++ b/toolserver/settings.py
@@ -21,7 +21,7 @@ def main(context, environ, headers):
         if query.cookie in cookies:
             delete_cookie(headers, cookies, query.cookie)
         elif query.all:
-            for cookie in cookies.values:
+            for cookie in cookies.values():
                 if cookie.path.startswith(cookies.path):
                     delete_cookie(headers, cookies, cookie.key)