Merge remote-tracking branch 'refs/remotes/breton/new_gst10'

[mediagoblin.git] / mediagoblin / user_pages / routing.py

diff --git a/mediagoblin/user_pages/routing.py b/mediagoblin/user_pages/routing.py
index 24bbab56b3415148e0aeabd60d7891c8a1f053d1..1a1d41399e93a51e8006247b7e65b5cb29894fb6 100644 (file)
--- a/mediagoblin/user_pages/routing.py
+++ b/mediagoblin/user_pages/routing.py
@@ -23,29 +23,50 @@ add_route('mediagoblin.user_pages.media_home',
           '/u/<string:user>/m/<string:media>/',
           'mediagoblin.user_pages.views:media_home')
 
+add_route('mediagoblin.user_pages.media_home.report_media',
+          '/u/<string:user>/m/<string:media>/report/',
+          'mediagoblin.user_pages.views:file_a_report')
+
 add_route('mediagoblin.user_pages.media_confirm_delete',
-          '/u/<string:user>/m/<string:media>/confirm-delete/',
+          '/u/<string:user>/m/<int:media_id>/confirm-delete/',
           'mediagoblin.user_pages.views:media_confirm_delete')
 
+add_route('mediagoblin.user_pages.activity_view',
+          '/<string:username>/activity/<string:id>/',
+          'mediagoblin.user_pages.views:activity_view')
+
 # Submission handling of new comments. TODO: only allow for POST methods
 add_route('mediagoblin.user_pages.media_post_comment',
-          '/u/<string:user>/m/<string:media>/comment/add/',
+          '/u/<string:user>/m/<int:media_id>/comment/add/',
           'mediagoblin.user_pages.views:media_post_comment')
 
+add_route('mediagoblin.user_pages.media_preview_comment',
+          '/ajax/comment/preview/',
+          'mediagoblin.user_pages.views:media_preview_comment')
+
 add_route('mediagoblin.user_pages.user_gallery',
           '/u/<string:user>/gallery/',
           'mediagoblin.user_pages.views:user_gallery')
 
 add_route('mediagoblin.user_pages.media_home.view_comment',
-          '/u/<string:user>/m/<string:media>/c/<string:comment>/',
+          '/u/<string:user>/m/<string:media>/c/<int:comment>/',
           'mediagoblin.user_pages.views:media_home')
 
+add_route('mediagoblin.user_pages.media_home.report_comment',
+          '/u/<string:user>/m/<string:media>/c/<int:comment>/report/',
+          'mediagoblin.user_pages.views:file_a_report')
+
+# User's tags gallery
+add_route('mediagoblin.user_pages.user_tag_gallery',
+          '/u/<string:user>/tag/<string:tag>/',
+          'mediagoblin.user_pages.views:user_gallery')
+
 add_route('mediagoblin.user_pages.atom_feed',
           '/u/<string:user>/atom/',
           'mediagoblin.user_pages.views:atom_feed')
 
 add_route('mediagoblin.user_pages.media_collect',
-          '/u/<string:user>/m/<string:media>/collect/',
+          '/u/<string:user>/m/<int:media_id>/collect/',
           'mediagoblin.user_pages.views:media_collect')
 
 add_route('mediagoblin.user_pages.collection_list',
@@ -78,9 +99,13 @@ add_route('mediagoblin.user_pages.processing_panel',
 
 # Stray edit routes
 add_route('mediagoblin.edit.edit_media',
-          '/u/<string:user>/m/<string:media>/edit/',
+          '/u/<string:user>/m/<int:media_id>/edit/',
           'mediagoblin.edit.views:edit_media')
 
 add_route('mediagoblin.edit.attachments',
-          '/u/<string:user>/m/<string:media>/attachments/',
+          '/u/<string:user>/m/<int:media_id>/attachments/',
           'mediagoblin.edit.views:edit_attachments')
+
+add_route('mediagoblin.edit.metadata',
+          '/u/<string:user>/m/<int:media_id>/metadata/',
+          'mediagoblin.edit.views:edit_metadata')