src/cm/urls.py
changeset 103 61fd17f9ab78
parent 63 0a610af4033f
child 143 3c21b9097908
child 145 fb5b1e6ad179
equal deleted inserted replaced
78:dda94db1149a 103:61fd17f9ab78
    50 
    50 
    51      # text create
    51      # text create
    52      url(r'^create/upload/$', text_create_upload, name="text-create-upload"),
    52      url(r'^create/upload/$', text_create_upload, name="text-create-upload"),
    53      url(r'^create/content/$', text_create_content, name="text-create-content"),
    53      url(r'^create/content/$', text_create_content, name="text-create-content"),
    54      
    54      
       
    55 
    55      # text
    56      # text
    56      url(r'^text/(?P<key>\w*)/view/$', text_view, name="text-view"),
    57      url(r'^text/(?P<key>\w*)/view/$', text_view, name="text-view"),
       
    58      url(r'^text/(?P<key>\w*)/view/\?comment_key=(?P<id>\w*)$', text_view, name="text-view-show-comment"), 
       
    59      
    57 #     url(r'^text/(?P<key>\w*)/view/(?P<version_key>\w*)/$', text_view, name="text-view-version"),
    60 #     url(r'^text/(?P<key>\w*)/view/(?P<version_key>\w*)/$', text_view, name="text-view-version"),
    58      
    61      
    59      url(r'^text/(?P<key>\w*)/edit/$', text_edit, name="text-edit"),
    62      url(r'^text/(?P<key>\w*)/edit/$', text_edit, name="text-edit"),
    60      url(r'^text/(?P<key>\w*)/pre_edit/$', text_pre_edit, name="text-preedit"),
    63      url(r'^text/(?P<key>\w*)/pre_edit/$', text_pre_edit, name="text-preedit"),
    61      url(r'^text/(?P<key>\w*)/share/$', text_share, name="text-share"),
       
    62      url(r'^text/(?P<key>\w*)/settings/$', text_settings, name="text-settings"),
    64      url(r'^text/(?P<key>\w*)/settings/$', text_settings, name="text-settings"),
    63      url(r'^text/(?P<key>\w*)/history/$', text_history, name="text-history"),
    65      url(r'^text/(?P<key>\w*)/history/$', text_history, name="text-history"),
    64      url(r'^text/(?P<key>\w*)/history-version/(?P<v1_nid>\d*)/$', text_history, name="text-history-version"),
    66      url(r'^text/(?P<key>\w*)/history-version/(?P<v1_nid>\d*)/$', text_history, name="text-history-version"),
    65      url(r'^text/(?P<key>\w*)/history/(?P<v1_nid>\w*)/(?P<v2_nid>\d*)/$', text_history, name="text-history-compare"),
    67      url(r'^text/(?P<key>\w*)/history/(?P<v1_nid>\w*)/(?P<v2_nid>\d*)/$', text_history, name="text-history-compare"),
    66      url(r'^text/(?P<key>\w*)/revert/(?P<v1_nid>\w*)/$', text_revert, name="text-revert"),
    68      url(r'^text/(?P<key>\w*)/revert/(?P<v1_nid>\w*)/$', text_revert, name="text-revert"),
    70      url(r'^text/(?P<key>\w*)/history/$', text_history, name="text-history"),
    72      url(r'^text/(?P<key>\w*)/history/$', text_history, name="text-history"),
    71      url(r'^text/(?P<key>\w*)/diff/(?P<id_v1>\w*)/(?P<id_v2>\w*)/$', text_diff, name="text-diff"),
    73      url(r'^text/(?P<key>\w*)/diff/(?P<id_v1>\w*)/(?P<id_v2>\w*)/$', text_diff, name="text-diff"),
    72 #     url(r'^text/(?P<key>\w*)/version/(?P<id_version>\w*)/$', text_version, name="text-version"),
    74 #     url(r'^text/(?P<key>\w*)/version/(?P<id_version>\w*)/$', text_version, name="text-version"),
    73      
    75      
    74      url(r'^text/(?P<key>\w*)/comments_frame/$', text_view_frame, name="text-view-comments-frame"),
    76      url(r'^text/(?P<key>\w*)/comments_frame/$', text_view_frame, name="text-view-comments-frame"),
       
    77      url(r'^text/(?P<key>\w*)/comments_frame/\?comment_key=(?P<id>\w*)$', text_view_frame, name="text-view-comments-frame-show-comment"), 
    75      url(r'^text/(?P<key>\w*)/comments_frame/(?P<version_key>\w*)/$', text_view_frame, name="text-view-comments-frame-version"),
    78      url(r'^text/(?P<key>\w*)/comments_frame/(?P<version_key>\w*)/$', text_view_frame, name="text-view-comments-frame-version"),
       
    79      url(r'^text/(?P<key>\w*)/comments_frame/\?comment_key=(?P<id>\w*)$', text_view_frame, name="text-view-comments-frame-version-show-comment"), 
    76      
    80      
    77      url(r'^text/(?P<key>\w*)/comments/$', text_view_comments, name="text-view-comments"),
    81      url(r'^text/(?P<key>\w*)/comments/$', text_view_comments, name="text-view-comments"),
    78      url(r'^text/(?P<key>\w*)/comments/(?P<version_key>\w*)/$', text_view_comments, name="text-view-comments-version"),
    82      url(r'^text/(?P<key>\w*)/comments/(?P<version_key>\w*)/$', text_view_comments, name="text-view-comments-version"),
    79 
    83 
    80      url(r'^text/(?P<key>\w*)/user/add/$', user_add, name="user-add-text"),
    84      url(r'^text/(?P<key>\w*)/user/add/$', user_add, name="user-add-text"),
    81      url(r'^text/(?P<key>\w*)/user/mass-add/$', user_mass_add, name="user-mass-add-text"),
    85      url(r'^text/(?P<key>\w*)/user/mass-add/$', user_mass_add, name="user-mass-add-text"),
    82      
       
    83      # comments
       
    84      url(r'^text/(?P<key>\w*)/view/\?comment_key=(?P<id>\w*)$', text_view, name="text-view-show-comment"),
       
    85      
    86      
    86      # site
    87      # site
    87      url(r'^contact/', contact, name="contact"),
    88      url(r'^contact/', contact, name="contact"),
    88      url(r'^help/', help, name="help"),
    89      url(r'^help/', help, name="help"),
    89      
    90