libreplanet-templates: 2018: lp-schedule: Update populate_sessions.

* libreplanet-templates/2018/lp-schedule.jinja2
(populate_sessions): Update macro.

1 files changed, 12 insertions, 17 deletions

diff --git a/libreplanet-templates/2018/lp-schedule.jinja2 b/libreplanet-templates/2018/lp-schedule.jinja2
index 71beb8c..cffee78 100644
--- a/libreplanet-templates/2018/lp-schedule.jinja2
+++ b/libreplanet-templates/2018/lp-schedule.jinja2
@@ -122,24 +122,19 @@
     <section id="day-{{ day_index }}-timeslot-{{ timeslot_index }}-session-{{ loop.index }}" class="program-session">
       {{ mk_session_header(session) }}
       {{ mk_speakers(session_info['speakers']) }}
-      <p class="program-session-room-details">
+      <div class="program-session-shelf">
         {{ mk_room(session_info['room']) }}
-        {% 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">
-                  Show details
-                  <span class="glyphicon glyphicon-menu-down" aria-hidden="true"></span>
-          </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 %}
+        {{ mk_video(session_info['video']) }}
+        {% call mk_desc_details_btn(session_info['desc']) %}
+          day-{{ day_index }}-timeslot-{{ timeslot_index }}-session-{{ loop.index }}-collapse
+        {% endcall %}
+      </div>
+
+      <div class="program-session-desc-block">
+        {% call mk_desc(session_info['desc']) %}
+          day-{{ day_index }}-timeslot-{{ timeslot_index }}-session-{{ loop.index }}-collapse
+        {% endcall %}
+      </div>
     </section> <!-- day-{{ day_index }}-timeslot-{{ timeslot_index }}-session-{{ loop.index }} end -->
   {% endfor %} {# session end #}
 {% endmacro %}