symposion_app Changeset - 89a11ac5582e

Changeset - 89a11ac5582e

Parent rev.

Child rev.

[Not reviewed]

0 3 0

Joel Addison - 4 years ago 2019-12-15 04:46:11
joel@addison.net.au

Update mobile schedule

Display track details on talks if available.
Show day end time slot as per desktop view.

3 files changed with 35 insertions and 16 deletions:

pinaxcon/templates/symposion/schedule/_mobile.html

pinaxcon/templatetags/lca2018_tags.py

pinaxcon/templatetags/lca2019_tags.py

0 comments (0 inline, 0 general)

pinaxcon/templates/symposion/schedule/_mobile.html

➞

Show inline comments

@@ ... / @@ -3,9 +3,9 @@ @@
 {% load waffle_tags %}
 {% with timetable|day_has_tracks:timetable.day as has_tracks %}
 {% for row in timetable %}
 {% if forloop.last %}
 {% else %}
 {% for slot in row.slots %}
 <div class="mobile-slot my-3">
   {% if forloop.first %}
@@ ... / @@ -13,31 +13,47 @@ @@
   {% endif %}
   {% with slot.kind.label.lower as label %}
   {% if label == "talk" or label == "tutorial" %}
   {% if slot.content %}
   <p>
     <a href="{% url "schedule_presentation_detail" slot.content.pk %}">{{ slot.content.title }}</a>
     <br>
     {{ slot.content.speakers|join:", "}}
   </p>
   {% listlookup timetable.rooms forloop.counter0 as room_names %}
   <p><em>{{ room_names }}<br />ends {{ slot.end }}</em></p>
   {% endif %}
     {% if slot.content %}
     <p>
       <a href="{% url "schedule_presentation_detail" slot.content.pk %}">{{ slot.content.title }}</a>
       <br>
       {{ slot.content.speakers|join:", "}}
     </p>
     {% endif %}
   {% elif label == "shortbreak" %}
   {% else %}
     {% if slot.content_override %}
       {{ slot.content_override_html|safe }}
   {% else %}
+    {% else %}
     <div class="d-flex align-items-center">
   <p>{{ slot.kind.label }}</p>
+      <p>{{ slot.kind.label }}</p>
     </div>
   {% endif %}
+    {% endif %}
   {% endif %}
   {% endwith %}
   <p><em>
     {% if has_tracks %}
     {% with slot.rooms|listlookup:forloop.counter0|trackname:timetable.day as track_name %}
     {% if track_name %}{{ track_name }} &mdash; {% endif %}
     {% endwith %}
     {% endif %}
     {{ slot.rooms|join:", "}}
     <br />
     ends {{ slot.end }}
   </em></p>
   {% if edit_schedule %}
   <a class="btn btn-secondary btn-sm edit-slot" role="button" data-action="{% url "schedule_slot_edit" schedule.section.slug slot.pk %}" href="#">Edit</a>
   {% endif %}
 </div>
 {% endfor %}
 {% if forloop.last %}
 <div class="mobile-slot my-3">
   <h3>{{ row.time|date:"h:iA" }}</h3>
   <p><em>Day End</em></p>
 </div>
 {% endif %}
 {% endfor %}
 {% endwith %}

pinaxcon/templatetags/lca2018_tags.py

➞

Show inline comments

@@ ... / @@ -103,6 +103,9 @@ def day_has_tracks(timetable, day): @@
 @register.filter()
 def trackname(room, day):
     if not room:
         return None
     try:
         track_name = room.track_set.get(day=day).name
     except Track.DoesNotExist:

pinaxcon/templatetags/lca2019_tags.py

➞

Show inline comments

@@ ... / @@ -48,12 +48,12 @@ def any_is_void(invoices): @@
     return False
-@register.simple_tag
+@register.filter
 def listlookup(lookup, target):
     try:
         return lookup[target]
     except IndexError:
-        return ''
+        return None
 @register.filter

0 comments (0 inline, 0 general)