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/

diff --git a/mediagoblin_libreplanet/__init__.py b/mediagoblin_libreplanet/__init__.py
index 67d9d5039df04094be99a19d70b985d39663fd67..0e842e8b03f644fe5a2c81efc7d5675d9ef5789c 100644 (file)
--- 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 087ba576b242c38e9d3d5845d893f1dbfa64c440..4163f8ea56f4e8a8dc25f9e0b195bacfa0a8ed2a 100644 (file)
--- 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")
-