From 115c5a5891a943756922be6019a35674a2e8c34c Mon Sep 17 00:00:00 2001
From: Aamir Khan <syst3m.w0rm@gmail.com>
Date: Wed, 28 Mar 2012 22:41:52 +0530
Subject: real pages are at / rather than /2, mockup is at /mockup

---
 urls.py | 46 +++++++++++++++++++++++-----------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

(limited to 'urls.py')

diff --git a/urls.py b/urls.py
index 1ea56e9..e0a0034 100644
--- a/urls.py
+++ b/urls.py
@@ -12,34 +12,34 @@ urlpatterns = patterns('',
     # url(r'^$', 'hyperkitty.views.home', name='home'),
     # url(r'^hyperkitty/', include('hyperkitty.foo.urls')),
     # This will be the new index page
-    url(r'^2$', 'views.pages.index'),
-    url(r'^2/$', 'views.pages.index'),
+    url(r'^$', 'views.pages.index'),
+    url(r'^/$', 'views.pages.index'),
     # This will be the new archives page
-    url(r'^2/archives/(?P<mlist_fqdn>.*@.*)/(?P<year>\d{4})/(?P<month>\d\d?)/$', 'views.pages.archives'),
-    url(r'^2/archives/(?P<mlist_fqdn>.*@.*)/(?P<year>\d{4})/(?P<month>\d\d?)$', 'views.pages.archives'),
-    url(r'^2/archives/(?P<mlist_fqdn>.*@.*)/$', 'views.pages.archives'),
-    url(r'^2/archives/(?P<mlist_fqdn>.*@.*)$', 'views.pages.archives'),
+    url(r'^archives/(?P<mlist_fqdn>.*@.*)/(?P<year>\d{4})/(?P<month>\d\d?)/$', 'views.pages.archives'),
+    url(r'^archives/(?P<mlist_fqdn>.*@.*)/(?P<year>\d{4})/(?P<month>\d\d?)$', 'views.pages.archives'),
+    url(r'^archives/(?P<mlist_fqdn>.*@.*)/$', 'views.pages.archives'),
+    url(r'^archives/(?P<mlist_fqdn>.*@.*)$', 'views.pages.archives'),
     # The thread view
-    url(r'^2/thread/(?P<mlist_fqdn>.*@.*)/(?P<threadid>\d+)$', 'views.pages.thread'),
+    url(r'^thread/(?P<mlist_fqdn>.*@.*)/(?P<threadid>\d+)$', 'views.pages.thread'),
     # This will be the new recent page
-    url(r'^2/list$', 'views.pages.index'),
-    url(r'^2/list/$', 'views.pages.index'),
-    url(r'^2/list/(?P<mlist_fqdn>.*@.*)/$', 'views.pages.list'),
-    url(r'^2/list/(?P<mlist_fqdn>.*@.*)$', 'views.pages.list'),
+    url(r'^list$', 'views.pages.index'),
+    url(r'^list/$', 'views.pages.index'),
+    url(r'^list/(?P<mlist_fqdn>.*@.*)/$', 'views.pages.list'),
+    url(r'^list/(?P<mlist_fqdn>.*@.*)$', 'views.pages.list'),
     # Search
-    #url(r'^2/search$', 'views.pages.search'),
-    url(r'^2/search/(?P<mlist_fqdn>.*@.*)$', 'views.pages.search_keyword'),
-    url(r'^2/search/(?P<mlist_fqdn>.*@.*)/$', 'views.pages.search_keyword'),
-    url(r'^2/search/(?P<mlist_fqdn>.*@.*)\/(?P<keyword>.*)$', 'views.pages.search_keyword'),
-    url(r'^2/tag/(?P<mlist_fqdn>.*@.*)\/(?P<tag>.*)$', 'views.pages.search_tag'),
+    #url(r'^search$', 'views.pages.search'),
+    url(r'^search/(?P<mlist_fqdn>.*@.*)$', 'views.pages.search_keyword'),
+    url(r'^search/(?P<mlist_fqdn>.*@.*)/$', 'views.pages.search_keyword'),
+    url(r'^search/(?P<mlist_fqdn>.*@.*)\/(?P<keyword>.*)$', 'views.pages.search_keyword'),
+    url(r'^tag/(?P<mlist_fqdn>.*@.*)\/(?P<tag>.*)$', 'views.pages.search_tag'),
     # mockups:
-    url(r'^$', 'views.mockup.index'),
-    url(r'^archives$', 'views.mockup.archives'),
-    url(r'^archives/(?P<year>\d{4})/(?P<month>\d{2})/$', 'views.mockup.archives'),
-    url(r'^recent$', 'views.mockup.recent'),
-    url(r'^search$', 'views.mockup.search'),
-    url(r'^search\/(?P<keyword>.*)$', 'views.mockup.search_keyword'),
-    url(r'^tag\/(?P<tag>.*)$', 'views.mockup.search_tag'),
+    url(r'^mockup/$', 'views.mockup.index'),
+    url(r'^mockup/archives$', 'views.mockup.archives'),
+    url(r'^mockup/archives/(?P<year>\d{4})/(?P<month>\d{2})/$', 'views.mockup.archives'),
+    url(r'^mockup/recent$', 'views.mockup.recent'),
+    url(r'^mockup/search$', 'views.mockup.search'),
+    url(r'^mockup/search\/(?P<keyword>.*)$', 'views.mockup.search_keyword'),
+    url(r'^mockup/tag\/(?P<tag>.*)$', 'views.mockup.search_tag'),
 
     # Uncomment the admin/doc line below to enable admin documentation:
     # url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
-- 
cgit