Dodanie planszy ładowania do document_details.html.

[redakcja.git] / platforma / urls.py

diff --git a/platforma/urls.py b/platforma/urls.py
index ccb9fcf..19dfc03 100755 (executable)
--- a/platforma/urls.py
+++ b/platforma/urls.py
@@ -10,27 +10,39 @@ PATH_END = PATH_SEC + "/$"
 
 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'^$', 'explorer.views.file_list', name='file_list'),        
+    # url(r'^file/upload', 'explorer.views.file_upload', name='file_upload'),    
 
-    url(r'^management/pull-requests$', 'explorer.views.pull_requests'),
+    # url(r'^management/pull-requests$', 'explorer.views.pull_requests'),
   
     # Editor panels
-    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'^file/(?P<docid>[^/]+)/print$', 'explorer.views.print_html', name="file_print"),
+    # url(r'^file/(?P<docid>[^/]+)/print$', 'explorer.views.print_html', name="file_print"),
 
+    url(r'^$', 'wiki.views.document_list'),
+    
     # Admin panel
     (r'^admin/filebrowser/', include('filebrowser.urls')),
     url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
     url(r'^admin/(.*)', admin.site.root),
 
     # Theme database
-    url(r'themes/', include('bookthemes.urls')),
+    # url(r'themes/', include('bookthemes.urls')),
 
     # Our über-restful api
-    url(r'^api/', include('api.urls')),
+    # url(r'^api/', include('api.urls')),
+    
+    url(r'^gallery/(?P<directory>[^/]+)$', 'wiki.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'),
     
 )
 
@@ -46,17 +58,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'),    
     )
-
-# Static files
-if settings.DEBUG:
-    urlpatterns += patterns('',
-        url(r'^renderer$', 'explorer.views.renderer_test'),
-    )
-
-    if 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