From 6eed17bfdd76b35a69ea21993eb0e0b66710d47f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Nov 2023 09:23:52 +0100 Subject: [PATCH 1/3] [DONE] Bump django from 3.2.20 to 3.2.23 (#1002) Bumps [django](https://github.com/django/django) from 3.2.20 to 3.2.23. - [Commits](https://github.com/django/django/compare/3.2.20...3.2.23) --- updated-dependencies: - dependency-name: django dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: Ptitloup Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 64da404eb6..ff27bb75e3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ -r requirements-encode.txt -Django==3.2.20 +Django==3.2.23 django-ckeditor==6.3.0 Pillow==9.5.0 django-tagging==0.5.0 From 8018b006dfc408635505596e33b7fa8fbea2dd55 Mon Sep 17 00:00:00 2001 From: Olivier Bado-Faustin Date: Mon, 6 Nov 2023 13:55:56 +0100 Subject: [PATCH 2/3] [DONE] Distinct icons on password protected and restricted video content. (#1001) * Display a different title on "bi-lock" icon when content is restricted. + Add missing lang strings * Use differents icons for password protected and restricted access * Correct rgba typos in CSS --- Makefile | 4 +- pod/chapter/static/css/chapters.css | 2 +- pod/chapter/static/css/videojs-chapters.css | 4 +- pod/completion/static/css/caption_maker.css | 6 +- pod/cut/static/css/video_cut.css | 2 +- pod/enrichment/static/css/enrichment.css | 2 +- pod/enrichment/static/css/videojs-slides.css | 2 +- pod/locale/fr/LC_MESSAGES/django.po | 25 +++++- pod/locale/fr/LC_MESSAGES/djangojs.po | 92 +++++++++++++++----- pod/locale/nl/LC_MESSAGES/django.po | 28 ++++-- pod/locale/nl/LC_MESSAGES/djangojs.po | 82 ++++++++++++++--- pod/main/static/css/dark.css | 4 +- pod/main/static/css/pod.css | 30 +++---- pod/main/tasks.py | 9 +- pod/podfile/static/podfile/css/podfile.css | 12 +-- pod/progressive_web_app/utils.py | 3 +- pod/video/static/css/comment-style.css | 10 +-- pod/video/static/css/video-iframe.css | 6 +- pod/video/static/css/video_category.css | 6 +- pod/video/templates/videos/card.html | 11 ++- 20 files changed, 249 insertions(+), 91 deletions(-) diff --git a/Makefile b/Makefile index b0a275774d..add22ca179 100755 --- a/Makefile +++ b/Makefile @@ -51,7 +51,7 @@ lang: echo "Processing python files..." python3 manage.py makemessages --all -i "opencast-studio/*" -i "pod/custom/settings_local.py" --add-location=file echo "Processing javascript files..." - python3 manage.py makemessages -d djangojs -l fr -l nl -i "*.min.js" -i "pod/static/*" -i "opencast-studio/*" -i "*/node_modules/*" --add-location=file + python3 manage.py makemessages -d djangojs -l fr -l nl -i "*.min.js" -i "pod/static/*" -i "opencast-studio/*" -i "*/node_modules/*" -i "node_modules/*" --add-location=file #compilation des fichiers de langue compilelang: @@ -76,7 +76,7 @@ pystyle: # Collects all static files inside all apps and put a copy inside the static directory declared in settings.py statics: - cd pod; yarn upgrade + cd pod; yarn install; yarn upgrade # --clear Clear the existing files before trying to copy or link the original file. python3 manage.py collectstatic --clear diff --git a/pod/chapter/static/css/chapters.css b/pod/chapter/static/css/chapters.css index b5d17425b6..fcd2308ede 100644 --- a/pod/chapter/static/css/chapters.css +++ b/pod/chapter/static/css/chapters.css @@ -69,7 +69,7 @@ table.scroll thead th.chapter_time_end { form#form_chapter, form#form_chapter_import { - background-color: rgba(0 0 0 0.05); + background-color: rgb(0 0 0 / 5%); } .form-group.row p { diff --git a/pod/chapter/static/css/videojs-chapters.css b/pod/chapter/static/css/videojs-chapters.css index e196bdd172..2f3a73b9b9 100644 --- a/pod/chapter/static/css/videojs-chapters.css +++ b/pod/chapter/static/css/videojs-chapters.css @@ -9,7 +9,7 @@ top: 0; height: 100%; width: 20%; - background-color: rgba(43 51 63 0.7); + background-color: rgb(43 51 63 / 70%); overflow-y: auto; cursor: default; z-index: 2; @@ -48,7 +48,7 @@ list-style-type: none; text-align: -webkit-match-parent; margin: 0 3px; - border-top: 1px solid rgba(0 0 0 0.8); + border-top: 1px solid rgb(0 0 0 / 80%); } .chapters-list ol li a { diff --git a/pod/completion/static/css/caption_maker.css b/pod/completion/static/css/caption_maker.css index 4b7271ef65..12b56a5b0f 100644 --- a/pod/completion/static/css/caption_maker.css +++ b/pod/completion/static/css/caption_maker.css @@ -120,7 +120,7 @@ } .newEditorBlock:hover { - background-color: rgba(223 230 246 0.4); + background-color: rgb(223 230 246 / 40%); } .newEditorBlock > textarea { @@ -129,7 +129,7 @@ .captionBeingEdited { border-left: 3px solid var(--pod-primary); - background-color: rgba(223 230 246 0.4); + background-color: rgb(223 230 246 / 40%); } .captionTimestamps { @@ -226,7 +226,7 @@ .regionHighligh { position: absolute; z-index: 1; - background-color: rgba(173 50 122 0.5); + background-color: rgb(173 50 122 / 50%); height: 3px; } diff --git a/pod/cut/static/css/video_cut.css b/pod/cut/static/css/video_cut.css index 836765d64a..b785a9d3d6 100644 --- a/pod/cut/static/css/video_cut.css +++ b/pod/cut/static/css/video_cut.css @@ -97,7 +97,7 @@ input[type="range"]::-ms-thumb { /* --bs-btn-focus-shadow-rgb: var(--pod-primary-rgb); */ --bs-btn-focus-shadow-rgb: 200, 200, 253; --bs-btn-focus-box-shadow: 0 0 0 0.25rem - rgba(var(--bs-btn-focus-shadow-rgb) 0.5); + rgb(var(--bs-btn-focus-shadow-rgb) / 50%); } input[type="range"]:active::-webkit-slider-thumb, diff --git a/pod/enrichment/static/css/enrichment.css b/pod/enrichment/static/css/enrichment.css index 8d126e3ccd..d4b6f3dbc8 100644 --- a/pod/enrichment/static/css/enrichment.css +++ b/pod/enrichment/static/css/enrichment.css @@ -55,5 +55,5 @@ table.scroll thead th { } form#form_enrich { - background-color: rgba(0 0 0 0.05); + background-color: rgb(0 0 0 / 5%); } diff --git a/pod/enrichment/static/css/videojs-slides.css b/pod/enrichment/static/css/videojs-slides.css index 3702ac9cd3..db50252287 100644 --- a/pod/enrichment/static/css/videojs-slides.css +++ b/pod/enrichment/static/css/videojs-slides.css @@ -213,7 +213,7 @@ top: -0.5rem; height: 100%; position: relative; - background: rgba(100 100 100 0.5); + background: rgb(100 100 100 / 50%); } .vjs-chapbar-holder { diff --git a/pod/locale/fr/LC_MESSAGES/django.po b/pod/locale/fr/LC_MESSAGES/django.po index b6315d50f4..a5d34bcd6e 100644 --- a/pod/locale/fr/LC_MESSAGES/django.po +++ b/pod/locale/fr/LC_MESSAGES/django.po @@ -5,16 +5,16 @@ msgid "" msgstr "" "Project-Id-Version: Pod\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-10-16 13:36+0000\n" +"POT-Creation-Date: 2023-10-31 11:26+0000\n" "PO-Revision-Date: \n" -"Last-Translator: Ptitloup \n" +"Last-Translator: obado \n" "Language-Team: Pod Team cotech-esup-pod@esup-portail.org\n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Poedit 3.3.2\n" +"X-Generator: Poedit 3.4\n" #: pod/authentication/admin.py pod/main/forms.py msgid "Email" @@ -370,7 +370,7 @@ msgstr "" "URL de la vignette correspondant à l’enregistrement de la présentation BBB." #: pod/bbb/models.py pod/import_video/models.py pod/meeting/models.py -#: pod/playlist/models.py pod/recorder/models.py +#: pod/playlist/models.py pod/recorder/models.py pod/video/models.py msgid "User" msgstr "Utilisateur" @@ -6112,6 +6112,7 @@ msgid "The playlist has been deleted." msgstr "La liste de lecture a été supprimée." #: pod/playlist/views.py +#, python-format msgid "Edit the playlist “%(pname)s”" msgstr "Modifier la liste de lecture « %(pname)s »" @@ -7346,6 +7347,18 @@ msgstr "Nombre de vues" msgid "View counts" msgstr "Statistiques" +#: pod/video/models.py +msgid "Marker time" +msgstr "Marqueur de temps" + +#: pod/video/models.py +msgid "User viewing time marker of video" +msgstr "Marqueur de lecture de vidéo de l’utilisateur" + +#: pod/video/models.py +msgid "Users viewing time marker of video" +msgstr "Marqueur de lecture de vidéo des utilisateurs" + #: pod/video/models.py msgid "Video version" msgstr "Version de la video" @@ -7663,6 +7676,10 @@ msgstr "Aide pour les champs de formulaire" msgid "This content is password protected." msgstr "Ce contenu est protégé par un mot de passe." +#: pod/video/templates/videos/card.html +msgid "This content has restricted access." +msgstr "Ce contenu est en accès restreint." + #: pod/video/templates/videos/card.html msgid "This content is chaptered." msgstr "Ce contenu est chapitré." diff --git a/pod/locale/fr/LC_MESSAGES/djangojs.po b/pod/locale/fr/LC_MESSAGES/djangojs.po index e613a4a746..4116df776d 100644 --- a/pod/locale/fr/LC_MESSAGES/djangojs.po +++ b/pod/locale/fr/LC_MESSAGES/djangojs.po @@ -5,16 +5,16 @@ msgid "" msgstr "" "Project-Id-Version: Esup-Pod\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-10-16 13:36+0000\n" +"POT-Creation-Date: 2023-10-31 11:26+0000\n" "PO-Revision-Date: \n" -"Last-Translator: AymericJak \n" +"Last-Translator: obado \n" "Language-Team: \n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Poedit 3.3.2\n" +"X-Generator: Poedit 3.4\n" #: pod/chapter/static/js/chapters.js pod/enrichment/static/js/enrichment.js msgid "Get time from the player" @@ -179,11 +179,19 @@ msgstr "Mettez en pause pour entrer le texte du segment entre %s et %s." msgid "A caption cannot has more than 80 characters." msgstr "Une légende / sous-titre ne peut comporter plus de 80 caractères." +#: pod/completion/static/js/caption_maker.js +msgid "Add a caption/subtitle after this one" +msgstr "Ajouter un(e) légende/sous-titre ci-dessous" + #: pod/completion/static/js/caption_maker.js #: pod/podfile/static/podfile/js/filewidget.js msgid "Add" msgstr "Ajouter" +#: pod/completion/static/js/caption_maker.js +msgid "Delete this caption/subtitle" +msgstr "Supprimer ce(tte) légende/sous-titre" + #: pod/completion/static/js/caption_maker.js #: pod/video/static/js/comment-script.js msgid "Delete" @@ -509,6 +517,11 @@ msgstr "Sauvegarder" msgid "Network response was not ok." msgstr "La réponse du réseau n’était pas correcte." +#: pod/podfile/static/podfile/js/filewidget.js +#: pod/video/static/js/change_video_owner.js +msgid "Loading…" +msgstr "Chargement en cours…" + #: pod/podfile/static/podfile/js/filewidget.js msgid "Change image" msgstr "Changer d’image" @@ -598,18 +611,26 @@ msgstr "Souscription aux notifications réussie." msgid "Error while subscribing to push notifications." msgstr "Une erreur est survenue lors de la souscription aux notifications." +#: pod/video/static/js/ajax-display-channels.js +msgid "%(count)s channel" +msgid_plural "%(count)s channels" +msgstr[0] "%(count)s chaîne" +msgstr[1] "%(count)s chaînes" + #: pod/video/static/js/ajax-display-channels.js msgid "No channels found" msgstr "Aucun chaîne trouvée" +#: pod/video/static/js/ajax-display-channels.js +msgid "%(count)s video" +msgid_plural "%(count)s videos" +msgstr[0] "%(count)s vidéo" +msgstr[1] "%(count)s vidéos" + #: pod/video/static/js/change_video_owner.js msgid "No element found" msgstr "Aucun élément trouvé" -#: pod/video/static/js/change_video_owner.js -msgid "Loading…" -msgstr "Chargement en cours…" - #: pod/video/static/js/change_video_owner.js msgid "An error occurred during the change of owner" msgstr "Une erreur s’est produite lors du changement de propriétaire" @@ -630,14 +651,37 @@ msgstr "Réponses" msgid "Cancel" msgstr "Annuler" +#: pod/video/static/js/comment-script.js +#, javascript-format +msgid "%s vote" +msgid_plural "%s votes" +msgstr[0] "%s vote" +msgstr[1] "%s votes" + #: pod/video/static/js/comment-script.js msgid "Agree with the comment" msgstr "D’accord avec ce commentaire" +#: pod/video/static/js/comment-script.js +msgid "Reply to comment" +msgstr "Répondre au commentaire" + +#: pod/video/static/js/comment-script.js +msgid "Reply" +msgstr "Répondre" + #: pod/video/static/js/comment-script.js msgid "Remove this comment" msgstr "Supprimer ce commentaire" +#: pod/video/static/js/comment-script.js +msgid "Add a public comment" +msgstr "Ajouter un commentaire public" + +#: pod/video/static/js/comment-script.js +msgid "Send" +msgstr "Envoyer" + #: pod/video/static/js/comment-script.js msgid "Show answers" msgstr "Afficher les réponses" @@ -650,13 +694,6 @@ msgstr "Mauvaise réponse du serveur." msgid "Sorry, you're not allowed to vote by now." msgstr "Désolé, vous n’êtes pas autorisé à voter maintenant." -#: pod/video/static/js/comment-script.js -#, javascript-format -msgid "%s vote" -msgid_plural "%s votes" -msgstr[0] "%s vote" -msgstr[1] "%s votes" - #: pod/video/static/js/comment-script.js msgid "Sorry, you can't comment this video by now." msgstr "Désolé, vous ne pouvez pas commenter cette vidéo maintenant." @@ -677,38 +714,47 @@ msgstr[0] "%s commentaire" msgstr[1] "%s commentaires" #: pod/video/static/js/regroup_videos_by_theme.js +#: pod/video/static/js/video_category.js msgid "This content is password protected." msgstr "Ce contenu est protégé par mot de passe." #: pod/video/static/js/regroup_videos_by_theme.js +#: pod/video/static/js/video_category.js msgid "This content is chaptered." msgstr "Ce contenu est chapitré." #: pod/video/static/js/regroup_videos_by_theme.js +#: pod/video/static/js/video_category.js msgid "This content is in draft." msgstr "Ce contenu est en brouillon." #: pod/video/static/js/regroup_videos_by_theme.js +#: pod/video/static/js/video_category.js msgid "Video content." msgstr "Contenu vidéo." #: pod/video/static/js/regroup_videos_by_theme.js +#: pod/video/static/js/video_category.js msgid "Audio content." msgstr "Contenu audio." #: pod/video/static/js/regroup_videos_by_theme.js +#: pod/video/static/js/video_category.js msgid "Edit the video" msgstr "Éditer la vidéo" #: pod/video/static/js/regroup_videos_by_theme.js +#: pod/video/static/js/video_category.js msgid "Complete the video" msgstr "Compléter la vidéo" #: pod/video/static/js/regroup_videos_by_theme.js +#: pod/video/static/js/video_category.js msgid "Chapter the video" msgstr "Chapitrer la vidéo" #: pod/video/static/js/regroup_videos_by_theme.js +#: pod/video/static/js/video_category.js msgid "Delete the video" msgstr "Supprimer la vidéo" @@ -781,6 +827,18 @@ msgstr "Désolé, aucune vidéo trouvée" msgid "Edit the category" msgstr "Éditer la catégorie" +#: pod/video/static/js/video_category.js +msgid "Delete the category" +msgstr "Supprimer la catégorie" + +#: pod/video/static/js/video_category.js +msgid "Success!" +msgstr "Succès !" + +#: pod/video/static/js/video_category.js +msgid "Error…" +msgstr "Erreur…" + #: pod/video/static/js/video_category.js msgid "Category created successfully" msgstr "Catégorie créée avec succès" @@ -856,9 +914,3 @@ msgstr "Ajouts en favoris total depuis la création" #: pod/video/static/js/video_stats_view.js msgid "Slug" msgstr "Titre court" - -#~ msgid "Add a caption/subtitle after this one" -#~ msgstr "Ajouter un(e) légende/sous-titre ci-dessous" - -#~ msgid "Delete this caption/subtitle" -#~ msgstr "Supprimer ce(tte) légende/sous-titre" diff --git a/pod/locale/nl/LC_MESSAGES/django.po b/pod/locale/nl/LC_MESSAGES/django.po index e3b82299ed..3ada7024d7 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: 2023-10-16 13:36+0000\n" +"POT-Creation-Date: 2023-10-31 11:26+0000\n" "PO-Revision-Date: 2023-06-08 14:37+0200\n" "Last-Translator: obado \n" "Language-Team: \n" @@ -362,7 +362,7 @@ msgid "URL of the recording thumbnail of the BBB presentation." msgstr "" #: pod/bbb/models.py pod/import_video/models.py pod/meeting/models.py -#: pod/playlist/models.py pod/recorder/models.py +#: pod/playlist/models.py pod/recorder/models.py pod/video/models.py msgid "User" msgstr "" @@ -2482,8 +2482,8 @@ msgstr "" #: pod/import_video/views.py #, python-format msgid "" -"This video '%(name)s' was uploaded to Pod; its origin is Youtube: %(url)s" +"This video '%(name)s' was uploaded to Pod; its origin is Youtube: %(url)s" msgstr "" #: pod/import_video/views.py @@ -6275,8 +6275,8 @@ msgstr "" #: pod/video/templates/videos/video-element.html msgid "" "To view this video please enable JavaScript, and consider upgrading to a web " -"browser that supports HTML5 video" +"browser that supports HTML5 video" msgstr "" #: pod/recorder/templates/recorder/link_record.html @@ -6884,6 +6884,18 @@ msgstr "" msgid "View counts" msgstr "" +#: pod/video/models.py +msgid "Marker time" +msgstr "" + +#: pod/video/models.py +msgid "User viewing time marker of video" +msgstr "" + +#: pod/video/models.py +msgid "Users viewing time marker of video" +msgstr "" + #: pod/video/models.py msgid "Video version" msgstr "" @@ -7184,6 +7196,10 @@ msgstr "" msgid "This content is password protected." msgstr "" +#: pod/video/templates/videos/card.html +msgid "This content has restricted access." +msgstr "" + #: pod/video/templates/videos/card.html msgid "This content is chaptered." msgstr "" diff --git a/pod/locale/nl/LC_MESSAGES/djangojs.po b/pod/locale/nl/LC_MESSAGES/djangojs.po index 8f3c82fab4..fa3dd5db32 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: 2023-10-16 13:36+0000\n" +"POT-Creation-Date: 2023-10-31 11:26+0000\n" "PO-Revision-Date: 2023-02-08 15:22+0100\n" "Last-Translator: obado \n" "Language-Team: \n" @@ -163,11 +163,19 @@ msgstr "" msgid "A caption cannot has more than 80 characters." msgstr "" +#: pod/completion/static/js/caption_maker.js +msgid "Add a caption/subtitle after this one" +msgstr "" + #: pod/completion/static/js/caption_maker.js #: pod/podfile/static/podfile/js/filewidget.js msgid "Add" msgstr "" +#: pod/completion/static/js/caption_maker.js +msgid "Delete this caption/subtitle" +msgstr "" + #: pod/completion/static/js/caption_maker.js #: pod/video/static/js/comment-script.js msgid "Delete" @@ -483,6 +491,11 @@ msgstr "" msgid "Network response was not ok." msgstr "" +#: pod/podfile/static/podfile/js/filewidget.js +#: pod/video/static/js/change_video_owner.js +msgid "Loading…" +msgstr "" + #: pod/podfile/static/podfile/js/filewidget.js msgid "Change image" msgstr "" @@ -567,16 +580,24 @@ msgstr "" msgid "Error while subscribing to push notifications." msgstr "" +#: pod/video/static/js/ajax-display-channels.js +msgid "%(count)s channel" +msgid_plural "%(count)s channels" +msgstr[0] "" +msgstr[1] "" + #: pod/video/static/js/ajax-display-channels.js msgid "No channels found" msgstr "" -#: pod/video/static/js/change_video_owner.js -msgid "No element found" -msgstr "" +#: pod/video/static/js/ajax-display-channels.js +msgid "%(count)s video" +msgid_plural "%(count)s videos" +msgstr[0] "" +msgstr[1] "" #: pod/video/static/js/change_video_owner.js -msgid "Loading…" +msgid "No element found" msgstr "" #: pod/video/static/js/change_video_owner.js @@ -599,14 +620,37 @@ msgstr "" msgid "Cancel" msgstr "" +#: pod/video/static/js/comment-script.js +#, javascript-format +msgid "%s vote" +msgid_plural "%s votes" +msgstr[0] "" +msgstr[1] "" + #: pod/video/static/js/comment-script.js msgid "Agree with the comment" msgstr "" +#: pod/video/static/js/comment-script.js +msgid "Reply to comment" +msgstr "" + +#: pod/video/static/js/comment-script.js +msgid "Reply" +msgstr "" + #: pod/video/static/js/comment-script.js msgid "Remove this comment" msgstr "" +#: pod/video/static/js/comment-script.js +msgid "Add a public comment" +msgstr "" + +#: pod/video/static/js/comment-script.js +msgid "Send" +msgstr "" + #: pod/video/static/js/comment-script.js msgid "Show answers" msgstr "" @@ -619,13 +663,6 @@ msgstr "" msgid "Sorry, you're not allowed to vote by now." msgstr "" -#: pod/video/static/js/comment-script.js -#, javascript-format -msgid "%s vote" -msgid_plural "%s votes" -msgstr[0] "" -msgstr[1] "" - #: pod/video/static/js/comment-script.js msgid "Sorry, you can't comment this video by now." msgstr "" @@ -646,38 +683,47 @@ msgstr[0] "" msgstr[1] "" #: pod/video/static/js/regroup_videos_by_theme.js +#: pod/video/static/js/video_category.js msgid "This content is password protected." msgstr "" #: pod/video/static/js/regroup_videos_by_theme.js +#: pod/video/static/js/video_category.js msgid "This content is chaptered." msgstr "" #: pod/video/static/js/regroup_videos_by_theme.js +#: pod/video/static/js/video_category.js msgid "This content is in draft." msgstr "" #: pod/video/static/js/regroup_videos_by_theme.js +#: pod/video/static/js/video_category.js msgid "Video content." msgstr "" #: pod/video/static/js/regroup_videos_by_theme.js +#: pod/video/static/js/video_category.js msgid "Audio content." msgstr "" #: pod/video/static/js/regroup_videos_by_theme.js +#: pod/video/static/js/video_category.js msgid "Edit the video" msgstr "" #: pod/video/static/js/regroup_videos_by_theme.js +#: pod/video/static/js/video_category.js msgid "Complete the video" msgstr "" #: pod/video/static/js/regroup_videos_by_theme.js +#: pod/video/static/js/video_category.js msgid "Chapter the video" msgstr "" #: pod/video/static/js/regroup_videos_by_theme.js +#: pod/video/static/js/video_category.js msgid "Delete the video" msgstr "" @@ -749,6 +795,18 @@ msgstr "" msgid "Edit the category" msgstr "" +#: pod/video/static/js/video_category.js +msgid "Delete the category" +msgstr "" + +#: pod/video/static/js/video_category.js +msgid "Success!" +msgstr "" + +#: pod/video/static/js/video_category.js +msgid "Error…" +msgstr "" + #: pod/video/static/js/video_category.js msgid "Category created successfully" msgstr "" diff --git a/pod/main/static/css/dark.css b/pod/main/static/css/dark.css index 63120ddd07..72a8892c6f 100644 --- a/pod/main/static/css/dark.css +++ b/pod/main/static/css/dark.css @@ -98,14 +98,14 @@ background-color: var(--background-color); color: var(--pod-font-color); border-color: var(--pod-primary); - box-shadow: 0 0 0 0.2rem rgba(126 126 126 0.25); + box-shadow: 0 0 0 .2rem rgb(126 126 126 / 25%); } [data-theme="dark"] .category_modal_videos_list .infinite-item .checked_overlay { - background-color: rgba(0 0 0 0.8); + background-color: rgb(0 0 0 / 80%); } [data-theme="dark"] #card-takenote .header:hover { diff --git a/pod/main/static/css/pod.css b/pod/main/static/css/pod.css index ab579500b0..ed295d48f6 100755 --- a/pod/main/static/css/pod.css +++ b/pod/main/static/css/pod.css @@ -3,7 +3,7 @@ :root { /* COMMON COLORS */ --color-black: #000; - --color-black-alpha: rgba(0 0 0 0.6); + --color-black-alpha: rgb(0 0 0 / 60%); --color-alto: #ddd; --color-silver: #ccc; --color-silver-chalice: #aaa; @@ -312,8 +312,8 @@ a:not(.btn):focus { background-color 0.3s ease-in-out, color 0.3s ease-in-out; color: var(--pod-font-color); - box-shadow: 0.05rem 0.05rem 0.2rem 0.05rem rgba(0 0 0 0.2); - border-radius: 0.15rem; + box-shadow: .05rem .05rem .2rem .05rem rgb(0 0 0 / 20%); + border-radius: .15rem; margin-top: 1rem; } @@ -682,7 +682,7 @@ div.card a img { } .errors > .form-control:focus { - box-shadow: 0 0 0 0.25rem rgba(var(--bs-danger-rgb) 0.25); + box-shadow: 0 0 0 0.25rem rgb(var(--bs-danger-rgb) / 25%); border-color: var(--bs-danger); } @@ -810,7 +810,7 @@ body { .accordion { --bs-accordion-active-color: var(--pod-link-color); - --bs-accordion-active-bg: rgba(var(--bs-primary-rgb) 0.1); + --bs-accordion-active-bg: rgb(var(--bs-primary-rgb) 10%); --bs-accordion-btn-focus-border-color: var(--pod-primary); } @@ -993,8 +993,8 @@ body { .pod-navbar { background: var(--pod-background); box-shadow: - 0 1px 3px rgba(0 0 0 0.12), - 0 1px 2px rgba(0 0 0 0.24); + 0 1px 3px rgb(0 0 0 / 12%), + 0 1px 2px rgb(0 0 0 / 24%); } .pod-info-video { @@ -1175,8 +1175,8 @@ body { .pod-card--video { border: none; box-shadow: - 0 3px 6px rgba(0 0 0 0.16), - 0 3px 6px rgba(0 0 0 0.23); + 0 3px 6px rgb(0 0 0 / 16%), + 0 3px 6px rgb(0 0 0 / 23%); background: var(--pod-background); } @@ -1199,7 +1199,7 @@ body { transition: all 0.15s ease; z-index: 5; padding-top: 5rem; - box-shadow: 0.05rem 0.05rem 0.2rem 0.05rem rgba(0 0 0 0.2); + box-shadow: 0.05rem 0.05rem 0.2rem 0.05rem rgb(0 0 0 / 20%); } .pod-aside.show { @@ -1446,11 +1446,11 @@ div.disabled, a.player-element.disabled { background-image: linear-gradient( 45deg, - rgba(0 0 0 0.2) 25%, + rgb(0 0 0 / 20%) 25%, transparent 25%, transparent 50%, - rgba(0 0 0 0.2) 50%, - rgba(0 0 0 0.2) 75%, + rgb(0 0 0 / 20%) 50%, + rgb(0 0 0 / 20%) 75%, transparent 75%, transparent ); @@ -1493,7 +1493,7 @@ a.player-element.disabled { } .bg-primary .podfile-icon-selector:focus-visible { - box-shadow: 0 0 0 0.25rem rgba(0 0 0 0.5); + box-shadow: 0 0 0 0.25rem rgb(0 0 0 / 50%); } /** Django 3 Admin pages @@ -1579,7 +1579,7 @@ body[data-admin-utc-offset] .select2-container--focus, .cke_focus { - box-shadow: 0 0 0 0.25rem rgba(var(--pod-primary-rgb) 0.25); + box-shadow: 0 0 0 0.25rem rgb(var(--pod-primary-rgb) / 25%); border-radius: 5px; } diff --git a/pod/main/tasks.py b/pod/main/tasks.py index 00239ab5f4..4d3e6caf6a 100644 --- a/pod/main/tasks.py +++ b/pod/main/tasks.py @@ -1,10 +1,12 @@ -# from celery import shared_task +"""Esup-Pod main tasks.""" + from pod.main.celery import app from pod.live.models import LiveTranscriptRunningTask, Broadcaster @app.task(bind=True) def task_start_encode(self, video_id): + """Start video encoding with Celery.""" print("CELERY START ENCODE VIDEO ID %s" % video_id) from pod.video_encode_transcript.encode import encode_video @@ -13,6 +15,7 @@ def task_start_encode(self, video_id): @app.task(bind=True) def task_start_transcript(self, video_id): + """Start video transcripting with Celery.""" print("CELERY START TRANSCRIPT VIDEO ID %s" % video_id) from pod.video_encode_transcript.transcript import main_threaded_transcript @@ -21,6 +24,7 @@ def task_start_transcript(self, video_id): @app.task(bind=True) def task_start_bbb_encode(self, meeting_id): + """Start BBB meeting encoding with Celery.""" print("CELERY START BBB ENCODE MEETING ID %s" % meeting_id) from pod.bbb.bbb import bbb_encode_meeting @@ -31,6 +35,7 @@ def task_start_bbb_encode(self, meeting_id): def task_start_encode_studio( self, recording_id, video_output, videos, subtime, presenter ): + """Start studio record encoding with Celery.""" print("CELERY START ENCODE VIDEOS FROM STUDIO RECORDING ID %s" % recording_id) from pod.video_encode_transcript.encode import encode_video_studio @@ -39,6 +44,7 @@ def task_start_encode_studio( @app.task(bind=True) def task_start_live_transcription(self, url, slug, model, filepath): + """Start live transcription with Celery.""" print("CELERY START LIVE TRANSCRIPTION %s" % slug) from pod.live.live_transcript import transcribe @@ -52,6 +58,7 @@ def task_start_live_transcription(self, url, slug, model, filepath): @app.task(bind=True) def task_end_live_transcription(self, slug): + """End live transcription with Celery.""" print("CELERY END LIVE TRANSCRIPTION %s" % slug) broadcaster = Broadcaster.objects.get(slug=slug) running_task = LiveTranscriptRunningTask.objects.get(broadcaster=broadcaster) diff --git a/pod/podfile/static/podfile/css/podfile.css b/pod/podfile/static/podfile/css/podfile.css index bc22e663cc..6a5b11f91b 100644 --- a/pod/podfile/static/podfile/css/podfile.css +++ b/pod/podfile/static/podfile/css/podfile.css @@ -58,7 +58,7 @@ button.close { pointer-events: auto; background-color: #fff; background-clip: padding-box; - border: 1px solid rgba(0 0 0 0.2); + border: 1px solid rgb(0 0 0 / 20%); outline: 0; max-width: 100% !important; width: calc(100% - 2em); @@ -102,7 +102,7 @@ button.close { #podfile .col { padding: 5px; background: white; - border: 1px solid rgba(0 0 0 0.125); + border: 1px solid rgb(0 0 0 / 12.5%); } #podifle .card-body { @@ -144,7 +144,7 @@ button.close { display: flex; justify-content: space-between; align-items: center; - border: 1px solid rgba(0 0 0 0.08); + border: 1px solid rgb(0 0 0 / 8%); padding: 0.8em; } @@ -182,8 +182,8 @@ button.close { padding: 0.8em 0; width: 400px; max-width: 100%; - border: 1px solid rgba(0 0 0 0.1); - box-shadow: 0 8px 10px 4px rgba(0 0 0 0.08); + border: 1px solid rgb(0 0 0 / 10%); + box-shadow: 0 8px 10px 4px rgb(0 0 0 / 8%); position: absolute; top: 100%; } @@ -333,7 +333,7 @@ button.close { border: 1px solid #ccc; font-size: 14px; padding: 0.4em; - color: rgba(0 0 0 0.75); + color: rgb(0 0 0 / 75%); flex: none; height: 35px; } diff --git a/pod/progressive_web_app/utils.py b/pod/progressive_web_app/utils.py index 6747376280..c6675ed9ff 100644 --- a/pod/progressive_web_app/utils.py +++ b/pod/progressive_web_app/utils.py @@ -1,3 +1,4 @@ +"""Esup-Pod PWA utilities.""" from webpush import send_user_notification from django.templatetags.static import static @@ -6,7 +7,7 @@ def notify_user(user, title, message, url=None, icon=None): - """Fills the payload to send a webpush notification to users devices.""" + """Fill the payload to send a webpush notification to users devices.""" payload = { "head": title, "body": message, diff --git a/pod/video/static/css/comment-style.css b/pod/video/static/css/comment-style.css index 5190b44f27..a403447c52 100644 --- a/pod/video/static/css/comment-style.css +++ b/pod/video/static/css/comment-style.css @@ -3,10 +3,10 @@ */ :root { - /* --content-primary-color: rgba(6, 14, 29, .75); */ + /* --content-primary-color: rgb(6 14 29 / 75%); */ --primary-background-color: #f8f9fa; --third-background-color: rgb(255 255 255); - --content-secondary-color: rgba(54 56 58 0.65); + --content-secondary-color: rgb(54 56 58 / 65%); --content-third-color: #696969; --padding-comment-content: 25px; --margin-between-comment: 1em; @@ -103,7 +103,7 @@ position: fixed; inset: 0; min-height: 100vh; - background-color: rgba(54 56 58 0.5); + background-color: rgb(54 56 58 / 50%); } .comment_main .confirm_delete.show { @@ -344,7 +344,7 @@ 0% { background-color: #f9f99b; - /* rgba(255 234 59) */ + /* rgb(255 234 59) */ } 100% { @@ -356,7 +356,7 @@ @keyframes deletecomment { 0% { position: relative; - box-shadow: 0 0 8px 8px rgba(255 0 0 0.3) !important; + box-shadow: 0 0 8px 8px rgb(255 0 0 / 30%) !important; z-index: 9999; transform: translateX(0); } diff --git a/pod/video/static/css/video-iframe.css b/pod/video/static/css/video-iframe.css index 09fe0fcbde..272b00c186 100644 --- a/pod/video/static/css/video-iframe.css +++ b/pod/video/static/css/video-iframe.css @@ -34,7 +34,7 @@ body { border-radius: 0; padding: 0; margin: 0; - background-color: rgba(250 250 250 0.9); + background-color: rgb(250 250 250 / 90%); z-index: 10; } @@ -63,7 +63,7 @@ body { */ .list-group-item { - background-color: rgba(250 250 250 0.9) !important; + background-color: rgb(250 250 250 / 90%) !important; } .iframe-header { @@ -108,7 +108,7 @@ body { /* bottom: 0; */ position: absolute; background-color: #2b333f; - background-color: rgba(43 51 63 0.7); + background-color: rgb(43 51 63 / 70%); z-index: 10; height: 30px; padding: 0 0.5em; diff --git a/pod/video/static/css/video_category.css b/pod/video/static/css/video_category.css index aa838407b3..9947ee0c49 100644 --- a/pod/video/static/css/video_category.css +++ b/pod/video/static/css/video_category.css @@ -79,7 +79,7 @@ display: flex; position: absolute; margin: 0.2em 0.4em; - background-color: rgba(255 255 255 0.8); + background-color: rgb(255 255 255 / 80%); border: 2px solid var(--pod-link-color); border-radius: var(--bs-border-radius-sm); inset: 0; @@ -192,8 +192,8 @@ } .categories_list_item:not(.active):hover { - background-color: rgba(149 149 149 0.09); - border-color: rgba(149 149 149 0.09); + background-color: rgb(149 149 149 / 9%); + border-color: rgb(149 149 149 / 9%); } .categories_list_item.active .cat_title { diff --git a/pod/video/templates/videos/card.html b/pod/video/templates/videos/card.html index aba7d344dd..432c3bd89c 100644 --- a/pod/video/templates/videos/card.html +++ b/pod/video/templates/videos/card.html @@ -12,8 +12,15 @@
{{video.duration_in_time}} - {% if video.password or video.is_restricted %} - + {% if video.password %} + + + + {% endif %} + {% if video.is_restricted %} + {% endif %} From 9538a680a4dcde243b8d5870f0a361d5341291c8 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 6 Nov 2023 12:56:17 +0000 Subject: [PATCH 3/3] Fixup. Format code with Prettier --- pod/main/static/css/dark.css | 2 +- pod/main/static/css/pod.css | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pod/main/static/css/dark.css b/pod/main/static/css/dark.css index 72a8892c6f..dc20a77f82 100644 --- a/pod/main/static/css/dark.css +++ b/pod/main/static/css/dark.css @@ -98,7 +98,7 @@ background-color: var(--background-color); color: var(--pod-font-color); border-color: var(--pod-primary); - box-shadow: 0 0 0 .2rem rgb(126 126 126 / 25%); + box-shadow: 0 0 0 0.2rem rgb(126 126 126 / 25%); } [data-theme="dark"] diff --git a/pod/main/static/css/pod.css b/pod/main/static/css/pod.css index ed295d48f6..1bea77564c 100755 --- a/pod/main/static/css/pod.css +++ b/pod/main/static/css/pod.css @@ -312,8 +312,8 @@ a:not(.btn):focus { background-color 0.3s ease-in-out, color 0.3s ease-in-out; color: var(--pod-font-color); - box-shadow: .05rem .05rem .2rem .05rem rgb(0 0 0 / 20%); - border-radius: .15rem; + box-shadow: 0.05rem 0.05rem 0.2rem 0.05rem rgb(0 0 0 / 20%); + border-radius: 0.15rem; margin-top: 1rem; }