added space above note about LP17 upload process

[mediagoblin-libreplanet.git] / mediagoblin_libreplanet / templates / libreplanet / root.html

diff --git a/mediagoblin_libreplanet/templates/libreplanet/root.html b/mediagoblin_libreplanet/templates/libreplanet/root.html
index 73896a47528139bdae4f5ba48be73009f24b050a..3a7930fe98452f87ab888507bc3e07e8cc0bf865 100644 (file)
--- a/mediagoblin_libreplanet/templates/libreplanet/root.html
+++ b/mediagoblin_libreplanet/templates/libreplanet/root.html
@@ -30,28 +30,71 @@
 {% block mediagoblin_content %}
   <h1>{% trans %}LibrePlanet{% endtrans %}</h1>
   <img  class="right_align" src="//static.fsf.org/nosvn/libreplanet/2015/graphical_assets/lp-logo-for-gmg.svg" />
+<p>
+  This site hosts media about free software and the amazing community
+  that uses and builds it. Much of the media is from our yearly <a href="https://libreplanet.org/wiki/LibrePlanet:Conference">LibrePlanet
+  conference</a> in Cambridge, MA, USA, but some is from other events.
+</p>
+
+<p>
+  This  site and the conference are run by the <a href="https://www.fsf.org">Free Software Foundation</a>, a nonprofit
+  with three decades of experience promoting and defending computer user
+  freedom. The site itself is running <a href="http://mediagoblin.org">GNU
+    MediaGoblin</a>, a wonderful free media hosting platform. Enjoy!
+</p>
+  <div class="clear"></div>
+
+  <div style="margin-top:40px;">
+      <p>We are uploading LibrePlanet 2017 videos as fast as we can! We are hoping to get most of the videos up by the end of the day.</p>
+  </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>
   <p>
-    {% trans %}The videos on this site were recorded during&nbsp;
-      <a href="http://libreplanet.org">LibrePlanet</a>, an annual
-      conference for free software enthusiasts held by the Free
-      Software Foundation in Cambridge, MA. This site is running
-      <a href="http://mediagoblin.org">MediaGoblin</a>, a great piece
-      of free media hosting software.{% endtrans %}
+    <a href="/u/libreplanet/tag/libreplanet-2016-video/">View all LibrePlanet 2016 videos</a>
   </p>
+
+  {# commenting out featured media sections for front page #}
+  {#
+  <h2>{% trans %}Featured Videos{% endtrans %}</h2>
+  {{ media_grid(request, featured_videos) }}
   <div class="clear"></div>
+  <p>
+    <a href="/videos/featured">View all featured videos</a>
+  </p>
+
+  <h2>{% trans %}Featured Photos{% endtrans %}</h2>
+  {{ media_grid(request, featured_images) }}
+  <div class="clear"></div>
+  <p>
+    <a href="/photos/featured">View all featured photos</a>
+  </p>
+  #}
 
-  <h2>{% trans %}Videos{% endtrans %}</h2>
+  <h2>{% trans %}All Videos{% endtrans %}</h2>
   {{ media_grid(request, videos) }}
   <div class="clear"></div>
   <p>
-    <a href="/videos">View all LibrePlanet videos</a>
+    <a href="/videos">View all videos</a>
   </p>
 
-  <h2>{% trans %}Photos{% endtrans %}</h2>
+  <h2>{% trans %}All Photos{% endtrans %}</h2>
   {{ media_grid(request, images) }}
   <div class="clear"></div>
   <p>
-    <a href="/photos">View all LibrePlanet photos</a>
+    <a href="/photos">View all photos</a>
   </p>
 
   {#- Need to set feed_url within this block so template can use it. -#}