back to top

diff --git a/teleforma/exam/templates/exam/script_detail.html b/teleforma/exam/templates/exam/script_detail.html
index e9b5fcca4937e11a17ce37de52802c2db6674c01..fbc2fd7536412aeb9c22ee2ba70edcacaf9af5f1 100644 (file)
--- 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 d3ed9e068ffd8c7a5213752b8f9ae367304f7094..a307b9cfb3bea1014f4993e69a9859dc8125a2f6 100644 (file)
--- 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>