X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/470817c5149ca294bd929fb29632a91c985aef0a..090fa209bd92925fbd407b8c3e7c996f5762fd3f:/project/urls.py diff --git a/project/urls.py b/project/urls.py index a9fad54f..c628d150 100644 --- a/project/urls.py +++ b/project/urls.py @@ -1,3 +1,5 @@ +# -*- coding: utf-8 -*- + from django.conf.urls.defaults import * from django.contrib import admin from django.conf import settings @@ -22,6 +24,7 @@ urlpatterns = patterns('', # Editor panels 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', @@ -41,8 +44,14 @@ urlpatterns = patterns('', url(r'^accounts/login/$', 'django.contrib.auth.views.login', {'redirect_field_name': 'next'}), url(r'^accounts/logout/$', 'django.contrib.auth.views.logout', {'next_page': '/'}), - # Our uber-restful api + # Prototypes + url(r'^wysiwyg-proto/', include('wysiwyg.urls')), + + # Our über-restful api url(r'^api/', include('api.urls') ), + + # django-cas-provider + url(r'^cas/', include('cas_provider.urls')), )