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

Basic template changes

Browse source
This commit is contained in:
Tobias 2018-09-27 19:49:00 +12:00
parent b5c9a81fbd
commit a75acac56f
3 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pinaxcon/templates/symposion/dashboard/_categories.html
View file

@ -1,6 +1,10 @@
{% load i18n %} {% load i18n %}
{% load lca2018_tags %} {% load proposal_tags %}
{% load review_tags %}
{% load teams_tags %}
{% load registrasion_tags %} {% load registrasion_tags %}
{% load lca2018_tags %}
{% load staticfiles %}
{% if user.is_staff %} {% if user.is_staff %}
<div class="container"> <div class="container">

11
pinaxcon/templates/symposion/schedule/_grid.html
View file

@ -28,9 +28,9 @@
<td class="time"><h4>{{ row.time|date:"h:iA" }}</h4></td> <td class="time"><h4>{{ row.time|date:"h:iA" }}</h4></td>
{% for slot in row.slots %} {% for slot in row.slots %}
<td class="slot slot-{{ slot.kind.label }}" colspan="{{ slot.colspan }}" rowspan="{{ slot.rowspan }}"> <td class="slot slot-{{ slot.kind.label }}" colspan="{{ slot.colspan }}" rowspan="{{ slot.rowspan }}">
{% if slot.kind.label == "talk" or slot.kind.label == "tutorial" %} {% with slot.kind.label.lower as label %}
{% if not slot.content %} {% if label == "talk" or label == "tutorial" %}
{% else %} {% if slot.content %}
<span class="title"> <span class="title">
<a href="{% url "schedule_presentation_detail" slot.content.pk %}">{{ slot.content.title }}</a> <a href="{% url "schedule_presentation_detail" slot.content.pk %}">{{ slot.content.title }}</a>
</span> </span>
@ -52,7 +52,7 @@
{% endif %} {% endif %}
{% endflag %} {% endflag %}
{% endif %} {% endif %}
{% elif slot.kind.label == "shortbreak" %} {% elif label == "shortbreak" %}
{% else %} {% else %}
{% if slot.content_override %} {% if slot.content_override %}
{{ slot.content_override_html|safe }} {{ slot.content_override_html|safe }}
@ -60,12 +60,13 @@
{{ slot.kind.label }} {{ slot.kind.label }}
{% endif %} {% endif %}
{% endif %} {% endif %}
{% if "break" in slot.kind.label %} {% if "break" in label %}
{% else %} {% else %}
<span class="room"> <span class="room">
{{ slot.rooms|join:", "}}<span class="endtime"> ends {{ slot.end|date:"h:iA" }}</span> {{ slot.rooms|join:", "}}<span class="endtime"> ends {{ slot.end|date:"h:iA" }}</span>
</span> </span>
{% endif %} {% endif %}
{% endwith %}
</td> </td>
{% endfor %} {% endfor %}
{% if forloop.last %} {% if forloop.last %}