X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=mediagoblin%2Fuser_pages%2Frouting.py;h=1a1d41399e93a51e8006247b7e65b5cb29894fb6;hb=dbc383d4834daea1de2c59aa95c06198a3941d6e;hp=929987268205667486cf0e909854e25480a0e2a6;hpb=184f2240cb9384bac9e3319f2d184e405e364611;p=mediagoblin.git
diff --git a/mediagoblin/user_pages/routing.py b/mediagoblin/user_pages/routing.py
index 92998726..1a1d4139 100644
--- a/mediagoblin/user_pages/routing.py
+++ b/mediagoblin/user_pages/routing.py
@@ -1,5 +1,5 @@
# GNU MediaGoblin -- federated, autonomous media hosting
-# Copyright (C) 2011 Free Software Foundation, Inc
+# Copyright (C) 2011, 2012 MediaGoblin contributors. See AUTHORS.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
@@ -14,17 +14,98 @@
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see .
-from routes.route import Route
-
-user_routes = [
- Route('mediagoblin.user_pages.user_home', "/{user}/",
- controller="mediagoblin.user_pages.views:user_home"),
- Route('mediagoblin.user_pages.user_gallery', "/{user}/gallery/",
- controller="mediagoblin.user_pages.views:user_gallery"),
- Route('mediagoblin.user_pages.media_home', '/{user}/m/{media}/',
- requirements=dict(m_id="[0-9a-fA-F]{24}"),
- controller="mediagoblin.user_pages.views:media_home"),
- Route('mediagoblin.edit.edit_media', "/{user}/m/{media}/edit/",
- controller="mediagoblin.edit.views:edit_media"),
- Route('mediagoblin.user_pages.atom_feed', '/{user}/atom/',
- controller="mediagoblin.user_pages.views:atom_feed")]
+from mediagoblin.tools.routing import add_route
+
+add_route('mediagoblin.user_pages.user_home',
+ '/u//', 'mediagoblin.user_pages.views:user_home')
+
+add_route('mediagoblin.user_pages.media_home',
+ '/u//m//',
+ 'mediagoblin.user_pages.views:media_home')
+
+add_route('mediagoblin.user_pages.media_home.report_media',
+ '/u//m//report/',
+ 'mediagoblin.user_pages.views:file_a_report')
+
+add_route('mediagoblin.user_pages.media_confirm_delete',
+ '/u//m//confirm-delete/',
+ 'mediagoblin.user_pages.views:media_confirm_delete')
+
+add_route('mediagoblin.user_pages.activity_view',
+ '//activity//',
+ '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//m//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//gallery/',
+ 'mediagoblin.user_pages.views:user_gallery')
+
+add_route('mediagoblin.user_pages.media_home.view_comment',
+ '/u//m//c//',
+ 'mediagoblin.user_pages.views:media_home')
+
+add_route('mediagoblin.user_pages.media_home.report_comment',
+ '/u//m//c//report/',
+ 'mediagoblin.user_pages.views:file_a_report')
+
+# User's tags gallery
+add_route('mediagoblin.user_pages.user_tag_gallery',
+ '/u//tag//',
+ 'mediagoblin.user_pages.views:user_gallery')
+
+add_route('mediagoblin.user_pages.atom_feed',
+ '/u//atom/',
+ 'mediagoblin.user_pages.views:atom_feed')
+
+add_route('mediagoblin.user_pages.media_collect',
+ '/u//m//collect/',
+ 'mediagoblin.user_pages.views:media_collect')
+
+add_route('mediagoblin.user_pages.collection_list',
+ '/u//collections/',
+ 'mediagoblin.user_pages.views:collection_list')
+
+add_route('mediagoblin.user_pages.user_collection',
+ '/u//collection//',
+ 'mediagoblin.user_pages.views:user_collection')
+
+add_route('mediagoblin.edit.edit_collection',
+ '/u//c//edit/',
+ 'mediagoblin.edit.views:edit_collection')
+
+add_route('mediagoblin.user_pages.collection_confirm_delete',
+ '/u//c//confirm-delete/',
+ 'mediagoblin.user_pages.views:collection_confirm_delete')
+
+add_route('mediagoblin.user_pages.collection_item_confirm_remove',
+ '/u//collection///confirm_remove/',
+ 'mediagoblin.user_pages.views:collection_item_confirm_remove')
+
+add_route('mediagoblin.user_pages.collection_atom_feed',
+ '/u//collection//atom/',
+ 'mediagoblin.user_pages.views:collection_atom_feed')
+
+add_route('mediagoblin.user_pages.processing_panel',
+ '/u//panel/',
+ 'mediagoblin.user_pages.views:processing_panel')
+
+# Stray edit routes
+add_route('mediagoblin.edit.edit_media',
+ '/u//m//edit/',
+ 'mediagoblin.edit.views:edit_media')
+
+add_route('mediagoblin.edit.attachments',
+ '/u//m//attachments/',
+ 'mediagoblin.edit.views:edit_attachments')
+
+add_route('mediagoblin.edit.metadata',
+ '/u//m//metadata/',
+ 'mediagoblin.edit.views:edit_metadata')