X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/f31bb368a2cad9a61e4fc652fa4b40c4114a128c..085dd288093e1fd5455cc4db9f82998f05656a14:/project/urls.py diff --git a/project/urls.py b/project/urls.py index b3576889..c8896314 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', @@ -31,7 +34,7 @@ urlpatterns = patterns('', url(r'^editor/'+PATH_SEC+'/print/xml$', 'explorer.views.print_xml'), # Task managment - url(r'^manager/pull-requests$', 'explorer.views.pull_requests'), + # url(r'^manager/pull-requests$', 'explorer.views.pull_requests'), # Admin panel url(r'^admin/doc/', include('django.contrib.admindocs.urls')), @@ -40,6 +43,12 @@ urlpatterns = patterns('', # 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')), + + # Our über-restful api + url(r'^api/', include('api.urls') ), )