Skip to content

Commit

Permalink
Merge a53d9b2 into 81c1fd8
Browse files Browse the repository at this point in the history
  • Loading branch information
FedeG committed Apr 12, 2016
2 parents 81c1fd8 + a53d9b2 commit 2d6e0b5
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions manager/templates/activities/schedule.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<div class="alert schedule-room row"><strong>{% trans "Hour" %}</strong></div>
<div style="height: {{ schedule.size }}px;">
{% for reference_hour in schedule.reference_hours %}
<div style="height: {{ reference_hour.size }}%">
<div style="height: {{ reference_hour.size | safe }}%">
<strong>{{ reference_hour.start|date:"H:i" }} - {{ reference_hour.end|date:"H:i" }}</strong>
</div>
{% if not forloop.last %}
Expand All @@ -26,9 +26,9 @@
<div style="height: {{ schedule.size }}px; font-size: 14px">
{% for activity in room.activities %}
{% if 'dummy' in activity %}
<div class="schedule-dummy hidden-sm hidden-xs" style="height: {{ activity.dummy_size }}%;"></div>
<div class="schedule-dummy hidden-sm hidden-xs" style="height: {{ activity.dummy_size | safe }}%;"></div>
{% else %}
<div class="schedule-talk" style="height: {{ activity.activity_size }}%">
<div class="schedule-talk" style="height: {{ activity.activity_size | safe }}%">
{% if activity.activity_size < 3 %}
{% if activity.is_talk %}<a href='{% url "activity_detail" event_slug activity.pk %}'>{% endif %}
<strong>
Expand Down

0 comments on commit 2d6e0b5

Please sign in to comment.