diff --git a/bornhack/static_src/css/bornhack.css b/bornhack/static_src/css/bornhack.css
index d26e0f8b..b9660a9d 100644
--- a/bornhack/static_src/css/bornhack.css
+++ b/bornhack/static_src/css/bornhack.css
@@ -115,8 +115,10 @@ footer {
}
.event {
- width: 100px;
+ max-width: 200px;
+ height: 100px;
display: inline-block;
- margin: 0 5px;
+ margin: 5px 5px;
padding: 5px;
+ flex: 1 1 auto;
}
diff --git a/program/templates/program_day.html b/program/templates/program_day.html
index 4f41278b..bbd2eece 100644
--- a/program/templates/program_day.html
+++ b/program/templates/program_day.html
@@ -3,7 +3,19 @@
{% block program_content %}
{% for event in events %}
- {{ event }}
+ {% ifchanged event.event_type %}
+ {% if not forloop.first %}{% endif %}
+
+ {% endifchanged %}
+
+
+ {{ event.start|date:"H:i" }} - {{ event.end|date:"H:i" }}
+
+ {{ event }}
+
+
{% endfor %}
{% endblock %}
diff --git a/program/templates/program_overview.html b/program/templates/program_overview.html
index 8e46e415..59bd9dd6 100644
--- a/program/templates/program_overview.html
+++ b/program/templates/program_overview.html
@@ -6,7 +6,7 @@
All
{% for event_type in event_types %}
-
+
{{ event_type.name }}
{% endfor %}
@@ -18,8 +18,9 @@
{% for event in events %}
+ style="background-color: {{ event.event_type.color }}; border: 0; color: {% if event.event_type.light_text %}white{% else %}black{% endif %};">
{{ event.start|date:"H:i" }} - {{ event.end|date:"H:i" }}
+
{{ event }}
{% endfor %}
diff --git a/program/views.py b/program/views.py
index 590aff58..c5972b50 100644
--- a/program/views.py
+++ b/program/views.py
@@ -52,7 +52,7 @@ class ProgramDayView(TemplateView):
day = int(kwargs['day'])
date = datetime.date(year=year, month=month, day=day)
day = Day.objects.filter(date=date)
- context['events'] = models.Event.objects.filter(days=day)
+ context['events'] = models.Event.objects.filter(days=day).order_by('start', 'event_type')
context['event_types'] = models.EventType.objects.all()
context['days'] = Day.objects.filter(date__year=year)
return context