| 
| 
Ministère de lʼEnseignement supérieur, de la Recherche et de lʼInnovation
+
Ministère de lʼEnseignement supérieur et de la Recherche
:-----:|:-----:|:----:
diff --git a/docs/index.md b/docs/index.md
index 0f80fe6c44..d1d1347be1 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -3,5 +3,5 @@
## Retrouvez toute la documentation à cette adresse : https://www.esup-portail.org/wiki/display/ES/esup-pod
-[{% trans "To delete the dressing, please check the box and click “Delete”." %}
+ +{% endblock page_content %} + +{% block collapse_page_aside %}{% endblock collapse_page_aside %} +{% block page_aside %}{% endblock page_aside %} diff --git a/pod/dressing/templates/dressing_edit.html b/pod/dressing/templates/dressing_edit.html new file mode 100644 index 0000000000..569fecf62e --- /dev/null +++ b/pod/dressing/templates/dressing_edit.html @@ -0,0 +1,81 @@ +{% extends 'base.html' %} +{% load i18n %} +{% load static %} +{% load tagging_tags %} +{% load thumbnail %} +{% block page_extra_head %} + +{% endblock page_extra_head %} + +{% block breadcrumbs %}{{ block.super }} +
+
+
+
+{% trans 'Add new dressing' %}
+{% endblock page_content %}
+
+{% block collapse_page_aside %}
+{% endblock collapse_page_aside %}
+{% block page_aside %}
+{% endblock page_aside %}
+
+{% block more_script %}
+{% endblock more_script %}
diff --git a/pod/dressing/templates/video_dressing.html b/pod/dressing/templates/video_dressing.html
new file mode 100644
index 0000000000..6f2f619397
--- /dev/null
+++ b/pod/dressing/templates/video_dressing.html
@@ -0,0 +1,145 @@
+{% extends 'base.html' %}
+{% load i18n %}
+{% load static %}
+{% load tagging_tags %}
+{% load thumbnail %}
+{% load video_filters %}
+{% load video_tags %}
+
+{% block page_extra_head %}
+ {% include 'videos/video-header.html' %}
+{% endblock page_extra_head %}
+
+{% block breadcrumbs %}
+ {{block.super}}
+
+ | {% trans 'Title' %} | +{% trans 'Owners' %} | +{% trans 'Users' %} | +{% trans 'Allow to Groups' %} | +{% trans 'Watermark' %} | +{% trans 'Position' %} | +{% trans 'Opacity' %} | +{% trans 'Opening credits' %} | +{% trans 'Ending credits' %} | +{% trans 'Actions' %} | +|
|---|---|---|---|---|---|---|---|---|---|---|
| {{ dressing.title }} | ++ {% for owner in dressing.owners.all %} + + {% if owner.first_name %} + {{ owner.first_name }} {{ owner.last_name }} + {% else %} + {{ owner.username }} + {% endif %} + {% if not forloop.last %}, {% endif %} + {% empty %} + {% trans 'No owners' %} + {% endfor %} + | ++ {% for user in dressing.users.all %} + + {% if user.first_name %} + {{ user.first_name }} {{ user.last_name }} + {% else %} + {{ user.username }} + {% endif %} + {% if not forloop.last %}, {% endif %} + {% empty %} + {% trans 'No users' %} + {% endfor %} + | ++ {% for group in dressing.allow_to_groups.all %} + {{ group }}{% if not forloop.last %}, {% endif %} + {% empty %} + {% trans 'No groups' %} + {% endfor %} + | +
+ {% if dressing.watermark %}
+ |
+
+ {% if dressing.watermark %}
+ {{ dressing.get_position_display }}
+ {% else %}
+
+
+
+ {% endif %}
+ |
+
+ {% if dressing.watermark %}
+ {{ dressing.opacity }}
+ {% else %}
+
+
+
+ {% endif %}
+ |
+ + {% if dressing.opening_credits %} + {{ dressing.opening_credits }} + {% else %} + {% trans 'None' %} + {% endif %} + | ++ {% if dressing.ending_credits %} + {{ dressing.ending_credits }} + {% else %} + {% trans 'None' %} + {% endif %} + | ++ + | +|
| {% trans 'No dressings found.' %} | +||||||||||
+ {% trans "The video is currently being encoded." %}
+
+{% endif %}
+
+
+ {% include 'videos/video-element.html' %}
+
+
+
+
+
+
+ {% trans 'My dressings' %}
+
+ {% trans 'Back to the video' %}
+
+
+
+{% endblock page_content %}
+
+{% block page_aside %}
+ {% if access_not_allowed == True %}
+ {% else %}
+
+
+ {% endif %}
+{% endblock page_aside %}
+
+{% block more_script %}
+ {% include 'videos/video-script.html'%}
+
+{% endblock more_script %}
diff --git a/pod/dressing/tests/__init__.py b/pod/dressing/tests/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/pod/dressing/tests/test_models.py b/pod/dressing/tests/test_models.py
new file mode 100644
index 0000000000..6e26be2d8a
--- /dev/null
+++ b/pod/dressing/tests/test_models.py
@@ -0,0 +1,107 @@
+"""Unit tests for dressing models."""
+
+import os
+from django.test import TestCase
+from django.contrib.auth.models import User
+from django.conf import settings
+from django.core.files.uploadedfile import SimpleUploadedFile
+from pod.video.models import Type, Video
+from pod.dressing.models import Dressing
+
+if getattr(settings, "USE_PODFILE", False):
+ from pod.podfile.models import CustomImageModel
+ from pod.podfile.models import UserFolder
+
+ FILEPICKER = True
+else:
+ FILEPICKER = False
+ from pod.main.models import CustomImageModel
+
+
+class DressingModelTest(TestCase):
+ """Test case for Pod dressing models."""
+
+ def setUp(self):
+ owner = User.objects.create(username="pod")
+ currentdir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+ simplefile = SimpleUploadedFile(
+ name="testimage.jpg",
+ content=open(os.path.join(currentdir, "tests", "testimage.jpg"), "rb").read(),
+ content_type="image/jpeg",
+ )
+
+ home = UserFolder.objects.get(name="home", owner=owner)
+ if FILEPICKER:
+ home = UserFolder.objects.get(name="home", owner=owner)
+ customImage = CustomImageModel.objects.create(
+ name="testimage",
+ description="testimage",
+ created_by=owner,
+ folder=home,
+ file=simplefile,
+ )
+ else:
+ customImage = CustomImageModel.objects.create(file=simplefile)
+ videotype = Type.objects.create(title="others")
+ video = Video.objects.create(
+ title="video",
+ type=videotype,
+ owner=owner,
+ video="test.mp4",
+ duration=20,
+ )
+ video2 = Video.objects.create(
+ title="video2",
+ type=videotype,
+ owner=owner,
+ video="test2.mp4",
+ duration=20,
+ )
+ dressing = Dressing.objects.create(
+ title="Test Dressing",
+ watermark=customImage,
+ position=Dressing.TOP_RIGHT,
+ opacity=50,
+ opening_credits=video,
+ ending_credits=video2,
+ )
+ dressing.owners.set([owner])
+ dressing.users.set([owner])
+
+ def test_attributs_full(self):
+ dressing = Dressing.objects.get(id=1)
+ owner = User.objects.get(username="pod")
+ video = Video.objects.get(id=1)
+ video2 = Video.objects.get(id=2)
+ self.assertEqual(dressing.title, "Test Dressing")
+ self.assertEqual(list(dressing.owners.all()), [owner])
+ self.assertEqual(list(dressing.users.all()), [owner])
+ self.assertEqual(list(dressing.allow_to_groups.all()), [])
+ self.assertTrue("testimage" in dressing.watermark.name)
+ self.assertEqual(dressing.position, Dressing.TOP_RIGHT)
+ self.assertEqual(dressing.opacity, 50)
+ self.assertEqual(dressing.opening_credits, video)
+ self.assertEqual(dressing.ending_credits, video2)
+ print(" ---> test_attributs_full: OK! --- DressingModelTest")
+
+ def test_dressing_to_json(self):
+ dressing = Dressing.objects.get(id=1)
+ dressing_json = dressing.to_json()
+ owner = User.objects.get(username="pod")
+ video = Video.objects.get(id=1)
+ video2 = Video.objects.get(id=2)
+
+ expected_json = {
+ "id": dressing.id,
+ "title": "Test Dressing",
+ "allow_to_groups": [],
+ "owners": [owner.id],
+ "users": [owner.id],
+ "watermark": dressing.watermark.file.url,
+ "position": dressing.get_position_display(),
+ "opacity": 50,
+ "opening_credits": video.slug,
+ "ending_credits": video2.slug,
+ }
+ self.assertEqual(dressing_json, expected_json)
+ print(" ---> test_dressing_to_json: OK! --- DressingModelTest")
diff --git a/pod/dressing/tests/test_utils.py b/pod/dressing/tests/test_utils.py
new file mode 100644
index 0000000000..ccd99963b2
--- /dev/null
+++ b/pod/dressing/tests/test_utils.py
@@ -0,0 +1,79 @@
+"""Unit tests for Esup-Pod dressing utilities."""
+
+import os
+import unittest
+from unittest.mock import patch
+from django.contrib.auth.models import User
+from pod.authentication.models import AccessGroup
+from pod.dressing.utils import get_dressings, get_position_value, get_dressing_input
+from pod.dressing.models import Dressing
+
+
+class DressingUtilitiesTests(unittest.TestCase):
+ """TestCase for Esup-Pod dressing utilities."""
+
+ def test_get_position_value(self):
+ """Test for the get_position_value function."""
+ result = get_position_value("top_right", "720")
+ self.assertEqual(result, "overlay=main_w-overlay_w-36.0:36.0")
+
+ result = get_position_value("top_left", "720")
+ self.assertEqual(result, "overlay=36.0:36.0")
+
+ result = get_position_value("bottom_right", "720")
+ self.assertEqual(result, "overlay=main_w-overlay_w-36.0:main_h-overlay_h-36.0")
+
+ result = get_position_value("bottom_left", "720")
+ self.assertEqual(result, "overlay=36.0:main_h-overlay_h-36.0")
+
+ print(" ---> test_get_position_value: OK! --- DressingUtilsTest")
+
+ def test_get_dressing_input(self):
+ """Test for the get_dressing_input function"""
+
+ dressing = Dressing(watermark=None, opening_credits=None, ending_credits=None)
+
+ FFMPEG_DRESSING_INPUT = "input=%s"
+
+ with patch("os.path.join", side_effect=os.path.join):
+ result = get_dressing_input(dressing, FFMPEG_DRESSING_INPUT)
+
+ self.assertIn("", result)
+
+ print(" ---> test_get_dressing_input: OK! --- DressingUtilsTest")
+
+ def test_get_dressings(self):
+ """Test for the get_dressings function."""
+ user = User.objects.create_user(username="user", password="password", is_staff=1)
+ access_group = AccessGroup.objects.create(
+ code_name="group1", display_name="Group 1"
+ )
+
+ dressing1 = Dressing.objects.create(title="Dressing 1")
+ dressing1.owners.add(user.id)
+
+ dressing2 = Dressing.objects.create(title="Dressing 2")
+ dressing2.users.add(user.id)
+
+ dressing3 = Dressing.objects.create(title="Dressing 3")
+ dressing3.allow_to_groups.add(access_group)
+
+ dressings = get_dressings(user.id, [access_group])
+
+ self.assertIn(dressing1, dressings)
+ self.assertIn(dressing2, dressings)
+ self.assertIn(dressing3, dressings)
+
+ self.assertEqual(len(dressings), 3)
+
+ print(" ---> test_get_dressings: OK! --- DressingUtilsTest")
+
+ def test_get_dressings_empty(self):
+ """Test for the get_dressings_empty function."""
+ new_user = User.objects.create_user(username="newuser", password="newpassword")
+
+ dressings = get_dressings(new_user, [])
+
+ self.assertEqual(len(dressings), 0)
+
+ print(" ---> test_get_dressings_empty: OK! --- DressingUtilsTest")
diff --git a/pod/dressing/tests/test_views.py b/pod/dressing/tests/test_views.py
new file mode 100644
index 0000000000..1b35275924
--- /dev/null
+++ b/pod/dressing/tests/test_views.py
@@ -0,0 +1,175 @@
+"""Unit tests for Esup-Pod dressing views."""
+
+from django.contrib.auth.models import User
+from django.contrib.messages import get_messages
+from django.test import TestCase
+from django.urls import reverse
+
+from pod.dressing.forms import DressingDeleteForm
+from pod.dressing.models import Dressing
+from pod.video.models import Type, Video
+
+
+class VideoDressingViewTest(TestCase):
+ """Dressing page test case."""
+
+ fixtures = ["initial_data.json"]
+
+ def setUp(self) -> None:
+ self.user = User.objects.create_user(
+ username="user", password="password", is_staff=1
+ )
+ self.first_video = Video.objects.create(
+ title="First video",
+ slug="first-video",
+ owner=self.user,
+ video="first_video.mp4",
+ is_draft=False,
+ type=Type.objects.get(id=1),
+ )
+ self.dressing = Dressing.objects.create(title="Test Dressing")
+ self.dressing.owners.set([self.user])
+ self.dressing.users.set([self.user])
+
+ def test_video_dressing_view(self):
+ """Test for video_dressing view."""
+
+ print(" ---> test_video_dressing_view: OK! --- VideoDressingViewTest")
+
+
+class DressingDeleteViewTest(TestCase):
+ """Dressing delete page test case."""
+
+ fixtures = ["initial_data.json"]
+
+ def setUp(self) -> None:
+ self.user = User.objects.create_user(
+ username="user", password="password", is_staff=1
+ )
+ self.first_video = Video.objects.create(
+ title="First video",
+ slug="first-video",
+ owner=self.user,
+ video="first_video.mp4",
+ is_draft=False,
+ type=Type.objects.get(id=1),
+ )
+ self.dressing = Dressing.objects.create(title="Test Dressing")
+ self.dressing.owners.set([self.user])
+ self.dressing.users.set([self.user])
+
+ def test_dressing_delete_view_get(self):
+ self.client.force_login(self.user)
+ response = self.client.get(
+ reverse("dressing:dressing_delete", args=[self.dressing.id])
+ )
+ self.assertEqual(response.status_code, 200)
+ self.assertTemplateUsed(response, "dressing_delete.html")
+ self.assertEqual(response.context["dressing"], self.dressing)
+ self.assertIsInstance(response.context["form"], DressingDeleteForm)
+
+ def test_dressing_delete_view_get_not_authenticated(self):
+ response = self.client.get(
+ reverse("dressing:dressing_delete", args=[self.dressing.id])
+ )
+ self.assertEqual(response.status_code, 302) # Redirect to login page
+
+ def test_dressing_delete_view_post(self):
+ self.client.force_login(self.user)
+ form_data = {"confirm_deletion": True}
+ response = self.client.post(
+ reverse("dressing:dressing_delete", args=[self.dressing.id]), data=form_data
+ )
+ self.assertEqual(response.status_code, 200) # Redirect after successful deletion
+
+ def test_dressing_delete_view_post_not_authenticated(self):
+ form_data = {"confirm_deletion": True}
+ response = self.client.post(
+ reverse("dressing:dressing_delete", args=[self.dressing.id]), data=form_data
+ )
+ self.assertEqual(response.status_code, 302) # Redirect to login page
+ self.assertEqual(Dressing.objects.filter(id=self.dressing.id).count(), 1)
+
+ def test_dressing_delete_view_post_invalid_form(self):
+ self.client.force_login(self.user)
+ form_data = {} # Invalid form data
+ response = self.client.post(
+ reverse("dressing:dressing_delete", args=[self.dressing.id]), data=form_data
+ )
+ self.assertEqual(response.status_code, 200)
+ self.assertTemplateUsed(response, "dressing_delete.html")
+ self.assertEqual(response.context["dressing"], self.dressing)
+ self.assertIsInstance(response.context["form"], DressingDeleteForm)
+ messages = [m.message for m in get_messages(response.wsgi_request)]
+ self.assertIn("One or more errors have been found in the form.", messages)
+
+ def test_dressing_delete_view_permission_denied(self):
+ user_without_permission = User.objects.create_user(
+ username="nopermuser", password="testpass"
+ )
+ self.client.force_login(user_without_permission)
+ self.client.get(reverse("dressing:dressing_delete", args=[self.dressing.id]))
+
+ def test_dressing_delete_view_not_authenticated(self):
+ self.client.logout()
+ response = self.client.get(
+ reverse("dressing:dressing_delete", args=[self.dressing.id])
+ )
+ self.assertEqual(response.status_code, 302) # Redirect to login page
+
+ def test_dressing_video_delete(self):
+ """Test for dressing_delete view."""
+ print(" ---> test_dressing_video_delete: OK! --- DressingDeleteViewTest")
+
+
+class DressingCreateViewTest(TestCase):
+ """Dressing create page test case."""
+
+ fixtures = ["initial_data.json"]
+
+ def setUp(self) -> None:
+ self.user = User.objects.create_user(
+ username="user", password="password", is_staff=1
+ )
+ self.first_video = Video.objects.create(
+ title="First video",
+ slug="first-video",
+ owner=self.user,
+ video="first_video.mp4",
+ is_draft=False,
+ type=Type.objects.get(id=1),
+ )
+ self.dressing = Dressing.objects.create(title="Test Dressing")
+ self.dressing.owners.set([self.user])
+ self.dressing.users.set([self.user])
+
+ def test_dressing_create_view_authenticated_user(self):
+ self.client.login(username="user", password="password")
+ response = self.client.get(reverse("dressing:dressing_create"))
+ self.assertEqual(response.status_code, 200)
+ self.assertTemplateUsed(response, "dressing_edit.html")
+
+ def test_dressing_create_view_unauthenticated_user(self):
+ response = self.client.get(reverse("dressing:dressing_create"))
+ self.assertEqual(response.status_code, 302) # Redirect to login page
+
+ def test_dressing_create_form_submission(self):
+ Dressing.objects.all().delete()
+ self.client.login(username="user", password="password")
+ form_data = {
+ "title": "Dressing test",
+ "owners": self.user.id,
+ "position": "top_right",
+ "opacity": 50,
+ "opening_credits": 1,
+ "ending_credits": 1,
+ }
+ response = self.client.post(reverse("dressing:dressing_create"), data=form_data)
+ self.assertEqual(
+ response.status_code, 302
+ ) # Redirect after creation of the video dressing
+ self.assertEqual(Dressing.objects.count(), 1)
+
+ def test_dressing_video_create(self):
+ """Test for dressing_create view."""
+ print(" ---> test_dressing_video_create: OK! --- DressingCreateViewTest")
diff --git a/pod/dressing/tests/testimage.jpg b/pod/dressing/tests/testimage.jpg
new file mode 100644
index 0000000000..933f8ab749
Binary files /dev/null and b/pod/dressing/tests/testimage.jpg differ
diff --git a/pod/dressing/urls.py b/pod/dressing/urls.py
new file mode 100644
index 0000000000..b398b2ac0c
--- /dev/null
+++ b/pod/dressing/urls.py
@@ -0,0 +1,13 @@
+from django.urls import path
+from pod.dressing.views import video_dressing, my_dressings, dressing_edit
+from pod.dressing.views import dressing_create, dressing_delete
+
+app_name = "dressing"
+
+urlpatterns = [
+ path("my/", my_dressings, name="my_dressings"),
+ path("edit/{% trans "Manage video" %}
+
+ {% include "videos/link_video.html" %}
+
+
{% block video-element %}
@@ -56,21 +24,21 @@
{% endif %}
{% if not form_enrichment %}
-
+ {% csrf_token %}
+
+
+
{% endif %}
@@ -93,9 +61,6 @@
{% endblock page_content %}
-
-
-
{% block page_aside %}
@@ -113,7 +78,7 @@
{% trans 'The title field is required and must contains from 2 to 100 characters.' %}
- {% trans 'The fields “Start“ and “End“ must contain an indication value in seconds. Start playback of the video, pause the video and click on “Get time from the player“ to fill in the field untitled “Start“. Then do the same to fill in the field untitled “End“.' %} + {% trans 'The fields “Start” and “End” must contain an indication value in seconds. Start playback of the video, pause the video and click on “Get time from the player” to fill in the field untitled “Start”. Then do the same to fill in the field untitled “End”.' %}
{% trans 'You cannot overlap enrichments.' %}
{% trans 'You must save your enrichments to view the result.' %}
@@ -122,9 +87,29 @@
{{ block.super }}
{% endblock page_aside %}
+{% block more_script %}
+
+
+
{{block.super}}
diff --git a/pod/enrichment/templates/enrichment/list_enrichment.html b/pod/enrichment/templates/enrichment/list_enrichment.html
index 8d023ac8b6..8a388297f0 100644
--- a/pod/enrichment/templates/enrichment/list_enrichment.html
+++ b/pod/enrichment/templates/enrichment/list_enrichment.html
@@ -1,42 +1,42 @@
{# HTML for enrichment list. Don't use this file alone it must be integrated into another template! #}
{% load i18n %}
-
- {% trans 'List of the enrichments' %} ({{list_enrichment|length}})
-
-
-
-
- {% trans 'Title' %}
- {% trans 'Type' %}
- {% trans 'Start' %}
- {% trans 'End' %}
- {% trans 'Actions' %}
-
-
-
- {% for enrich in list_enrichment %}
-
- {{enrich.title}}
- {% if enrich.type %}{% trans enrich.type %}{% endif %}
- {{enrich.start}}
- {{enrich.end}}
-
-
-
-
-
- {% endfor %}
-
-
+
+ {% trans 'List of the enrichments' %} ({{list_enrichment|length}})
+
+
+
+
+ {% trans 'Title' %}
+ {% trans 'Type' %}
+ {% trans 'Start' %}
+ {% trans 'End' %}
+ {% trans 'Actions' %}
+
+
+
+ {% for enrich in list_enrichment %}
+
+ {{enrich.title}}
+ {% if enrich.type %}{% trans enrich.type %}{% endif %}
+ {{enrich.start}}
+ {{enrich.end}}
+
+
+
+
+
+ {% endfor %}
+
+
diff --git a/pod/enrichment/templates/enrichment/video_enrichment-iframe.html b/pod/enrichment/templates/enrichment/video_enrichment-iframe.html
index 6f0035888d..b3b3a690ea 100644
--- a/pod/enrichment/templates/enrichment/video_enrichment-iframe.html
+++ b/pod/enrichment/templates/enrichment/video_enrichment-iframe.html
@@ -19,6 +19,10 @@
{% block more_script %}
{{block.super}}
+
+
{% include 'enrichment/video_enrichment-script.html' %}
{% endblock more_script %}
diff --git a/pod/enrichment/templates/enrichment/video_enrichment-script.html b/pod/enrichment/templates/enrichment/video_enrichment-script.html
index 5d45c72129..7193de8b39 100644
--- a/pod/enrichment/templates/enrichment/video_enrichment-script.html
+++ b/pod/enrichment/templates/enrichment/video_enrichment-script.html
@@ -13,50 +13,50 @@
let metadataTrack, i, track;
for (i = 0; i < tracks.length; i++) {
- track = tracks[i];
- // console.log("track: ["+track.kind + "] " + track.label);
- if (track.kind === 'metadata' && track.label === 'enrichment') {
- metadataTrack = track;
- metadataTrack.index = i;
- metadataTrack.src = trackElts[i].src;
- break;
- }
+ track = tracks[i];
+ // console.log("track: ["+track.kind + "] " + track.label);
+ if (track.kind === 'metadata' && track.label === 'enrichment') {
+ metadataTrack = track;
+ metadataTrack.index = i;
+ metadataTrack.src = trackElts[i].src;
+ break;
+ }
}
player.on('loadedmetadata', function() {
- if(!metadataTrack){
- console.log("No enrichment track found.")
- return
- }
- let slide = [];
- if(!metadataTrack.cues) { //Safari do not get cues
- //let tracksrc = player.el().getElementsByTagName('TRACK')[metadataTrack.index].src;
- //let tracksrc = player.el().querySelector("TRACK[kind='metadata'][label='enrichment']").src
- loadEnrichmentVTTfile(metadataTrack.src, function(cues) {
- if (typeof player.slides === "function") {
- player.slides(cues);
- }
- });
- } else {
- //console.log(metadataTrack.cues.length);
- for (i = 0; i < metadataTrack.cues.length; i++) {
- // Replace tabs by spaces to prevent a "JSON.parse: bad control character in string literal" error.
- data = JSON.parse(metadataTrack.cues[i].text.replace(/\t/g, ' '));
- //console.log('Parsed '+data.title)
- slide.push({
- title: data.title,
- url: data.url,
- type: data.type,
- stop_video: data.stop_video,
- start: metadataTrack.cues[i].startTime,
- end: metadataTrack.cues[i].endTime
- });
+ if(!metadataTrack){
+ console.log("No enrichment track found.")
+ return
+ }
+ let slide = [];
+ if(!metadataTrack.cues) { //Safari do not get cues
+ //let tracksrc = player.el().getElementsByTagName('TRACK')[metadataTrack.index].src;
+ //let tracksrc = player.el().querySelector("TRACK[kind='metadata'][label='enrichment']").src
+ loadEnrichmentVTTfile(metadataTrack.src, function(cues) {
+ if (typeof player.slides === "function") {
+ player.slides(cues);
}
+ });
+ } else {
+ //console.log(metadataTrack.cues.length);
+ for (i = 0; i < metadataTrack.cues.length; i++) {
+ // Replace tabs by spaces to prevent a "JSON.parse: bad control character in string literal" error.
+ data = JSON.parse(metadataTrack.cues[i].text.replace(/\t/g, ' '));
+ //console.log('Parsed '+data.title)
+ slide.push({
+ title: data.title,
+ url: data.url,
+ type: data.type,
+ stop_video: data.stop_video,
+ start: metadataTrack.cues[i].startTime,
+ end: metadataTrack.cues[i].endTime
+ });
}
- if (typeof player.slides === "function") {
- //console.log('Call player.slides from video-script');
- player.slides(slide);
- }
+ }
+ if (typeof player.slides === "function") {
+ //console.log('Call player.slides from video-script');
+ player.slides(slide);
+ }
});
});
}
diff --git a/pod/enrichment/tests/test_models.py b/pod/enrichment/tests/test_models.py
index 93a1acd0c0..e18d6704c8 100644
--- a/pod/enrichment/tests/test_models.py
+++ b/pod/enrichment/tests/test_models.py
@@ -1,4 +1,5 @@
"""Unit tests for enrichment models."""
+
from django.test import TestCase
from django.contrib.auth.models import User, Group
from django.core.files.uploadedfile import SimpleUploadedFile
diff --git a/pod/enrichment/views.py b/pod/enrichment/views.py
index c9f155caaa..a09f81572d 100644
--- a/pod/enrichment/views.py
+++ b/pod/enrichment/views.py
@@ -96,7 +96,11 @@ def edit_enrichment(request, slug):
return render(
request,
"enrichment/edit_enrichment.html",
- {"video": video, "list_enrichment": list_enrichment},
+ {
+ "video": video,
+ "list_enrichment": list_enrichment,
+ "page_title": _("Enrichment of the video “%s”") % video.title,
+ },
)
diff --git a/pod/import_video/admin.py b/pod/import_video/admin.py
index ce457865b8..4791ac2528 100644
--- a/pod/import_video/admin.py
+++ b/pod/import_video/admin.py
@@ -1,4 +1,5 @@
"""Admin for the Import video module."""
+
from django.contrib import admin
from .models import ExternalRecording
diff --git a/pod/import_video/apps.py b/pod/import_video/apps.py
index eb0bc883ab..b1d967e66f 100644
--- a/pod/import_video/apps.py
+++ b/pod/import_video/apps.py
@@ -1,4 +1,5 @@
"""Apps for the Import_video module."""
+
from django.apps import AppConfig
from django.utils.translation import gettext_lazy as _
diff --git a/pod/import_video/context_processors.py b/pod/import_video/context_processors.py
index 4f11ec3539..d72e775b31 100644
--- a/pod/import_video/context_processors.py
+++ b/pod/import_video/context_processors.py
@@ -1,4 +1,5 @@
"""Context processors for the Import_video module."""
+
from django.conf import settings as django_settings
USE_IMPORT_VIDEO = getattr(django_settings, "USE_IMPORT_VIDEO", True)
@@ -12,7 +13,7 @@ def context_settings(request):
"""Return all context settings."""
new_settings = {}
new_settings["USE_IMPORT_VIDEO"] = USE_IMPORT_VIDEO
- new_settings[
- "RESTRICT_EDIT_IMPORT_VIDEO_ACCESS_TO_STAFF_ONLY"
- ] = RESTRICT_EDIT_IMPORT_VIDEO_ACCESS_TO_STAFF_ONLY
+ new_settings["RESTRICT_EDIT_IMPORT_VIDEO_ACCESS_TO_STAFF_ONLY"] = (
+ RESTRICT_EDIT_IMPORT_VIDEO_ACCESS_TO_STAFF_ONLY
+ )
return new_settings
diff --git a/pod/import_video/forms.py b/pod/import_video/forms.py
index 86ed8fb9a4..e14f8eb61c 100644
--- a/pod/import_video/forms.py
+++ b/pod/import_video/forms.py
@@ -1,4 +1,5 @@
"""Forms for the Import_video module."""
+
from django import forms
from django.conf import settings
from django.contrib.sites.models import Site
@@ -26,8 +27,9 @@ class ExternalRecordingForm(forms.ModelForm):
fieldsets = (
(
- None,
+ "general",
{
+ "legend": _("General settings"),
"fields": (
"name",
"type",
@@ -35,7 +37,7 @@ class ExternalRecordingForm(forms.ModelForm):
"start_at",
"owner",
"site",
- )
+ ),
},
),
)
diff --git a/pod/import_video/models.py b/pod/import_video/models.py
index 5da494bbef..ee804661a1 100644
--- a/pod/import_video/models.py
+++ b/pod/import_video/models.py
@@ -1,4 +1,5 @@
"""Models for the Import_video module."""
+
from django.conf import settings
from django.contrib.sites.models import Site
from django.contrib.auth.models import User
diff --git a/pod/import_video/static/css/import_video.css b/pod/import_video/static/css/import_video.css
index c5f25bd664..3f82647ca6 100644
--- a/pod/import_video/static/css/import_video.css
+++ b/pod/import_video/static/css/import_video.css
@@ -51,8 +51,6 @@ div.alert.alert-dismissible {
padding-left: 78px;
position: relative;
padding-right: 60px;
- border: 1px solid #e6e6e6;
- background: #fff;
}
div.alert .icon {
diff --git a/pod/import_video/templates/import_video/add_or_edit.html b/pod/import_video/templates/import_video/add_or_edit.html
index 4217205a81..65ccef3744 100644
--- a/pod/import_video/templates/import_video/add_or_edit.html
+++ b/pod/import_video/templates/import_video/add_or_edit.html
@@ -3,21 +3,16 @@
{% load static %}
{% block breadcrumbs %}
-{{ block.super }}
-
-
- {% trans 'List of the enrichments' %} ({{list_enrichment|length}})
-| {% trans 'Title' %} | -{% trans 'Type' %} | -{% trans 'Start' %} | -{% trans 'End' %} | -{% trans 'Actions' %} | -
|---|---|---|---|---|
| {{enrich.title}} | -{% if enrich.type %}{% trans enrich.type %}{% endif %} | -{{enrich.start}} | -{{enrich.end}} | -- - - | -
+
+ {% trans 'List of the enrichments' %} ({{list_enrichment|length}})
+| {% trans 'Title' %} | +{% trans 'Type' %} | +{% trans 'Start' %} | +{% trans 'End' %} | +{% trans 'Actions' %} | +
|---|---|---|---|---|
| {{enrich.title}} | +{% if enrich.type %}{% trans enrich.type %}{% endif %} | +{{enrich.start}} | +{{enrich.end}} | ++ + + | +
- {% trans "Access to adding external recording has been restricted. If you want to add external recordings on the platform, please" %} {% trans 'contact us' %} + {% url "contact_us" as contact_us %} + {% blocktrans with url=contact_us %}Access to adding external recording has been restricted. If you want to add external recordings on the platform, please contact us.{% endblocktrans %}
{% else %}
@@ -27,27 +22,26 @@
- {% if form.instance.id and form.instance.id != '' %}
-