Merge branch 'featured'
authorAndrew Engelbrecht <sudoman@ninthfloor.org>
Mon, 6 Mar 2017 22:47:10 +0000 (17:47 -0500)
committerAndrew Engelbrecht <sudoman@ninthfloor.org>
Mon, 6 Mar 2017 22:47:10 +0000 (17:47 -0500)
mediagoblin_libreplanet/__init__.py
mediagoblin_libreplanet/views.py

index 03e63d3..7199c4c 100644 (file)
@@ -83,9 +83,10 @@ register_routes([('all-videos', '/videos',
                   'mediagoblin.plugins.libreplanet.views:video_listing'),
                  ('all-photos', '/photos',
                   'mediagoblin.plugins.libreplanet.views:image_listing'),
-                 ('all-photos', '/videos/featured',
+
+                 ('featured-videos', '/videos/featured',
                   'mediagoblin.plugins.libreplanet.views:featured_video_listing'),
-                 ('all-photos', '/photos/featured',
+                 ('featured-photos', '/photos/featured',
                   'mediagoblin.plugins.libreplanet.views:featured_image_listing')
              ])
 
index 829840c..4163f8e 100644 (file)
@@ -51,6 +51,7 @@ def image_listing(request, page):
 def video_listing(request, page):
     return type_listing(u'mediagoblin.media_types.video', 'Videos', request, page)
 
+
 @uses_pagination
 def featured_image_listing(request, page):
     return type_listing(u'mediagoblin.media_types.image', 'Featured Photos', request, page, "featured")