update support default block extrahead extrastyle

Author: wuyue92tree

adminlteui/templates/admin/auth/user/change_password.html

@@ -6,12 +6,11 @@
 <script type="text/javascript" src="{% url 'admin:jsi18n' %}"></script>
 {% endblock %}
 
-{% block custom_style %}{{ block.super }}
+{% block extrastyle %}
+{{ block.super }}
 <link rel="stylesheet" type="text/css" href="{% static "admin/dist/css/app.css" %}">
-<script type="text/javascript" src="{% url 'admin:jsi18n' %}"></script>
 {% endblock %}
 
-{% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% static "admin/css/forms.css" %}">{% endblock %}
 {% block bodyclass %}{{ block.super }} {{ opts.app_label }}-{{ opts.model_name }} change-form{% endblock %}
 {% if not is_popup %}
 {% block breadcrumbs %}
@@ -105,7 +104,7 @@ <h4 class="box-title">
 
 {% endblock %}
 
-{% block custom_js %}
+{% block extrajs %}
 <script>
     $('[required]').before('<span class="text-red" style="margin-left: -10px;">* </span>');
 </script>

adminlteui/templates/admin/base.html

@@ -19,7 +19,7 @@
          folder instead of downloading all of them to reduce the load. -->
     <link rel="stylesheet" href={% static "admin/dist/css/skins/_all-skins.min.css" %}>
 
-    {% block custom_style %} {% endblock %}
+    {% block extrastyle %} {% endblock %}
     <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
     <!--[if lt IE 9]>
@@ -452,7 +452,7 @@ <h3 class="control-sidebar-heading">Chat Settings</h3>
 })
 </script>
 
-{% block custom_js %}{% endblock %}
+{% block extrajs %}{% endblock %}
 
 </body>
 </html>

adminlteui/templates/admin/base_site.html

@@ -50,4 +50,4 @@ <h5><i class="icon fa fa-check"></i>{{ message|capfirst }}</h5>
 reserved.
 {% endblock %}
 
-{% block custom_js %} {% endblock %}
+{% block extrajs %} {% endblock %}

adminlteui/templates/admin/change_form.html

@@ -6,11 +6,11 @@
 {{ media }}
 {% endblock %}
 
-{% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% static "admin/css/forms.css" %}">{% endblock %}
-
-{% block custom_style %}
+{% block extrastyle %}
+{{ block.super }}
 <link rel="stylesheet" href="{% static "admin/dist/css/app.css" %}">
 {% endblock %}
+
 {% block coltype %}colM{% endblock %}
 
 {% block bodyclass %}{{ block.super }} app-{{ opts.app_label }} model-{{ opts.model_name }} change-form{% endblock %}
@@ -124,7 +124,7 @@ <h4 class="box-title">
 
 {% endblock %}
 
-{% block custom_js %}
+{% block extrajs %}
 <script src="{% static "admin/plugins/datatables/jquery.dataTables.min.js" %}"></script>
 <script src="{% static "admin/plugins/datatables/dataTables.bootstrap.min.js" %}"></script>
 <script>

adminlteui/templates/admin/change_list.html

@@ -3,10 +3,7 @@
 
 {% block extrastyle %}
 {{ block.super }}
-<link rel="stylesheet" type="text/css" href="{% static "admin/css/changelists.css" %}">
-{% if cl.formset %}
-<link rel="stylesheet" type="text/css" href="{% static "admin/css/forms.css" %}">
-{% endif %}
+<link rel="stylesheet" href="{% static "admin/plugins/datatables/dataTables.bootstrap.css" %}">
 {% if cl.formset or action_form %}
 <script type="text/javascript" src="{% url 'admin:jsi18n' %}"></script>
 {% endif %}
@@ -18,13 +15,6 @@
 {% endif %}
 {% endblock %}
 
-{% block custom_style %}
-<link rel="stylesheet" href="{% static "admin/plugins/datatables/dataTables.bootstrap.css" %}">
-{% if cl.formset or action_form %}
-<script type="text/javascript" src="{% url 'admin:jsi18n' %}"></script>
-{% endif %}
-{% endblock %}
-
 {% block extrahead %}
 {{ block.super }}
 {{ media.js }}
@@ -111,7 +101,7 @@ <h4 class="box-title">
 
 {% endblock %}
 
-{% block custom_js %}
+{% block extrajs %}
 <script src="{% static "admin/plugins/datatables/jquery.dataTables.min.js" %}"></script>
 <script src="{% static "admin/plugins/datatables/dataTables.bootstrap.min.js" %}"></script>
 

adminlteui/templates/admin/index.html

@@ -1,7 +1,7 @@
 {% extends "admin/base_site.html" %}
 {% load i18n static %}
 
-{% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% static "admin/css/dashboard.css" %}">{% endblock %}
+{% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% static "admin/dist/css/app.css" %}">{% endblock %}
 
 {% block coltype %}colMS{% endblock %}
 

adminlteui/templates/registration/password_change_form.html

@@ -1,10 +1,10 @@
 {% extends "admin/base_site.html" %}
 {% load i18n static %}
-{% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% static "admin/css/forms.css" %}">{% endblock %}
-{% block userlinks %}{% url 'django-admindocs-docroot' as docsroot %}{% if docsroot %}<a href="{{ docsroot }}">{% trans 'Documentation' %}</a> / {% endif %} {% trans 'Change password' %} / <a href="{% url 'admin:logout' %}">{% trans 'Log out' %}</a>{% endblock %}
-{% block custom_style %}
+{% block extrastyle %}
+{{ block.super }}
 <link rel="stylesheet" href="{% static "admin/dist/css/app.css" %}">
 {% endblock %}
+{% block userlinks %}{% url 'django-admindocs-docroot' as docsroot %}{% if docsroot %}<a href="{{ docsroot }}">{% trans 'Documentation' %}</a> / {% endif %} {% trans 'Change password' %} / <a href="{% url 'admin:logout' %}">{% trans 'Log out' %}</a>{% endblock %}
 
 {% block breadcrumbs %}
 <ol class="breadcrumb">
@@ -113,7 +113,7 @@ <h4 class="box-title">
 {% endblock %}
 
 
-{% block custom_js %}
+{% block extrajs %}
 <script>
     $('[required]').before('<span class="text-red" style="margin-left: -10px;">* </span>');
 </script>