2017: Update Speaker, Schedule Jinja2 templates.

* 2017/Makefile (SPEAKERS_TEMPLATE)
(SESSIONS_TEMPLATE): Update variables.
* 2017/assets/templates/lp-schedule.jinja2: New file.
* 2017/assets/templates/lp-speakers.jinja2: New file.
* 2017/assets/templates/lp-sessions-2017.jinja2: Remove file.
* 2017/assets/templates/lp-bios-2017.jinja2: Remove file.

diff --git a/2017/Makefile b/2017/Makefile
index cb0d8129eaf543f0d0884ad70130e3122e4545d1..410ba86b7e54b625c4655b5924c71f7947911fa4 100644 (file)
--- a/2017/Makefile
+++ b/2017/Makefile
@@ -16,11 +16,11 @@
 
 LP_YEAR = 2017
 
-SPEAKERS_TEMPLATE = assets/templates/lp-speakers-2016.jinja2
+SPEAKERS_TEMPLATE = assets/templates/lp-speakers.jinja2
 SPEAKERS_MD = /home/owner/brains/campaigns/libreplanet/2017/program/bios-for-site.mdwn
 SPEAKERS_HTML = program/generated-bios.html
 
-SESSIONS_TEMPLATE = assets/templates/lp-sch-2016.jinja2
+SESSIONS_TEMPLATE = assets/templates/lp-schedule.jinja2
 SESSIONS_MD = /home/owner/brains/campaigns/libreplanet/2017/program/sessions-for-site.mdwn
 SESSIONS_HTML = program/generated-sessions.html
 

diff --git a/2017/assets/templates/lp-sessions-2017.jinja2 b/2017/assets/templates/lp-schedule.jinja2
similarity index 72%
rename from 2017/assets/templates/lp-sessions-2017.jinja2
rename to 2017/assets/templates/lp-schedule.jinja2
index 0f0e372562231dd169429f1029626c9acd345ba2..7b55ca47fd21957f1bfbf21cce3870ea9a7fe261 100644 (file)
--- a/2017/assets/templates/lp-sessions-2017.jinja2
+++ b/2017/assets/templates/lp-schedule.jinja2
@@ -1,6 +1,6 @@
 {# -*- mode: jinja2; -*- #}
 {#
-   Copyright (C) 2015  lpschedule-generator contributors. See CONTRIBUTORS.
+   Copyright (C) 2015-2016  lpschedule-generator contributors. See CONTRIBUTORS.
 
     This file is part of lpschedule-generator.
 
@@ -23,21 +23,23 @@
 
 {# make speakers macro #}
 {% macro mk_speakers(speakers) %}
-  <span class="program-session-speaker">
-    {% for speaker in speakers %}
-      {% if loop.last %}
-        {{ speaker }}
-      {% else %}
-        {{ speaker }},
-      {% endif %}
-    {% endfor %}
-  </span>
+  {% if speakers[0]|lower != 'speakertba' %}
+    <span class="program-session-speaker">
+      {% for speaker in speakers %}
+        {% if loop.last %}
+          {{ speaker }}
+        {% else %}
+          {{ speaker }},
+        {% endif %}
+      {% endfor %}
+    </span>
+  {% endif %}
 {% endmacro %}
 
 {# make room macro #}
 {% macro mk_room(room) %}
   {% if room|lower != 'roomtba' %}
-    <span class="label label-default">{{ room }}</span>
+    <span class="room label label-default">{{ room }}</span>
   {% endif %}
 {% endmacro %}
 
@@ -87,17 +89,21 @@
       {{ mk_speakers(session_info['speakers']) }}
       <p class="program-session-room-details">
         {{ mk_room(session_info['room']) }}
-        <button class="btn btn-default btn-xs"
-                data-toggle="collapse" aria-expanded="false"
-                aria-controls="day-{{ day_index }}-timeslot-{{ timeslot_index }}-session-{{ loop.index }}-collapse"
-                data-target="#day-{{ day_index }}-timeslot-{{ timeslot_index }}-session-{{ loop.index }}-collapse">
-                Details
-        </button>
-      </p>
-      <div class="collapse in"
-           id="day-{{ day_index }}-timeslot-{{ timeslot_index }}-session-{{ loop.index }}-collapse">
-        {{ desc(session_info['desc']) }}
-      </div> <!-- day-{{ day_index }}-timeslot-{{ timeslot_index }}-session-{{ loop.index }}-collapse end -->
+        {% if session_info['desc'][0]|lower == 'desctba' %}
+          </p>
+        {% else %}
+          <button class="btn btn-default btn-xs"
+                  data-toggle="collapse" aria-expanded="false"
+                  aria-controls="day-{{ day_index }}-timeslot-{{ timeslot_index }}-session-{{ loop.index }}-collapse"
+                  data-target="#day-{{ day_index }}-timeslot-{{ timeslot_index }}-session-{{ loop.index }}-collapse">
+                  Details
+          </button>
+          </p>
+          <div class="session-desc collapse in"
+               id="day-{{ day_index }}-timeslot-{{ timeslot_index }}-session-{{ loop.index }}-collapse">
+               {{ desc(session_info['desc']) }}
+          </div> <!-- day-{{ day_index }}-timeslot-{{ timeslot_index }}-session-{{ loop.index }}-collapse end -->
+        {% endif %}
     </section> <!-- day-{{ day_index }}-timeslot-{{ timeslot_index }}-session-{{ loop.index }} end -->
   {% endfor %} {# session end #}
 {% endmacro %}

diff --git a/2017/assets/templates/lp-bios-2017.jinja2 b/2017/assets/templates/lp-speakers.jinja2
similarity index 100%
rename from 2017/assets/templates/lp-bios-2017.jinja2
rename to 2017/assets/templates/lp-speakers.jinja2