aboutsummaryrefslogtreecommitdiffstats
path: root/packages/torouter-web/tui/controllers/network.py
diff options
context:
space:
mode:
authorJacob Appelbaum <jacob@appelbaum.net>2011-08-17 17:59:37 +0200
committerJacob Appelbaum <jacob@appelbaum.net>2011-08-17 17:59:37 +0200
commit24b92ab9b034d6c957631a034a717ba41809a335 (patch)
tree3e3808829c653d40ece2fc4a88ef0271313501b4 /packages/torouter-web/tui/controllers/network.py
parente5dbdcb4bbe43a9f652a045f8dcf0b092b11eba0 (diff)
parented08b56338e9b230c2a475946511c0e13cfce487 (diff)
downloadtorouter-24b92ab9b034d6c957631a034a717ba41809a335.tar.gz
torouter-24b92ab9b034d6c957631a034a717ba41809a335.zip
Merge branch 'master' of ssh://git-rw.torproject.org/torouter
Diffstat (limited to 'packages/torouter-web/tui/controllers/network.py')
-rw-r--r--packages/torouter-web/tui/controllers/network.py10
1 files changed, 8 insertions, 2 deletions
diff --git a/packages/torouter-web/tui/controllers/network.py b/packages/torouter-web/tui/controllers/network.py
index b5da4e3..d189d0c 100644
--- a/packages/torouter-web/tui/controllers/network.py
+++ b/packages/torouter-web/tui/controllers/network.py
@@ -1,7 +1,7 @@
import web
import view, config
from view import render
-from tui.utils import session,configuration
+from tui.utils import session,configuration,parsing
"""
This function is used to generate the network
@@ -116,8 +116,14 @@ General status page, displays a bit more detail than main
"""
class status:
def GET(self):
- return render.base(render.status(),menu(4))
+ itfc = parsing.interfaces(config.interfaces_file)
+ itfc.parse()
+ network = itfc.html_output(itfc.wifi) + itfc.html_output(itfc.eth0) + itfc.html_output(itfc.eth1)
+ return render.base(render.status(network),menu(4))
def POST(self):
+ itfc = parsing.interfaces(config.interfaces_file)
+ itfc.parse()
+ network = itfc.html_output(itfc.wifi) + itfc.html_output(itfc.eth0) + itfc.html_output(itfc.eth1)
return render.base(render.status(),menu(4))