diff -r a69421197502 -r 2fdb7d095d5c src/cm/urls.py --- a/src/cm/urls.py Thu Aug 09 16:55:25 2012 +0200 +++ b/src/cm/urls.py Fri Aug 10 16:12:29 2012 +0200 @@ -52,16 +52,14 @@ url(r'^text/(?P\w*)/share/$', text_share, name="text-share"), # text create + url(r'^create/content/$', text_create_content, name="text-create-content"), url(r'^create/upload/$', text_create_upload, name="text-create-upload"), - url(r'^create/content/$', text_create_content, name="text-create-content"), - + url(r'^create/import/$', text_create_import, name="text-create-import"), # text url(r'^text/(?P\w*)/view/$', text_view, name="text-view"), url(r'^text/(?P\w*)/view/\?comment_id_key=(?P\w*)$', text_view, name="text-view-show-comment"), -# url(r'^text/(?P\w*)/view/(?P\w*)/$', text_view, name="text-view-version"), - url(r'^text/(?P\w*)/edit/$', text_edit, name="text-edit"), url(r'^text/(?P\w*)/pre_edit/$', text_pre_edit, name="text-preedit"), url(r'^text/(?P\w*)/settings/$', text_settings, name="text-settings"), @@ -75,8 +73,6 @@ url(r'^text/(?P\w*)/(?P\w*)/delete/$', text_version_delete, name="text-version-delete"), url(r'^text/(?P\w*)/export/(?P\w*)/(?P\w*)/(?P\w*)/(?P\w*)/$', text_export, name="text-export"), url(r'^text/(?P\w*)/history/$', text_history, name="text-history"), - #url(r'^text/(?P\w*)/diff/(?P\w*)/(?P\w*)/$', text_diff, name="text-diff"), -# url(r'^text/(?P\w*)/version/(?P\w*)/$', text_version, name="text-version"), # detached attachements! (used for saving images when just converting to HTML, without creating a text) url(r'^attach/(?P\w*)/$', notext_attach, name="notext-attach"),