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

EsupPortail · Dec 11, 2023 · 8c431eb · 8c431eb
1 parent 75af086
commit 8c431eb
Show file tree

Hide file tree

Showing 17 changed files with 15 additions and 58 deletions.
diff --git a/pod/completion/templates/video_caption_maker.html b/pod/completion/templates/video_caption_maker.html
@@ -3,7 +3,6 @@
 {% load static %}
 
 {% block page_extra_head %}
-  <script id="jsi18n" src="{% url 'javascript-catalog' %}"></script>
   <link rel="stylesheet" href="{% static 'css/caption_maker.css' %}?ver={{VERSION}}">
   {% include 'videos/video-header.html' %}
 {% endblock page_extra_head %}

diff --git a/pod/enrichment/templates/enrichment/group_enrichment.html b/pod/enrichment/templates/enrichment/group_enrichment.html
@@ -2,18 +2,13 @@
 {% load i18n %}
 {% load static %}
 
-{% block page_extra_head %}
-  <script id="jsi18n" src="{% url 'javascript-catalog' %}"></script>
-{% 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>
 {% endblock %}
 
 {% 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}}"

diff --git a/pod/import_video/templates/import_video/add_or_edit.html b/pod/import_video/templates/import_video/add_or_edit.html
@@ -2,10 +2,6 @@
 {% load i18n %}
 {% load static %}
 
-{% block page_extra_head %}
-  <script id="jsi18n" src="{% url 'javascript-catalog' %}"></script>
-{% endblock page_extra_head %}
-
 {% block breadcrumbs %}
 {{ block.super }}
 <li class="breadcrumb-item"><a href="{% url 'import_video:external_recordings' %}">{% trans "My external videos" %}</a></li>

diff --git 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
@@ -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="i18njs" 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
@@ -2,10 +2,6 @@
 {% load i18n %}
 {% load static %}
 
-{% block page_extra_head %}
-  <script id="jsi18n" src="{% url 'javascript-catalog' %}"></script>
-{% endblock %}
-
 {% block more_style %}
   <link rel="stylesheet" type="text/css" href="{% static 'admin/css/widgets.css' %}?ver={{ VERSION }}">
   <style>

diff --git a/pod/live/templates/live/event_immediate_edit.html b/pod/live/templates/live/event_immediate_edit.html
@@ -2,10 +2,6 @@
 {% load i18n %}
 {% load static %}
 
-{% block page_extra_head %}
-  <script id="jsi18n" src="{% url 'javascript-catalog' %}"></script>
-{% endblock %}
-
 {% block more_style %}
     <link rel="stylesheet" type="text/css" href="{% static 'admin/css/widgets.css' %}?ver={{ VERSION }}">
     <style></style>

diff --git 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="i18njs" src="{% url 'javascript-catalog' %}?ver={{VERSION}}"></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
@@ -2,10 +2,6 @@
 {% load i18n %}
 {% load static %}
 
-{% block page_extra_head %}
-  <script id="jsi18n" src="{% url 'javascript-catalog' %}"></script>
-{% endblock page_extra_head %}
-
 {% block breadcrumbs %}
 {{ block.super }}
 <li class="breadcrumb-item"><a href="{% url 'meeting:my_meetings' %}">{% trans 'My meetings' %}</a></li>

diff --git a/pod/playlist/templates/playlist/add_or_edit.html b/pod/playlist/templates/playlist/add_or_edit.html
@@ -2,10 +2,6 @@
 {% load i18n %}
 {% load static %}
 
-{% block page_extra_head %}
-  <script id="jsi18n" src="{% url 'javascript-catalog' %}"></script>
-{% endblock %}
-
 {% block breadcrumbs %}
     {{ block.super }}
     <li class="breadcrumb-item">

diff --git 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
@@ -3,7 +3,6 @@
 {% load static %}
 {% load thumbnail %}
 {% block page_extra_head %}
-  <script id="jsi18n" src="{% url 'javascript-catalog' %}"></script>
   <style>
     {{ form.instance.style }}
 

diff --git a/pod/video/templates/channel/theme_edit.html b/pod/video/templates/channel/theme_edit.html
@@ -4,7 +4,6 @@
 {% load thumbnail %}
 
 {% block page_extra_head %}
-  <script id="jsi18n" src="{% url 'javascript-catalog' %}"></script>
 <style>
   {{channel.style}}
   {% if channel.color %}

diff --git a/pod/video/templates/videos/add_video.html b/pod/video/templates/videos/add_video.html
@@ -3,13 +3,9 @@
 {% load static %}
 {% load tagging_tags %}
 
-{% block page_extra_head %}
-  <script id="jsi18n" src="{% url 'javascript-catalog' %}"></script>
-{% 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 %}

diff --git 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="i18njs" 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
@@ -3,10 +3,6 @@
 {% load static %}
 {% load tagging_tags %}
 
-{% block page_extra_head %}
-  <script id="jsi18n" src="{% url 'javascript-catalog' %}"></script>
-{% 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 != '' %}

diff --git a/pod/video_search/templates/search/search.html b/pod/video_search/templates/search/search.html
@@ -2,10 +2,6 @@
 {% load i18n %}
 {% load static %}
 
-{% block page_extra_head %}
-  <script id="jsi18n" src="{% url 'javascript-catalog' %}"></script>
-{% endblock page_extra_head %}
-
 {% block opengraph %}
   <meta name="description" content="{{ query }}">
   <!-- Open Graph data -->