fix

pod/dressing/forms.py

@@ -106,7 +106,7 @@ class DressingDeleteForm(forms.Form):
     """Form to delete a dressing."""
     agree = forms.BooleanField(
         label=_("I agree"),
-        help_text=_("Delete dressing cannot be undo"),
+        help_text=_("Delete video dressing cannot be undone"),
         widget=forms.CheckboxInput(),
     )
 

pod/dressing/models.py

@@ -73,7 +73,7 @@ class Dressing(models.Model):
 
     opacity = models.PositiveIntegerField(
         default=100,
-        validators=[MinValueValidator(0), MaxValueValidator(100)],
+        validators=[MinValueValidator(1), MaxValueValidator(100)],
         blank=True,
         null=True,
         verbose_name=_("opacity"),

pod/dressing/static/js/video_dressing.js

@@ -1,5 +1,6 @@
 /**
  * @file Esup-Pod functions for the dressing form.
+ * @since 3.5.0
  */
 
 /**

pod/dressing/templates/dressing_edit.html

@@ -9,7 +9,7 @@
 
 {% block breadcrumbs %}{{ block.super }}
 <li class="breadcrumb-item">
-  <a href="{% url 'dressing:my_dressings' %}" title="{% trans 'My dressings' %}">
+  <a href="{% url 'dressing:my_dressings' %}" title="{% trans 'My dressings' %}" data-bs-toggle="tooltip" data-bs-placement="top">
     {% trans 'My dressings' %}
   </a>
 </li>
@@ -64,7 +64,7 @@
         {% endfor %}
       </div>
       <div class="text-center">
-        <button type="submit" class="btn btn-primary">{% trans "Save" %}</button>
+        <button type="submit" class="btn btn-primary" title="{% trans 'Save' %}" data-bs-toggle="tooltip" data-bs-placement="top">{% trans "Save" %}</button>
       </div>
   </form>
 {% endblock page_content %}

pod/dressing/templates/my_dressings.html

@@ -112,8 +112,8 @@
                   </td>
                 <td>
                     <div class="d-flex justify-content-between">
-                        <a href="{% url 'dressing:dressing_edit' dressing_id=dressing.pk %}" class="btn btn-primary" title="{% trans 'Edit'%}"><i class="bi bi-pencil-square" aria-hidden="true"></i></a>
-                        <a href="{% url 'dressing:dressing_delete' dressing_id=dressing.pk %}" class="btn btn-danger" title="{% trans 'Delete'%}"><i class="bi bi-trash" aria-hidden="true"></i></a>
+                        <a href="{% url 'dressing:dressing_edit' dressing_id=dressing.pk %}" class="btn btn-primary" title="{% trans 'Edit'%}" data-bs-toggle="tooltip" data-bs-placement="top"><i class="bi bi-pencil-square" aria-hidden="true"></i></a>
+                        <a href="{% url 'dressing:dressing_delete' dressing_id=dressing.pk %}" class="btn btn-danger" title="{% trans 'Delete'%}" data-bs-toggle="tooltip" data-bs-placement="top"><i class="bi bi-trash" aria-hidden="true"></i></a>
                     </div>
                 </td>
             </tr>
@@ -124,7 +124,7 @@
         {% endfor %}
     </tbody>
 </table>
-<a href="{% url 'dressing:dressing_create' %}" class="btn btn-primary">{% trans 'Add new object' %}</a>
+<a href="{% url 'dressing:dressing_create' %}" class="btn btn-primary" title="{% trans 'Add new object' %}" data-bs-toggle="tooltip" data-bs-placement="top">{% trans 'Add new object' %}</a>
 {% endblock page_content %}
 
 {% block collapse_page_aside %}

pod/dressing/templates/video_dressing.html

@@ -17,9 +17,9 @@
 
 {% block breadcrumbs %}
 {{block.super}}
-<li class="breadcrumb-item"><a href="{% url 'video:my_videos'%}">{% trans 'My videos' %}</a></li>
+<li class="breadcrumb-item"><a href="{% url 'video:my_videos'%}" title="{% trans 'My videos' %}" data-bs-toggle="tooltip" data-bs-placement="bottom">{% trans 'My videos' %}</a></li>
 <li class="breadcrumb-item">
-  <a href="{% url 'video:video' slug=video.slug %}" title="{{video.title}}">
+  <a href="{% url 'video:video' slug=video.slug %}" title="{{video.title}}" data-bs-toggle="tooltip" data-bs-placement="bottom">
     {{video.title|title|truncatechars:45}}
   </a>
 </li>
@@ -66,7 +66,7 @@
           <td>{{ dressing.title }}</td>
           <td>
             {% if dressing.watermark %}
-            <img id="watermark" src="{{ dressing.watermark.file.url }}" alt="Watermark">
+            <img id="watermark" src="{{ dressing.watermark.file.url }}" alt="{% trans 'Watermark' %}">
             {% else %}
               {% trans 'None' %}
             {% endif %}
@@ -76,7 +76,7 @@
             {{ dressing.get_position_display }}
             {% else %}
             <div class="text-center">
-              <i class="bi bi-x-lg"></i>
+              <i class="bi bi-x-lg" aria-hidden="true"></i>
             </div>
             {% endif %}
           </td>
@@ -85,7 +85,7 @@
             {{ dressing.opacity }}
             {% else %}
             <div class="text-center">
-              <i class="bi bi-x-lg"></i>
+              <i class="bi bi-x-lg" aria-hidden="true"></i>
             </div>
             {% endif %}
           </td>
@@ -111,12 +111,13 @@
         {% endfor %}
     </tbody>
   </table>
-  <button type="button" onclick="resetRadioButtons()" class="btn btn btn-secondary btn-sm" title="{% trans 'Reset' %}">{% trans "Reset" %}</button>
+  <button type="button" onclick="resetRadioButtons()" class="btn btn btn-secondary btn-sm" title="{% trans 'Reset' %}" data-bs-toggle="tooltip" data-bs-placement="top">{% trans "Reset" %}</button>
 </form>
 
 <span class="float-end">
-  <button type="submit" form="apply_dressing" class="btn btn-primary btn-sm m-2" title="{% trans 'Apply' %}">{% trans "Apply" %}</button>
-  <a href="{% url 'video:video' slug=video.slug %}" title="{% trans 'View the video'%}" class="btn btn btn-secondary btn-sm">
+  <button type="submit" form="apply_dressing" class="btn btn-primary btn-sm m-2" title="{% trans 'Apply' %}" data-bs-toggle="tooltip" data-bs-placement="top">{% trans "Apply" %}</button>
+  <a class="btn btn btn-secondary btn-sm" href="{% url 'dressing:my_dressings' %}" title="{% trans 'My dressings'%}" data-bs-toggle="tooltip" data-bs-placement="top"><i class="bi bi-palette" aria-hidden="true"></i>&nbsp;{% trans 'My dressings' %}</a>
+  <a href="{% url 'video:video' slug=video.slug %}" title="{% trans 'View the video'%}" class="btn btn btn-secondary btn-sm" data-bs-toggle="tooltip" data-bs-placement="top">
     <i class="bi bi-film" aria-hidden="true"></i>&nbsp;{% trans 'Back to the video' %}
   </a>
 </span>
@@ -127,7 +128,7 @@
   {% if access_not_allowed == True %}
   {% else %}
     <div class="card" id="card-managevideo">
-      <h2 class="card-header card-title pod-card__title h4"><i class="bi bi-gear"></i>&nbsp;{% trans "Manage video" %}</h2>
+      <h2 class="card-header card-title pod-card__title h4"><i class="bi bi-gear" aria-hidden="true"></i>&nbsp;{% trans "Manage video" %}</h2>
       <div class="card-body card-text text-center">
         {% include "videos/link_video.html" %}
       </div>

pod/dressing/utils.py

@@ -5,7 +5,16 @@
 
 
 def get_position_value(position, height):
-    """Obtain dimensions proportional to the video format."""
+    """
+    Obtain dimensions proportional to the video format.
+
+    Args:
+        position (str): proprerty "position" of the dressing object.
+        height (str): height of the source video.
+
+    Returns:
+        str: params for the ffmpeg command.
+    """
     height = str(float(height) * 0.05)
     if position == 'top_right':
         return 'overlay=main_w-overlay_w-' + height + ':' + height
@@ -18,7 +27,16 @@ def get_position_value(position, height):
 
 
 def get_dressing_input(dressing, FFMPEG_DRESSING_INPUT):
-    """Function to obtain the files necessary for encoding a dressed video"""
+    """
+    Function to obtain the files necessary for encoding a dressed video.
+
+    Args:
+        dressing (:class:`pod.dressing.models.Dressing`): The dressing object.
+        FFMPEG_DRESSING_INPUT (str): Source file for encoding.
+
+    Returns:
+        command (str): params for the ffmpeg command.
+    """
     command = ''
     if dressing.watermark:
         command += FFMPEG_DRESSING_INPUT % {

pod/dressing/views.py

@@ -43,6 +43,8 @@ def video_dressing(request, slug):
         else:
             start_encode(video.id)
 
+        return redirect(reverse("video:video", args=(video.slug,)))
+
     try:
         current = Dressing.objects.get(videos=video)
     except Dressing.DoesNotExist:
@@ -78,7 +80,7 @@ def dressing_edit(request, dressing_id):
                                  _("The changes have been saved."))
             form_dressing.save()
             return redirect(reverse("dressing:my_dressings"))
-    page_title = _("Edit the dressing") + f' "{dressing_edit.title}"'
+    page_title = f'{_("Edit the dressing")} {dressing_edit.title}'
     return render(
         request,
         'dressing_edit.html',

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: 2023-11-30 16:26+0100\n"
+"POT-Creation-Date: 2023-12-04 11:53+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: obado <[email protected]>\n"
 "Language-Team: Pod Team [email protected]\n"
@@ -1958,7 +1958,7 @@ msgid "I agree"
 msgstr "J’accepte"
 
 #: pod/dressing/forms.py
-msgid "Delete dressing cannot be undo"
+msgid "Delete video dressing cannot be undone"
 msgstr "La suppression de l'habillage est définitive"
 
 #: pod/dressing/models.py
@@ -2031,7 +2031,8 @@ msgstr "Habillage de vidéos"
 
 #: pod/dressing/templates/dressing_delete.html
 #: pod/dressing/templates/dressing_edit.html
-#: pod/dressing/templates/my_dressings.html pod/main/templates/navbar.html
+#: pod/dressing/templates/my_dressings.html
+#: pod/dressing/templates/video_dressing.html pod/main/templates/navbar.html
 msgid "My dressings"
 msgstr "Mes habillages"
 
@@ -2138,10 +2139,6 @@ msgstr "Appliquer"
 msgid "The changes have been saved."
 msgstr "Les modifications ont été sauvegardées."
 
-#: pod/dressing/views.py
-msgid "Edit the dressing"
-msgstr "Éditer l'habillage"
-
 #: pod/dressing/views.py
 msgid "The dressing has been deleted."
 msgstr "L’habillage a été supprimé."
@@ -8864,6 +8861,9 @@ msgstr "Résultats de la recherche"
 msgid "Esup-Pod xAPI"
 msgstr "xAPI Esup-Pod"
 
+#~ msgid "Edit the dressing"
+#~ msgstr "Éditer l'habillage"
+
 #~ msgid "Dressing"
 #~ msgstr "Habillage"
 

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: 2023-11-30 16:26+0100\n"
+"POT-Creation-Date: 2023-12-04 11:53+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: obado <[email protected]>\n"
 "Language-Team: \n"

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-11-30 16:26+0100\n"
+"POT-Creation-Date: 2023-12-04 11:53+0100\n"
 "PO-Revision-Date: 2023-06-08 14:37+0200\n"
 "Last-Translator: obado <[email protected]>\n"
 "Language-Team: \n"
@@ -1860,7 +1860,7 @@ msgid "I agree"
 msgstr ""
 
 #: pod/dressing/forms.py
-msgid "Delete dressing cannot be undo"
+msgid "Delete video dressing cannot be undone"
 msgstr ""
 
 #: pod/dressing/models.py
@@ -1928,7 +1928,8 @@ msgstr ""
 
 #: pod/dressing/templates/dressing_delete.html
 #: pod/dressing/templates/dressing_edit.html
-#: pod/dressing/templates/my_dressings.html pod/main/templates/navbar.html
+#: pod/dressing/templates/my_dressings.html
+#: pod/dressing/templates/video_dressing.html pod/main/templates/navbar.html
 msgid "My dressings"
 msgstr ""
 
@@ -2035,10 +2036,6 @@ msgstr ""
 msgid "The changes have been saved."
 msgstr ""
 
-#: pod/dressing/views.py
-msgid "Edit the dressing"
-msgstr ""
-
 #: pod/dressing/views.py
 msgid "The dressing has been deleted."
 msgstr ""

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-11-30 16:26+0100\n"
+"POT-Creation-Date: 2023-12-04 11:53+0100\n"
 "PO-Revision-Date: 2023-02-08 15:22+0100\n"
 "Last-Translator: obado <[email protected]>\n"
 "Language-Team: \n"

pod/main/templates/navbar.html

@@ -269,7 +269,7 @@ <h5 id="pod-navbar__menuuserLabel">{% if user.get_full_name != '' %}{{ user.get_
                 <a class="nav-item nav-link" href="{% url 'channels:my_channels' %}"><i class="bi bi-play-btn pod-nav-link-icon mx-1" aria-hidden="true"></i>{% trans 'My channels' %}</a>
               {% endif %}
               {% if request.user.is_staff or request.user.is_superuser %}
-              <a class="nav-item nav-link" href="{% url 'dressing:my_dressings' %}"><i class="bi bi-palette-fill pod-nav-link-icon mx-1" aria-hidden="true"></i>{% trans 'My dressings' %}</a>
+              <a class="nav-item nav-link" href="{% url 'dressing:my_dressings' %}"><i class="bi bi-palette pod-nav-link-icon mx-1" aria-hidden="true"></i>{% trans 'My dressings' %}</a>
               {% endif %}
               {% if request.user.is_staff and USE_PODFILE %}
                 <a class="nav-item nav-link" href="{% url 'podfile:home' %}"><i class="bi bi-folder pod-nav-link-icon mx-1" aria-hidden="true"></i>{% trans 'My files' %}</a>

pod/video/templates/videos/link_video.html

@@ -57,8 +57,8 @@
 {% endif %}
 {% if video.encoded and video.encoding_in_progress is False %}
 {% if video.owner == request.user or request.user.is_superuser %}
-  <a href="{% url 'video:dressing:video_dressing' slug=video.slug %}" title="{% trans 'Dress the video'%}" class="btn btn-lg pod-btn-social p-1 m-0 ms-1">
-    <i class="bi bi-palette-fill" aria-hidden="true"></i></a>
+  <a href="{% url 'video:dressing:video_dressing' slug=video.slug %}" title="{% trans 'Dress the video'%}" class="btn btn-lg pod-btn-social p-1 m-0 ms-1" data-bs-toggle="tooltip" data-bs-placement="top">
+    <i class="bi bi-palette" aria-hidden="true"></i></a>
 {% endif %}
 {% endif %}
 {% if video.encoded and video.encoding_in_progress is False %}