Podwyższenie wymaganej wersji biblioteki librarian do 1.2.5 (wydanej dzisiaj).

[redakcja.git] / project / urls.py

diff --git a/project/urls.py b/project/urls.py
index 2c1fab7..c38f3f6 100644 (file)
--- 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
@@ -8,29 +10,25 @@ 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<folder>[^/]+)/$', 'explorer.views.folder_images', name='folder_image'),
-    url(r'^images/$', 'explorer.views.folder_images', {'folder': '.'}, name='folder_image_ajax'),
+    
+#    url(r'^images/(?P<folder>[^/]+)/$', '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<name>[a-z]+)/$', 'explorer.views.panel_view', name='panel_view'),
+ #   url(r'^editor/'+PATH_SEC+'/panel/(?P<name>[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<docid>[^/]+)/print$', 'explorer.views.print_html', name="file_print"),
     # Task managment
     # url(r'^manager/pull-requests$', 'explorer.views.pull_requests'),
 
@@ -38,14 +36,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')),
 
-    # Our uber-restful api
+    # 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'):
@@ -55,3 +65,4 @@ if settings.DEBUG and not hasattr(settings, 'DONT_SERVE_STATIC'):
         url(r'^%s(?P<path>.+)$' % settings.STATIC_URL[1:], 'django.views.static.serve',
             {'document_root': settings.STATIC_ROOT, 'show_indexes': True}),
     )
+# 
\ No newline at end of file