Lepsze obsługiwanie nieudanych merge oraz podawanie w vstorage.all_pages() jedynie...

[redakcja.git] / platforma / urls.py

diff --git a/platforma/urls.py b/platforma/urls.py
old mode 100644 (file)
new mode 100755 (executable)
index 00a2784..8100a18
--- a/platforma/urls.py
+++ b/platforma/urls.py
@@ -11,36 +11,36 @@ PATH_END = PATH_SEC + "/$"
 urlpatterns = patterns('',
     # Explorer:
     url(r'^$', 'explorer.views.file_list', name='file_list'),        
 urlpatterns = patterns('',
     # Explorer:
     url(r'^$', 'explorer.views.file_list', name='file_list'),        

-    url(r'^file/upload', 'explorer.views.file_upload', name='file_upload'),
+    url(r'^file/upload', 'explorer.views.file_upload', name='file_upload'),    

 
 

-
-    url(r'^managment/pull-requests$', 'explorer.views.pull_requests'),
-    
-#    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'^management/pull-requests$', 'explorer.views.pull_requests'),
+  

     # Editor panels
     # Editor panels

- #   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_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+'/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"),
     url(r'^file/(?P<docid>[^/]+)/print$', 'explorer.views.print_html', name="file_print"),

-    # Task managment
-    # url(r'^manager/pull-requests$', 'explorer.views.pull_requests'),

 
     # Admin panel
 
     # Admin panel

+    (r'^admin/filebrowser/', include('filebrowser.urls')),

     url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
     url(r'^admin/(.*)', admin.site.root),
 
     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
     # Our über-restful api

-    url(r'^api/', include('api.urls')),
+    # url(r'^api/', include('api.urls')),
+    
+    url(r'^gallery/(?P<directory>[^/]+)$', 'explorer.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.STATIC_URL[1:], 'django.views.static.serve',
+        {'document_root': settings.STATIC_ROOT, 'show_indexes': True}),
+        
+    url(r'^(?P<name>(.*))$', 'wiki.views.document_detail'),

     
 )
 
     
 )
 


@@ -56,13 +56,3 @@ else:
         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'^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'):
-    urlpatterns += patterns('',
-        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.STATIC_URL[1:], 'django.views.static.serve',
-            {'document_root': settings.STATIC_ROOT, 'show_indexes': True}),
-    )
-# 
\ No newline at end of file