diff -r dda94db1149a -r 61fd17f9ab78 src/cm/urls.py --- a/src/cm/urls.py Wed Jan 13 18:15:21 2010 +0100 +++ b/src/cm/urls.py Wed Jan 20 20:43:38 2010 +0100 @@ -52,13 +52,15 @@ url(r'^create/upload/$', text_create_upload, name="text-create-upload"), url(r'^create/content/$', text_create_content, name="text-create-content"), + # text url(r'^text/(?P\w*)/view/$', text_view, name="text-view"), + url(r'^text/(?P\w*)/view/\?comment_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*)/share/$', text_share, name="text-share"), url(r'^text/(?P\w*)/settings/$', text_settings, name="text-settings"), url(r'^text/(?P\w*)/history/$', text_history, name="text-history"), url(r'^text/(?P\w*)/history-version/(?P\d*)/$', text_history, name="text-history-version"), @@ -72,7 +74,9 @@ # url(r'^text/(?P\w*)/version/(?P\w*)/$', text_version, name="text-version"), url(r'^text/(?P\w*)/comments_frame/$', text_view_frame, name="text-view-comments-frame"), + url(r'^text/(?P\w*)/comments_frame/\?comment_key=(?P\w*)$', text_view_frame, name="text-view-comments-frame-show-comment"), url(r'^text/(?P\w*)/comments_frame/(?P\w*)/$', text_view_frame, name="text-view-comments-frame-version"), + url(r'^text/(?P\w*)/comments_frame/\?comment_key=(?P\w*)$', text_view_frame, name="text-view-comments-frame-version-show-comment"), url(r'^text/(?P\w*)/comments/$', text_view_comments, name="text-view-comments"), url(r'^text/(?P\w*)/comments/(?P\w*)/$', text_view_comments, name="text-view-comments-version"), @@ -80,9 +84,6 @@ url(r'^text/(?P\w*)/user/add/$', user_add, name="user-add-text"), url(r'^text/(?P\w*)/user/mass-add/$', user_mass_add, name="user-mass-add-text"), - # comments - url(r'^text/(?P\w*)/view/\?comment_key=(?P\w*)$', text_view, name="text-view-show-comment"), - # site url(r'^contact/', contact, name="contact"), url(r'^help/', help, name="help"),