Merge branch 'main' into issue-1259/video-publication-email-notificat…

…ions
emfcamp · Aug 22, 2024 · 9844048 · 9844048
2 parents 866a25c + 888fb8b
commit 9844048
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 13 deletions.
diff --git a/docker-compose.kelvin.yml b/docker-compose.kelvin.yml
@@ -27,7 +27,7 @@ services:
     networks:
       - emfweb
 
-  postgres_exporter:
+  postgres-exporter:
     restart: unless-stopped
     image: 'wrouesnel/postgres_exporter:v0.8.0'
     environment:

diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
@@ -32,7 +32,7 @@ services:
     networks:
       - emfweb
 
-  postgres_exporter:
+  postgres-exporter:
     restart: unless-stopped
     image: 'wrouesnel/postgres_exporter:v0.8.0'
     environment:
@@ -49,7 +49,7 @@ services:
       - emfweb
     command: memcached -m 64
 
-  memcached_exporter:
+  memcached-exporter:
     restart: unless-stopped
     image: 'prom/memcached-exporter:v0.9.0'
     depends_on:

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -14,8 +14,6 @@ services:
       - "2342:2342"
     environment:
       SETTINGS_FILE: ./config/development.cfg
-      FLASK_APP: dev_server.py
-      FLASK_ENV: development
       COLORIZE_LOGS: always
       PYTHONUNBUFFERED: 1
       IRCCAT: fakeirccat:12345

diff --git a/poetry.lock b/poetry.lock
diff --git a/templates/schedule/historic/item.html b/templates/schedule/historic/item.html
@@ -60,8 +60,19 @@ <h3>Video</h3>
           <button class="youtube-wait-for-click-button">Continue</button>
         </div>
       </div>
-      <p>View this video <a href="{{ event.video.youtube }}">on YouTube</a>.</p>
     {% endif %}
+    <strong>Video Hosts:</strong>
+    <ul>
+    {% if event.video.ccc %}
+      <li>View this video <a href="{{ event.video.ccc }}">on media.ccc.de</a>.</li>
+    {% endif %}
+    {% if event.video.archiveorg %}
+      <li>View this video <a href="{{ event.video.archiveorg }}">on the Internet Archive</a>.</li>
+    {% endif %}
+    {% if event.video.youtube %}
+      <li>View this video <a href="{{ event.video.youtube }}">on YouTube</a>.</li>
+    {% endif %}
+    </ul>
   </div>
 {% endif %}
 {% endblock %}
diff --git a/templates/schedule/item.html b/templates/schedule/item.html
@@ -135,8 +135,16 @@ <h4>Video</h4>
     <iframe src="{{proposal.youtube_url|replace('youtube.com/watch?v=', 'youtube.com/embed/')}}"
         width="100%" height="500px" frameborder="0" 
         allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
-    <p>View this video <a href="{{ proposal.youtube_url }}">on YouTube</a>.</p>
   {% endif %}
+  <strong>Video Hosts:</strong>
+  <ul>
+  {% if proposal.c3voc_url %}
+    <li>View this video <a href="{{ proposal.c3voc_url }}">on media.ccc.de</a>.</li>
+  {% endif %}
+  {% if proposal.youtube_url %}
+    <li>View this video <a href="{{ proposal.youtube_url }}">on YouTube</a>.</li>
+  {% endif %}
+  </ul>
 </div>
 <p>&nbsp;</p>
 {% endif %}