From c8eb3dd6ed58462ffbad91ee9e208ff3df6822e7 Mon Sep 17 00:00:00 2001
From: Sanj <b@pad.ma>
Date: Thu, 7 Jul 2011 20:23:02 +0530
Subject: [PATCH] move urls to top level

---
 edgware/settings.py |  4 ++--
 edgware/urls.py     | 12 ++++++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/edgware/settings.py b/edgware/settings.py
index 02fe70b..47aeea6 100644
--- a/edgware/settings.py
+++ b/edgware/settings.py
@@ -20,8 +20,8 @@ ADMINS = (
     # ('Your Name', 'your_email@domain.com'),
 )
 
-LOGIN_URL = "/sandbox/account"
-LOGIN_REDIRECT_URL = "/sandbox/"
+LOGIN_URL = "/account"
+LOGIN_REDIRECT_URL = "/home"
 MANAGERS = ADMINS
 
 DATABASE_ENGINE = 'mysql'           # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
diff --git a/edgware/urls.py b/edgware/urls.py
index 5e9b238..16ed93a 100644
--- a/edgware/urls.py
+++ b/edgware/urls.py
@@ -15,6 +15,17 @@ urlpatterns = patterns('',
     (r'^sandbox/$', 'main.views.home'),
     (r'^debug/$', 'main.views.debug'),
     (r'^error/$', 'main.views.error'),
+    (r'^home$', 'main.views.home'),
+    (r'^contact$', 'main.views.contact'),
+    (r'^archive$', 'files.views.browse'),
+    (r'^publish$', 'main.views.publish'),
+    (r'^browse$', 'main.views.browse'),
+    (r'^upload$', 'files.views.upload_files'),
+    (r'^faq$', 'main.views.faq'),
+    (r'^help$', 'main.views.help'),
+    (r'^account$', login),
+    (r'^logout$', logout),
+
     (r'^sandbox/home$', 'main.views.home'),
     (r'^sandbox/contact$', 'main.views.contact'),
     (r'^sandbox/archive$', 'files.views.browse'),
@@ -25,6 +36,7 @@ urlpatterns = patterns('',
     (r'^sandbox/help$', 'main.views.help'),
     (r'^sandbox/account$', login),
     (r'^sandbox/logout$', logout),
+
     (r'^$', 'django.views.generic.simple.redirect_to', {'url': '/slider/'}),
     (r'^robots.txt(?P<path>)$', 'django.views.static.serve', { 'document_root' : "/home/itf/soc/edgware/static/txt/robots.txt"  } ),
    # Uncomment the admin/doc line below and add 'django.contrib.admindocs'