summaryrefslogtreecommitdiff
path: root/program/templates/v2
diff options
context:
space:
mode:
authorChristian Pointner <equinox@helsinki.at>2021-03-29 12:22:19 (GMT)
committerChristian Pointner <equinox@helsinki.at>2021-05-28 20:17:37 (GMT)
commitdde04a95dcb76b765b8c66775a6ee242d3c316c4 (patch)
tree9dd6feef40534dae4f515dc6d24b7fc1ea29acca /program/templates/v2
parent8154c30318127e0491786b65975bee808cd8e27b (diff)
add show and note images based on S3 storage
Diffstat (limited to 'program/templates/v2')
-rw-r--r--program/templates/v2/show_detail.html6
-rw-r--r--program/templates/v2/timeslot_detail.html4
2 files changed, 7 insertions, 3 deletions
diff --git a/program/templates/v2/show_detail.html b/program/templates/v2/show_detail.html
index 55f7f3b..7b2e07e 100644
--- a/program/templates/v2/show_detail.html
+++ b/program/templates/v2/show_detail.html
@@ -43,8 +43,8 @@
<div id="description">{{ show.description|safe }}</div>
{% endif %}
-{% if show.image and show.image_enabled %}
- <div id="image" style="float: right;"><img src="/program/static/{{ show.image }}" width="200" alt="image"></div>
+{% if show.image %}
+ <div id="image"><img src="https://images.helsinki.at/program/{{ show.image }}"></div>
{% endif %}
<p>
@@ -69,7 +69,7 @@
<div class="title">{{ note.title }}</div>
</li>
{% endfor %}
-{% if show.predecessor and show.predecessor.notes.all %}
+{% if show.predecessor and show.predecessor.notes.all %}p
{% if show.name != show.predecessor.name %}
<h3>Davor als <a href="/program/shows/{{ show.predecessor.slug }}">{{ show.predecessor.name }}</a></h3>
{% endif %}
diff --git a/program/templates/v2/timeslot_detail.html b/program/templates/v2/timeslot_detail.html
index ab3b429..f1e65b4 100644
--- a/program/templates/v2/timeslot_detail.html
+++ b/program/templates/v2/timeslot_detail.html
@@ -32,6 +32,10 @@
{% if timeslot.note %}
<div class="timeslot-note">{{ timeslot.note.content|safe }}</div>
+
+{% if timeslot.note.image %}
+ <div id="timeslot-note-image"><img src="https://images.helsinki.at/notes/{{ timeslot.note.image }}"></div>
+{% endif %}
{% endif %}
</div>