From 23517c81e4302f9234b1050228e41312c8695e1c Mon Sep 17 00:00:00 2001
From: Olivier Bado-Faustin <bado@unice.fr>
Date: Thu, 4 Jan 2024 10:31:05 +0100
Subject: [PATCH] [DONE] Fix jsi18n (#1011)

* * Replace every `<script src="/admin/jsi18n/"></script>` by `<script id="jsi18n" src="{% url 'javascript-catalog' %}"></script>`
* Add js-catalog in theme_edit.html

* Add jsi18n in more scripts

* Add JS catalog in caption maker

* Remove every `javascript-catalog` as it is already in base.html

* rename i18njs as jsi18n

* Remove the "version" number in base html, as webpush also load it without version number and we do not want it to be downloaded twice.
---
 .../templates/enrichment/group_enrichment.html  |  6 ------
 .../templates/import_video/add_or_edit.html     |  1 -
 pod/live/templates/live/directs.html            |  4 ----
 pod/live/templates/live/event-iframe.html       |  4 ++--
 pod/live/templates/live/event_edit.html         |  2 +-
 .../templates/live/event_immediate_edit.html    |  1 -
 pod/main/templates/base.html                    | 17 ++++++++++-------
 pod/meeting/templates/meeting/add_or_edit.html  |  1 -
 .../templates/playlist/add_or_edit.html         |  3 +--
 pod/podfile/templates/podfile/home.html         |  2 --
 pod/video/templates/channel/channel_edit.html   | 17 ++++++++---------
 pod/video/templates/channel/theme_edit.html     |  2 +-
 pod/video/templates/videos/add_video.html       | 12 +++---------
 pod/video/templates/videos/video-iframe.html    |  2 +-
 pod/video/templates/videos/video_edit.html      |  5 -----
 pod/video_search/templates/search/search.html   |  2 --
 16 files changed, 27 insertions(+), 54 deletions(-)

diff --git a/pod/enrichment/templates/enrichment/group_enrichment.html b/pod/enrichment/templates/enrichment/group_enrichment.html
index 6fcef1f905..cd18a75fab 100644
--- a/pod/enrichment/templates/enrichment/group_enrichment.html
+++ b/pod/enrichment/templates/enrichment/group_enrichment.html
@@ -2,10 +2,6 @@
 {% load i18n %}
 {% load static %}
 
-{% block page_extra_head %}
-
-{% endblock page_extra_head %}
-
 {% block breadcrumbs %}{{ block.super }}
 <li class="breadcrumb-item"><a href="{% url 'video:my_videos' %}">{% trans 'My videos' %}</a></li>
 <li class="breadcrumb-item active" aria-current="page">{% trans "Editing group for the enrichment of the video" %}</li>
@@ -13,7 +9,6 @@
 
 {% block page_title %}{% trans "Editing group for the enrichment of the video" %} "{{video.title}}"{% endblock %}
 
-
 {% block page_content %}
 {% spaceless %}
 <h3>{% trans "Editing group for the enrichment of the video" %} "{{video.title}}"
@@ -79,7 +74,6 @@ <h2 class="card-header card-title pod-card__title h4">
 {% endblock page_aside %}
 
 {% block more_script %}
-  <script src="/admin/jsi18n/"></script>
   <script src="{% static 'admin/js/core.js' %}?ver={{VERSION}}"></script>
   <script src="{% static 'admin/js/vendor/jquery/jquery.js' %}?ver={{VERSION}}"></script>
   <script src="{% static 'admin/js/jquery.init.js' %}?ver={{VERSION}}"></script>
diff --git a/pod/import_video/templates/import_video/add_or_edit.html b/pod/import_video/templates/import_video/add_or_edit.html
index 4217205a81..ca6f16af12 100644
--- a/pod/import_video/templates/import_video/add_or_edit.html
+++ b/pod/import_video/templates/import_video/add_or_edit.html
@@ -227,7 +227,6 @@ <h2 class="card-header card-title pod-card__title h4">{% trans "Terms of Service
 {% endblock page_aside %}
 
 {% block more_script %}
-<script src="/admin/jsi18n/"></script>
 <script src="{% static 'admin/js/core.js' %}?ver={{VERSION}}"></script>
 <link rel="stylesheet" type="text/css" href="{% static 'admin/css/widgets.css' %}?ver={{VERSION}}">
 {{form.media}}
diff --git a/pod/live/templates/live/directs.html b/pod/live/templates/live/directs.html
index fb30bdb0a6..0e2484e871 100644
--- a/pod/live/templates/live/directs.html
+++ b/pod/live/templates/live/directs.html
@@ -2,10 +2,6 @@
 {% load i18n %}
 {% load static %}
 
-{% block page_extra_head %}
-{% endblock %}
-
-
 {% block breadcrumbs %}
 {{ block.super }}
 <li class="breadcrumb-item"><a href="{% url 'live:directs_all'%}">{% trans "Lives" %}</a></li>
diff --git a/pod/live/templates/live/event-iframe.html b/pod/live/templates/live/event-iframe.html
index 722972f068..3c478f743a 100644
--- a/pod/live/templates/live/event-iframe.html
+++ b/pod/live/templates/live/event-iframe.html
@@ -2,7 +2,7 @@
 {% load static %}
 
 <!DOCTYPE html>
-<html itemscope itemtype="https://schema.org/MediaObject" lang="eng">
+<html itemscope itemtype="https://schema.org/MediaObject">
     <head>
         <meta charset="utf-8">
 
@@ -27,7 +27,7 @@
 
         <link rel="stylesheet" href="{% static 'bootstrap/dist/css/bootstrap.min.css' %}?ver={{VERSION}}" crossorigin="anonymous">
         <script src="{% static 'bootstrap/dist/js/bootstrap.bundle.min.js' %}?ver={{VERSION}}"></script>
-        <script src="{% url 'javascript-catalog' %}"></script>
+        <script id="jsi18n" src="{% url 'javascript-catalog' %}?ver={{VERSION}}"></script>
 
         <link rel="stylesheet" href="{% static 'css/video-iframe.css' %}?ver={{VERSION}}">
     </head>
diff --git a/pod/live/templates/live/event_edit.html b/pod/live/templates/live/event_edit.html
index f8bb4f619c..d7b735cba0 100644
--- a/pod/live/templates/live/event_edit.html
+++ b/pod/live/templates/live/event_edit.html
@@ -10,6 +10,7 @@
     }
   </style>
 {% endblock %}
+
 {% block breadcrumbs %}{{ block.super }}
   <li class="breadcrumb-item"><a href="{% url 'live:my_events' %}">{% trans 'My events' %}</a></li>
   {% if form.instance.title and form.instance.slug != '' %}
@@ -163,7 +164,6 @@ <h2 class="h4 card-header card-title pl-2">{% trans "Mandatory fields" %}</h2>
 {% endblock page_aside %}
 
 {% block more_script %}
-  <script src="/admin/jsi18n/"></script>
   <script src="{% static 'admin/js/core.js' %}?ver={{ VERSION }}"></script>
   <script src="{% static 'js/broadcaster_from_building.js' %}?ver={{ VERSION }}"></script>
 
diff --git a/pod/live/templates/live/event_immediate_edit.html b/pod/live/templates/live/event_immediate_edit.html
index d12f7c2971..98b43c8c01 100644
--- a/pod/live/templates/live/event_immediate_edit.html
+++ b/pod/live/templates/live/event_immediate_edit.html
@@ -108,7 +108,6 @@ <h2 class="h4 card-header card-title pl-2">{% trans "Mandatory fields" %}</h2>
 {% endblock page_aside %}
 
 {% block more_script %}
-    <script src="/admin/jsi18n/"></script>
     <script src="{% static 'admin/js/core.js' %}?ver={{ VERSION }}"></script>
     <script src="{% static 'admin/js/vendor/jquery/jquery.js' %}?ver={{ VERSION }}"></script>
     <script src="{% static 'admin/js/jquery.init.js' %}?ver={{ VERSION }}"></script>
diff --git a/pod/main/templates/base.html b/pod/main/templates/base.html
index 00bd5b27bc..c582886dd0 100644
--- a/pod/main/templates/base.html
+++ b/pod/main/templates/base.html
@@ -40,11 +40,15 @@
     <link href="{% static 'css/event.css' %}?ver={{ VERSION }}" rel="stylesheet">
   {% endif %}
   <!-- more styles for each App -->
-  {% block more_style %}
-  {% endblock more_style %}
-  <title>{{ TITLE_SITE }} - {% block page_title %}{{page_title|striptags|capfirst}}{% endblock %}</title>  <script src="{% static 'jquery/dist/jquery.min.js' %}"></script>
-  {% block page_extra_head %}
-  {% endblock %}
+  {% block more_style %}{% endblock more_style %}
+
+  <title>{{ TITLE_SITE }} - {% block page_title %}{{page_title|striptags|capfirst}}{% endblock %}</title>
+
+  <script src="{% static 'jquery/dist/jquery.min.js' %}"></script>
+  <script id="jsi18n" src="{% url 'javascript-catalog' %}"></script>
+
+  {% block page_extra_head %}{% endblock %}
+
   {% if request.GET.is_iframe %}
     <link rel="stylesheet" href="{% static 'css/iframe.css' %}?ver={{VERSION}}" media="screen">
   {% endif %}
@@ -166,7 +170,7 @@ <h1 class="page_title">{{page_title|capfirst}}</h1>
             <img src="{% static 'img/cookie.svg' %}" alt="" width="50">
             <span class="mt-2">{% trans 'We use third party cookies to personalize content, manage session and analyze site traffic.' %}</span>
             {% if COOKIE_LEARN_MORE != "" %}
-              <a class="d-flex align-items-center" href="{{COOKIE_LEARN_MORE}}">{% trans 'Learn more' %}<i class="bi bi-caret-right ms-2"></i></a>
+              <a class="d-flex align-items-center" href="{{COOKIE_LEARN_MORE}}">{% trans 'Learn more' %}<i class="bi bi-caret-right ms-2" aria-hidden="true"></i></a>
             {% endif %}
             <button class="btn btn-dark mt-3 px-4" type="button" id='okcookie'>{% trans 'I understand' %}</button>
           </div>
@@ -177,7 +181,6 @@ <h1 class="page_title">{{page_title|capfirst}}</h1>
   <!-- Javascript migration from header to footer-->
   <!-- except for jquery, to do later ! -->
   <script src="{% static 'js-cookie/dist/js.cookie.min.js' %}?ver={{VERSION}}"></script>
-  <script src="{% url 'javascript-catalog' %}"></script>
   <!-- JS -->
   <script src="{% static 'bootstrap/dist/js/bootstrap.bundle.min.js' %}?ver={{VERSION}}"></script>
 
diff --git a/pod/meeting/templates/meeting/add_or_edit.html b/pod/meeting/templates/meeting/add_or_edit.html
index 0889a4eeaf..592fc65fcd 100644
--- a/pod/meeting/templates/meeting/add_or_edit.html
+++ b/pod/meeting/templates/meeting/add_or_edit.html
@@ -157,7 +157,6 @@ <h2 class="modal-title h3" id="addEditLabel">{{ options.legend|safe }}</h2>
 {% endblock page_aside %}
 
 {% block more_script %}
-<script src="/admin/jsi18n/"></script>
 <script src="{% static 'admin/js/core.js' %}?ver={{VERSION}}"></script>
 <!--
 <script src="{% static 'admin/js/vendor/jquery/jquery.js' %}?ver={{VERSION}}"></script>
diff --git a/pod/playlist/templates/playlist/add_or_edit.html b/pod/playlist/templates/playlist/add_or_edit.html
index 26d122937b..2b27023a9a 100644
--- a/pod/playlist/templates/playlist/add_or_edit.html
+++ b/pod/playlist/templates/playlist/add_or_edit.html
@@ -39,7 +39,7 @@
                     {% endfor %}
                 </p>
             {% endif %}
-            
+
             {% for field_hidden in form.hidden_fields %}
                 {{ field_hidden }}
             {% endfor %}
@@ -96,7 +96,6 @@
 {% endblock page_aside %}
 
 {% block more_script %}
-    <script src="/admin/jsi18n/"></script>
     <script src="{% static 'admin/js/core.js' %}?ver={{ VERSION }}"></script>
     <link rel="stylesheet" type="text/css" href="{% static 'admin/css/widgets.css' %}?ver={{ VERSION }}">
     <script src="{% static 'playlist/js/add-or-edit.js' %}?ver={{ VERSION }}"></script>
diff --git a/pod/podfile/templates/podfile/home.html b/pod/podfile/templates/podfile/home.html
index 6b550a0895..1d2a96feb7 100644
--- a/pod/podfile/templates/podfile/home.html
+++ b/pod/podfile/templates/podfile/home.html
@@ -14,8 +14,6 @@
   <link rel="stylesheet" type="text/css" href="{% static 'podfile/css/podfile.css' %}?ver={{VERSION}}">
 {% endblock more_style %}
 
-{% block page_extra_head %}
-{% endblock %}
 
 {% block page_content %}
   {% include 'podfile/home_content.html' %}
diff --git a/pod/video/templates/channel/channel_edit.html b/pod/video/templates/channel/channel_edit.html
index b2eff5875e..2c33505ddd 100644
--- a/pod/video/templates/channel/channel_edit.html
+++ b/pod/video/templates/channel/channel_edit.html
@@ -3,15 +3,15 @@
 {% load static %}
 {% load thumbnail %}
 {% block page_extra_head %}
-<style>
-  {{ form.instance.style }}
+  <style>
+    {{ form.instance.style }}
 
-  {% if form.instance.color %}
-    body {
-      background-color: {{form.instance.color}};
-    }
-  {% endif %}
-</style>
+    {% if form.instance.color %}
+      body {
+        background-color: {{form.instance.color}};
+      }
+    {% endif %}
+  </style>
 {% endblock page_extra_head %}
 
 {% block breadcrumbs %}{{ block.super }}
@@ -152,7 +152,6 @@ <h2 class="h4 card-header card-title pod-card__title">{% trans "Form fields"%}</
 {% endblock page_aside %}
 
 {% block more_script %}
-  <script src="/admin/jsi18n/"></script>
   <script src="{% static 'admin/js/core.js' %}?ver={{VERSION}}"></script>
   <link rel="stylesheet" type="text/css" href="{% static 'admin/css/widgets.css' %}?ver={{VERSION}}">
   {{form.media}}
diff --git a/pod/video/templates/channel/theme_edit.html b/pod/video/templates/channel/theme_edit.html
index 206a763eef..8fc51fa9de 100644
--- a/pod/video/templates/channel/theme_edit.html
+++ b/pod/video/templates/channel/theme_edit.html
@@ -93,4 +93,4 @@ <h2 class="h4 card-header card-title pod-card__title">{% trans "Form fields"%}</
 {% endblock page_aside %}
 
 {% block more_script %}
-{% endblock more_script %}
\ No newline at end of file
+{% endblock more_script %}
diff --git a/pod/video/templates/videos/add_video.html b/pod/video/templates/videos/add_video.html
index 870a529b0f..70079c3f5a 100644
--- a/pod/video/templates/videos/add_video.html
+++ b/pod/video/templates/videos/add_video.html
@@ -3,14 +3,9 @@
 {% load static %}
 {% load tagging_tags %}
 
-
-{% block page_extra_head %}
-{% endblock page_extra_head %}
-
-
 {% block breadcrumbs %}{{ block.super }}
-<li class="breadcrumb-item"><a href="{% url 'video:my_videos' %}">{% trans 'My videos' %}</a></li>
-<li class="breadcrumb-item active" aria-current="page">{{page_title}}</li>
+  <li class="breadcrumb-item"><a href="{% url 'video:my_videos' %}">{% trans 'My videos' %}</a></li>
+  <li class="breadcrumb-item active" aria-current="page">{{page_title}}</li>
 {% endblock %}
 
 {% block page_title %}{% if form.instance.title %}{% trans "Editing the video" %} "{{form.instance.title}}"{% else %}{% trans "Choose an audio or video file to upload" %}{% endif %}{% endblock %}
@@ -113,7 +108,6 @@ <h2 class="card-header card-title pod-card__title h4">{% trans "Help for form fi
 
 
 {% block more_script %}
-<script src="/admin/jsi18n/"></script>
 <script src="{% static 'admin/js/core.js' %}?ver={{VERSION}}"></script>
 <script src="{% static 'admin/js/vendor/jquery/jquery.js' %}?ver={{VERSION}}"></script>
 <script src="{% static 'admin/js/jquery.init.js' %}?ver={{VERSION}}"></script>
@@ -235,4 +229,4 @@ <h2 class="card-header card-title pod-card__title h4">{% trans "Help for form fi
   }
 </style>
 
-{% endblock more_script %}
\ No newline at end of file
+{% endblock more_script %}
diff --git a/pod/video/templates/videos/video-iframe.html b/pod/video/templates/videos/video-iframe.html
index 2ecdc08d56..31965abdc7 100644
--- a/pod/video/templates/videos/video-iframe.html
+++ b/pod/video/templates/videos/video-iframe.html
@@ -23,7 +23,7 @@
 
   <link rel="stylesheet" href="{% static 'bootstrap/dist/css/bootstrap.min.css' %}?ver={{VERSION}}" crossorigin="anonymous">
   <script src="{% static 'bootstrap/dist/js/bootstrap.bundle.min.js' %}?ver={{VERSION}}"></script>
-  <script src="{% url 'javascript-catalog' %}"></script>
+  <script id="jsi18n" src="{% url 'javascript-catalog' %}?ver={{VERSION}}"></script>
 
   <link rel="stylesheet" href="{% static 'css/video-iframe.css' %}?ver={{VERSION}}">
 
diff --git a/pod/video/templates/videos/video_edit.html b/pod/video/templates/videos/video_edit.html
index bc38f7a483..ce582bd8d6 100644
--- a/pod/video/templates/videos/video_edit.html
+++ b/pod/video/templates/videos/video_edit.html
@@ -3,10 +3,6 @@
 {% load static %}
 {% load tagging_tags %}
 
-{% block page_extra_head %}
-{% endblock page_extra_head %}
-
-
 {% block breadcrumbs %}{{ block.super }}
   <li class="breadcrumb-item"><a href="{% url 'video:my_videos' %}">{% trans 'My videos' %}</a></li>
   {% if form.instance.title and form.instance.slug != '' %}
@@ -271,7 +267,6 @@ <h2 class="h4 card-header card-title pod-card__title ps-2">{% trans "Help for fo
 
 
 {% block more_script %}
-  <script src="/admin/jsi18n/"></script>
   <script src="{% static 'admin/js/core.js' %}?ver={{VERSION}}"></script>
   <script>
     var listTheme = {{listTheme | safe}};
diff --git a/pod/video_search/templates/search/search.html b/pod/video_search/templates/search/search.html
index e0151218fe..e95de73232 100644
--- a/pod/video_search/templates/search/search.html
+++ b/pod/video_search/templates/search/search.html
@@ -162,7 +162,6 @@ <h2 class="card-title pod-card__title h4">{% trans 'Filter' %}</h2>
 {% 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>
@@ -188,7 +187,6 @@ <h2 class="card-title pod-card__title h4">{% trans 'Filter' %}</h2>
   }
   });
 </script>
-<script src="/admin/jsi18n/"></script>
 <script src="{% static 'admin/js/core.js' %}?ver={{VERSION}}"></script>
 <script src="{% static 'admin/js/vendor/jquery/jquery.js' %}?ver={{VERSION}}"></script>
 <script src="{% static 'admin/js/jquery.init.js' %}?ver={{VERSION}}"></script>