X-Git-Url: https://vcs.fsf.org/?p=mediagoblin-libreplanet.git;a=blobdiff_plain;f=mediagoblin_libreplanet%2F__init__.py;h=9caf1c208f3034c65069791e9b08676b11863647;hp=fa9c112282d1de9102f31d773ae8acf360587aa1;hb=267126234a1ba0db921314ffa9173579f51ab7ba;hpb=7f8847829a190d78683f98ed4f3073f67a7542be diff --git a/mediagoblin_libreplanet/__init__.py b/mediagoblin_libreplanet/__init__.py index fa9c112..9caf1c2 100644 --- a/mediagoblin_libreplanet/__init__.py +++ b/mediagoblin_libreplanet/__init__.py @@ -35,7 +35,6 @@ SUPPORTED_LICENSES[cc_by_sa_4.uri] = cc_by_sa_4 PLUGIN_DIR = os.path.dirname(__file__) MAX_HOME_ITEMS = 20 -LP_TAG = 'lp2015' _log = logging.getLogger(__name__) @@ -47,8 +46,13 @@ def setup_plugin(): # Register the template path. register_template_path(os.path.join(PLUGIN_DIR, 'templates')) -def lp_media_for_type(db, type): - return media_entries_for_tag_slug(db, LP_TAG).\ +def lp_media_for_type(db, type, tag=None): + if (tag == None): + cursor = MediaEntry.query + else: + cursor = media_entries_for_tag_slug(db, tag) + + return cursor.\ filter((MediaEntry.media_type == type) & (MediaEntry.state == u'processed')).\ order_by(MediaEntry.created.desc()).\ @@ -56,13 +60,17 @@ def lp_media_for_type(db, type): @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") + featured_videos = lp_media_for_type(request.db, u'mediagoblin.media_types.video', "featured") 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(): @@ -71,7 +79,11 @@ def frontpage_view_hook(): register_routes([('all-videos', '/videos', 'mediagoblin.plugins.libreplanet.views:video_listing'), ('all-photos', '/photos', - 'mediagoblin.plugins.libreplanet.views:image_listing') + 'mediagoblin.plugins.libreplanet.views:image_listing'), + ('all-photos', '/videos/featured', + 'mediagoblin.plugins.libreplanet.views:featured_video_listing'), + ('all-photos', '/photos/featured', + 'mediagoblin.plugins.libreplanet.views:featured_image_listing') ]) # This is a dict that specifies which hooks this plugin uses.