Conservancy/symposion_app
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix overly verbose slot names

Browse source
This commit is contained in:
Tobias 2018-12-29 14:38:16 +13:00
parent 46b5941d67
commit ac71aa170b
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pinaxcon/templates/symposion/schedule/schedule_conference.html
View file

@ -21,24 +21,24 @@
<nav class="mb-4"> <nav class="mb-4">
<div class="nav schedule-nav" id="schedule-nav" role="tablist"> <div class="nav schedule-nav" id="schedule-nav" role="tablist">
Monday Monday miniconfs
{% for section in sections %} {% for section in sections %}
{% if "Miniconf" in section.schedule.section.name %} {% if "Miniconf" in section.schedule.section.name %}
{% for timetable in section.days %} {% for timetable in section.days %}
{% if timetable.day.date|date:"Y-m-d" == "2019-01-21" %} {% if timetable.day.date|date:"Y-m-d" == "2019-01-21" %}
{% include "symposion/schedule/_schedule_nav_link.html" with label=section.schedule.section.name %} {% include "symposion/schedule/_schedule_nav_link.html" with label=section.schedule.section.name|cut:" Miniconf" %}
{% endif %} {% endif %}
{% endfor %} {% endfor %}
{% endif %} {% endif %}
{% endfor %} {% endfor %}
<br /> <br />
Tuesday Tuesday miniconfs
{% for section in sections %} {% for section in sections %}
{% if "Miniconf" in section.schedule.section.name %} {% if "Miniconf" in section.schedule.section.name %}
{% for timetable in section.days %} {% for timetable in section.days %}
{% if timetable.day.date|date:"Y-m-d" == "2019-01-22" %} {% if timetable.day.date|date:"Y-m-d" == "2019-01-22" %}
{% include "symposion/schedule/_schedule_nav_link.html" with label=section.schedule.section.name %} {% include "symposion/schedule/_schedule_nav_link.html" with label=section.schedule.section.name|cut:" Miniconf" %}
{% endif %} {% endif %}
{% endfor %} {% endfor %}
{% endif %} {% endif %}

2
vendor/symposion/schedule/models.py vendored
View file

@ -173,7 +173,7 @@ class Slot(models.Model):
def save(self, *args, **kwargs): def save(self, *args, **kwargs):
roomlist = ' '.join(map(str, self.rooms)) roomlist = ' '.join(map(str, self.rooms))
self.name = "%s %s (%s - %s) %s" % (self.day, self.kind, self.start, self.end, roomlist) self.name = "%s %s (%s - %s) %s" % (self.day.date, self.kind.label, self.start, self.end, roomlist)
self.content_override_html = parse(self.content_override) self.content_override_html = parse(self.content_override)
super(Slot, self).save(*args, **kwargs) super(Slot, self).save(*args, **kwargs)