Merge branch 'master' of github.com:FinalsClub/karmaworld
[oweals/karmaworld.git] / karmaworld / urls.py
1 from django.contrib import admin
2 from django.conf.urls.defaults import patterns, include, url
3 from django.views.generic import ListView, DetailView
4
5 from karmaworld.apps.courses.models import Course
6 from karmaworld.apps.courses.views import CourseDetailView
7
8 # See: https://docs.djangoproject.com/en/dev/ref/contrib/admin/#hooking-adminsite-instances-into-your-urlconf
9 admin.autodiscover()
10
11
12 # See: https://docs.djangoproject.com/en/dev/topics/http/urls/
13 urlpatterns = patterns('',
14     # Admin panel and documentation:
15     url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
16     url(r'^admin/', include(admin.site.urls)),
17
18     #url(r'^/(?P<school_slug>[^/]+)/(?P<slug>[^/]+)$',
19     #url(r'^/[a-z0-9\-]+$', CourseDetailView.as_view(), name='course_detail'),
20     url(r'^(?P<school_slug>[^/]+)/(?P<slug>[^/]+)$', CourseDetailView.as_view(), name='course_detail'),
21
22     url(r'^$', ListView.as_view(model=Course), name='home'),
23 )