From 57c104063a7bef4da8f7af2e668f0f5ad8343c8e 2017-10-16 02:05:47 From: Christopher Neugebauer Date: 2017-10-16 02:05:47 Subject: [PATCH] Merge branch 'master' into prod --- diff --git a/pinaxcon/templates/static_pages/homepage.html b/pinaxcon/templates/static_pages/homepage.html index 593fd4b58578bcf5c353641c53a1a78a5163e5df..9e5d296298c0c6b7ba5dc4df6487fd5da6699ff2 100644 --- a/pinaxcon/templates/static_pages/homepage.html +++ b/pinaxcon/templates/static_pages/homepage.html @@ -2,6 +2,9 @@ {% load i18n %} {% load staticfiles %} +{% load thumbnail %} +{% load sponsorship_tags %} +{% load schedule_tags %} {% block head_title %}Welcome{% endblock %} @@ -71,6 +74,57 @@ +
+
+

Speakers

+ +
+
+
+
+
+
+
+ +

Carina C. Zona

+ Keynote Speaker +
+ + {% speakers as speakers %} + {% for speaker in speakers %} +
+
+
+ {% if speaker.photo %} +
+ {% else %} +
+ {% endif %} +
+
+ {% for presentation in speaker.presentations.all %} + +

{{ speaker.conferencespeaker.name }}

+ {{ presentation.title }} +
+ {% endfor %} +
+ {% endfor %} +
+
+ + +
+ +
@@ -108,9 +162,6 @@

Sponsors

- {% load sponsorship_tags %} - {% load thumbnail %} - {% sponsor_levels as levels %}