summaryrefslogtreecommitdiffstats
path: root/hyperkitty/urls.py
diff options
context:
space:
mode:
authorAamir Khan <syst3m.w0rm@gmail.com>2012-07-25 17:56:23 -0400
committerAamir Khan <syst3m.w0rm@gmail.com>2012-07-25 17:56:23 -0400
commitc7178cfcc107c295398162bcf184d2421c5f92f8 (patch)
treee88314e381396cf3bee73c632186658df065f4b1 /hyperkitty/urls.py
parent58b625df6f625ed88a0d2580dcc5cc22d722a2b8 (diff)
downloadhyperkitty-c7178cfcc107c295398162bcf184d2421c5f92f8.tar.gz
hyperkitty-c7178cfcc107c295398162bcf184d2421c5f92f8.tar.xz
hyperkitty-c7178cfcc107c295398162bcf184d2421c5f92f8.zip
Bug Fix caused by wrong application name
Diffstat (limited to 'hyperkitty/urls.py')
-rw-r--r--hyperkitty/urls.py46
1 files changed, 23 insertions, 23 deletions
diff --git a/hyperkitty/urls.py b/hyperkitty/urls.py
index 29edb06..d88887b 100644
--- a/hyperkitty/urls.py
+++ b/hyperkitty/urls.py
@@ -9,60 +9,60 @@ from django.contrib.staticfiles.urls import staticfiles_urlpatterns
from django.contrib import admin
admin.autodiscover()
-urlpatterns = patterns('',
+urlpatterns = patterns('hyperkitty.views',
# Account
- url(r'^accounts/login/$', 'views.accounts.user_login', name='user_login'),
- url(r'^accounts/logout/$', 'views.accounts.user_logout', name='user_logout'),
- url(r'^accounts/profile/$', 'views.accounts.user_profile', name='user_profile'),
- url(r'^accounts/register/$', 'views.accounts.user_registration', name='user_registration'),
+ url(r'^accounts/login/$', 'accounts.user_login', name='user_login'),
+ url(r'^accounts/logout/$', 'accounts.user_logout', name='user_logout'),
+ url(r'^accounts/profile/$', 'accounts.user_profile', name='user_profile'),
+ url(r'^accounts/register/$', 'accounts.user_registration', name='user_registration'),
# Index
- url(r'^/$', 'views.pages.index', name='index'),
- url(r'^$', 'views.pages.index', name='index'),
+ url(r'^/$', 'pages.index', name='index'),
+ url(r'^$', 'pages.index', name='index'),
# Archives
url(r'^archives/(?P<mlist_fqdn>.*@.*)/(?P<year>\d{4})/(?P<month>\d\d?)/(?P<day>\d\d?)/$',
- 'views.list.archives'),
+ 'list.archives'),
url(r'^archives/(?P<mlist_fqdn>.*@.*)/(?P<year>\d{4})/(?P<month>\d\d?)/$',
- 'views.list.archives'),
+ 'list.archives'),
url(r'^archives/(?P<mlist_fqdn>.*@.*)/$',
- 'views.list.archives'),
+ 'list.archives'),
# Threads
url(r'^thread/(?P<mlist_fqdn>.*@.*)/(?P<threadid>.+)/$',
- 'views.thread.thread_index'),
+ 'thread.thread_index'),
# Lists
- url(r'^list/$', 'views.pages.index'), # Can I remove this URL?
+ url(r'^list/$', 'pages.index'), # Can I remove this URL?
url(r'^list/(?P<mlist_fqdn>.*@.*)/$',
- 'views.list.list'),
+ 'list.list'),
# Search Tag
url(r'^tag/(?P<mlist_fqdn>.*@.*)\/(?P<tag>.*)\/(?P<page>\d+)/$',
- 'views.list.search_tag'),
+ 'list.search_tag'),
url(r'^tag/(?P<mlist_fqdn>.*@.*)\/(?P<tag>.*)/$',
- 'views.list.search_tag'),
+ '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.list.search_keyword'),
+ '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.list.search_keyword'),
+ 'list.search_keyword'),
url(r'^search/(?P<mlist_fqdn>.*@.*)/$',
- 'views.list.search'),
+ 'list.search'),
### MESSAGE LEVEL VIEWS ###
# Vote a message
url(r'^message/(?P<mlist_fqdn>.*@.*)/(?P<messageid>.+)/$',
- 'views.message.index'),
+ 'message.index'),
url(r'^vote/(?P<mlist_fqdn>.*@.*)/$',
- 'views.message.vote'),
+ 'message.vote'),
### MESSAGE LEVEL VIEW ENDS ###
@@ -70,16 +70,16 @@ urlpatterns = patterns('',
### THREAD LEVEL VIEWS ###
# Thread view page
url(r'^thread/(?P<mlist_fqdn>.*@.*)/(?P<threadid>.+)/$',
- 'views.thread.thread_index'),
+ 'thread.thread_index'),
# Add Tag to a thread
url(r'^addtag/(?P<mlist_fqdn>.*@.*)\/(?P<email_id>.*)/$',
- 'views.thread.add_tag'),
+ 'thread.add_tag'),
### THREAD LEVEL VIEW ENDS ###
# REST API
- url(r'^api/$', 'views.api.api'),
+ url(r'^api/$', 'api.api'),
url(r'^api/email\/(?P<mlist_fqdn>.*@.*)\/(?P<messageid>.*)/',
EmailResource.as_view()),
url(r'^api/thread\/(?P<mlist_fqdn>.*@.*)\/(?P<threadid>.*)/',