diff -r fb5b1e6ad179 -r 51c34f5970c2 src/cm/urls.py --- a/src/cm/urls.py Fri Feb 05 12:23:29 2010 +0100 +++ b/src/cm/urls.py Fri Feb 05 12:24:06 2010 +0100 @@ -55,7 +55,7 @@ # 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/\?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"), @@ -74,11 +74,11 @@ 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"), + # main client frame 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"), - + + # included in text_view_frame 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"),