From 1d2ebaa4b232ba23f1413abde1fac3831af7e6cb Mon Sep 17 00:00:00 2001 From: Olivier Bado-Faustin Date: Tue, 30 Jan 2024 09:11:05 +0100 Subject: [PATCH] [DONE] Last fixes for 3.5.0 (#1034) * + Correct some i18n bugs + add table-responsive to my dressings + remove css causing alerts to be always white + correct event-info indentation + add missing "aria-hidden" + Move inline Js from my_meeting to a separate file + correct color bug on video-info * Remove useless call to "jsi18n" --- CONTRIBUTING.md | 2 +- pod/dressing/templates/my_dressings.html | 6 +- pod/dressing/views.py | 4 +- pod/import_video/static/css/import_video.css | 3 +- pod/live/templates/live/event-info.html | 115 +++++++++--------- pod/locale/fr/LC_MESSAGES/django.mo | Bin 177948 -> 177910 bytes pod/locale/fr/LC_MESSAGES/django.po | 39 +++--- pod/locale/fr/LC_MESSAGES/djangojs.mo | Bin 20097 -> 20429 bytes pod/locale/fr/LC_MESSAGES/djangojs.po | 18 ++- pod/locale/nl/LC_MESSAGES/django.po | 31 ++--- pod/locale/nl/LC_MESSAGES/djangojs.po | 18 ++- pod/meeting/static/css/meeting.css | 3 +- pod/meeting/static/js/my_meetings.js | 84 +++++++++++++ .../templates/meeting/link_meeting.html | 4 +- .../templates/meeting/meeting_card.html | 6 +- .../templates/meeting/my_meetings.html | 86 +------------ pod/video/static/js/video_category.js | 11 +- pod/video/templates/videos/video-info.html | 13 +- 18 files changed, 245 insertions(+), 198 deletions(-) create mode 100644 pod/meeting/static/js/my_meetings.js diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 21a953ef24..739513007b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -139,7 +139,7 @@ Start reading our code and you'll get the hang of it. We optimize for readabilit * Configuration variables are uppercase and can be called in all modules keeping the same name. For example, MAVAR = getattr(settings, "MAVAR", default value) * Global variables to a module are also in uppercase but are considered private to the module and therefore must be prefixed and suffixed with a double underscore - * We indent using two spaces (soft tabs) + * All .py files must be indented using 4 spaces, and all other files (.css, .html, .js) with 2 spaces (soft tabs) * This is open source software. Consider the people who will read your code, and make it look nice for them. It's sort of like driving a car: Perhaps you love doing donuts when you're alone, but with passengers the goal is to make the ride as smooth as possible. ### JavaScript Styleguide diff --git a/pod/dressing/templates/my_dressings.html b/pod/dressing/templates/my_dressings.html index 17bea727b5..3fa2f8e010 100644 --- a/pod/dressing/templates/my_dressings.html +++ b/pod/dressing/templates/my_dressings.html @@ -14,6 +14,7 @@ {% endblock %} {% block page_content %} +
@@ -108,10 +109,10 @@
{% trans 'Available video dressings' %}
- + - +
@@ -124,6 +125,7 @@ {% endfor %}
+
{% trans 'Add new dressing' %} {% endblock page_content %} diff --git a/pod/dressing/views.py b/pod/dressing/views.py index 9a56f03742..df8433de2b 100644 --- a/pod/dressing/views.py +++ b/pod/dressing/views.py @@ -64,7 +64,7 @@ def video_dressing(request, slug): "video": video, "dressings": dressings, "current": current, - "page_title": _("Dress the video “%s”" % video.title), + "page_title": _("Dress the video “%s”") % video.title, }, ) @@ -190,7 +190,7 @@ def dressing_delete(request, dressing_id): { "dressing": dressing, "form": form, - "page_title": _("Deleting the dressing “%s”" % dressing.title), + "page_title": _("Deleting the dressing “%s”") % dressing.title, }, ) diff --git a/pod/import_video/static/css/import_video.css b/pod/import_video/static/css/import_video.css index c5f25bd664..c80c036171 100644 --- a/pod/import_video/static/css/import_video.css +++ b/pod/import_video/static/css/import_video.css @@ -51,10 +51,9 @@ div.alert.alert-dismissible { padding-left: 78px; position: relative; padding-right: 60px; - border: 1px solid #e6e6e6; - background: #fff; } + div.alert .icon { text-align: center; width: 58px; diff --git a/pod/live/templates/live/event-info.html b/pod/live/templates/live/event-info.html index 40475205e1..e736c802b8 100644 --- a/pod/live/templates/live/event-info.html +++ b/pod/live/templates/live/event-info.html @@ -68,68 +68,67 @@ -
+
- {% 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 %} -
-
- {% endif %} + {% if event.is_draft %} + + {% endif %} -
-  {% trans 'Embed in a web page' %} -
- - -
-
+
+  {% trans 'Embed in a web page' %} +
+ + +
+
- {% if not event.is_draft and not event.broadcaster.is_restricted %} -
- -
- -
-
-
- {% endif %} + {% if not event.is_draft and not event.broadcaster.is_restricted %} +
+ +
+ +
+
+
+ {% endif %} -
-  {% trans 'Share the link' %} -
- - -
-
- {% get_event_qrcode event.id as qrcode %} -
- {{ qrcode }} -
- -
-
-
+
+  {% trans 'Share the link' %} +
+ + +
+
+ {% get_event_qrcode event.id as qrcode %} +
+ {{ qrcode }} +
+ +
+
+
diff --git a/pod/locale/fr/LC_MESSAGES/django.mo b/pod/locale/fr/LC_MESSAGES/django.mo index b706d2547caec11a026ae1927bde8871545e7171..b64aad40107efa45d948b91f31e3f3f133ac26a1 100644 GIT binary patch delta 36727 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 G^ZgHcyOgB> diff --git a/pod/locale/fr/LC_MESSAGES/django.po b/pod/locale/fr/LC_MESSAGES/django.po index 7d96cfa15b..158ebc0000 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-29 10:06+0000\n" +"POT-Creation-Date: 2024-01-29 15:38+0000\n" "PO-Revision-Date: \n" "Last-Translator: obado \n" "Language-Team: Pod Team cotech-esup-pod@esup-portail.org\n" @@ -1001,7 +1001,6 @@ msgstr "Supprimer le chapitre « %(chapter_title)s »" #: pod/completion/templates/document/list_document.html #: pod/completion/templates/overlay/list_overlay.html #: pod/dressing/templates/dressing_delete.html -#: pod/dressing/templates/my_dressings.html #: pod/enrichment/templates/enrichment/list_enrichment.html #: pod/live/templates/live/event_delete.html #: pod/meeting/templates/meeting/delete.html @@ -2141,10 +2140,15 @@ msgstr "Pas de filigrane" msgid "View the video" msgstr "Voir la vidéo" -#: pod/dressing/templates/my_dressings.html pod/live/templates/live/direct.html -#: pod/video/templates/videos/video_edit.html -msgid "Edit" -msgstr "Éditer" +#: pod/dressing/templates/my_dressings.html +#, python-format +msgid "Edit “%(title)s”" +msgstr "Modifier « %(title)s »" + +#: pod/dressing/templates/my_dressings.html +#, python-format +msgid "Delete “%(title)s”" +msgstr "Supprimer « %(title)s »" #: pod/dressing/templates/my_dressings.html #: pod/dressing/templates/video_dressing.html @@ -3485,6 +3489,11 @@ msgstr "Prochains évènements" msgid "Manage broadcaster" msgstr "Gérer le diffuseur" +#: pod/live/templates/live/direct.html +#: pod/video/templates/videos/video_edit.html +msgid "Edit" +msgstr "Éditer" + #: pod/live/templates/live/direct.html pod/live/templates/live/directs_all.html msgid "no broadcast in progress" msgstr "aucune diffusion actuellement" @@ -5780,14 +5789,6 @@ msgstr "" msgid "Add a meeting" msgstr "Ajouter une réunion" -#: pod/meeting/templates/meeting/my_meetings.html -msgid "Unable to find information about the meeting" -msgstr "Impossible de trouver des informations sur la réunion" - -#: pod/meeting/templates/meeting/my_meetings.html -msgid "End the meeting" -msgstr "Terminer la réunion" - #: pod/meeting/templates/meeting/recurring_options_modal_form.html msgid "Repeat every" msgstr "Répéter tou(te)s les" @@ -8412,8 +8413,8 @@ msgstr "Document :" #: pod/video/templates/videos/video-info.html msgid "" "Please note that your video is in draft mode.
\n" -"The following links contain a key allowing access.\n" -"Anyone with this links can access it." +" The following links contain a key allowing access.\n" +" Anyone with this links can access it." msgstr "" "Veuillez noter que votre vidéo est en mode brouillon.
\n" "Les liens suivants contiennent une clé permettant l’accès.\n" @@ -9141,3 +9142,9 @@ msgstr "Résultats de la recherche" #: pod/xapi/apps.py msgid "Esup-Pod xAPI" msgstr "xAPI Esup-Pod" + +#~ msgid "Unable to find information about the meeting" +#~ msgstr "Impossible de trouver des informations sur la réunion" + +#~ msgid "End the meeting" +#~ msgstr "Terminer la réunion" diff --git a/pod/locale/fr/LC_MESSAGES/djangojs.mo b/pod/locale/fr/LC_MESSAGES/djangojs.mo index e97aaac2a753abb7e26b8ec6dd8ca13ac4e5bb4a..411d8417a5b2373a06614a0dc53a780373548a35 100644 GIT binary patch delta 4905 zcmZA53s6+o0mkvO0TD!0Kv5vZE8+_TjUtBnLQ%w5j1Q84Rz+D93#_n<8nvz_#;C1C z<1?vfeB@!Qib1UvqqRy+OtBb4XKZ|=v2DhVGihqmPHfur|Lwg@Nbl^ozjH44-gEAG zteLE-b~WsE`EN%BZ#NuG?P$znoLGcGxB+|OCgfvk`Rai0JKjJw@K@}Cu1*&tNLv$0UsJY(Fp? zb-fqc;XcP2>`MJSGMMHTGAQOxn1KI6bv&*M*U`Qip#sjr?zkLv<8BPc1K1XiA){u_ zA|KPpm)`UqhT^}m6$Z!J4YtAd)Vrddmx8)K4K<=U=+~U*QP71;kWn)0P$RM%bMYYd z#)qf|6Bs|eaT;m_vXI#@<)|rKhZ?DksOO$Uy+}Rw!E2}&co@g{tHJ1ayJvk-9U6`r z@_fe)s5d-~8lelQA-szk($?IhsY*gUcot5@N>s-$qZaWOsE+&t)v>_%>y0`v{%tS; zhhPd$LpO4*IgMKVO~}VQC_d=)ahZ zDLhnDoQLXQA%<%IFQT9ey{N^pAJx!Nr(TCz&6km9nZKjnD2Co?t&Bs}{f;$gQU4=8 zfsgburUHlJ3OtHz0F%Ug45fWDmO>7$!LfJ+wM{zk#WPF>>V`R}saTHc$Trl}okn%M z0bAh>qz!Y&F@&EzO=Sv(Vm9g*aSHl1XgCPvZXpBcr znc1lO*W+M(8wcWT%)m&-zY-@R?`AHbo_8;q@mJ5jc*0L%GKH^^ ze;3R+#w`=);7EKON8qQZsp>Y!p2Jb7k(z)%z!{j0FFW<$V>oNj1?CoNWIjhd=v&mTh-UAp;~A)q=b%=15f-2a)!;Sk zgx{c^8^xZ~)FxuA_J0wDAWp1CK4vXn>d1SjMfDMCwckO#aRN))!m+5|^djVAcJQU^ z8c`z^&Ae!e^3cNh7>jFBBe(~1Xy2Tp5Ra`{8S}6QGOA`BY89VFt@aD3p>04t=u?cr zhxjZ;4zqt?7NI)!7gUF1Siu%%psvqH?XGh4cc!q5f_hYgtTWSyYy=a;O3B25*cZLn z8>>+dsK=3bA6ajv9~Ct`7xkRY$c{4?u@t{VJ!ej)y$d#EGX7dT^_=LA_fQRlkFvMj zAmrJm9JP;YP!DcGjX)^lt-mK=7c9U8T#j9_8oOZ~YI}ZyS|g$CWi8goEWdqYEGINq z15pnehD^7~MGbuwYUp0W?syz^{dLr0yoKsu5Sv8M3F6Lo(n>UnEX&)Mv! zU{QD%869&Sc{vl!3SwGKE^41{LG6;g*aqK3e%{S-)FS-@>blQS4Sa=~LRYrkp#jLp z%;bypY4+oE^xveQxf?Lf9->0j5O2ZlcnN=r`8oDbb{uaEACtz{)3^$s!6xL#&!kM? zZ#Ww@MO#t-y>JAR@Cs@he}#0^Z^9=x_=0XcAopMi{ z>y#64s#6wPXy?dpRpHPyO(SQ?dqktsio8txOoQ=|Zlo_!k9FkR1b$dloJ1ZW{8j~y zB)&I0x5nt4JeRPiB$+L`NSok(?lx$b6#Xr2YQ(e*@a5_+KbaVGcg!l--Vx;%;(` zY#`f-jz}_{q>?S<0BJsADJ*ZU;4hqV9d@6`*Ax{G--_=-JcR>3?^rSE$WKHO(?`;If*6{W>x?h31qce2u55i{t5 vJJ1K6x-+JxRr>hS#U8J>SUoAEGZmi7B{Wdz_O|Sh*YZ|=ztyS<4}$&&g4-@H delta 4579 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 H&#?ak`G(SS diff --git a/pod/locale/fr/LC_MESSAGES/djangojs.po b/pod/locale/fr/LC_MESSAGES/djangojs.po index 1712eb8d05..60b767041e 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-26 16:38+0000\n" +"POT-Creation-Date: 2024-01-29 15:38+0000\n" "PO-Revision-Date: \n" "Last-Translator: obado \n" "Language-Team: \n" @@ -497,6 +497,22 @@ msgstr "Info" msgid "Information" msgstr "Information" +#: pod/meeting/static/js/my_meetings.js +msgid "Unable to find information about the meeting" +msgstr "Impossible de trouver des informations sur la réunion" + +#: pod/meeting/static/js/my_meetings.js +msgid "End the meeting" +msgstr "Terminer la réunion" + +#: pod/meeting/static/js/my_meetings.js +msgid "Text copied." +msgstr "Texte copié." + +#: pod/meeting/static/js/my_meetings.js +msgid "Something went wrong." +msgstr "Quelque-chose s’est mal passé." + #: pod/playlist/static/playlist/js/add-or-edit.js msgid "Public: the playlist can be accessed by anyone." msgstr "Public : la liste de lecture est accessible par tous." diff --git a/pod/locale/nl/LC_MESSAGES/django.po b/pod/locale/nl/LC_MESSAGES/django.po index 324709af9c..312f1f2406 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-29 10:06+0000\n" +"POT-Creation-Date: 2024-01-29 15:38+0000\n" "PO-Revision-Date: 2023-06-08 14:37+0200\n" "Last-Translator: obado \n" "Language-Team: \n" @@ -944,7 +944,6 @@ msgstr "" #: pod/completion/templates/document/list_document.html #: pod/completion/templates/overlay/list_overlay.html #: pod/dressing/templates/dressing_delete.html -#: pod/dressing/templates/my_dressings.html #: pod/enrichment/templates/enrichment/list_enrichment.html #: pod/live/templates/live/event_delete.html #: pod/meeting/templates/meeting/delete.html @@ -2036,9 +2035,14 @@ msgstr "" msgid "View the video" msgstr "" -#: pod/dressing/templates/my_dressings.html pod/live/templates/live/direct.html -#: pod/video/templates/videos/video_edit.html -msgid "Edit" +#: pod/dressing/templates/my_dressings.html +#, python-format +msgid "Edit “%(title)s”" +msgstr "" + +#: pod/dressing/templates/my_dressings.html +#, python-format +msgid "Delete “%(title)s”" msgstr "" #: pod/dressing/templates/my_dressings.html @@ -3261,6 +3265,11 @@ msgstr "" msgid "Manage broadcaster" msgstr "" +#: pod/live/templates/live/direct.html +#: pod/video/templates/videos/video_edit.html +msgid "Edit" +msgstr "" + #: pod/live/templates/live/direct.html pod/live/templates/live/directs_all.html msgid "no broadcast in progress" msgstr "" @@ -5475,14 +5484,6 @@ msgstr "" msgid "Add a meeting" msgstr "" -#: pod/meeting/templates/meeting/my_meetings.html -msgid "Unable to find information about the meeting" -msgstr "" - -#: pod/meeting/templates/meeting/my_meetings.html -msgid "End the meeting" -msgstr "" - #: pod/meeting/templates/meeting/recurring_options_modal_form.html msgid "Repeat every" msgstr "" @@ -7896,8 +7897,8 @@ msgstr "" #: pod/video/templates/videos/video-info.html msgid "" "Please note that your video is in draft mode.
\n" -"The following links contain a key allowing access.\n" -"Anyone with this links can access it." +" The following links contain a key allowing access.\n" +" Anyone with this links can access it." msgstr "" #: pod/video/templates/videos/video-info.html diff --git a/pod/locale/nl/LC_MESSAGES/djangojs.po b/pod/locale/nl/LC_MESSAGES/djangojs.po index c3a646e1a0..6a02cef1be 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-26 16:38+0000\n" +"POT-Creation-Date: 2024-01-29 15:38+0000\n" "PO-Revision-Date: 2023-02-08 15:22+0100\n" "Last-Translator: obado \n" "Language-Team: \n" @@ -473,6 +473,22 @@ msgstr "" msgid "Information" msgstr "" +#: pod/meeting/static/js/my_meetings.js +msgid "Unable to find information about the meeting" +msgstr "" + +#: pod/meeting/static/js/my_meetings.js +msgid "End the meeting" +msgstr "" + +#: pod/meeting/static/js/my_meetings.js +msgid "Text copied." +msgstr "" + +#: pod/meeting/static/js/my_meetings.js +msgid "Something went wrong." +msgstr "" + #: pod/playlist/static/playlist/js/add-or-edit.js msgid "Public: the playlist can be accessed by anyone." msgstr "" diff --git a/pod/meeting/static/css/meeting.css b/pod/meeting/static/css/meeting.css index 3abef463c2..ab49b2e9dd 100644 --- a/pod/meeting/static/css/meeting.css +++ b/pod/meeting/static/css/meeting.css @@ -72,10 +72,9 @@ div.alert.alert-dismissible { padding-left: 78px; position: relative; padding-right: 60px; - border: 1px solid #e6e6e6; - background: #fff; } + div.alert .icon { text-align: center; width: 58px; diff --git a/pod/meeting/static/js/my_meetings.js b/pod/meeting/static/js/my_meetings.js new file mode 100644 index 0000000000..579dc18583 --- /dev/null +++ b/pod/meeting/static/js/my_meetings.js @@ -0,0 +1,84 @@ +/* Esup-Pod My Meetings JS */ + +var meetingModal = document.getElementById('meetingModal') +meetingModal.addEventListener('show.bs.modal', function (event) { + // Button that triggered the modal + const button = event.relatedTarget + // Extract info from data-bs-* attributes + const meeting_id = button.getAttribute('data-bs-meeting-id') + const title = button.getAttribute('data-bs-meeting-title') + const endurl = button.getAttribute('data-bs-meeting-end-url') + const modalHref = button.getAttribute('data-bs-meeting-info-url'); + + fetch(modalHref, { + method: 'GET', + }).then((response) => { + if (!response.ok) throw Error(response.statusText); + return response.json(); + }).then(function(data){ + if(data.msg != "") { + modalBody.innerHTML = gettext('Unable to find information about the meeting') + console.log(msg) + } else { + const modalendlink = '

' + gettext('End the meeting') + '

'; + modalBody.innerHTML = generateHtml(data.info) + modalendlink + } + }).catch((error) => { + console.error(error); + }); + + // + // Update the modal's content. + const modalTitle = meetingModal.querySelector('.modal-title') + const modalBody = meetingModal.querySelector('.modal-body') + //const modalFooterEndLink = meetingModal.querySelector('.modal-footer a.endlink') + + modalTitle.textContent = title + modalBody.textContent = meeting_id + //modalFooterEndLink.setAttribute("href", endurl) + +}) + +/* TODO: check if level parameter can be removed. */ +/** + * Recursively generate an HTML unordered list version of data + * @param {Array} data Data to be displayed + * @param {Number} level level of recursion (useless?) + * @return {string} Generated HTML + */ +function generateHtml(data, level=0) { + html = "
    " + for (let k in data) { + if (typeof data[k] === "object") { + html += "
  • " + k + ": " + generateHtml(data[k], level++) + "
    • "; + } else { + html += "
  • " + k + ": " + data[k] + "
    • "; + } + } + html += "
" + return html +} + +var copyButtons = document.querySelectorAll('.pod-btn-copy') +copyButtons.forEach(function (elt) { + elt.addEventListener('click', function (event) { + const input_id = this.dataset.copyvalue; + copyValue(input_id) + }); +}); + +/** + * Copy a value in client clipboard, then display a feedback. + * @param {String} value The value to be copied + * @return {void} + */ +function copyValue(value) { + navigator.clipboard + .writeText(value) + .then(() => { + showalert(gettext("Text copied."), "alert-success"); + }) + .catch(() => { + showalert(gettext("Something went wrong."), "alert-danger"); + }); +} diff --git a/pod/meeting/templates/meeting/link_meeting.html b/pod/meeting/templates/meeting/link_meeting.html index fea68ff73f..09a1aa08af 100644 --- a/pod/meeting/templates/meeting/link_meeting.html +++ b/pod/meeting/templates/meeting/link_meeting.html @@ -7,8 +7,8 @@ + data-copyvalue="{% if request.is_secure %}https://{% else %}http://{% endif %}{{request.get_host}}{% url 'meeting:join' meeting.meeting_id meeting.get_hashkey %}" + data-bs-toggle="tooltip" data-bs-placement="top" title="{% trans 'Copy the direct join link' %}"> diff --git a/pod/meeting/templates/meeting/meeting_card.html b/pod/meeting/templates/meeting/meeting_card.html index 54b264c573..dd77fa49ab 100644 --- a/pod/meeting/templates/meeting/meeting_card.html +++ b/pod/meeting/templates/meeting/meeting_card.html @@ -42,15 +42,15 @@ - + - {% trans "Join the meeting" %} + {% trans "Join the meeting" %} {% else %} - {% trans "Start the meeting" %} + {% trans "Start the meeting" %} {% endif %} diff --git a/pod/meeting/templates/meeting/my_meetings.html b/pod/meeting/templates/meeting/my_meetings.html index fb76211655..767b35ae3c 100644 --- a/pod/meeting/templates/meeting/my_meetings.html +++ b/pod/meeting/templates/meeting/my_meetings.html @@ -69,89 +69,5 @@ {% endblock page_aside %} {% block more_script %} - - + {% endblock more_script %} diff --git a/pod/video/static/js/video_category.js b/pod/video/static/js/video_category.js index dc135a2e9c..4f4b66eea8 100644 --- a/pod/video/static/js/video_category.js +++ b/pod/video/static/js/video_category.js @@ -1,3 +1,12 @@ +/** + * Esup-Pod video category scripts. + */ + +/* Read-only globals defined in filter_aside_video_list_refresh.js and my_videos.html */ +/* +global refreshVideosSearch, CATEGORIES_DATA, BASE_URL, VIDEO_URL, EDIT_URL, + COMPLETION_URL, CHAPTER_URL, DELETE_URL +*/ (function (CATEGORIES_DATA) { const SERVER_DATA = CATEGORIES_DATA.filter((c) => !Number.isInteger(c)); // Category to delete @@ -180,7 +189,7 @@ }); } }; - searchCatInput.addEventListener("input", (e) => { + searchCatInput.addEventListener("input", () => { searchCatHandler(searchCatInput.value.trim()); }); diff --git a/pod/video/templates/videos/video-info.html b/pod/video/templates/videos/video-info.html index b92fa4b828..63f6ee94d6 100644 --- a/pod/video/templates/videos/video-info.html +++ b/pod/video/templates/videos/video-info.html @@ -352,18 +352,17 @@