# -*- coding: utf-8 -*-
-from django.conf.urls.defaults import *
+from django.conf.urls import include, patterns, url
from django.contrib import admin
from django.conf import settings
+from django.conf.urls.static import static
+from django.contrib.staticfiles.urls import staticfiles_urlpatterns
+from django.views.generic import RedirectView
-import wiki.urls
admin.autodiscover()
# Auth
url(r'^accounts/login/$', 'django_cas.views.login', name='login'),
url(r'^accounts/logout/$', 'django_cas.views.logout', name='logout'),
+ url(r'^admin/login/$', 'django_cas.views.login', name='login'),
+ url(r'^admin/logout/$', 'django_cas.views.logout', name='logout'),
# Admin panel
- (r'^admin/filebrowser/', include('filebrowser.urls')),
url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
(r'^admin/', include(admin.site.urls)),
- url(r'^$', 'django.views.generic.simple.redirect_to', {'url': '/documents/'}),
- url(r'^documents/', include('wiki.urls')),
- url(r'^storage/', include('dvcs.urls')),
+ (r'^comments/', include('django.contrib.comments.urls')),
+
+ url(r'^$', RedirectView.as_view(url= '/documents/')),
+ url(r'^documents/', include('catalogue.urls')),
url(r'^apiclient/', include('apiclient.urls')),
+ url(r'^editor/', include('wiki.urls')),
+ url(r'^cover/', include('cover.urls')),
+ (r'^jsi18n/$', 'django.views.i18n.javascript_catalog', dict(packages=['wiki'])),
+
+)
- # Static files (should be served by Apache)
- url(r'^%s(?P<path>.+)$' % settings.MEDIA_URL[1:], 'django.views.static.serve',
- {'document_root': settings.MEDIA_ROOT, 'show_indexes': True}),
- url(r'^%s(?P<path>.+)$' % settings.ADMIN_MEDIA_PREFIX[1:], 'django.views.static.serve',
- {'document_root': settings.MEDIA_ROOT, 'show_indexes': True}),
- url(r'^%s(?P<path>.+)$' % settings.STATIC_URL[1:], 'django.views.static.serve',
- {'document_root': settings.STATIC_ROOT, 'show_indexes': True}),
- (r'^documents/', include(wiki.urls)),
- url(r'^themes$', 'wiki.views.themes', name="themes"),
- url(r'^$', 'django.views.generic.simple.redirect_to', {'url': '/documents/'}),
+if settings.DEBUG:
+ urlpatterns += staticfiles_urlpatterns()
+ urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
+if getattr(settings, 'SERVE_FILES_WITH_DEBUG_FALSE', False):
+ urlpatterns += patterns('',
+ (r'^%s(?P<path>.*)$' % settings.STATIC_URL[1:], 'django.views.static.serve', {'document_root': settings.STATIC_ROOT}),
+ (r'^%s(?P<path>.*)$' % settings.MEDIA_URL[1:], 'django.views.static.serve', {'document_root': settings.MEDIA_ROOT}),
)