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)
1  2 
mediagoblin_libreplanet/__init__.py

@@@ -34,7 -34,10 +34,10 @@@ SORTED_LICENSES.insert(1, cc_by_sa_4
  SUPPORTED_LICENSES[cc_by_sa_4.uri] = cc_by_sa_4
  
  PLUGIN_DIR = os.path.dirname(__file__)
  MAX_HOME_ITEMS = 20
+ MAX_HOME_FEATURED_ITEMS = 10
+ FEATURED_TAG = "featured"
  
  _log = logging.getLogger(__name__)
  
@@@ -46,7 -49,7 +49,7 @@@ def setup_plugin()
      # Register the template path.
      register_template_path(os.path.join(PLUGIN_DIR, 'templates'))
  
- def lp_media_for_type(db, type, tag=None):
+ def lp_media_for_type(db, type, tag=None, max_items=MAX_HOME_ITEMS):
      if (tag == None):
          cursor = MediaEntry.query
      else:
          filter((MediaEntry.media_type == type)
                 & (MediaEntry.state == u'processed')).\
          order_by(MediaEntry.created.desc()).\
-         limit(MAX_HOME_ITEMS)
+         limit(max_items)
  
  @user_not_banned
  def frontpage_view(request):
-     images = lp_media_for_type(request.db, u'mediagoblin.media_types.image')
-     videos = lp_media_for_type(request.db, u'mediagoblin.media_types.video')
+     images          = lp_media_for_type(request.db, u'mediagoblin.media_types.image')
+     videos          = lp_media_for_type(request.db, u'mediagoblin.media_types.video')
+     featured_images = lp_media_for_type(request.db, u'mediagoblin.media_types.image', FEATURED_TAG, MAX_HOME_FEATURED_ITEMS)
+     featured_videos = lp_media_for_type(request.db, u'mediagoblin.media_types.video', FEATURED_TAG, MAX_HOME_FEATURED_ITEMS)
  
      return render_to_response(
          request, 'libreplanet/root.html',
          {'images': images,
           'videos': videos,
+          'featured_images': featured_images,
+          'featured_videos': featured_videos,
           'allow_registration': mg_globals.app_config["allow_registration"]})
  
  def frontpage_view_hook():
@@@ -76,10 -83,9 +83,10 @@@ register_routes([('all-videos', '/video
                    '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')
               ])