summaryrefslogtreecommitdiff
path: root/program/templates
diff options
context:
space:
mode:
authorChristian Pointner <equinox@helsinki.at>2021-06-15 20:52:55 (GMT)
committerChristian Pointner <equinox@helsinki.at>2021-06-15 20:52:55 (GMT)
commit09276cc47736785e7a2784172a2cf3663de4e57e (patch)
tree202b46bfc67595a64bda7aa4ac359e0957b09189 /program/templates
parentb2415eb92622563f567106e2c4951ed498273e53 (diff)
parent88fb9a1d5bc7dc5f22d96fcee970f4ec9f88b289 (diff)
Merge branch 'topic/new-show-and-note-images' into stable
Diffstat (limited to 'program/templates')
-rw-r--r--program/templates/v2/show_detail.html4
-rw-r--r--program/templates/v2/timeslot_detail.html4
2 files changed, 6 insertions, 2 deletions
diff --git a/program/templates/v2/show_detail.html b/program/templates/v2/show_detail.html
index 55f7f3b..73ec5b1 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>
diff --git a/program/templates/v2/timeslot_detail.html b/program/templates/v2/timeslot_detail.html
index ab3b429..81c40c7 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/program/{{ timeslot.note.image }}"></div>
+{% endif %}
{% endif %}
</div>