Merge branch 'develop' of https://github.com/EsupPortail/Esup-Pod int…

…o develop

CONFIGURATION_FR.md

@@ -1552,13 +1552,13 @@ Mettre `USE_IMPORT_VIDEO` à True pour activer cette application.<br>
 
  - `USE_BBB`
 
-  > valeur par défaut : `True`
+  > valeur par défaut : `False`
 
   >> Utilisation de BigBlueButton - [TODO] À retirer dans les futures versions de Pod <br>
 
  - `USE_BBB_LIVE`
 
-  > valeur par défaut : `False `
+  > valeur par défaut : `False`
 
   >> Utilisation du système de diffusion de Webinaires en lien avec BigBlueButton - [TODO] À retirer dans les futures versions de Pod <br>
 

pod/bbb/forms.py

@@ -1,3 +1,5 @@
+"""Esup-Pod BBB forms."""
+
 from django import forms
 from django.conf import settings
 from .models import BBB_Meeting

pod/bbb/templates/bbb/list_meeting.html

@@ -11,21 +11,17 @@
 
 {% block breadcrumbs %}
 {{ block.super }}
-    <li class="breadcrumb-item active" aria-current="page">{% trans "My BigBlueButton records" %}</li>
-{% endblock %}
-
-{% block page_title %}
-    {% trans "My BigBlueButton records" %}
+  <li class="breadcrumb-item active" aria-current="page">{{page_title}}</li>
 {% endblock %}
 
 {% block page_content %}
 
-  <h3>{% trans "Create a video from a BigBlueButton presentation" %}</h3>
+  <h2 class="h3">{% trans "Create a video from a BigBlueButton presentation" %}</h2>
   {% if records.paginator.count == 0 %}
-    <h4>{% trans "No record found"%}</h4>
-    <p class="alert alert-info">{% trans 'There are no BigBlueButton records.'%}</p>
+    <h3 class="h4">{% trans "No record found"%}</h3>
+    <p class="alert alert-info" role="alert">{% trans 'There are no BigBlueButton records.'%}</p>
   {% else %}
-    <h4>{% blocktrans count counter=records.paginator.count %}{{ counter }} record found{% plural %}{{ counter }} records found{% endblocktrans %}</h4>
+    <h3 class="h4">{% blocktrans count counter=records.paginator.count %}{{ counter }} record found{% plural %}{{ counter }} records found{% endblocktrans %}</h4>
     {% trans "This is the list of the recorded BigBlueButton sessions for which you were moderator. This module allows you to create a video from a BigBlueButton presentation." %}<br>
     {% trans "Shortly after the presentation is published, the corresponding video will appear in your videos." %}<br>
     <small class="form-text">
@@ -61,11 +57,8 @@ <h2 class="modal-title" id="previewModalLabel">{% trans "BigBlueButton presentat
 
 {% endblock page_content %}
 
-{% block collapse_page_aside %}
-{% endblock collapse_page_aside %}
-
-{% block page_aside %}
-{% endblock page_aside %}
+{% block collapse_page_aside %}{% endblock collapse_page_aside %}
+{% block page_aside %}{% endblock page_aside %}
 
 {% block more_script %}
 <script src="{% static 'waypoints/lib/jquery.waypoints.min.js' %}?ver={{VERSION}}"></script>

pod/bbb/templates/bbb/live_list_meeting.html

@@ -4,50 +4,41 @@
 
 {% block page_extra_head %}
   <link rel="stylesheet" href="{% static 'css/bbb.css' %}?ver={{VERSION}}">
-  <script>
-    window.setInterval("location.reload(true)",30000);
-  </script>
 {% endblock %}
 
 {% block breadcrumbs %}{{ block.super }}
-  <li class="breadcrumb-item active" aria-current="page">{% trans 'Perform a BigBlueButton live' %}</li>
-{% endblock %}
-
-{% block page_title %}
-  {% trans 'Perform a BigBlueButton live' %}
+  <li class="breadcrumb-item active" aria-current="page">{{page_title}}</li>
 {% endblock %}
 
 {% block page_content %}
-  <h3>{% trans "Perform a BigBlueButton live" %}</h3>
   {% if records.paginator.count == 0 %}
-    <h4>{% trans "No BigBlueButton session in progress found"%}</h4>
+    <h2 class="h3">{% trans "No BigBlueButton session in progress found"%}</h2>
   {% else %}
-    <h4>{% blocktrans count counter=records.paginator.count %}{{ counter }} BigBlueButton session in progress found{% plural %}{{ counter }} BigBlueButton sessions in progress found{% endblocktrans %}</h4>
+    <h2 class="h3">{% blocktrans count counter=records.paginator.count %}{{ counter }} BigBlueButton session in progress found{% plural %}{{ counter }} BigBlueButton sessions in progress found{% endblocktrans %}</h2>
   {% endif %}
-
-  {% trans "This is the list of current BigBlueButton sessions for which you are moderator. This module allows you to make a live stream from this BigBlueButton session (<i>useful if there are more than 100 users</i>)." %}
-  {% trans "<b>Remember to not use breakout rooms in this case and end the meeting once it is over.</b>" %}<br>
-  {% trans 'Shortly after clicking the "Perform a BigBlueButton live" button, and select the desired options, the live stream will be available to users on the <i class=\"bi bi-broadcast\"></i> <b>Lives</b> page.' %}<br>
-  <br>
+  <p>
+    {% trans "This is the list of current BigBlueButton sessions for which you are moderator. This module allows you to make a live stream from this BigBlueButton session (<em>useful if there are more than 100 users</em>)." %}
+    <strong>{% trans "Remember to not use breakout rooms in this case and end the meeting once it is over." %}</strong>
+  </p><p>
+    {% blocktrans %}Shortly after clicking the “Perform a BigBlueButton live” button, and select the desired options, the live stream will be available to users on the <i class="bi bi-broadcast" aria-hidden="true"></i> <strong>Lives</strong> page.{% endblocktrans %}
+  </p>
 
   {% if records.paginator.count == 0 %}
-    <p class="alert alert-info">{% trans 'There are no BigBlueButton sessions in progress.'%}</p>
+    <p class="alert alert-info" role="alert">{% trans 'There are no BigBlueButton sessions in progress.'%}</p>
   {% else %}
     {% include "bbb/live_record_list.html" %}
   {% endif %}
 
-  <small class="form-text"><i>{% trans "Please note: this page refreshes automatically every 30 seconds." %}</i></small>
+  <p class="form-text"><em>{% trans "Please note: this page refreshes automatically every 30 seconds." %}</em></p>
 {% endblock page_content %}
 
-{% block collapse_page_aside %}
-{% endblock collapse_page_aside %}
-
-{% block page_aside %}
-{% endblock page_aside %}
+{% block collapse_page_aside %}{% endblock collapse_page_aside %}
+{% block page_aside %}{% endblock page_aside %}
 
 {% block more_script %}
-<script src="{% static 'waypoints/lib/jquery.waypoints.min.js' %}?ver={{VERSION}}"></script>
-<script src="{% static 'waypoints/lib/shortcuts/infinite.min.js' %}?ver={{VERSION}}"></script>
+  <script>window.setInterval("location.reload(true)",30000);</script>
+  <script src="{% static 'waypoints/lib/jquery.waypoints.min.js' %}?ver={{VERSION}}"></script>
+  <script src="{% static 'waypoints/lib/shortcuts/infinite.min.js' %}?ver={{VERSION}}"></script>
 <script>
   var infinite = new Waypoint.Infinite({
     element: $('.infinite-container')[0],

pod/bbb/templates/bbb/live_publish_meeting.html

@@ -57,11 +57,11 @@ <h3>{% trans "Are you sure you want to perform a BigBlueButton live?" %}</h3>
           {% spaceless %}
           <div class="{% if "description_" in field.name or "title_"  in field.name %}collapse{% else %}{% endif %}{% if "description_" in field.name %} description{% endif %}{% if "title_" in field.name %} title{% endif %}">
             <div class="list-group-item">
-              <div class="{% if field.name == "owners" or field.name == "users" %}form-row {% endif %}form-group {% if field.field.required %}form-group-required {% endif %}" >
+              <div class="{% if field.name == "owners" or field.name == "users" %}form-row {% endif %}form-group {% if field.field.required %}form-group-required {% endif %}">
                 {{ field.errors }}
                 {% if "form-check-input" in field.field.widget.attrs.class %}
                   <div class="form-check">
-                    {{ field }} <label for="{{ field.id_for_label }}" class="form-check-label" >{{ field.label }}</label>
+                    {{ field }} <label for="{{ field.id_for_label }}" class="form-check-label">{{ field.label }}</label>
                   </div>
                 {% else %}
                     <label for="{{ field.id_for_label }}">{{ field.label }}</label>

pod/bbb/templates/bbb/live_record_list.html

@@ -2,7 +2,7 @@
 {% spaceless %}
   <div class="infinite-container pod-infinite-container" id="bbb_meetings_list">
     {% for record in records %}
-      <div class="infinite-item card-group">
+      <div class="infinite-item">
         {% include "bbb/live_card.html" %}
       </div>
       {% empty %}

pod/bbb/templates/bbb/publish_meeting.html

@@ -49,11 +49,11 @@ <h3>{% trans "Are you sure you want to publish this BigBlueButton presentation?"
       {% spaceless %}
       <div class="{% if "description_" in field.name or "title_"  in field.name %}collapse{% else %}{% endif %}{% if "description_" in field.name %} description{% endif %}{% if "title_" in field.name %} title{% endif %}">
         <div class="list-group-item">
-          <div class="{% if field.name == "owners" or field.name == "users" %}form-row {% endif %}form-group {% if field.field.required %}form-group-required {% endif %}" >
+          <div class="{% if field.name == "owners" or field.name == "users" %}form-row {% endif %}form-group {% if field.field.required %}form-group-required {% endif %}">
           {{ field.errors }}
           {% if "form-check-input" in field.field.widget.attrs.class %}
             <div class="form-check">
-              {{ field }} <label for="{{ field.id_for_label }}" class="form-check-label" >{{ field.label }}</label>
+              {{ field }} <label for="{{ field.id_for_label }}" class="form-check-label">{{ field.label }}</label>
             </div>
           {% else %}
             <label for="{{ field.id_for_label }}">{{ field.label }}</label>

pod/bbb/templates/bbb/record_list.html

@@ -2,7 +2,7 @@
 {% spaceless %}
 <div class="infinite-container pod-infinite-container" id="bbb_meetings_list">
   {% for record in records %}
-    <div class="infinite-item card-group">
+    <div class="infinite-item">
       {% include "bbb/card.html" %}
     </div>
     {% empty %}

pod/bbb/views.py

@@ -65,7 +65,11 @@ def list_meeting(request):
     return render(
         request,
         "bbb/list_meeting.html",
-        {"records": records, "full_path": full_path},
+        {
+            "records": records,
+            "full_path": full_path,
+            "page_title": _("My BigBlueButton records"),
+        },
     )
 
 
@@ -188,6 +192,7 @@ def live_list_meeting(request):
             "records": records,
             "full_path": full_path,
             "max_limit_reached": max_limit_reached,
+            "page_title": _("Perform a BigBlueButton live"),
         },
     )
 

pod/completion/admin.py

@@ -98,10 +98,11 @@ class DocumentAdmin(admin.ModelAdmin):
     autocomplete_fields = ["video"]
 
     def get_queryset(self, request):
-        qs = super().get_queryset(request)
+        """Get the queryset based on the request."""
+        queryset = super().get_queryset(request)
         if not request.user.is_superuser:
-            qs = qs.filter(video__sites=get_current_site(request))
-        return qs
+            queryset = queryset.filter(video__sites=get_current_site(request))
+        return queryset
 
     def formfield_for_foreignkey(self, db_field, request, **kwargs):
         if (db_field.name) == "video":

pod/completion/static/css/caption_maker.css

@@ -168,7 +168,7 @@
   float: right;
 }
 
-@media only screen and (max-width: 1000px) {
+@media only screen and (width <= 1000px) {
   .makerNavbarRight {
     float: none;
   }

pod/import_video/templates/import_video/add_or_edit.html

@@ -11,7 +11,8 @@
 {% block page_content %}
 {% if access_not_allowed == True %}
   <p class="text-info-emphasis">
-    <i class="bi bi-info-circle"></i>&nbsp;{% trans "Access to adding external recording has been restricted. If you want to add external recordings on the platform, please" %} <a href="{% url 'contact_us' %}">{% trans 'contact us' %}</a>
+    {% url "contact_us" as contact_us %}
+    <i class="bi bi-info-circle" aria-hidden="true"></i>&nbsp;{% blocktrans with url=contact_us %}Access to adding external recording has been restricted. If you want to add external recordings on the platform, please <a href="{{url}}">contact us</a>.{% endblocktrans %}
   </p>
 {% else %}
   <div class="pod-first-content">