aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJacob Appelbaum <jacob@appelbaum.net>2011-08-23 15:20:12 +0200
committerJacob Appelbaum <jacob@appelbaum.net>2011-08-23 15:20:12 +0200
commit5c61f445926f1420f61e509cea51dc7a24e1b0b5 (patch)
tree9c4d8eed750c673db7cfb5fa697765e6b55d4f67
parent3dd720f3d17b946481ab59ec191bf17cafec50e5 (diff)
parentb54039300353ad6bfb59e6668f03fe9e1745c763 (diff)
downloadtorouter-5c61f445926f1420f61e509cea51dc7a24e1b0b5.zip
torouter-5c61f445926f1420f61e509cea51dc7a24e1b0b5.tar.gz
Merge branch 'master' of ssh://git-rw.torproject.org/torouter
-rw-r--r--packages/torouter-web/setup.py6
-rw-r--r--packages/torouter-web/src/runui.py2
-rw-r--r--packages/torouter-web/src/tui/view.py5
-rw-r--r--packages/torouter-web/src/tui/views/base.html55
4 files changed, 62 insertions, 6 deletions
diff --git a/packages/torouter-web/setup.py b/packages/torouter-web/setup.py
index fe3e6e8..fe01ab8 100644
--- a/packages/torouter-web/setup.py
+++ b/packages/torouter-web/setup.py
@@ -4,8 +4,8 @@ from distutils.core import setup
setup(name='torouter-tui',
packages=['tui', 'tui.controllers',
'tui.models', 'tui.utils'],
- package_dir = {'tui': 'src/tui/'},
- package_data = {'tui': ['src/tui/']},
+ package_dir = {'tui': 'src/tui'},
+ package_data = {'tui': ['src/tui', 'views/*html']},
data_files = [('/usr/share/torouter-tui/static',
['src/static/main.css'])],
version='0.1',
@@ -13,5 +13,5 @@ setup(name='torouter-tui',
author='Arturo Filasto',
author_email='hellais@torproject.org',
url='https://www.torproject.org/',
- scripts=['src/runui.py', 'src/tui/view.py', 'src/tui/config.py', 'src/daemon.py'])
+ scripts=['src/runui.py', 'src/daemon.py'])
diff --git a/packages/torouter-web/src/runui.py b/packages/torouter-web/src/runui.py
index b016ea9..87c6626 100644
--- a/packages/torouter-web/src/runui.py
+++ b/packages/torouter-web/src/runui.py
@@ -41,7 +41,7 @@ DEBUG = False
if __name__ == "__main__":
if DEBUG:
app.run()
- service = TorWebDaemon(os.path.join(os.getcwd(),'tui.pid'))
+ service = TorWebDaemon('/tmp/tui.pid')
if len(sys.argv) == 2:
if 'start' == sys.argv[1]:
sys.argv[1] = '8080'
diff --git a/packages/torouter-web/src/tui/view.py b/packages/torouter-web/src/tui/view.py
index 0252ad8..ea885be 100644
--- a/packages/torouter-web/src/tui/view.py
+++ b/packages/torouter-web/src/tui/view.py
@@ -1,3 +1,4 @@
+import os
import web
from tui import config
@@ -5,7 +6,9 @@ t_globals = dict(
datestr=web.datestr,
)
+# get the path where the script currently resides
+current_path = "/".join(os.path.abspath(__file__).split("/")[:-1])
# create the render object
-render = web.template.render('tui/views', cache=config.cache, globals=t_globals)
+render = web.template.render(current_path+'/views', cache=config.cache, globals=t_globals)
render._keywords['globals']['render'] = render
diff --git a/packages/torouter-web/src/tui/views/base.html b/packages/torouter-web/src/tui/views/base.html
index bce4110..5db0249 100644
--- a/packages/torouter-web/src/tui/views/base.html
+++ b/packages/torouter-web/src/tui/views/base.html
@@ -5,7 +5,60 @@ $def with (page,submenu=None)
<html>
<head>
<title>TUI - Tor Web User Interface</title>
- <link REL="stylesheet" href="/static/main.css" type="text/css">
+<style type="text/css">
+/* Clear all */
+body { margin: 0;border: 0;padding: 0; }
+
+div.wrapper {
+ min-height: 300px;
+ width: 800px;
+ margin: 0 auto;
+}
+
+div.footer {
+ text-align: center;
+ background-color: #333;
+ color: white;
+ padding-top: 20px;
+ padding-bottom: 20px;
+}
+
+div.header {
+ color: white;
+}
+
+div.header ul {
+ list-style: none;
+ height: 20px;
+}
+
+div.header ul li {
+ font-size: 20px;
+ float: left;
+ padding: 5px 10px;
+}
+
+div.header ul#submenu li {
+ font-size: 15px;
+}
+
+div.header ul#submenu li a.sel {
+ color: black;
+ text-decoration: none;
+}
+
+/* More specific stuff */
+#torrc {
+list-style: none;
+line-height: 2em;
+}
+
+#torrc em {
+font-weight: bold;
+font-style: normal;
+}
+</style>
+<!-- link REL="stylesheet" href="/static/main.css" type="text/css" -->
</head>
<body>
<div class="header">