display LP 2017 videos and keynotes

diff --git a/mediagoblin_libreplanet/__init__.py b/mediagoblin_libreplanet/__init__.py
index 62c1d3d7aeff9187b0401a9dae2a437ab7465151..501225815e7f7bccd7e9e0ba7a8abddecb3920f6 100644 (file)
--- 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 3d6ef50160477c221678c1b600f50ac6339c6b29..7004b84976d3331d6bf575127a61b1a17ded50f5 100644 (file)
--- a/mediagoblin_libreplanet/templates/libreplanet/root.html
+++ b/mediagoblin_libreplanet/templates/libreplanet/root.html
@@ -44,6 +44,17 @@
 </p>
   <div class="clear"></div>
 
+  <h2>{% trans %}LibrePlanet 2017 Keynotes{% endtrans %}</h2>
+  {{ media_grid(request, lp2017_keynotes) }}
+  <div class="clear"></div>
+
+  <h2>{% trans %}LibrePlanet 2017 Videos{% endtrans %}</h2>
+  {{ media_grid(request, lp2017_videos) }}
+  <div class="clear"></div>
+  <p>
+    <a href="/u/libreplanet/tag/libreplanet-2017-video/">View all LibrePlanet 2017 videos</a>
+  </p>
+
   <h2>{% trans %}LibrePlanet 2016 Videos{% endtrans %}</h2>
   {{ media_grid(request, lp2016_videos) }}
   <div class="clear"></div>