refactor: remove the "javascripts" block

In accordance to stephenmcd/grappelli-safe@04a8900
stephenmcd · Aug 12, 2020 · e04a9c1 · e04a9c1
1 parent b5316ca
commit e04a9c1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/filebrowser_safe/templates/filebrowser/index.html b/filebrowser_safe/templates/filebrowser/index.html
@@ -11,7 +11,7 @@
 {% endblock %}
 
 <!-- JAVASCRIPTS -->
-{% block javascripts %}
+{% block extrahead %}
 {{ block.super }}
 
 {% ifequal query.pop '1' %} <!-- FileBrowseField -->
@@ -32,16 +32,14 @@
 <script language="javascript" type="text/javascript" src="{{ settings_var.URL_FILEBROWSER_MEDIA }}js/FB_TinyMCE4.js"></script>
 {% endifequal %}
 
-{{ media }}
-
 <script type="text/javascript" src="{% static "grappelli/js/admin/Changelist.js" %}"></script>
 
 {% if not actions_on_top and not actions_on_bottom %}
 <style>
     #changelist table thead th:first-child { width: inherit; }
 </style>
 {% endif %}
-{% endblock %}
+{% endblock extrahead %}
 
 {% block rtl_styles %}
 {{ block.super }}

diff --git a/filebrowser_safe/templates/filebrowser/upload.html b/filebrowser_safe/templates/filebrowser/upload.html
@@ -16,11 +16,10 @@
 {% endblock %}
 
 <!-- JAVASCRIPTS -->
-{% block javascripts %}
+{% block extrahead %}
     {{ block.super }}
-    <script type="text/javascript" src="../../jsi18n/"></script>
     <script type="text/javascript" src="{{ settings_var.URL_FILEBROWSER_MEDIA }}js/upload.js"></script>
-{% endblock %}
+{% endblock extrahead %}
 
 <!-- COLTYPE/BODYCLASS -->
 {% block coltype %}colM{% endblock %}