diff options
Diffstat (limited to 'bn_django/urls.py')
| -rw-r--r-- | bn_django/urls.py | 29 |
1 files changed, 19 insertions, 10 deletions
diff --git a/bn_django/urls.py b/bn_django/urls.py index 9ccf0a3..425066b 100644 --- a/bn_django/urls.py +++ b/bn_django/urls.py @@ -1,18 +1,22 @@ from django.conf.urls.defaults import * from photos.models import Photo +import git_wiki.models urlpatterns = patterns('', # Example: # (r'^bn_django/', include('bn_django.foo.urls')), - (r'^$', 'django.views.generic.simple.direct_to_template', {'template': 'frontpage.html','extra_context':dict({ \ - 'latest_photos':Photo.objects.order_by('date')[:2] \ + (r'^$', 'django.views.generic.simple.direct_to_template', + {'template': 'frontpage.html','extra_context':dict({ \ + 'latest_photos':Photo.objects.order_by('date')[:2], \ #'latest_comments':Photo.objects.order_by('date')[:4] \ - #'latest_knowledge':Photo.objects.order_by('date')[:4] \ + 'latest_knowledge':git_wiki.models.shortlog() \ })}), - (r'^about/$', 'django.views.generic.simple.direct_to_template', {'template': 'about.html'}), - (r'^credits/$', 'django.views.generic.simple.direct_to_template', {'template': 'credits.html'}), - (r'^copyright/$', 'django.views.generic.simple.direct_to_template', {'template': 'copyright.html'}), - + (r'^about/$', 'django.views.generic.simple.direct_to_template', + {'template': 'about.html'}), + (r'^credits/$', 'django.views.generic.simple.direct_to_template', + {'template': 'credits.html'}), + (r'^copyright/$', 'django.views.generic.simple.direct_to_template', + {'template': 'copyright.html'}), (r'^knowledge/$', 'bn_django.git_wiki.views.frontpage',), (r'^k/', include('bn_django.git_wiki.urls')), @@ -23,8 +27,13 @@ urlpatterns = patterns('', # Uncomment this for admin: (r'^admin/', include('django.contrib.admin.urls')), + (r'^comments/', include('django.contrib.comments.urls.comments')), - (r'^static/(?P<path>.*)$', 'django.views.static.serve', {'document_root': '/home/bnewbold/bn-project/static', 'show_indexes': True}), - (r'^style/(?P<path>.*)$', 'django.views.static.serve', {'document_root': '/home/bnewbold/bn-project/static/style'}), - (r'^media/(?P<path>.*)$', 'django.views.static.serve', {'document_root': '/home/bnewbold/bn-project/media'}), + (r'^static/(?P<path>.*)$', 'django.views.static.serve', + {'document_root': '/home/bnewbold/bn-project/static', + 'show_indexes': True}), + (r'^style/(?P<path>.*)$', 'django.views.static.serve', + {'document_root': '/home/bnewbold/bn-project/static/style'}), + (r'^media/(?P<path>.*)$', 'django.views.static.serve', + {'document_root': '/home/bnewbold/bn-project/media'}), ) |