From: rsiddharth <rsd@gnu.org>
Date: Sun, 29 Oct 2017 15:39:30 +0000 (+0000)
Subject: 2018: Update lp-schedule jinja2 template.
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=41e432fa2521657797b4b75ae54aba246eedf5de;p=libreplanet-static.git

2018: Update lp-schedule jinja2 template.

* 2018/assets/templates/lp-schedule.jinja2: Update file.
---

diff --git a/2018/assets/templates/lp-schedule.jinja2 b/2018/assets/templates/lp-schedule.jinja2
index 036b92e1..cffee780 100644
--- a/2018/assets/templates/lp-schedule.jinja2
+++ b/2018/assets/templates/lp-schedule.jinja2
@@ -24,7 +24,7 @@
 {# make speakers macro #}
 {% macro mk_speakers(speakers) %}
   {% if speakers[0]|lower != 'speakertba' %}
-    <span class="program-session-speaker">
+    <div class="program-session-speaker">
       {% for speaker in speakers %}
         {% if loop.last %}
           {{ speaker }}
@@ -32,14 +32,47 @@
           {{ speaker }},
         {% endif %}
       {% endfor %}
-    </span>
+    </div>
   {% endif %}
 {% endmacro %}
 
 {# make room macro #}
 {% macro mk_room(room) %}
   {% if room|lower != 'roomtba' %}
-    <span class="room label label-default">{{ room }}</span>
+    <div class="program-session-room-details">
+      <span class="room label label-default">{{ room }}</span>
+    </div>
+  {% endif %}
+{% endmacro %}
+
+{# make video macro #}
+{% macro mk_video(video) %}
+  {% if video|lower != 'videotba' %}
+    <a class="btn btn-default btn-xs" href="{{ video }}">
+      <span class="glyphicon glyphicon-facetime-video"></span>
+    </a>
+  {% endif %}
+{% endmacro %}
+
+{# make desc details button macro #}
+{% macro mk_desc_details_btn(disc_list) %}
+  {% if disc_list[0]|lower != 'desctba' %}
+    <button class="btn btn-default btn-xs"
+            data-toggle="collapse" aria-expanded="false"
+            aria-controls="{{ caller()|trim }}"
+            data-target="#{{ caller()|trim }}">
+            Show details
+            <span class="glyphicon glyphicon-menu-down" aria-hidden="true"></span>
+    </button>
+  {% endif %}
+{% endmacro %}
+
+{% macro mk_desc(disc_list) %}
+  {% if disc_list[0]|lower != 'desctba' %}
+    <div class="session-desc collapse in"
+         id="{{ caller()|trim }}">
+         {{ desc(disc_list) }}
+    </div> <!--  {{ caller()|trim }} end -->
   {% endif %}
 {% endmacro %}
 
@@ -89,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 %}