remove some unused markup, and fix color of text
This commit is contained in:
parent
10a1b55618
commit
2c648b12c8
|
@ -1,28 +1,6 @@
|
||||||
{% extends 'program_base.html' %}
|
{% extends 'program_base.html' %}
|
||||||
|
|
||||||
{% block program_content %}
|
{% block program_content %}
|
||||||
<h2>{{ date|date:"l, F jS" }}</h2>
|
|
||||||
{% for event in events %}
|
|
||||||
{% ifchanged event.event_type %}
|
|
||||||
{% if not forloop.first %}</div>{% endif %}
|
|
||||||
<h3>{{ event.event_type }}</h3>
|
|
||||||
<div style="display: flex; flex-wrap: wrap;">
|
|
||||||
{% endifchanged %}
|
|
||||||
|
|
||||||
<a class="event"
|
|
||||||
href="{% url 'event_detail' camp_slut=camp.slug slug=event.slug %}"
|
|
||||||
style="background-color: {{ event.event_type.color }}; border: 0; color: {% if event.event_type.light_text %}white{% else %}black{% endif %};">
|
|
||||||
<small>{{ event.start|date:"H:i" }} - {{ event.end|date:"H:i" }}</small>
|
|
||||||
<br />
|
|
||||||
{{ event }}
|
|
||||||
<br />
|
|
||||||
{% if event.speakers.exists %}
|
|
||||||
by {{ event.speakers.all|join:", " }}
|
|
||||||
{% endif %}
|
|
||||||
</a>
|
|
||||||
|
|
||||||
{% endfor %}
|
|
||||||
|
|
||||||
<table>
|
<table>
|
||||||
<tbody>
|
<tbody>
|
||||||
<table>
|
<table>
|
||||||
|
@ -31,7 +9,7 @@
|
||||||
<td style="height: 50px; padding: 5px;">{{ timeslot.time }}</td>
|
<td style="height: 50px; padding: 5px;">{{ timeslot.time }}</td>
|
||||||
{% for eventinstance in eventinstances %}
|
{% for eventinstance in eventinstances %}
|
||||||
{% if eventinstance.when.lower.time == timeslot.time %}
|
{% if eventinstance.when.lower.time == timeslot.time %}
|
||||||
<td style="background-color: {{ eventinstance.event.event_type.color }}; color: {% if event.event_type.light_text %}white{% else %}black{% endif %};" class="event" rowspan={{ eventinstance.timeslots }}>
|
<td style="background-color: {{ eventinstance.event.event_type.color }}; color: {% if eventinstance.event.event_type.light_text %}white{% else %}black{% endif %};" class="event" rowspan={{ eventinstance.timeslots }}>
|
||||||
<a style="color:inherit;" href="{% url 'event_detail' camp_slug=camp.slug slug=eventinstance.event.slug %}">
|
<a style="color:inherit;" href="{% url 'event_detail' camp_slug=camp.slug slug=eventinstance.event.slug %}">
|
||||||
{{ eventinstance.event.title }}<br>
|
{{ eventinstance.event.title }}<br>
|
||||||
{{ eventinstance.when.lower.time }}-{{ eventinstance.when.upper.time }}
|
{{ eventinstance.when.lower.time }}-{{ eventinstance.when.upper.time }}
|
||||||
|
@ -44,5 +22,4 @@
|
||||||
</table>
|
</table>
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
|
|
||||||
{% endblock program_content %}
|
{% endblock program_content %}
|
||||||
|
|
Loading…
Reference in a new issue