From c64b4fe35c7a01143c6d98cc4589d3b8298c54c3 Mon Sep 17 00:00:00 2001
From: Aamir Khan <syst3m.w0rm@gmail.com>
Date: Tue, 26 Jun 2012 23:59:54 -0400
Subject: code refactoring: two new view files added

---
 urls.py | 51 +++++++++++++++++++++++++++------------------------
 1 file changed, 27 insertions(+), 24 deletions(-)

(limited to 'urls.py')

diff --git a/urls.py b/urls.py
index a42a1c5..6f2ef92 100644
--- a/urls.py
+++ b/urls.py
@@ -20,11 +20,11 @@ urlpatterns = patterns('',
 
     # Archives
     url(r'^archives/(?P<mlist_fqdn>.*@.*)/(?P<year>\d{4})/(?P<month>\d\d?)/(?P<day>\d\d?)/$',
-        'views.pages.archives'),
+        'views.list.archives'),
     url(r'^archives/(?P<mlist_fqdn>.*@.*)/(?P<year>\d{4})/(?P<month>\d\d?)/$',
-        'views.pages.archives'),
+        'views.list.archives'),
     url(r'^archives/(?P<mlist_fqdn>.*@.*)/$',
-        'views.pages.archives'),
+        'views.list.archives'),
 
     # Threads
     url(r'^thread/(?P<mlist_fqdn>.*@.*)/(?P<threadid>.+)/$',
@@ -32,48 +32,51 @@ urlpatterns = patterns('',
 
 
     # Lists
-    url(r'^list/$', 'views.pages.index'),
+    url(r'^list/$', 'views.pages.index'), # Can I remove this URL?
     url(r'^list/(?P<mlist_fqdn>.*@.*)/$',
-        'views.pages.list'),
-
-
-    # Message
-    url(r'^message/(?P<mlist_fqdn>.*@.*)/(?P<messageid>.+)/$',
-        'views.message.index'),
+        'views.list.list'),
 
+    # Search Tag
+    url(r'^tag/(?P<mlist_fqdn>.*@.*)\/(?P<tag>.*)\/(?P<page>\d+)/$',
+        'views.list.search_tag'),
+    url(r'^tag/(?P<mlist_fqdn>.*@.*)\/(?P<tag>.*)/$',
+        'views.list.search_tag'),
 
     # Search
     # If page number is present in URL
     url(r'^search/(?P<mlist_fqdn>.*@.*)\/(?P<target>.*)\/(?P<keyword>.*)\/(?P<page>\d+)/$',
-        'views.pages.search_keyword'),
+        'views.list.search_keyword'),
     # Show the first page as default when no page number is present in URL
     url(r'^search/(?P<mlist_fqdn>.*@.*)\/(?P<target>.*)\/(?P<keyword>.*)/$',
-        'views.pages.search_keyword'),
+        'views.list.search_keyword'),
     url(r'^search/(?P<mlist_fqdn>.*@.*)/$',
-        'views.pages.search'),
+        'views.list.search'),
 
-    # Category
-    url(r'^addcategory/(?P<mlist_fqdn>.*@.*)\/(?P<email_id>.*)/$',
-        'views.pages.add_category'),
 
     ### MESSAGE LEVEL VIEWS ###
     # Vote a message
+    url(r'^message/(?P<mlist_fqdn>.*@.*)/(?P<messageid>.+)/$',
+        'views.message.index'),
+
     url(r'^vote/(?P<mlist_fqdn>.*@.*)/$',
         'views.message.vote'),
+    ### MESSAGE LEVEL VIEW ENDS ###
+
+ 
 
     ### THREAD LEVEL VIEWS ###
-    # Add Tag
+    # Thread view page
+    url(r'^thread/(?P<mlist_fqdn>.*@.*)/(?P<threadid>.+)/$',
+        'views.thread.thread_index'),
+
+    # Add Tag to a thread
     url(r'^addtag/(?P<mlist_fqdn>.*@.*)\/(?P<email_id>.*)/$',
         'views.thread.add_tag'),
+    ### THREAD LEVEL VIEW ENDS ###
 
-    # Search Tag
-    url(r'^tag/(?P<mlist_fqdn>.*@.*)\/(?P<tag>.*)\/(?P<page>\d+)/$',
-        'views.pages.search_tag'),
-    url(r'^tag/(?P<mlist_fqdn>.*@.*)\/(?P<tag>.*)/$',
-        'views.pages.search_tag'),
-
+ 
     # REST API
-    url(r'^api/$', 'views.pages.api'),
+    url(r'^api/$', 'views.api.api'),
     url(r'^api/email\/(?P<mlist_fqdn>.*@.*)\/(?P<messageid>.*)/',
         EmailResource.as_view()),
     url(r'^api/thread\/(?P<mlist_fqdn>.*@.*)\/(?P<threadid>.*)/',
-- 
cgit