From abe91d7c5c06684a6d25a9058566878ca4062d41 Mon Sep 17 00:00:00 2001
From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Fri, 16 Jul 2021 07:33:53 +0200
Subject: [PATCH] back to top

---
 .../exam/templates/exam/script_detail.html    |  4 +-
 teleforma/templates/teleforma/base.html       | 41 +++++++++----------
 2 files changed, 20 insertions(+), 25 deletions(-)

diff --git a/teleforma/exam/templates/exam/script_detail.html b/teleforma/exam/templates/exam/script_detail.html
index e9b5fcca..fbc2fd75 100644
--- a/teleforma/exam/templates/exam/script_detail.html
+++ b/teleforma/exam/templates/exam/script_detail.html
@@ -5,7 +5,7 @@
 {% load pdfannotator %}
 {% load thumbnail %}
 
-{% block top_javascript %}
+{% block extra_javascript %}
 {#  <link rel="stylesheet" href="//code.jquery.com/ui/1.10.4/themes/smoothness/jquery-ui.css">#}
 {#  <script src="//code.jquery.com/jquery-1.10.2.js"></script>#}
 {#  <script src="//code.jquery.com/ui/1.10.4/jquery-ui.js"></script>#}
@@ -21,9 +21,7 @@
   {% endif %}
     </script>
 
-{% endblock top_javascript %}
 
-{% block extra_javascript %}
 {% endblock extra_javascript %}
 
 {% block extra_stylesheets %}
diff --git a/teleforma/templates/teleforma/base.html b/teleforma/templates/teleforma/base.html
index d3ed9e06..a307b9cf 100644
--- a/teleforma/templates/teleforma/base.html
+++ b/teleforma/templates/teleforma/base.html
@@ -33,7 +33,25 @@
 
   {% block extra_stylesheets %}{% endblock %}
 
-  {% block top_javascript %}{% endblock top_javascript %}
+  {% block javascript %}
+  <script src="{% url 'js_catalog' %}" type="text/javascript"></script>
+  <script src="/static/teleforma/js/jquery-1.6.min.js" type="text/javascript"></script>
+  <script src="/static/teleforma/js/jquery-ui.js" type="text/javascript"></script>
+  <script src="/static/teleforma/js/jquery.expander.min.js" type="text/javascript"></script>
+  <script src="/static/teleforma/js/messi.min.js" type="text/javascript"></script>
+  <script src="/static/teleforma/js/rainbowvis.js" type="text/javascript"></script>
+  <script src="/static/teleforma/js/locale.js" type="text/javascript"></script>
+  <script src="/static/teleforma/js/application.js?v=2.1" type="text/javascript"></script>
+
+  {% if user.is_authenticated %}
+  <script type='text/javascript'>
+    var CURRENT_USER_NAME = "{{ user.username }}";
+  </script>
+  {% else %}
+  <script type='text/javascript'>
+    var CURRENT_USER_NAME = undefined;
+  </script>
+  {% endif %}
 
 </head>
 
@@ -221,27 +239,6 @@
   </div>
   {% endblock layout %}
 
-
-  {% block javascript %}
-  <script src="{% url 'js_catalog' %}" type="text/javascript"></script>
-  <script src="/static/teleforma/js/jquery-1.6.min.js" type="text/javascript"></script>
-  <script src="/static/teleforma/js/jquery-ui.js" type="text/javascript"></script>
-  <script src="/static/teleforma/js/jquery.expander.min.js" type="text/javascript"></script>
-  <script src="/static/teleforma/js/messi.min.js" type="text/javascript"></script>
-  <script src="/static/teleforma/js/rainbowvis.js" type="text/javascript"></script>
-  <script src="/static/teleforma/js/locale.js" type="text/javascript"></script>
-  <script src="/static/teleforma/js/application.js?v=2.1" type="text/javascript"></script>
-
-  {% if user.is_authenticated %}
-  <script type='text/javascript'>
-    var CURRENT_USER_NAME = "{{ user.username }}";
-  </script>
-  {% else %}
-  <script type='text/javascript'>
-    var CURRENT_USER_NAME = undefined;
-  </script>
-  {% endif %}
-
   {% block extra_javascript %}{% endblock %}
 
   <script type="text/javascript" src="{% static 'teleforma/tarteaucitron/tarteaucitron.js' %}"></script>
-- 
2.39.5