X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=apps%2Fpatchwork%2Furls.py;h=9b681f9f3da1ed0fb05c448539be77c2acac42e6;hb=429ef9ba9dcc8f92b8362c1b0fca0916db05e84b;hp=4a7ccb19552c08f931a1794f41edf5bbd4017aa2;hpb=c561ebe710d6e6a43aa4afc6c2036a215378ce87;p=patchwork

diff --git a/apps/patchwork/urls.py b/apps/patchwork/urls.py
index 4a7ccb1..9b681f9 100644
--- a/apps/patchwork/urls.py
+++ b/apps/patchwork/urls.py
@@ -17,45 +17,83 @@
 # along with Patchwork; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-from django.conf.urls.defaults import *
+from django.conf.urls import patterns, url
+from django.conf import settings
+from django.contrib.auth import views as auth_views
 
 urlpatterns = patterns('',
     # Example:
     (r'^$', 'patchwork.views.projects'),
     (r'^project/(?P<project_id>[^/]+)/list/$', 'patchwork.views.patch.list'),
-    (r'^project/(?P<project_id>[^/]+)/$', 'patchwork.views.project'),
+    (r'^project/(?P<project_id>[^/]+)/$', 'patchwork.views.project.project'),
 
     # patch views
     (r'^patch/(?P<patch_id>\d+)/$', 'patchwork.views.patch.patch'),
     (r'^patch/(?P<patch_id>\d+)/raw/$', 'patchwork.views.patch.content'),
     (r'^patch/(?P<patch_id>\d+)/mbox/$', 'patchwork.views.patch.mbox'),
 
-    # registration process
-    (r'^register/$', 'patchwork.views.user.register'),
-    (r'^register/confirm/(?P<key>[^/]+)/$',
-        'patchwork.views.user.register_confirm'),
-
-    (r'^login/$', 'patchwork.views.user.login'),
-    (r'^logout/$', 'patchwork.views.user.logout'),
-
     # logged-in user stuff
     (r'^user/$', 'patchwork.views.user.profile'),
     (r'^user/todo/$', 'patchwork.views.user.todo_lists'),
     (r'^user/todo/(?P<project_id>[^/]+)/$', 'patchwork.views.user.todo_list'),
 
-    (r'^user/bundle/(?P<bundle_id>[^/]+)/$',
-	'patchwork.views.bundle.bundle'),
-    (r'^user/bundle/(?P<bundle_id>[^/]+)/mbox/$',
-	'patchwork.views.bundle.mbox'),
+    (r'^user/bundles/$',
+        'patchwork.views.bundle.bundles'),
 
     (r'^user/link/$', 'patchwork.views.user.link'),
-    (r'^user/link/(?P<key>[^/]+)/$', 'patchwork.views.user.link_confirm'),
     (r'^user/unlink/(?P<person_id>[^/]+)/$', 'patchwork.views.user.unlink'),
 
+    # password change
+    url(r'^user/password-change/$', auth_views.password_change,
+            name='password_change'),
+    url(r'^user/password-change/done/$', auth_views.password_change_done,
+            name='password_change_done'),
+
+    # login/logout
+    url(r'^user/login/$', auth_views.login,
+        {'template_name': 'patchwork/login.html'},
+        name = 'auth_login'),
+    url(r'^user/logout/$', auth_views.logout,
+        {'template_name': 'patchwork/logout.html'},
+        name = 'auth_logout'),
+
+    # registration
+    (r'^register/', 'patchwork.views.user.register'),
+
     # public view for bundles
     (r'^bundle/(?P<username>[^/]*)/(?P<bundlename>[^/]*)/$',
-                                'patchwork.views.bundle.public'),
+                                'patchwork.views.bundle.bundle'),
+    (r'^bundle/(?P<username>[^/]*)/(?P<bundlename>[^/]*)/mbox/$',
+                                'patchwork.views.bundle.mbox'),
+
+    (r'^confirm/(?P<key>[0-9a-f]+)/$', 'patchwork.views.confirm'),
 
     # submitter autocomplete
     (r'^submitter/$', 'patchwork.views.submitter_complete'),
+
+    # email setup
+    (r'^mail/$', 'patchwork.views.mail.settings'),
+    (r'^mail/optout/$', 'patchwork.views.mail.optout'),
+    (r'^mail/optin/$', 'patchwork.views.mail.optin'),
+
+    # help!
+    (r'^help/(?P<path>.*)$', 'patchwork.views.help'),
 )
+
+if settings.ENABLE_XMLRPC:
+    urlpatterns += patterns('',
+        (r'xmlrpc/$', 'patchwork.views.xmlrpc.xmlrpc'),
+        (r'^pwclient/$', 'patchwork.views.pwclient'),
+        (r'^project/(?P<project_id>[^/]+)/pwclientrc/$',
+             'patchwork.views.pwclientrc'),
+    )
+
+# redirect from old urls
+if settings.COMPAT_REDIR:
+    urlpatterns += patterns('',
+        (r'^user/bundle/(?P<bundle_id>[^/]+)/$',
+            'patchwork.views.bundle.bundle_redir'),
+        (r'^user/bundle/(?P<bundle_id>[^/]+)/mbox/$',
+            'patchwork.views.bundle.mbox_redir'),
+    )
+