diff -r b4ed8cdc654c -r 0fe2f3f5466f src/hp/urls.py --- a/src/hp/urls.py Wed Nov 07 11:48:38 2012 +0100 +++ b/src/hp/urls.py Tue Nov 13 16:20:34 2012 +0100 @@ -1,17 +1,22 @@ from django.conf.urls import patterns, include, url # 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('', # Examples: # url(r'^$', 'hp.views.home', name='home'), # url(r'^hp/', include('hp.foo.urls')), + url(r'^$', 'hp.views.all_videos', name='home'), + url(r'^video/(?P.*)$', 'hp.views.show_video_details', name='video_details'), + + url(r'^api/1.0/', include('hp.api.urls')), # Uncomment the admin/doc line below to enable admin documentation: # url(r'^admin/doc/', include('django.contrib.admindocs.urls')), + # Uncomment the next line to enable the admin: - # url(r'^admin/', include(admin.site.urls)), + url(r'^admin/', include(admin.site.urls)), )