X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/71b07fe1928b04a218e062f01cca720863b9eeb9..97059a831f2e7ac44ccfacde3950cc2561c539ee:/project/urls.py?ds=sidebyside diff --git a/project/urls.py b/project/urls.py index c8896314..e107635e 100644 --- a/project/urls.py +++ b/project/urls.py @@ -10,29 +10,28 @@ PATH_END = PATH_SEC + "/$" urlpatterns = patterns('', # Explorer: - url(r'^$', 'explorer.views.file_list', name='file_list'), - - url(r'^file/'+PATH_SEC+'/text/$', 'explorer.views.file_xml', name='file_xml'), - url(r'^file/'+PATH_SEC+'/dc/$', 'explorer.views.file_dc', name='file_dc'), + url(r'^$', 'explorer.views.file_list', name='file_list'), url(r'^file/upload', 'explorer.views.file_upload', name='file_upload'), - url(r'^file/'+PATH_SEC+'/commit$', 'explorer.views.file_commit', name='file_commit'), - url(r'^file/'+PATH_SEC+'/update$', 'explorer.views.file_update_local', name='file_update'), - url(r'^images/(?P[^/]+)/$', 'explorer.views.folder_images', name='folder_image'), - url(r'^images/$', 'explorer.views.folder_images', {'folder': '.'}, name='folder_image_ajax'), + + url(r'^managment/pull-requests$', 'explorer.views.pull_requests'), + +# url(r'^images/(?P[^/]+)/$', 'explorer.views.folder_images', name='folder_image'), +# url(r'^images/$', 'explorer.views.folder_images', {'folder': '.'}, name='folder_image_ajax'), # Editor panels - url(r'^editor/'+PATH_SEC+'/panel/(?P[a-z]+)/$', 'explorer.views.panel_view', name='panel_view'), + # url(r'^editor/'+PATH_SEC+'/panel/(?P[a-z]+)/$', 'explorer.views.panel_view', name='panel_view'), url(r'^editor/'+PATH_END, 'explorer.views.display_editor', name='editor_view'), url(r'^editor/$', 'explorer.views.file_list', name='editor_base'), - url(r'^editor/'+PATH_SEC+'/split$', 'explorer.views.split_text'), - url(r'^editor/'+PATH_SEC+'/split-success', - 'explorer.views.split_success', name='split-success'), + # url(r'^editor/'+PATH_SEC+'/split$', 'explorer.views.split_text'), + # url(r'^editor/'+PATH_SEC+'/split-success', + # 'explorer.views.split_success', name='split-success'), - url(r'^editor/'+PATH_SEC+'/print/html$', 'explorer.views.print_html'), - url(r'^editor/'+PATH_SEC+'/print/xml$', 'explorer.views.print_xml'), - + # url(r'^editor/'+PATH_SEC+'/print/html$', 'explorer.views.print_html'), + # url(r'^editor/'+PATH_SEC+'/print/xml$', 'explorer.views.print_xml'), + + url(r'^file/(?P[^/]+)/print$', 'explorer.views.print_html', name="file_print"), # Task managment # url(r'^manager/pull-requests$', 'explorer.views.pull_requests'), @@ -40,17 +39,26 @@ urlpatterns = patterns('', url(r'^admin/doc/', include('django.contrib.admindocs.urls')), url(r'^admin/(.*)', admin.site.root), - # Authorization - url(r'^accounts/login/$', 'django.contrib.auth.views.login', {'redirect_field_name': 'next'}), - url(r'^accounts/logout/$', 'django.contrib.auth.views.logout', {'next_page': '/'}), - # Prototypes - url(r'^wysiwyg-proto/', include('wysiwyg.urls')), +# url(r'^wysiwyg-proto/', include('wysiwyg.urls')), # Our über-restful api url(r'^api/', include('api.urls') ), + ) +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'), + ) # Static files if settings.DEBUG and not hasattr(settings, 'DONT_SERVE_STATIC'): @@ -60,3 +68,4 @@ if settings.DEBUG and not hasattr(settings, 'DONT_SERVE_STATIC'): url(r'^%s(?P.+)$' % settings.STATIC_URL[1:], 'django.views.static.serve', {'document_root': settings.STATIC_ROOT, 'show_indexes': True}), ) +# \ No newline at end of file