Merge branch 'master' of ssh://git-rw.torproject.org/torouter

32 files changed, 16 insertions, 0 deletions

diff --git a/packages/torouter-web/setup.py b/packages/torouter-web/setup.py
new file mode 100644
index 0000000..7629b6b
--- /dev/null
+++ b/packages/torouter-web/setup.py
@@ -0,0 +1,16 @@
+#!/usr/bin/env python
+from distutils.core import setup
+
+setup(name='torouter-tui',
+      packages=['tui'],
+      package_dir = {'tui': 'src/tui/'},
+      package_data = {'tui': ['src/tui/']},
+      data_files = [('/usr/share/torouter-tui/static',
+                     ['src/static/main.css'])],
+      version='0.1',
+      description='Torouter Web UI',
+      author='Arturo Filasto',
+      author_email='hellais@torproject.org',
+      url='https://www.torproject.org/',
+      scripts=['src/runui.py', 'src/view.py', 'src/config.py'])
+
diff --git a/packages/torouter-web/__init__.py b/packages/torouter-web/src/__init__.py
index e69de29..e69de29 100644
--- a/packages/torouter-web/__init__.py
+++ b/packages/torouter-web/src/__init__.py
diff --git a/packages/torouter-web/config.py b/packages/torouter-web/src/config.py
index 15057df..15057df 100644
--- a/packages/torouter-web/config.py
+++ b/packages/torouter-web/src/config.py
diff --git a/packages/torouter-web/runui.py b/packages/torouter-web/src/runui.py
index 80836b3..80836b3 100644
--- a/packages/torouter-web/runui.py
+++ b/packages/torouter-web/src/runui.py
diff --git a/packages/torouter-web/static/main.css b/packages/torouter-web/src/static/main.css
index 7277912..7277912 100644
--- a/packages/torouter-web/static/main.css
+++ b/packages/torouter-web/src/static/main.css
diff --git a/packages/torouter-web/tui/__init__.py b/packages/torouter-web/src/tui/__init__.py
index e69de29..e69de29 100644
--- a/packages/torouter-web/tui/__init__.py
+++ b/packages/torouter-web/src/tui/__init__.py
diff --git a/packages/torouter-web/tui/controllers/__init__.py b/packages/torouter-web/src/tui/controllers/__init__.py
index e69de29..e69de29 100644
--- a/packages/torouter-web/tui/controllers/__init__.py
+++ b/packages/torouter-web/src/tui/controllers/__init__.py
diff --git a/packages/torouter-web/tui/controllers/main.py b/packages/torouter-web/src/tui/controllers/main.py
index 060caa6..060caa6 100644
--- a/packages/torouter-web/tui/controllers/main.py
+++ b/packages/torouter-web/src/tui/controllers/main.py
diff --git a/packages/torouter-web/tui/controllers/network.py b/packages/torouter-web/src/tui/controllers/network.py
index cc46643..cc46643 100644
--- a/packages/torouter-web/tui/controllers/network.py
+++ b/packages/torouter-web/src/tui/controllers/network.py
diff --git a/packages/torouter-web/tui/controllers/old/main.py b/packages/torouter-web/src/tui/controllers/old/main.py
index 9127e72..9127e72 100644
--- a/packages/torouter-web/tui/controllers/old/main.py
+++ b/packages/torouter-web/src/tui/controllers/old/main.py
diff --git a/packages/torouter-web/tui/controllers/old/status.py b/packages/torouter-web/src/tui/controllers/old/status.py
index 05f0bf8..05f0bf8 100644
--- a/packages/torouter-web/tui/controllers/old/status.py
+++ b/packages/torouter-web/src/tui/controllers/old/status.py
diff --git a/packages/torouter-web/tui/controllers/old/wizard.py b/packages/torouter-web/src/tui/controllers/old/wizard.py
index 7b82df2..7b82df2 100644
--- a/packages/torouter-web/tui/controllers/old/wizard.py
+++ b/packages/torouter-web/src/tui/controllers/old/wizard.py
diff --git a/packages/torouter-web/tui/controllers/tor.py b/packages/torouter-web/src/tui/controllers/tor.py
index af8678c..af8678c 100644
--- a/packages/torouter-web/tui/controllers/tor.py
+++ b/packages/torouter-web/src/tui/controllers/tor.py
diff --git a/packages/torouter-web/tui/models/router_config.py b/packages/torouter-web/src/tui/models/router_config.py
index e83f9aa..e83f9aa 100644
--- a/packages/torouter-web/tui/models/router_config.py
+++ b/packages/torouter-web/src/tui/models/router_config.py
diff --git a/packages/torouter-web/tui/utils/__init__.py b/packages/torouter-web/src/tui/utils/__init__.py
index e69de29..e69de29 100644
--- a/packages/torouter-web/tui/utils/__init__.py
+++ b/packages/torouter-web/src/tui/utils/__init__.py
diff --git a/packages/torouter-web/tui/utils/configuration.py b/packages/torouter-web/src/tui/utils/configuration.py
index 88bbc05..88bbc05 100644
--- a/packages/torouter-web/tui/utils/configuration.py
+++ b/packages/torouter-web/src/tui/utils/configuration.py
diff --git a/packages/torouter-web/tui/utils/parsing.py b/packages/torouter-web/src/tui/utils/parsing.py
index beb45d3..beb45d3 100644
--- a/packages/torouter-web/tui/utils/parsing.py
+++ b/packages/torouter-web/src/tui/utils/parsing.py
diff --git a/packages/torouter-web/tui/utils/session.py b/packages/torouter-web/src/tui/utils/session.py
index a554dad..a554dad 100644
--- a/packages/torouter-web/tui/utils/session.py
+++ b/packages/torouter-web/src/tui/utils/session.py
diff --git a/packages/torouter-web/tui/views/base.html b/packages/torouter-web/src/tui/views/base.html
index bce4110..bce4110 100644
--- a/packages/torouter-web/tui/views/base.html
+++ b/packages/torouter-web/src/tui/views/base.html
diff --git a/packages/torouter-web/tui/views/firewall.html b/packages/torouter-web/src/tui/views/firewall.html
index 30f5a9b..30f5a9b 100644
--- a/packages/torouter-web/tui/views/firewall.html
+++ b/packages/torouter-web/src/tui/views/firewall.html
diff --git a/packages/torouter-web/tui/views/index.html b/packages/torouter-web/src/tui/views/index.html
index 3907d84..3907d84 100644
--- a/packages/torouter-web/tui/views/index.html
+++ b/packages/torouter-web/src/tui/views/index.html
diff --git a/packages/torouter-web/tui/views/login.html b/packages/torouter-web/src/tui/views/login.html
index 1377078..1377078 100644
--- a/packages/torouter-web/tui/views/login.html
+++ b/packages/torouter-web/src/tui/views/login.html
diff --git a/packages/torouter-web/tui/views/logout.html b/packages/torouter-web/src/tui/views/logout.html
index f027ed4..f027ed4 100644
--- a/packages/torouter-web/tui/views/logout.html
+++ b/packages/torouter-web/src/tui/views/logout.html
diff --git a/packages/torouter-web/tui/views/main.html b/packages/torouter-web/src/tui/views/main.html
index dc503e7..dc503e7 100644
--- a/packages/torouter-web/tui/views/main.html
+++ b/packages/torouter-web/src/tui/views/main.html
diff --git a/packages/torouter-web/tui/views/saved.html b/packages/torouter-web/src/tui/views/saved.html
index ba14488..ba14488 100644
--- a/packages/torouter-web/tui/views/saved.html
+++ b/packages/torouter-web/src/tui/views/saved.html
diff --git a/packages/torouter-web/tui/views/status.html b/packages/torouter-web/src/tui/views/status.html
index bfe2fcd..bfe2fcd 100644
--- a/packages/torouter-web/tui/views/status.html
+++ b/packages/torouter-web/src/tui/views/status.html
diff --git a/packages/torouter-web/tui/views/torconfig.html b/packages/torouter-web/src/tui/views/torconfig.html
index 26bd228..26bd228 100644
--- a/packages/torouter-web/tui/views/torconfig.html
+++ b/packages/torouter-web/src/tui/views/torconfig.html
diff --git a/packages/torouter-web/tui/views/torstatus.html b/packages/torouter-web/src/tui/views/torstatus.html
index 27b2888..27b2888 100644
--- a/packages/torouter-web/tui/views/torstatus.html
+++ b/packages/torouter-web/src/tui/views/torstatus.html
diff --git a/packages/torouter-web/tui/views/wired.html b/packages/torouter-web/src/tui/views/wired.html
index 3676f63..3676f63 100644
--- a/packages/torouter-web/tui/views/wired.html
+++ b/packages/torouter-web/src/tui/views/wired.html
diff --git a/packages/torouter-web/tui/views/wireless.html b/packages/torouter-web/src/tui/views/wireless.html
index 48242bc..48242bc 100644
--- a/packages/torouter-web/tui/views/wireless.html
+++ b/packages/torouter-web/src/tui/views/wireless.html
diff --git a/packages/torouter-web/tui/views/wizard.html b/packages/torouter-web/src/tui/views/wizard.html
index 0890507..0890507 100644
--- a/packages/torouter-web/tui/views/wizard.html
+++ b/packages/torouter-web/src/tui/views/wizard.html
diff --git a/packages/torouter-web/view.py b/packages/torouter-web/src/view.py
index f4c9b39..f4c9b39 100644
--- a/packages/torouter-web/view.py
+++ b/packages/torouter-web/src/view.py