From 3d2049606f5430f473e75f000e149bb225e57c90 Mon Sep 17 00:00:00 2001 From: Andrew Engelbrecht Date: Mon, 6 Mar 2017 17:20:57 -0500 Subject: [PATCH] removing /videos/libreplanet, etc URLs These videos and photos are already tagged, and we can just use the tagging system to show them: https://media.libreplanet.org/u/libreplanet/tag/libreplanet-2016-video/ https://media.libreplanet.org/u/libreplanet/tag/libreplanet-2016/ --- mediagoblin_libreplanet/__init__.py | 7 +------ mediagoblin_libreplanet/views.py | 9 --------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/mediagoblin_libreplanet/__init__.py b/mediagoblin_libreplanet/__init__.py index 67d9d50..0e842e8 100644 --- a/mediagoblin_libreplanet/__init__.py +++ b/mediagoblin_libreplanet/__init__.py @@ -80,12 +80,7 @@ register_routes([('all-videos', '/videos', ('featured-videos', '/videos/featured', 'mediagoblin.plugins.libreplanet.views:featured_video_listing'), ('featured-photos', '/photos/featured', - 'mediagoblin.plugins.libreplanet.views:featured_image_listing'), - - ('libreplanet-videos', '/videos/libreplanet', - 'mediagoblin.plugins.libreplanet.views:libreplanet_video_listing'), - ('libreplanet-photos', '/photos/libreplanet', - 'mediagoblin.plugins.libreplanet.views:libreplanet_image_listing') + 'mediagoblin.plugins.libreplanet.views:featured_image_listing') ]) # This is a dict that specifies which hooks this plugin uses. diff --git a/mediagoblin_libreplanet/views.py b/mediagoblin_libreplanet/views.py index 087ba57..4163f8e 100644 --- a/mediagoblin_libreplanet/views.py +++ b/mediagoblin_libreplanet/views.py @@ -60,12 +60,3 @@ def featured_image_listing(request, page): def featured_video_listing(request, page): return type_listing(u'mediagoblin.media_types.video', 'Featured Videos', request, page, "featured") - -@uses_pagination -def libreplanet_image_listing(request, page): - return type_listing(u'mediagoblin.media_types.image', 'LibrePlanet Photos', request, page, "libreplanet") - -@uses_pagination -def libreplanet_video_listing(request, page): - return type_listing(u'mediagoblin.media_types.video', 'LibrePlanet Videos', request, page, "libreplanet") - -- 2.25.1