From f077badf3163fc36c111dc45fe8d7d6f57d8712a Mon Sep 17 00:00:00 2001 From: Filipp Lepalaan Date: Fri, 8 Nov 2013 09:31:01 +0200 Subject: Merged motor and checkin --- motor/urls.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'motor/urls.py') diff --git a/motor/urls.py b/motor/urls.py index c19c2d0..13ebf37 100644 --- a/motor/urls.py +++ b/motor/urls.py @@ -1,14 +1,18 @@ from django.conf.urls import patterns, include, url from django.views.generic import TemplateView +from apps.core.views import LoginView, SitesListView # Uncomment the next two lines to enable the admin: -from django.contrib import admin -admin.autodiscover() +#from django.contrib import admin +#admin.autodiscover() + urlpatterns = patterns( '', - url(r'^$', 'docs.views.index', name='docs-index'), + #url(r'^$', 'docs.views.index', name='docs-index'), + url(r'^manage/$', LoginView.as_view(), name='core-login'), + url(r'^manage/sites/$', SitesListView.as_view(), name='core-list_sites'), url(r'^terms/$', TemplateView.as_view(template_name="terms.html"), {'title': 'ServoApp Terms of Service'}), - (r'^admin/', include(admin.site.urls)), + #(r'^admin/', include(admin.site.urls)), url(r'^([\w\-]+)/$', 'docs.views.view_article', name='docs-view'), ) -- cgit v1.2.3