[tor-commits] [torouter/master] Move styling to static/ folder

Thu Aug 11 16:34:49 UTC 2011

commit 6d6eb966bc080325c3fdfd0320df794cdf523ea8
Author: Arturo FilastoÌ€ <hellais at torproject.org>
Date:   Thu Aug 11 18:34:26 2011 +0200

    Move styling to static/ folder
---
 packages/torouter-web/config.pyc                  |  Bin 255 -> 308 bytes
 packages/torouter-web/runui.pyc                   |  Bin 1390 -> 1390 bytes
 packages/torouter-web/static/main.css             |   29 +++++++++++++++++++
 packages/torouter-web/tui/controllers/main.pyc    |  Bin 1196 -> 1196 bytes
 packages/torouter-web/tui/controllers/network.pyc |  Bin 6373 -> 6373 bytes
 packages/torouter-web/tui/utils/session.pyc       |  Bin 1207 -> 1244 bytes
 packages/torouter-web/tui/views/base.html         |   32 +-------------------
 packages/torouter-web/view.pyc                    |  Bin 411 -> 411 bytes
 8 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/packages/torouter-web/config.pyc b/packages/torouter-web/config.pyc
index 23bf9e9..9ed9f95 100644
Binary files a/packages/torouter-web/config.pyc and b/packages/torouter-web/config.pyc differ
diff --git a/packages/torouter-web/runui.pyc b/packages/torouter-web/runui.pyc
index ce57e6c..a564a49 100644
Binary files a/packages/torouter-web/runui.pyc and b/packages/torouter-web/runui.pyc differ
diff --git a/packages/torouter-web/static/main.css b/packages/torouter-web/static/main.css
new file mode 100644
index 0000000..41cb47f
--- /dev/null
+++ b/packages/torouter-web/static/main.css
@@ -0,0 +1,29 @@
+
+/* Clear all */
+body { margin: 0;border: 0;padding: 0; }
+
+div.wrapper {
+  width: 800px;
+  margin: 0 auto;
+}
+
+div.footer {
+  background-color: #CCC;
+  color: white;
+}
+
+div.header {
+  color: white;
+}
+
+div.header ul {
+  list-style: none;
+  height: 20px;
+}
+
+div.header ul li {
+  float: left;
+  padding: 5px 10px;
+}
+
+
diff --git a/packages/torouter-web/tui/controllers/main.pyc b/packages/torouter-web/tui/controllers/main.pyc
index 6fb29f0..93200bc 100644
Binary files a/packages/torouter-web/tui/controllers/main.pyc and b/packages/torouter-web/tui/controllers/main.pyc differ
diff --git a/packages/torouter-web/tui/controllers/network.pyc b/packages/torouter-web/tui/controllers/network.pyc
index ba6e816..0a0db6d 100644
Binary files a/packages/torouter-web/tui/controllers/network.pyc and b/packages/torouter-web/tui/controllers/network.pyc differ
diff --git a/packages/torouter-web/tui/utils/session.pyc b/packages/torouter-web/tui/utils/session.pyc
index 2084493..e825de5 100644
Binary files a/packages/torouter-web/tui/utils/session.pyc and b/packages/torouter-web/tui/utils/session.pyc differ
diff --git a/packages/torouter-web/tui/views/base.html b/packages/torouter-web/tui/views/base.html
index 47091f8..aca2bf9 100644
--- a/packages/torouter-web/tui/views/base.html
+++ b/packages/torouter-web/tui/views/base.html
@@ -5,38 +5,10 @@ $def with (page,submenu=None)
 <html>
 <head>
   <title>TUI - Tor Web User Interface</title>
-  <style type="text/css">
-    body {
-      margin: 0;
-      border: 0;
-      padding: 0;
-
-    }
-
-    div.wrapper {
-      width: 800px;
-      margin: 0 auto;
-    }
-    
-    div.footer {
-      background-color: #CCC;
-      color: white;
-    }
-    
-    div.header {
-      background-color: #CCC;
-      color: white;
-    }
-
-    ul#menu {
-      list-style: none;
-
-    }
-
-  </style>
+  <link REL="stylesheet" href="/static/main.css" type="text/css">
 </head>
 <body>
-<div id="header">
+<div class="header">
   <ul id="menu">
     <li><a href="/">Home</a></li>
     <li><a href="/network">Network</a></li>
diff --git a/packages/torouter-web/view.pyc b/packages/torouter-web/view.pyc
index 17728c0..3870298 100644
Binary files a/packages/torouter-web/view.pyc and b/packages/torouter-web/view.pyc differ

