aboutsummaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorJacob Appelbaum <jacob@appelbaum.net>2011-08-19 10:59:57 +0200
committerJacob Appelbaum <jacob@appelbaum.net>2011-08-19 10:59:57 +0200
commitd4b0267763c7501b855daffba8c9aa6ce61f462e (patch)
tree37145c2befe9525a07ac51eec14b8dd1eb2e625a /packages
parent5e49b4a2970e8ee7a525db78d1876ca95de01c6d (diff)
parent11aaab578cc13910aca7a32d87072781056f30df (diff)
downloadtorouter-d4b0267763c7501b855daffba8c9aa6ce61f462e.tar.gz
torouter-d4b0267763c7501b855daffba8c9aa6ce61f462e.zip
Merge branch 'master' of ssh://git-rw.torproject.org/torouter
Diffstat (limited to 'packages')
-rw-r--r--packages/torouter-web/src/static/main.css5
-rw-r--r--packages/torouter-web/src/tui/controllers/network.py4
-rw-r--r--packages/torouter-web/src/tui/utils/parsing.py1
3 files changed, 8 insertions, 2 deletions
diff --git a/packages/torouter-web/src/static/main.css b/packages/torouter-web/src/static/main.css
index 34e26cf..7277912 100644
--- a/packages/torouter-web/src/static/main.css
+++ b/packages/torouter-web/src/static/main.css
@@ -35,6 +35,11 @@ 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;
diff --git a/packages/torouter-web/src/tui/controllers/network.py b/packages/torouter-web/src/tui/controllers/network.py
index d189d0c..cc46643 100644
--- a/packages/torouter-web/src/tui/controllers/network.py
+++ b/packages/torouter-web/src/tui/controllers/network.py
@@ -55,14 +55,14 @@ class firewall:
def GET(self):
if session.is_logged() > 0:
- return render.base(render.firewall(configuration.get_form("firewall")),menu(0))
+ return render.base(render.firewall(configuration.get_form("firewall")),menu(1))
else:
return render.base(render.login())
def POST(self):
if session.is_logged() > 0:
self.update_config(web.input())
- return render.base(render.firewall(),menu(1))
+ return render.base(render.firewall(configuration.get_form("firewall")),menu(1))
else:
return render.base(render.login())
diff --git a/packages/torouter-web/src/tui/utils/parsing.py b/packages/torouter-web/src/tui/utils/parsing.py
index 6acf988..beb45d3 100644
--- a/packages/torouter-web/src/tui/utils/parsing.py
+++ b/packages/torouter-web/src/tui/utils/parsing.py
@@ -81,6 +81,7 @@ class torrc:
def parse(self):
for line in self.fp.readlines():
+ line = line.lstrip()
if line.startswith("#") or line == "":
continue
else: