@@ -70,7 +71,7 @@
{% if event.is_draft %}
-
+
{% blocktrans %}Please note that your event is in draft mode.
The following links contain a key allowing access. Anyone with this links can access it.{% endblocktrans %}
@@ -117,17 +118,16 @@
diff --git a/pod/live/templatetags/event_tags.py b/pod/live/templatetags/event_tags.py
index bcd98d4f81..dca0da2868 100644
--- a/pod/live/templatetags/event_tags.py
+++ b/pod/live/templatetags/event_tags.py
@@ -1,8 +1,10 @@
from django.template.defaultfilters import register
from django.utils import timezone
+from django.utils.translation import ugettext_lazy as _
from pod.live.models import Event
from pod.live.views import can_manage_event
+from pod.main.utils import generate_qrcode
@register.simple_tag(takes_context=True)
@@ -23,3 +25,18 @@ def get_next_events(context, broadcaster_id=None, limit_nb=4):
@register.filter
def can_manage_event_filter(user):
return can_manage_event(user)
+
+
+@register.simple_tag(name="get_event_qrcode")
+def get_event_qrcode(event_id: int) -> str:
+ """Get the event generated QR code.
+
+ Args:
+ event_id (int): Identifier of event object
+
+ Returns:
+ string: HTML-formed generated qrcode
+
+ """
+ alt = _("QR code event's link")
+ return generate_qrcode("live:event_immediate_edit", event_id, alt)
diff --git a/pod/locale/fr/LC_MESSAGES/django.mo b/pod/locale/fr/LC_MESSAGES/django.mo
index 02fe079123..4d07d48251 100644
Binary files a/pod/locale/fr/LC_MESSAGES/django.mo and b/pod/locale/fr/LC_MESSAGES/django.mo differ
diff --git a/pod/locale/fr/LC_MESSAGES/django.po b/pod/locale/fr/LC_MESSAGES/django.po
index d7dfaa937f..6a47e885c3 100644
--- a/pod/locale/fr/LC_MESSAGES/django.po
+++ b/pod/locale/fr/LC_MESSAGES/django.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Pod\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-01-19 09:07+0100\n"
+"POT-Creation-Date: 2024-01-24 12:51+0100\n"
"PO-Revision-Date: \n"
"Last-Translator: obado \n"
"Language-Team: Pod Team cotech-esup-pod@esup-portail.org\n"
@@ -3016,8 +3016,8 @@ msgid "QR code to record immediately an event"
msgstr "QR code pour la programmation d’un évènement immédiat"
#: pod/live/admin.py
-msgid "QR Code"
-msgstr "QR Code"
+msgid "QR code"
+msgstr "QR code"
#: pod/live/admin.py pod/live/models.py pod/recorder/models.py
#: pod/video/models.py
@@ -3642,9 +3642,8 @@ msgid "Share the link"
msgstr "Partager le lien"
#: pod/live/templates/live/event-info.html
-#: pod/video/templates/videos/video-info.html
-msgid "Use this link to share the video:"
-msgstr "Utiliser ce lien pour partager la vidéo :"
+msgid "Use this link to share the event:"
+msgstr "Utiliser ce lien pour partager l'évènement :"
#: pod/live/templates/live/event-info.html
#: pod/video/templates/videos/video-info.html
@@ -3653,8 +3652,14 @@ msgstr "QR code pour le lien :"
#: pod/live/templates/live/event-info.html
#: pod/video/templates/videos/video-info.html
-msgid "Warning, it use google API"
-msgstr "Attention, utilise une API Google"
+msgid "Download this QR code"
+msgstr "Télécharger ce QR code"
+
+#: pod/live/templates/live/event-info.html
+#: pod/podfile/templates/podfile/list_folder_files.html
+#: pod/video/templates/videos/video-info.html
+msgid "Download"
+msgstr "Télécharger"
#: pod/live/templates/live/event-script.html
msgid "Recording not done: "
@@ -3929,6 +3934,10 @@ msgstr "Évènements à venir"
msgid "Past events"
msgstr "Évènements passés"
+#: pod/live/templatetags/event_tags.py
+msgid "QR code event's link:"
+msgstr "QR code pour le lien de l'évènement :"
+
#: pod/live/utils.py
#, python-format
msgid "Registration of event #%(content_id)s"
@@ -4804,7 +4813,7 @@ msgstr ""
"droite, mode sombre ou dyslexie etc.), gérer la session (authentification) "
"et analyser le trafic du site (pour certaines instances)."
-#: pod/main/templates/base.html
+#: pod/main/templates/base.html pod/video/templates/videos/add_video.html
msgid "Learn more"
msgstr "En savoir plus"
@@ -6549,10 +6558,6 @@ msgstr "Partager le dossier « %(folder_name)s » avec un autre utilisateur"
msgid "Upload Files"
msgstr "Téléverser des fichiers"
-#: pod/podfile/templates/podfile/list_folder_files.html
-msgid "Download"
-msgstr "Télécharger"
-
#: pod/podfile/templates/podfile/list_folder_files.html
msgid "Delete file"
msgstr "Supprimer le fichier"
@@ -8387,8 +8392,8 @@ msgstr ""
"interactive H5P :"
#: pod/video/templates/videos/video-info.html
-msgid "QR code"
-msgstr "QR code"
+msgid "Use this link to share the video:"
+msgstr "Utiliser ce lien pour partager la vidéo :"
#: pod/video/templates/videos/video_collaborate.html
msgid "Collaborate"
@@ -8582,6 +8587,10 @@ msgstr "Afficher les statistiques de visualisation de toutes les vidéos"
msgid ": "
msgstr " : "
+#: pod/video/templatetags/video_tags.py
+msgid "QR code video's link:"
+msgstr "QR code pour le lien de la vidéo :"
+
#: pod/video/templatetags/video_tags.py
msgid "This content is not password protected."
msgstr "Ce contenu n'est pas protégé par un mot de passe."
@@ -9064,4 +9073,3 @@ msgstr "Résultats de la recherche"
#: pod/xapi/apps.py
msgid "Esup-Pod xAPI"
msgstr "xAPI Esup-Pod"
-
diff --git a/pod/locale/fr/LC_MESSAGES/djangojs.po b/pod/locale/fr/LC_MESSAGES/djangojs.po
index d924555f45..a0b27dcbef 100644
--- a/pod/locale/fr/LC_MESSAGES/djangojs.po
+++ b/pod/locale/fr/LC_MESSAGES/djangojs.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Esup-Pod\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-01-19 09:07+0100\n"
+"POT-Creation-Date: 2024-01-24 12:51+0100\n"
"PO-Revision-Date: \n"
"Last-Translator: obado \n"
"Language-Team: \n"
diff --git a/pod/locale/nl/LC_MESSAGES/django.po b/pod/locale/nl/LC_MESSAGES/django.po
index ebd8c54792..75b9dfc52f 100644
--- a/pod/locale/nl/LC_MESSAGES/django.po
+++ b/pod/locale/nl/LC_MESSAGES/django.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Pod\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-01-19 09:07+0100\n"
+"POT-Creation-Date: 2024-01-24 12:51+0100\n"
"PO-Revision-Date: 2023-06-08 14:37+0200\n"
"Last-Translator: obado \n"
"Language-Team: \n"
@@ -2824,7 +2824,7 @@ msgid "QR code to record immediately an event"
msgstr ""
#: pod/live/admin.py
-msgid "QR Code"
+msgid "QR code"
msgstr ""
#: pod/live/admin.py pod/live/models.py pod/recorder/models.py
@@ -3409,8 +3409,7 @@ msgid "Share the link"
msgstr ""
#: pod/live/templates/live/event-info.html
-#: pod/video/templates/videos/video-info.html
-msgid "Use this link to share the video:"
+msgid "Use this link to share the event:"
msgstr ""
#: pod/live/templates/live/event-info.html
@@ -3420,7 +3419,13 @@ msgstr ""
#: pod/live/templates/live/event-info.html
#: pod/video/templates/videos/video-info.html
-msgid "Warning, it use google API"
+msgid "Download this QR code"
+msgstr ""
+
+#: pod/live/templates/live/event-info.html
+#: pod/podfile/templates/podfile/list_folder_files.html
+#: pod/video/templates/videos/video-info.html
+msgid "Download"
msgstr ""
#: pod/live/templates/live/event-script.html
@@ -3683,6 +3688,10 @@ msgstr ""
msgid "Past events"
msgstr ""
+#: pod/live/templatetags/event_tags.py
+msgid "QR code event's link"
+msgstr ""
+
#: pod/live/utils.py
#, python-format
msgid "Registration of event #%(content_id)s"
@@ -4548,7 +4557,7 @@ msgid ""
"analyze site traffic."
msgstr ""
-#: pod/main/templates/base.html
+#: pod/main/templates/base.html pod/video/templates/videos/add_video.html
msgid "Learn more"
msgstr ""
@@ -6186,10 +6195,6 @@ msgstr ""
msgid "Upload Files"
msgstr ""
-#: pod/podfile/templates/podfile/list_folder_files.html
-msgid "Download"
-msgstr ""
-
#: pod/podfile/templates/podfile/list_folder_files.html
msgid "Delete file"
msgstr ""
@@ -7873,7 +7878,7 @@ msgid ""
msgstr ""
#: pod/video/templates/videos/video-info.html
-msgid "QR code"
+msgid "Use this link to share the video:"
msgstr ""
#: pod/video/templates/videos/video_collaborate.html
@@ -7912,6 +7917,25 @@ msgstr ""
msgid "Add a new video"
msgstr ""
+#: pod/video/templates/videos/video_edit.html
+#, python-format
+msgid ""
+"\n"
+" By default, the deletion date of your video is set to "
+"%(counter)s year, in accordance with your profile. As a teacher, you can "
+"modify this date. If you are a student and wish to extend this period, add a "
+"teacher as an additional video owner\n"
+" "
+msgid_plural ""
+"\n"
+" By default, the deletion date of your video is set to "
+"%(counter)s years, in accordance with your profile. As a teacher, you can "
+"modify this date. If you are a student and wish to extend this period, add a "
+"teacher as an additional video owner\n"
+" "
+msgstr[0] ""
+msgstr[1] ""
+
#: pod/video/templates/videos/video_edit.html
#: pod/video/templates/videos/video_page_content.html
msgid "The video is currently waiting for encoding."
@@ -8062,6 +8086,10 @@ msgstr ""
msgid ": "
msgstr ""
+#: pod/video/templatetags/video_tags.py
+msgid "QR code video's link"
+msgstr ""
+
#: pod/video/templatetags/video_tags.py
msgid "This content is not password protected."
msgstr ""
diff --git a/pod/locale/nl/LC_MESSAGES/djangojs.po b/pod/locale/nl/LC_MESSAGES/djangojs.po
index 9cb4453506..c0745d7d9a 100644
--- a/pod/locale/nl/LC_MESSAGES/djangojs.po
+++ b/pod/locale/nl/LC_MESSAGES/djangojs.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Esup-Pod\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-01-19 09:07+0100\n"
+"POT-Creation-Date: 2024-01-24 12:51+0100\n"
"PO-Revision-Date: 2023-02-08 15:22+0100\n"
"Last-Translator: obado \n"
"Language-Team: \n"
diff --git a/pod/main/static/js/main.js b/pod/main/static/js/main.js
index a038350af8..7c212a59d8 100644
--- a/pod/main/static/js/main.js
+++ b/pod/main/static/js/main.js
@@ -300,6 +300,39 @@ document.addEventListener("hidden.bs.collapse", (e) => {
if (e.target.id === "qrcode") e.target.setAttribute("src", "");
});
+if(document.getElementById("btn-download-qr-code") !== null){
+ document.getElementById("btn-download-qr-code").addEventListener('click', (e) => {
+ let nameOfDownload = e.target.dataset.slug + "-qrcode.png";
+ downloadImage(document.getElementById('qrcode').src, nameOfDownload);
+ });
+}
+
+/**
+ * Download image function with url
+ *
+ * @param imageSrc Source of image
+ * @param nameOfDownload Given name for download
+ * @returns {Promise}
+ */
+async function downloadImage(
+ imageSrc,
+ nameOfDownload = 'default.png',
+) {
+ const response = await fetch(imageSrc);
+ const blobImage = await response.blob();
+ const href = URL.createObjectURL(blobImage);
+
+ const anchorElement = document.createElement('a');
+ anchorElement.href = href;
+ anchorElement.download = nameOfDownload;
+
+ document.body.appendChild(anchorElement);
+ anchorElement.click();
+
+ document.body.removeChild(anchorElement);
+ window.URL.revokeObjectURL(href);
+}
+
document.addEventListener("change", (e) => {
if (e.target.id !== "displaytime") return;
let displayTime = document.getElementById("displaytime");
diff --git a/pod/main/utils.py b/pod/main/utils.py
index f1f44d376e..1cbdf2faca 100644
--- a/pod/main/utils.py
+++ b/pod/main/utils.py
@@ -1,13 +1,22 @@
"""Useful functions for the entire Pod application."""
+import base64
+import io
+import qrcode
+
from django.contrib import messages
from django.contrib.auth.models import User
+from django.contrib.sites.shortcuts import get_current_site
from django.core.exceptions import PermissionDenied
+from django.urls import reverse
from django.utils.html import mark_safe
from django.utils.translation import gettext_lazy as _
+from pod import settings
from pod.playlist.utils import get_playlist_list_for_user
from pod.video.models import Video
+SECURE_SSL_REDIRECT = getattr(settings, "SECURE_SSL_REDIRECT", False)
+
def is_ajax(request) -> bool:
"""Check that the request is made by a javascript call."""
@@ -101,3 +110,37 @@ def secure_post_request(request):
request, messages.WARNING, _("This view cannot be accessed directly.")
)
raise PermissionDenied
+
+
+def generate_qrcode(url: str, id: int, alt: str, request=None):
+ """
+ Generate qrcode for live event or video share link
+
+ Args:
+ url (string): Url corresponding to link
+ id (number): Identifier of object
+ alt (string): Translated string for alternative text
+ request (Request): HTTP Request
+
+ Returns:
+ string: HTML-formed qrcode
+
+ """
+ url_scheme = "https" if SECURE_SSL_REDIRECT else "http"
+ url_immediate_event = reverse(url, args={id})
+ data = "".join(
+ [
+ url_scheme,
+ "://",
+ get_current_site(request).domain,
+ url_immediate_event,
+ ]
+ )
+ img = qrcode.make(data)
+ buffer = io.BytesIO()
+ img.save(buffer, format="PNG")
+ img_str = base64.b64encode(buffer.getvalue()).decode("utf-8")
+ return mark_safe(
+ f'
'
+ )
diff --git a/pod/video/templates/videos/video-info.html b/pod/video/templates/videos/video-info.html
index 8067593fc8..ee555756ed 100644
--- a/pod/video/templates/videos/video-info.html
+++ b/pod/video/templates/videos/video-info.html
@@ -321,7 +321,7 @@
-
+
{% if not video.is_draft and not video.is_restricted and video.password != '' %}
@@ -352,7 +352,7 @@
{% endif %}
{% if video.is_draft %}
-
+
{% blocktrans %}Please note that your video is in draft mode.
The following links contain a key allowing access.
@@ -416,16 +416,14 @@
-
-
- ![{% trans 'QR code' %}]()
+
+ {% get_video_qrcode video.id as qrcode %}
+
+ {{ qrcode }}
+
+
-
diff --git a/pod/video/templatetags/video_tags.py b/pod/video/templatetags/video_tags.py
index 674c2cb55f..5678ddb088 100644
--- a/pod/video/templatetags/video_tags.py
+++ b/pod/video/templatetags/video_tags.py
@@ -22,6 +22,8 @@
import importlib
import os
+from ...main.utils import generate_qrcode
+
register = template.Library()
HOMEPAGE_SHOWS_PASSWORDED = getattr(django_settings, "HOMEPAGE_SHOWS_PASSWORDED", True)
@@ -122,6 +124,21 @@ def get_last_videos(context):
return recent_vids
+@register.simple_tag(name="get_video_qrcode")
+def get_video_qrcode(video_id: int) -> str:
+ """Get the video generated QR code.
+
+ Args:
+ video_id (int): Identifier of video object
+
+ Returns:
+ string: HTML-formed generated qrcode
+
+ """
+ alt = _("QR code video's link")
+ return generate_qrcode("enrichment:video_enrichment", video_id, alt)
+
+
@register.simple_tag(name="get_video_infos")
def get_video_infos(video):
"""
+
diff --git a/pod/live/templatetags/event_tags.py b/pod/live/templatetags/event_tags.py
index bcd98d4f81..dca0da2868 100644
--- a/pod/live/templatetags/event_tags.py
+++ b/pod/live/templatetags/event_tags.py
@@ -1,8 +1,10 @@
from django.template.defaultfilters import register
from django.utils import timezone
+from django.utils.translation import ugettext_lazy as _
from pod.live.models import Event
from pod.live.views import can_manage_event
+from pod.main.utils import generate_qrcode
@register.simple_tag(takes_context=True)
@@ -23,3 +25,18 @@ def get_next_events(context, broadcaster_id=None, limit_nb=4):
@register.filter
def can_manage_event_filter(user):
return can_manage_event(user)
+
+
+@register.simple_tag(name="get_event_qrcode")
+def get_event_qrcode(event_id: int) -> str:
+ """Get the event generated QR code.
+
+ Args:
+ event_id (int): Identifier of event object
+
+ Returns:
+ string: HTML-formed generated qrcode
+
+ """
+ alt = _("QR code event's link")
+ return generate_qrcode("live:event_immediate_edit", event_id, alt)
diff --git a/pod/locale/fr/LC_MESSAGES/django.mo b/pod/locale/fr/LC_MESSAGES/django.mo
index 02fe079123..4d07d48251 100644
Binary files a/pod/locale/fr/LC_MESSAGES/django.mo and b/pod/locale/fr/LC_MESSAGES/django.mo differ
diff --git a/pod/locale/fr/LC_MESSAGES/django.po b/pod/locale/fr/LC_MESSAGES/django.po
index d7dfaa937f..6a47e885c3 100644
--- a/pod/locale/fr/LC_MESSAGES/django.po
+++ b/pod/locale/fr/LC_MESSAGES/django.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Pod\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-01-19 09:07+0100\n"
+"POT-Creation-Date: 2024-01-24 12:51+0100\n"
"PO-Revision-Date: \n"
"Last-Translator: obado
{% blocktrans %}Please note that your event is in draft mode.
The following links contain a key allowing access. Anyone with this links can access it.{% endblocktrans %}
@@ -117,17 +118,16 @@ The following links contain a key allowing access. Anyone with this links can access it.{% endblocktrans %}
'
+ )
diff --git a/pod/video/templates/videos/video-info.html b/pod/video/templates/videos/video-info.html
index 8067593fc8..ee555756ed 100644
--- a/pod/video/templates/videos/video-info.html
+++ b/pod/video/templates/videos/video-info.html
@@ -321,7 +321,7 @@
+
{% if not video.is_draft and not video.is_restricted and video.password != '' %}
-
@@ -352,7 +352,7 @@
{% endif %}
{% if video.is_draft %}
-
+
{% blocktrans %}Please note that your video is in draft mode.
The following links contain a key allowing access.
@@ -416,16 +416,14 @@
-
-
- ![{% trans 'QR code' %}]()
+
+ {% get_video_qrcode video.id as qrcode %}
+
+ {{ qrcode }}
+
+
-
diff --git a/pod/video/templatetags/video_tags.py b/pod/video/templatetags/video_tags.py
index 674c2cb55f..5678ddb088 100644
--- a/pod/video/templatetags/video_tags.py
+++ b/pod/video/templatetags/video_tags.py
@@ -22,6 +22,8 @@
import importlib
import os
+from ...main.utils import generate_qrcode
+
register = template.Library()
HOMEPAGE_SHOWS_PASSWORDED = getattr(django_settings, "HOMEPAGE_SHOWS_PASSWORDED", True)
@@ -122,6 +124,21 @@ def get_last_videos(context):
return recent_vids
+@register.simple_tag(name="get_video_qrcode")
+def get_video_qrcode(video_id: int) -> str:
+ """Get the video generated QR code.
+
+ Args:
+ video_id (int): Identifier of video object
+
+ Returns:
+ string: HTML-formed generated qrcode
+
+ """
+ alt = _("QR code video's link")
+ return generate_qrcode("enrichment:video_enrichment", video_id, alt)
+
+
@register.simple_tag(name="get_video_infos")
def get_video_infos(video):
"""
{% blocktrans %}Please note that your video is in draft mode.
The following links contain a key allowing access. @@ -416,16 +416,14 @@
- The following links contain a key allowing access. @@ -416,16 +416,14 @@
-
- ![{% trans 'QR code' %}]()
+
+ {% get_video_qrcode video.id as qrcode %}
+
+ {{ qrcode }} +
+
-
+ {{ qrcode }} +
+