summaryrefslogtreecommitdiff
path: root/base_urls.py
diff options
context:
space:
mode:
Diffstat (limited to 'base_urls.py')
-rw-r--r--base_urls.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/base_urls.py b/base_urls.py
index 67ebd86..37bfa87 100644
--- a/base_urls.py
+++ b/base_urls.py
@@ -43,7 +43,7 @@ urlpatterns += patterns('',
urlpatterns += patterns('',
(r'^admin/doc/', include('django.contrib.admindocs.urls')),
(r'^admin/filebrowser/', include('filebrowser.urls')),
- (r'^admin/', include(admin.site.urls),{'SSL':True}),
+ (r'^admin/', include(admin.site.urls),),
(r'^grappelli/', include('grappelli.urls')),
(r'^feeds/(?P<url>.*)/$', 'django.contrib.syndication.views.feed', {'feed_dict': feeds}),
(r'^robots.txt$', direct_to_template, {'template': 'archives/robots.html'}),
@@ -52,9 +52,6 @@ urlpatterns += patterns('',
(r'^sitemap.xml$', 'django.contrib.sitemaps.views.sitemap', {'sitemaps': sitemaps}),
(r'^writing/', include('blog.urls')),
(r'^projects/', include('projects.urls')),
- (r'^tops/', include('blog.urls')),
- (r'^topics/(?P<slug>[-\w]+)/$', redirect_to, {'url': '/topics/%(slug)s/1/'}),
- (r'^topics/(?P<slug>[-\w]+)/(?P<page>\d+)/', 'blog.views.topic_list'),
#Entry detail i.e. /year/month/day/my-title/
(r'(?P<year>\d{4})/(?P<month>[a-z]{3})/(?P<day>\w{1,2})/(?P<slug>[-\w]+)/$', 'blog.views.entry_detail'),
# locations