Skip to content

Commit

Permalink
[DONE] Update : Playlist (EsupPortail#857)
Browse files Browse the repository at this point in the history
* Add video in playlist without refresh page

* Fix playlist-modal JS

* Add button in playlist-modal

* Add unit tests for playlist pages

* Add playlist link in user menu

* Add unit tests for playlist pages

* Change icon for 'My playlists' link in the navbar and add unit test

* Fix video counter

* Add form

* Fix breadcrumb

* Change urls

* Add utils tests

* Add tests view for modal

* Change playlist icon

* Fix star button in video.html

* Add stats in user_menu

* Add tests for statistics in usermenu

* Add form to ad or edit a playlist

* flake8

* Add or remove punctuation

* Add tests for the form to add or edit a playlist

* Change logic for stats in usermenu

* Add get_number_favorites function

* Add signal to add favorite playlist when create account

* Change signal for favorites playlist creation

* Add a default sort in the playlists page

* Add editable field in model

* Fix videos sort in playlist

* Sort videos by rank

* Add a confirmation before the playlist deletion

* Add a redirect to old page when the user add playlist via video page

* Add drag & drop for playlist videos

* Add translate

* Translate

* Check if name of playlist is correct

* Add translation

* Change star filling when in favorites playlist

* Fix form to add or delete playlist

* Add video in favorites playlist

* Remove sort in playlist + add description

* Add additional owners in model and forms

* Fix favorites button under a video

* Add pydoc for the forms

* Add get_playlists_for_additional_owners util functions

* Add additional owners in playlist

* Add playlist aside informations

* Add the last updated date in playlist page

* Translations

* Add the startup playlist param

* Remove refresh on all pages

* Add additionals owner in playlist informations card

* Fix favorites name

* Add template for playlist player

* Add templateTag to get playlist name

* Fix flake8

* Add a first version for playlist player

* Infinite loader & templatetag

* Add template for playlist player

* Add counters under videos

* finish stats views

* Add previous favorites cast

* Fix group by & default field

* Change import

* Fix gettext_lazy

* Add favorites script

* Create Favorites for all & cast previous playlists

* Add 'start the playlist'

* Update previous playlists

* Fix video order in the playlist player

* Playlists content

* Update playlist player

* Use bulk create / update

* Fix addind playlist route

* Fix flake8

* Add read playlist button in card

* Fix users roles

* Fix playlist player when the first video in playlist isn't accesible

* Add lock icon when the video is limited is the playlist player

* Add unit tests for utils functions

* Fix playlist player when the video is draft

* Fix playlist player rights

* Rename can_see_favorite_video to can_see_playlist_video and move it in playlist_buttons

* Add 'playlist' prefix in playlist title in the player

* Add link in title playlist player

* Fix add or edit playlist form

* Add redirect or error 404 when the playlist is private for the user

* Unit tests & some fixs

* Add test

* Add link in playlist video to start the playlist at this video

* Flake8

* Change title tag and breadcrumb depending of video

* Fix infinite loader

* Add scroll box for playlist player

* Remove Favorites application

* Start implementing playlists sort

* Merge

* Update playlist player

* Update playlisy player

* Fix password encryption

* Fix flake8

* Fix playlist start button

* Implement protected playlists

* Add test for private playlist

* Fix playlist access when protected

* optimisation of signals

* Fix add or edit playlist form

* Add tests for playlist player

* Remove the link for video disabled in playlist content page

* Add triangle for current video in playlist player

* Translation

* Add translation

* Merge develop

* Fix bulk create

* Start protected playlist

* Update style

* Fix redirection

* Fix playlist filters

* Fix flake8 in part

* Code factorisation & fix bugs

* Fix truncatechar

* Fix signals

* Fix render video when the playlist is protected

* Add link redirection in cards

* Fix bugs & traductions

* Add playlist sort

* Add translations

* Improve code quality

* Add tests for models & forms

* Add FAVORITE_PLAYLIST_NAME constant

* Add params in configuration JSON file

* Quick changes

* Fix flake8

* Update autoscroll in playlist player

* Fix unittests

* Change tests & methods

* Fix flake 8

* Some right fixes & tests

* FIX requirements

* Fix the addition & deletion favorite video in infinite loader

* Fix playlist addition counter translation

* Remove text-white class

* Move static files in static/playlist folder

* Add static tag & rename add-or-remove.js to add-or-edit.js

* Remove debug prints & add condition to load JS files

* Fix a strange test

* Remove unnecessary field definitions

* Add signal to remove favorite table

* Remove unneccesary id

* Remove unneccesary requirement

* Remove USER_PLAYLIST

* Add API REST requests for playlists

* Remove owner filter & add search fields

* Fix undefined scrollContainer

* Fix translation for 'Favorites' playlist name

* Fix display of star icon after adding a video to the favorites playlist

* Add translations & update name field

* Disable the video addition in playlist during the updating button

* Add promoted playlists

* Change some translations

* Change JS files

* Add a test & remove useless import

* Change 'name' by 'title' in the name help text

* Add the translate for the name field

* Add site

* Add refreshElementWithDocumentFragment JS function

* Update the video autoplay in playlist

* Add chapter in autoplay

* Fix the autoplay in the end of playlist

* Improve accessibility

* Fix the state of the star & add aria-pressed

* Fix the form to add or edit a playlist

* Add aria-describedly for all field forms

* Update translations

* Add template to play playlist

* Add script reloading

* Update autoplay in playlist

* Fix the autoplay

* Fix the autoplay for sound recording

* Reorganize video & playlist templates

* Fix the autoscroll

* Fix Django Debug Toolbar

* Remove unnecessary templates

* Remove unnecessary template

* Fix flake8

* Fix the favorite playlist description

* Fix the tests

* Add intermediate state for favorite button

---------

Co-authored-by: Aymeric Jakobowski <[email protected]>
  • Loading branch information
2 people authored and vsabatie committed Nov 23, 2023
1 parent dd22246 commit 7fd6d5c
Show file tree
Hide file tree
Showing 8 changed files with 866 additions and 11 deletions.
360 changes: 360 additions & 0 deletions pod/locale/fr/LC_MESSAGES/django.po

Large diffs are not rendered by default.

82 changes: 82 additions & 0 deletions pod/locale/fr/LC_MESSAGES/djangojs.po
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ msgstr ""
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"POT-Creation-Date: 2023-08-30 12:33+0200\n"
=======
=======
Expand Down Expand Up @@ -246,6 +247,8 @@ msgstr ""
>>>>>>> b78c7ae7 ([DONE] live Extron SMP (#873))
=======
>>>>>>> 0fee55e1 ([DONE] Update : Displaying channels via AJAX (#910))
=======
>>>>>>> 3ba3755b ([DONE] Update : Playlist (#857))
"POT-Creation-Date: 2023-11-07 10:52+0000\n"
=======
"POT-Creation-Date: 2023-07-13 16:48+0200\n"
Expand Down Expand Up @@ -315,6 +318,8 @@ msgstr ""
=======
=======
>>>>>>> 3a4a3085 ([DONE] Update : Displaying channels via AJAX (#910))
=======
>>>>>>> 46d54872 ([DONE] Update : Playlist (#857))
"POT-Creation-Date: 2023-08-30 12:33+0200\n"
=======
"POT-Creation-Date: 2023-07-05 15:50+0200\n"
Expand All @@ -328,8 +333,17 @@ msgstr ""
=======
"POT-Creation-Date: 2023-07-20 13:09+0000\n"
>>>>>>> 96067166 ([DONE] Update : Displaying channels via AJAX (#910))
<<<<<<< HEAD
>>>>>>> 3a4a3085 ([DONE] Update : Displaying channels via AJAX (#910))
<<<<<<< HEAD
>>>>>>> 0fee55e1 ([DONE] Update : Displaying channels via AJAX (#910))
=======
=======
=======
"POT-Creation-Date: 2023-08-18 09:32+0000\n"
>>>>>>> ee58a741 ([DONE] Update : Playlist (#857))
>>>>>>> 46d54872 ([DONE] Update : Playlist (#857))
>>>>>>> 3ba3755b ([DONE] Update : Playlist (#857))
"PO-Revision-Date: \n"
"Last-Translator: obado <[email protected]>\n"
"Language-Team: \n"
Expand Down Expand Up @@ -408,6 +422,7 @@ msgid "starts at the same time."
msgstr "commencent au même moment."

#: pod/chapter/static/js/videojs-chapters.js
#: pod/playlist/static/playlist/js/playlist-player.js
msgid "Chapters"
msgstr "Chapitres"

Expand Down Expand Up @@ -835,6 +850,7 @@ msgstr "Mode enrichi"
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
#: pod/live/static/js/admin_broadcaster.js
msgid "An error occurred"
msgstr "Une erreur est survenue."
Expand All @@ -857,16 +873,22 @@ msgstr "Une erreur est survenue."
>>>>>>> ee58a741 ([DONE] Update : Playlist (#857))
=======
>>>>>>> 22bbad30 ([DONE] Update : Playlist (#857))
=======
>>>>>>> 3ba3755b ([DONE] Update : Playlist (#857))
#: pod/live/static/js/admin_broadcaster.js
msgid "An error occurred"
msgstr "Une erreur est survenue"

=======
>>>>>>> db188f15 ([DONE] Update : Playlist (#857))
=======
>>>>>>> 46d54872 ([DONE] Update : Playlist (#857))
#: pod/live/static/js/admin_broadcaster.js
msgid "An error occurred"
msgstr "Une erreur est survenue."

=======
>>>>>>> ee58a741 ([DONE] Update : Playlist (#857))
#: pod/live/static/js/admin_broadcaster.js
msgid "An error occurred"
msgstr "Une erreur est survenue."
Expand Down Expand Up @@ -903,6 +925,7 @@ msgstr "Une erreur s’est produite lors du chargement des diffuseurs…"
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 43dd9c9b ([DONE] Update : Playlist (corrections) (#923))
=======
Expand All @@ -919,6 +942,12 @@ msgstr "Une erreur s’est produite lors du chargement des diffuseurs…"
=======
>>>>>>> 5a94d8e5 ([DONE] Update : Playlist (corrections) (#923))
>>>>>>> 961ae8ee ([DONE] Update : Playlist (corrections) (#923))
=======
=======
>>>>>>> 5a94d8e5 ([DONE] Update : Playlist (corrections) (#923))
=======
>>>>>>> 46d54872 ([DONE] Update : Playlist (#857))
>>>>>>> 3ba3755b ([DONE] Update : Playlist (#857))
#: pod/live/static/js/filter_aside_event_list.js
#: pod/playlist/static/playlist/js/filter-aside-playlist-list-refresh.js
#: pod/video/static/js/filter_aside_video_list_refresh.js
Expand All @@ -931,6 +960,7 @@ msgstr "Une erreur est survenue durant l’exécution du processus."
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ee58a741 ([DONE] Update : Playlist (#857))
=======
Expand All @@ -941,9 +971,12 @@ msgstr "Une erreur est survenue durant l’exécution du processus."
>>>>>>> 605f7669 ([DONE] Update : Playlist (#857))
=======
=======
>>>>>>> 3ba3755b ([DONE] Update : Playlist (#857))
=======
>>>>>>> db188f15 ([DONE] Update : Playlist (#857))
=======
>>>>>>> 5a94d8e5 ([DONE] Update : Playlist (corrections) (#923))
<<<<<<< HEAD
>>>>>>> 6a658ca2 ([DONE] Update : Playlist (corrections) (#923))
=======
>>>>>>> ee58a741 ([DONE] Update : Playlist (#857))
Expand All @@ -959,6 +992,12 @@ msgstr "Une erreur est survenue durant l’exécution du processus."
=======
>>>>>>> 5a94d8e5 ([DONE] Update : Playlist (corrections) (#923))
>>>>>>> 961ae8ee ([DONE] Update : Playlist (corrections) (#923))
=======
=======
=======
>>>>>>> ee58a741 ([DONE] Update : Playlist (#857))
>>>>>>> 46d54872 ([DONE] Update : Playlist (#857))
>>>>>>> 3ba3755b ([DONE] Update : Playlist (#857))
#: pod/main/static/js/filter-aside-element-list-refresh.js
msgid "Descending sort"
msgstr "Tri descendant"
Expand Down Expand Up @@ -1036,6 +1075,7 @@ msgstr ""
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 7a99126f ([DONE] Update : Displaying channels via AJAX (#910))
Expand All @@ -1049,6 +1089,8 @@ msgstr ""
>>>>>>> 22bbad30 ([DONE] Update : Playlist (#857))
=======
>>>>>>> 0fee55e1 ([DONE] Update : Displaying channels via AJAX (#910))
=======
>>>>>>> 3ba3755b ([DONE] Update : Playlist (#857))
#: pod/main/static/js/videojs-info-controlbar.js
msgid "Info"
msgstr "Info"
Expand All @@ -1057,10 +1099,15 @@ msgstr "Info"
msgid "Information"
msgstr "Information"

<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9a4278d9 ([DONE] Feature/fix iframe js (#1004))
=======
>>>>>>> 9a4278d9 ([DONE] Feature/fix iframe js (#1004))
=======
=======
>>>>>>> 46d54872 ([DONE] Update : Playlist (#857))
>>>>>>> 3ba3755b ([DONE] Update : Playlist (#857))
#: pod/playlist/static/playlist/js/add-or-edit.js
msgid "<b>Public:</b> the playlist can be accessed by anyone."
msgstr "<b>Public :</b> la liste de lecture est accessible par tous."
Expand Down Expand Up @@ -1137,8 +1184,21 @@ msgstr "La trace (slug) de la vidéo est introuvable."

#: pod/playlist/static/js/playlist.js
>>>>>>> 96067166 ([DONE] Update : Displaying channels via AJAX (#910))
<<<<<<< HEAD
>>>>>>> 3a4a3085 ([DONE] Update : Displaying channels via AJAX (#910))
<<<<<<< HEAD
>>>>>>> 0fee55e1 ([DONE] Update : Displaying channels via AJAX (#910))
=======
=======
=======
#: pod/playlist/static/playlist/js/add-or-edit.js
msgid "<b>Public:</b> the playlist can be accessed by anyone."
msgstr "<b>Public :</b> la liste de lecture est accessible par tous."

#: pod/playlist/static/playlist/js/add-or-edit.js
>>>>>>> ee58a741 ([DONE] Update : Playlist (#857))
>>>>>>> 46d54872 ([DONE] Update : Playlist (#857))
>>>>>>> 3ba3755b ([DONE] Update : Playlist (#857))
msgid ""
"<b>Password-protected:</b> the playlist can be accessed by anyone with the "
"appropriate link and password."
Expand Down Expand Up @@ -1182,10 +1242,15 @@ msgstr "<b>Privé :</b> vous seul avez accès à cette liste de lecture."
msgstr "<b>Privé :</b> vous seul avez accès à cette liste de lecture."

<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 46d54872 ([DONE] Update : Playlist (#857))
#: pod/playlist/static/playlist/js/filter-aside-playlist-list-refresh.js
#: pod/video/static/js/filter_aside_video_list_refresh.js
msgid "An Error occurred while processing."
msgstr "Une erreur est survenue durant l’exécution du processus."
<<<<<<< HEAD
>>>>>>> db188f15 ([DONE] Update : Playlist (#857))
>>>>>>> 22bbad30 ([DONE] Update : Playlist (#857))

Expand Down Expand Up @@ -1218,6 +1283,7 @@ msgstr "Une erreur est survenue durant l’exécution du processus."
=======
=======
>>>>>>> 5a94d8e5 ([DONE] Update : Playlist (corrections) (#923))
<<<<<<< HEAD
>>>>>>> 6a658ca2 ([DONE] Update : Playlist (corrections) (#923))
=======
>>>>>>> ee58a741 ([DONE] Update : Playlist (#857))
Expand All @@ -1227,6 +1293,12 @@ msgstr "Une erreur est survenue durant l’exécution du processus."
=======
>>>>>>> 5a94d8e5 ([DONE] Update : Playlist (corrections) (#923))
>>>>>>> 961ae8ee ([DONE] Update : Playlist (corrections) (#923))
=======
=======

>>>>>>> ee58a741 ([DONE] Update : Playlist (#857))
>>>>>>> 46d54872 ([DONE] Update : Playlist (#857))
>>>>>>> 3ba3755b ([DONE] Update : Playlist (#857))
#: pod/playlist/static/playlist/js/playlist-reorganize.js
msgid "Save your reorganization"
msgstr "Sauvegarder votre réorganisation"
Expand All @@ -1238,6 +1310,7 @@ msgstr "Sauvegarder"
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD

#: pod/playlist/static/playlist/js/video-favorites-remove-card.js
msgid "Network response was not ok."
Expand Down Expand Up @@ -1275,6 +1348,8 @@ msgstr "Chargement en cours…"
>>>>>>> ee58a741 ([DONE] Update : Playlist (#857))
=======
>>>>>>> 22bbad30 ([DONE] Update : Playlist (#857))
=======
>>>>>>> 3ba3755b ([DONE] Update : Playlist (#857))

#: pod/playlist/static/playlist/js/video-favorites-remove-card.js
msgid "Network response was not ok."
Expand All @@ -1286,6 +1361,8 @@ msgid "Loading…"
msgstr "Chargement en cours…"
=======
>>>>>>> db188f15 ([DONE] Update : Playlist (#857))
=======
>>>>>>> 46d54872 ([DONE] Update : Playlist (#857))

#: pod/playlist/static/playlist/js/video-favorites-remove-card.js
msgid "Network response was not ok."
Expand All @@ -1295,6 +1372,8 @@ msgstr "La réponse du réseau n'était pas correcte."
#: pod/video/static/js/change_video_owner.js
msgid "Loading…"
msgstr "Chargement en cours…"
=======
>>>>>>> ee58a741 ([DONE] Update : Playlist (#857))

#: pod/podfile/static/podfile/js/filewidget.js
msgid "Change image"
Expand Down Expand Up @@ -2029,6 +2108,7 @@ msgstr "Titre court"
<<<<<<< HEAD
=======

<<<<<<< HEAD
<<<<<<< HEAD
#~ msgid "Add a caption/subtitle after this one"
#~ msgstr "Ajouter un(e) légende/sous-titre ci-dessous"
Expand Down Expand Up @@ -2083,6 +2163,8 @@ msgstr "Titre court"
#~ msgstr "Répondre au commentaire"
>>>>>>> 0fee55e1 ([DONE] Update : Displaying channels via AJAX (#910))

=======
>>>>>>> 3ba3755b ([DONE] Update : Playlist (#857))
#~ msgid "Reply"
#~ msgstr "Répondre"

Expand Down
Loading

0 comments on commit 7fd6d5c

Please sign in to comment.