projects
/
sommitrealweird.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Actually add comments to blog, tidy up rst handling to make sure we get xhtml1.1...
[sommitrealweird.git]
/
sommitrealweird
/
urls.py
diff --git
a/sommitrealweird/urls.py
b/sommitrealweird/urls.py
index b709acced792c93e27330fea820be3f1576d06d8..6106b9f61afdb47f47c7b6f5ca6ef76ba1311f8e 100644
(file)
--- a/
sommitrealweird/urls.py
+++ b/
sommitrealweird/urls.py
@@
-1,6
+1,7
@@
from django.conf.urls.defaults import *
from settings import MEDIA_ROOT, MEDIA_URL
from django.conf.urls.defaults import *
from settings import MEDIA_ROOT, MEDIA_URL
-from blog.feeds import LatestBlogEntries
+from blog.feeds import LatestBlogEntries, LatestBlogEntriesRss
+from django.contrib import admin
handler404 = 'generic.views.render_404'
handler404 = 'generic.views.render_404'
@@
-8,6
+9,12
@@
feeds_dict = {
'blog': LatestBlogEntries,
}
'blog': LatestBlogEntries,
}
+rssfeeds_dict = {
+ 'blog': LatestBlogEntriesRss,
+ }
+
+admin.autodiscover()
+
urlpatterns = patterns('',
# Example:
# (r'^sommitrealweird/', include('sommitrealweird.foo.urls')),
urlpatterns = patterns('',
# Example:
# (r'^sommitrealweird/', include('sommitrealweird.foo.urls')),
@@
-15,9
+22,13
@@
urlpatterns = patterns('',
# Uncomment this for admin:
(r'^$', 'bpcms.views.document_view', {'slug': 'index'}),
(r'^media/(?P<path>.*)$', 'django.views.static.serve', {'document_root': MEDIA_ROOT, 'show_indexes': True}),
# Uncomment this for admin:
(r'^$', 'bpcms.views.document_view', {'slug': 'index'}),
(r'^media/(?P<path>.*)$', 'django.views.static.serve', {'document_root': MEDIA_ROOT, 'show_indexes': True}),
- (r'^admin/
', include('django.contrib.admin.urls')
),
+ (r'^admin/
(.*)$', admin.site.root
),
(r'^blog/', include('blog.urls')),
(r'^blog/', include('blog.urls')),
+ (r'^photo/', include('photo.urls')),
+ (r'^photos/', include('photo.urls')),
+ (r'^css-doc/(?P<slug>.*)$', 'bpcms.views.css_view'),
+ (r'^feeds/rss/(?P<url>.*)/', 'django.contrib.syndication.views.feed', {'feed_dict': rssfeeds_dict}),
(r'^feeds/(?P<url>.*)/', 'django.contrib.syndication.views.feed', {'feed_dict': feeds_dict}),
(r'^feeds/(?P<url>.*)/', 'django.contrib.syndication.views.feed', {'feed_dict': feeds_dict}),
- (r'^
(?:content/|)(?P<slug>[^/]+)/$', 'bpcms.views.document_view'
),
- (r'^(?:content/|)
(?P<folders>.*)/(?P<slug>[^/]+)/$', 'bpcms.views.document_view'),
+ (r'^
comments/', include('django.contrib.comments.urls')
),
+ (r'^(?:content/|)
', include('bpcms.urls'))
)
)