diff --git a/mediagoblin_libreplanet/__init__.py b/mediagoblin_libreplanet/__init__.py index 0e842e8..7199c4c 100644 --- a/mediagoblin_libreplanet/__init__.py +++ b/mediagoblin_libreplanet/__init__.py @@ -34,7 +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 @@ 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: @@ -56,17 +59,21 @@ def lp_media_for_type(db, type, tag=None): 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(): diff --git a/mediagoblin_libreplanet/templates/libreplanet/root.html b/mediagoblin_libreplanet/templates/libreplanet/root.html index c67f296..746abf4 100644 --- a/mediagoblin_libreplanet/templates/libreplanet/root.html +++ b/mediagoblin_libreplanet/templates/libreplanet/root.html @@ -44,6 +44,20 @@

+

{% trans %}Featured Videos{% endtrans %}

+ {{ media_grid(request, featured_videos) }} +
+

+ View all featured videos +

+ +

{% trans %}Featured Photos{% endtrans %}

+ {{ media_grid(request, featured_photos) }} +
+

+ View all featured photos +

+

{% trans %}Videos{% endtrans %}

{{ media_grid(request, videos) }}