summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--hyperkitty/api.py2
-rw-r--r--hyperkitty/models.py2
-rw-r--r--hyperkitty/urls.py46
-rw-r--r--hyperkitty/views/accounts.py4
-rw-r--r--hyperkitty/views/api.py2
-rw-r--r--hyperkitty/views/list.py6
-rw-r--r--hyperkitty/views/message.py6
-rw-r--r--hyperkitty/views/pages.py6
-rw-r--r--hyperkitty/views/thread.py6
9 files changed, 40 insertions, 40 deletions
diff --git a/hyperkitty/api.py b/hyperkitty/api.py
index fe1d715..09fa240 100644
--- a/hyperkitty/api.py
+++ b/hyperkitty/api.py
@@ -8,7 +8,7 @@ from kittystore.kittysastore import KittySAStore
import json
import re
-from gsoc.utils import log
+from hyperkitty.utils import log
STORE = KittySAStore(settings.KITTYSTORE_URL)
diff --git a/hyperkitty/models.py b/hyperkitty/models.py
index 588363d..f1bc196 100644
--- a/hyperkitty/models.py
+++ b/hyperkitty/models.py
@@ -25,7 +25,7 @@ from django.conf import settings
from kittystore.kittysastore import KittySAStore
-from gsoc.utils import log
+from hyperkitty.utils import log
STORE = KittySAStore(settings.KITTYSTORE_URL)
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>.*)/',
diff --git a/hyperkitty/views/accounts.py b/hyperkitty/views/accounts.py
index 3154563..ab9bf26 100644
--- a/hyperkitty/views/accounts.py
+++ b/hyperkitty/views/accounts.py
@@ -29,7 +29,7 @@ from django.contrib.auth.decorators import (login_required,
permission_required,
user_passes_test)
from django.contrib.auth.forms import AuthenticationForm
-from gsoc.models import UserProfile
+from hyperkitty.models import UserProfile
from django.contrib.auth.models import User
from django.core.urlresolvers import reverse
from django.http import HttpResponse, HttpResponseRedirect
@@ -40,7 +40,7 @@ from urllib2 import HTTPError
from urlparse import urlparse
from forms import RegistrationForm
-from gsoc.utils import log
+from hyperkitty.utils import log
def user_logout(request):
logout(request)
diff --git a/hyperkitty/views/api.py b/hyperkitty/views/api.py
index 3a764db..d3c2260 100644
--- a/hyperkitty/views/api.py
+++ b/hyperkitty/views/api.py
@@ -15,7 +15,7 @@ from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger, Invali
from django.contrib.auth.decorators import (login_required,
permission_required,
user_passes_test)
-from gsoc.utils import log
+from hyperkitty.utils import log
def api(request):
diff --git a/hyperkitty/views/list.py b/hyperkitty/views/list.py
index 17da2c6..df745a2 100644
--- a/hyperkitty/views/list.py
+++ b/hyperkitty/views/list.py
@@ -17,10 +17,10 @@ from django.contrib.auth.decorators import (login_required,
user_passes_test)
from kittystore.kittysastore import KittySAStore
-from gsoc.models import Rating
-from lib.mockup import *
+from hyperkitty.models import Rating
+from hyperkitty.lib.mockup import *
from forms import *
-from gsoc.utils import log
+from hyperkitty.utils import log
STORE = KittySAStore(settings.KITTYSTORE_URL)
diff --git a/hyperkitty/views/message.py b/hyperkitty/views/message.py
index 0b70969..9feec6c 100644
--- a/hyperkitty/views/message.py
+++ b/hyperkitty/views/message.py
@@ -12,10 +12,10 @@ from django.contrib.auth.decorators import (login_required,
from kittystore.kittysastore import KittySAStore
-from gsoc.models import Rating
-from lib.mockup import *
+from hyperkitty.models import Rating
+from hyperkitty.lib.mockup import *
from forms import *
-from gsoc.utils import log
+from hyperkitty.utils import log
STORE = KittySAStore(settings.KITTYSTORE_URL)
diff --git a/hyperkitty/views/pages.py b/hyperkitty/views/pages.py
index 189d574..4d33a78 100644
--- a/hyperkitty/views/pages.py
+++ b/hyperkitty/views/pages.py
@@ -17,10 +17,10 @@ from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger, Invali
from django.contrib.auth.decorators import (login_required,
permission_required,
user_passes_test)
-from gsoc.models import Rating
-from lib.mockup import *
+from hyperkitty.models import Rating
+from hyperkitty.lib.mockup import *
from forms import *
-from gsoc.utils import log
+from hyperkitty.utils import log
def index(request):
t = loader.get_template('index.html')
diff --git a/hyperkitty/views/thread.py b/hyperkitty/views/thread.py
index 06a1bda..dc62ad1 100644
--- a/hyperkitty/views/thread.py
+++ b/hyperkitty/views/thread.py
@@ -9,10 +9,10 @@ from django.contrib.auth.decorators import (login_required,
user_passes_test)
from kittystore.kittysastore import KittySAStore
-from gsoc.models import Rating
-from lib.mockup import *
+from hyperkitty.models import Rating
+from hyperkitty.lib.mockup import *
from forms import *
-from gsoc.utils import log
+from hyperkitty.utils import log
STORE = KittySAStore(settings.KITTYSTORE_URL)
generated by cgit (git 2.34.1) at 2025-07-02 01:42:38 +0000