X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/317112df0a3aa6652f867da0fd8b7de504156e2b..f1aa11d3c90925a0ecc4f7db2df571aabf99fc3e:/platforma/urls.py?ds=inline diff --git a/platforma/urls.py b/platforma/urls.py index 8d58e0e6..1abc8992 100755 --- a/platforma/urls.py +++ b/platforma/urls.py @@ -5,56 +5,32 @@ from django.contrib import admin from django.conf import settings admin.autodiscover() -PATH_SEC = r"(?P<path>[^/]+)" -PATH_END = PATH_SEC + "/$" -urlpatterns = patterns('', - # Explorer: - # url(r'^$', 'explorer.views.file_list', name='file_list'), - # url(r'^file/upload', 'explorer.views.file_upload', name='file_upload'), +if 'cas_consumer' in settings.INSTALLED_APPS: + auth_views = 'cas_consumer.views' +else: + auth_views = 'django.contrib.auth.views' - # url(r'^management/pull-requests$', 'explorer.views.pull_requests'), - - # Editor panels - # url(r'^editor/'+PATH_END, 'explorer.views.display_editor', name='editor_view'), - # url(r'^editor/$', 'explorer.views.file_list', name='editor_base'), +urlpatterns = patterns('', + url(r'^$', 'wiki.views.document_list'), + url(r'^gallery/(?P<directory>[^/]+)$', 'wiki.views.document_gallery'), - # url(r'^file/(?P<docid>[^/]+)/print$', 'explorer.views.print_html', name="file_print"), + # Auth + url(r'^accounts/login/$', auth_views + '.login', name = 'login'), + url(r'^accounts/logout/$', auth_views + '.logout', name = 'logout'), - url(r'^$', 'wiki.views.document_list', {'template_name': 'explorer/file_list.html'}), - # Admin panel (r'^admin/filebrowser/', include('filebrowser.urls')), url(r'^admin/doc/', include('django.contrib.admindocs.urls')), url(r'^admin/(.*)', admin.site.root), - # Theme database - # url(r'themes/', include('bookthemes.urls')), - - # Our über-restful api - # url(r'^api/', include('api.urls')), - - url(r'^gallery/(?P<directory>[^/]+)$', 'wiki.views.document_gallery'), - # 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}), - - url(r'^(?P<name>(.*))$', 'wiki.views.document_detail'), - -) -if 'cas_consumer' in settings.INSTALLED_APPS: - urlpatterns += patterns('', - # django-cas-consumer - url(r'^accounts/login/$', 'cas_consumer.views.login', name='login'), - url(r'^accounts/logout/$', 'cas_consumer.views.logout', name='logout'), - ) -else: - urlpatterns += patterns('', - # Django auth - url(r'^accounts/login/$', 'django.contrib.auth.views.login', {'redirect_field_name': 'next'}, name='login'), - url(r'^accounts/logout/$', 'django.contrib.auth.views.logout', {'next_page': '/'}, name='logout'), - ) + url(r'^(?P<name>[^/]+)$', 'wiki.views.document_detail'), +)