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

diff --git a/apps/urls.py b/apps/urls.py
index 9886fd7..4ddef9e 100644
--- a/apps/urls.py
+++ b/apps/urls.py
@@ -17,39 +17,28 @@
 # along with Patchwork; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
+import os
+
 from django.conf.urls.defaults import *
 from django.conf import settings
-from patchwork.admin import admin_site
+from django.contrib import admin
+
+admin.autodiscover()
 
-from registration.views import register
-from patchwork.forms import RegistrationForm
-from patchwork.utils import userprofile_register_callback
+htdocs = os.path.join(settings.ROOT_DIR, 'htdocs')
 
 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/(.*)', admin_site.root),
+     (r'^admin/', include(admin.site.urls)),
 
      (r'^css/(?P<path>.*)$', 'django.views.static.serve',
-        {'document_root': '/srv/patchwork/htdocs/css'}),
+        {'document_root': os.path.join(htdocs, 'css')}),
      (r'^js/(?P<path>.*)$', 'django.views.static.serve',
-        {'document_root': '/srv/patchwork/htdocs/js'}),
+        {'document_root': os.path.join(htdocs, 'js')}),
      (r'^images/(?P<path>.*)$', 'django.views.static.serve',
-        {'document_root': '/srv/patchwork/htdocs/images'}),
+        {'document_root': os.path.join(htdocs, 'images')}),
 )
 
-if settings.ENABLE_XMLRPC:
-    urlpatterns += patterns('',
-		    (r'xmlrpc/$', 'django_xmlrpc.views.handle_xmlrpc'),
-    )