Merge branch 'master' of stigma:platforma

[redakcja.git] / project / urls.py

diff --git a/project/urls.py b/project/urls.py
index a77169d..e107635 100644 (file)
--- a/project/urls.py
+++ b/project/urls.py
@@ -10,29 +10,28 @@ 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'^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'),
     
     # 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'),
 
@@ -41,7 +40,7 @@ urlpatterns = patterns('',
     url(r'^admin/(.*)', admin.site.root),
 
     # Prototypes
-    url(r'^wysiwyg-proto/', include('wysiwyg.urls')),
+#    url(r'^wysiwyg-proto/', include('wysiwyg.urls')),
 
     # Our über-restful api
     url(r'^api/', include('api.urls') ),