X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=apps%2Furls.py;h=9886fd7c9841f2635e3569b6ee49ad61fd0ff2a2;hb=de9e9e1a014328b64b9e6aa7f618df472bfaef0c;hp=e11cbd976d67a45460ef7333ed57158707eeb5bd;hpb=c561ebe710d6e6a43aa4afc6c2036a215378ce87;p=patchwork

diff --git a/apps/urls.py b/apps/urls.py
index e11cbd9..9886fd7 100644
--- a/apps/urls.py
+++ b/apps/urls.py
@@ -18,18 +18,38 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 from django.conf.urls.defaults import *
+from django.conf import settings
+from patchwork.admin import admin_site
+
+from registration.views import register
+from patchwork.forms import RegistrationForm
+from patchwork.utils import userprofile_register_callback
 
 urlpatterns = patterns('',
     # Example:
     (r'^', include('patchwork.urls')),
 
+    # override the default registration form
+    url(r'^accounts/register/$',
+        register,
+        {'form_class': RegistrationForm,
+         'profile_callback': userprofile_register_callback},
+        name='registration_register'),
+
+    (r'^accounts/', include('registration.urls')),
+
     # Uncomment this for admin:
-     (r'^admin/', include('django.contrib.admin.urls')),
+     (r'^admin/(.*)', admin_site.root),
 
      (r'^css/(?P<path>.*)$', 'django.views.static.serve',
-	{'document_root': '/home/jk/devel/patchwork/pwsite/htdocs/css'}),
+        {'document_root': '/srv/patchwork/htdocs/css'}),
      (r'^js/(?P<path>.*)$', 'django.views.static.serve',
-	{'document_root': '/home/jk/devel/patchwork/pwsite/htdocs/js'}),
+        {'document_root': '/srv/patchwork/htdocs/js'}),
      (r'^images/(?P<path>.*)$', 'django.views.static.serve',
-	{'document_root': '/home/jk/devel/patchwork/pwsite/htdocs/images'}),
+        {'document_root': '/srv/patchwork/htdocs/images'}),
 )
+
+if settings.ENABLE_XMLRPC:
+    urlpatterns += patterns('',
+		    (r'xmlrpc/$', 'django_xmlrpc.views.handle_xmlrpc'),
+    )