From 34b22c5e195ba0472a4dbd73e6f2921765d8053b Mon Sep 17 00:00:00 2001
From: Andrew Engelbrecht
Date: Tue, 28 Mar 2017 13:01:41 -0400
Subject: [PATCH] display LP 2017 videos and keynotes
---
mediagoblin_libreplanet/__init__.py | 6 ++++--
.../templates/libreplanet/root.html | 11 +++++++++++
2 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/mediagoblin_libreplanet/__init__.py b/mediagoblin_libreplanet/__init__.py
index 62c1d3d..5012258 100644
--- a/mediagoblin_libreplanet/__init__.py
+++ b/mediagoblin_libreplanet/__init__.py
@@ -60,7 +60,6 @@ MAX_HOME_LP_ITEMS = 10
# make tags lowercase and use dashes in place of spaces.
# uppercase tags will be included by the lowercase form.
FEATURED_TAG = "featured"
-LATEST_LP_VIDEO_TAG = "libreplanet-2016-video"
_log = logging.getLogger(__name__)
@@ -90,7 +89,10 @@ def frontpage_view(request):
images = lp_media_for_type(request.db, u'mediagoblin.media_types.image', None, MAX_HOME_ALL_PHOTO_ITEMS)
videos = lp_media_for_type(request.db, u'mediagoblin.media_types.video', None, MAX_HOME_ALL_VIDEO_ITEMS)
- lp2016_videos = lp_media_for_type(request.db, u'mediagoblin.media_types.video', LATEST_LP_VIDEO_TAG, MAX_HOME_LP_ITEMS)
+ lp2017_keynotes = lp_media_for_type(request.db, u'mediagoblin.media_types.video', "libreplanet-2017-keynote", MAX_HOME_LP_ITEMS)
+ lp2017_videos = lp_media_for_type(request.db, u'mediagoblin.media_types.video', "libreplanet-2017-video", MAX_HOME_LP_ITEMS)
+
+ lp2016_videos = lp_media_for_type(request.db, u'mediagoblin.media_types.video', "libreplanet-2016-video", MAX_HOME_LP_ITEMS)
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)
diff --git a/mediagoblin_libreplanet/templates/libreplanet/root.html b/mediagoblin_libreplanet/templates/libreplanet/root.html
index 3d6ef50..7004b84 100644
--- a/mediagoblin_libreplanet/templates/libreplanet/root.html
+++ b/mediagoblin_libreplanet/templates/libreplanet/root.html
@@ -44,6 +44,17 @@
+ {% trans %}LibrePlanet 2017 Keynotes{% endtrans %}
+ {{ media_grid(request, lp2017_keynotes) }}
+
+
+ {% trans %}LibrePlanet 2017 Videos{% endtrans %}
+ {{ media_grid(request, lp2017_videos) }}
+
+
+ View all LibrePlanet 2017 videos
+
+
{% trans %}LibrePlanet 2016 Videos{% endtrans %}
{{ media_grid(request, lp2016_videos) }}