Skip to content

Commit 2f71f1d

Browse files
wuyue92treewuyue92tree
committed
Merge branch 'release/1.1.0'
2 parents a2fcc39 + 1afa94a commit 2f71f1d

File tree

13 files changed

+202
-33
lines changed

13 files changed

+202
-33
lines changed

‎adminlteui/__init__.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
version = '1.0.0'
1+
version = '1.1.0'
2+
# default_app_config = 'adminlteui.apps.AdminlteUIConfig'

‎adminlteui/templates/admin/404.html‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{% extends "admin/base_site.html" %}
2+
{% load i18n %}
3+
4+
{% block title %}{% trans 'Page not found' %}{% endblock %}
5+
6+
{% block content_title %} {% trans 'Page not found' %} {% endblock %}
7+
8+
{% block content %}
9+
10+
<p>{% trans "We're sorry, but the requested page could not be found." %}</p>
11+
12+
{% endblock %}

‎adminlteui/templates/admin/500.html‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{% extends "admin/base_site.html" %}
2+
{% load i18n %}
3+
4+
{% block breadcrumbs %}
5+
6+
<ol class="breadcrumb">
7+
<li><a href="{% url 'admin:index' %}"><i class="fa fa-dashboard"></i> {% trans 'Home' %}</a></li>
8+
<li class="active">{% trans 'Server error' %}</li>
9+
</ol>
10+
{% endblock %}
11+
12+
{% block title %}{% trans 'Server error (500)' %}{% endblock %}
13+
14+
{% block content_title %} {% trans 'Server Error <em>(500)</em>' %} {% endblock %}
15+
16+
{% block content %}
17+
18+
<p>{% trans "There's been an error. It's been reported to the site administrators via email and should be fixed shortly. Thanks for your patience." %}</p>
19+
20+
{% endblock %}

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,11 @@
66
<script type="text/javascript" src="{% url 'admin:jsi18n' %}"></script>
77
{% endblock %}
88

9-
{% block custom_style %}{{ block.super }}
9+
{% block extrastyle %}
10+
{{ block.super }}
1011
<link rel="stylesheet" type="text/css" href="{% static "admin/dist/css/app.css" %}">
11-
<script type="text/javascript" src="{% url 'admin:jsi18n' %}"></script>
1212
{% endblock %}
1313

14-
{% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% static "admin/css/forms.css" %}">{% endblock %}
1514
{% block bodyclass %}{{ block.super }} {{ opts.app_label }}-{{ opts.model_name }} change-form{% endblock %}
1615
{% if not is_popup %}
1716
{% block breadcrumbs %}
@@ -105,7 +104,7 @@ <h4 class="box-title">
105104

106105
{% endblock %}
107106

108-
{% block custom_js %}
107+
{% block extrajs %}
109108
<script>
110109
$('[required]').before('<span class="text-red" style="margin-left: -10px;">* </span>');
111110
</script>

‎adminlteui/templates/admin/base.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
folder instead of downloading all of them to reduce the load. -->
2020
<link rel="stylesheet" href={% static "admin/dist/css/skins/_all-skins.min.css" %}>
2121

22-
{% block custom_style %} {% endblock %}
22+
{% block extrastyle %} {% endblock %}
2323
<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
2424
<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
2525
<!--[if lt IE 9]>
@@ -452,7 +452,7 @@ <h3 class="control-sidebar-heading">Chat Settings</h3>
452452
})
453453
</script>
454454

455-
{% block custom_js %}{% endblock %}
455+
{% block extrajs %}{% endblock %}
456456

457457
</body>
458458
</html>

‎adminlteui/templates/admin/base_site.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,4 +50,4 @@ <h5><i class="icon fa fa-check"></i>{{ message|capfirst }}</h5>
5050
reserved.
5151
{% endblock %}
5252

53-
{% block custom_js %} {% endblock %}
53+
{% block extrajs %} {% endblock %}

‎adminlteui/templates/admin/change_form.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
{{ media }}
77
{% endblock %}
88

9-
{% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% static "admin/css/forms.css" %}">{% endblock %}
10-
11-
{% block custom_style %}
9+
{% block extrastyle %}
10+
{{ block.super }}
1211
<link rel="stylesheet" href="{% static "admin/dist/css/app.css" %}">
1312
{% endblock %}
13+
1414
{% block coltype %}colM{% endblock %}
1515

1616
{% block bodyclass %}{{ block.super }} app-{{ opts.app_label }} model-{{ opts.model_name }} change-form{% endblock %}
@@ -124,7 +124,7 @@ <h4 class="box-title">
124124

125125
{% endblock %}
126126

127-
{% block custom_js %}
127+
{% block extrajs %}
128128
<script src="{% static "admin/plugins/datatables/jquery.dataTables.min.js" %}"></script>
129129
<script src="{% static "admin/plugins/datatables/dataTables.bootstrap.min.js" %}"></script>
130130
<script>

‎adminlteui/templates/admin/change_list.html‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,7 @@
33

44
{% block extrastyle %}
55
{{ block.super }}
6-
<link rel="stylesheet" type="text/css" href="{% static "admin/css/changelists.css" %}">
7-
{% if cl.formset %}
8-
<link rel="stylesheet" type="text/css" href="{% static "admin/css/forms.css" %}">
9-
{% endif %}
6+
<link rel="stylesheet" href="{% static "admin/plugins/datatables/dataTables.bootstrap.css" %}">
107
{% if cl.formset or action_form %}
118
<script type="text/javascript" src="{% url 'admin:jsi18n' %}"></script>
129
{% endif %}
@@ -18,13 +15,6 @@
1815
{% endif %}
1916
{% endblock %}
2017

21-
{% block custom_style %}
22-
<link rel="stylesheet" href="{% static "admin/plugins/datatables/dataTables.bootstrap.css" %}">
23-
{% if cl.formset or action_form %}
24-
<script type="text/javascript" src="{% url 'admin:jsi18n' %}"></script>
25-
{% endif %}
26-
{% endblock %}
27-
2818
{% block extrahead %}
2919
{{ block.super }}
3020
{{ media.js }}
@@ -111,7 +101,7 @@ <h4 class="box-title">
111101

112102
{% endblock %}
113103

114-
{% block custom_js %}
104+
{% block extrajs %}
115105
<script src="{% static "admin/plugins/datatables/jquery.dataTables.min.js" %}"></script>
116106
<script src="{% static "admin/plugins/datatables/dataTables.bootstrap.min.js" %}"></script>
117107

‎adminlteui/templates/admin/delete_selected_confirmation.html‎

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
{% extends "admin/base_site.html" %}
2+
{% load i18n l10n admin_urls static %}
3+
4+
{% block extrahead %}
5+
{{ block.super }}
6+
{{ media }}
7+
<script type="text/javascript" src="{% static 'admin/js/cancel.js' %}"></script>
8+
{% endblock %}
9+
10+
{% block bodyclass %}{{ block.super }} app-{{ opts.app_label }} model-{{ opts.model_name }} delete-confirmation delete-selected-confirmation{% endblock %}
11+
12+
{% block breadcrumbs %}
13+
<ol class="breadcrumb">
14+
<li><a href="{% url 'admin:index' %}"><i class="fa fa-dashboard"></i> {% trans 'Home' %}</a></li>
15+
<li><a href="{% url 'admin:app_list' app_label=opts.app_label %}">{{ opts.app_config.verbose_name }}</a></li>
16+
<li><a href="{% url opts|admin_urlname:'changelist' %}">{{ opts.verbose_name_plural|capfirst }}</a></li>
17+
<li class="active">{% trans 'Delete multiple objects' %}</li>
18+
</ol>
19+
{% endblock %}
20+
21+
{% block content_title %} {% trans 'Delete multiple objects' %} {% endblock %}
22+
23+
{% block content %}
24+
25+
<div class="row">
26+
<div class="col-md-12">
27+
<div class="box box-danger">
28+
<div class="box-header with-border">
29+
<h4 class="box-title">
30+
{% trans 'Delete multiple objects' %}
31+
</h4>
32+
</div>
33+
34+
<div class="box-body">
35+
<div id="content-main">
36+
{% if perms_lacking %}
37+
<p>{% blocktrans %}Deleting the selected {{ objects_name }} would result in deleting related objects, but your account doesn't have permission to delete the following types of objects:{% endblocktrans %}</p>
38+
<ol>
39+
{% for obj in perms_lacking %}
40+
<li>{{ obj }}</li>
41+
{% endfor %}
42+
</ol>
43+
{% elif protected %}
44+
<p>{% blocktrans %}Deleting the selected {{ objects_name }} would require deleting the following protected related objects:{% endblocktrans %}</p>
45+
<ol>
46+
{% for obj in protected %}
47+
<li>{{ obj }}</li>
48+
{% endfor %}
49+
</ol>
50+
{% else %}
51+
<p>{% blocktrans %}Are you sure you want to delete the selected {{ objects_name }}? All of the following objects and their related items will be deleted:{% endblocktrans %}</p>
52+
{% include "admin/includes/object_delete_summary.html" %}
53+
<h4>{% trans "Objects" %}</h4>
54+
{% for deletable_object in deletable_objects %}
55+
<ol>{{ deletable_object|unordered_list }}</ol>
56+
{% endfor %}
57+
<form method="post">{% csrf_token %}
58+
<div>
59+
{% for obj in queryset %}
60+
<input type="hidden" name="{{ action_checkbox_name }}" value="{{ obj.pk|unlocalize }}">
61+
{% endfor %}
62+
<input type="hidden" name="action" value="delete_selected">
63+
<input type="hidden" name="post" value="yes">
64+
<input type="submit" class="btn btn-danger" value="{% trans "Yes, I'm sure" %}">
65+
<a href="#" class="btn btn-default cancel-link">{% trans "No, take me back" %}</a>
66+
</div>
67+
</form>
68+
{% endif %}
69+
</div>
70+
</div>
71+
</div>
72+
</div>
73+
</div>
74+
{% endblock %}

‎adminlteui/templates/admin/includes/fieldset.html‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,16 @@
1-
<fieldset class="module aligned {{ fieldset.classes }}">
2-
{% if fieldset.name %}<div class="page-header text-center"><strong>{{ fieldset.name }}</strong></div>{% endif %}
3-
{% if fieldset.description %}
4-
<div class="description">{{ fieldset.description|safe }}</div>
1+
<fieldset class="box box-solid module aligned {{ fieldset.classes }}">
2+
{% if fieldset.name %}
3+
<div class="box-header with-border">
4+
<div class="box-title">
5+
{{ fieldset.name }}
6+
{% if fieldset.description %}
7+
<span class="description">{{ fieldset.description|safe }}</span>
8+
{% endif %}
9+
</div>
10+
</div>
511
{% endif %}
12+
13+
<div {% if fieldset.name %}class="box-body"{% endif %}>
614
{% for line in fieldset %}
715
<div class="form-group{% if line.fields|length_is:'1' and line.errors %} errors{% endif %}{% if not line.has_visible_field %} hidden{% endif %}{% for field in line %}{% if field.field.name %} field-{{ field.field.name }}{% endif %}{% endfor %}">
816
<div class="row">
@@ -32,4 +40,5 @@
3240
</div>
3341
</div>
3442
{% endfor %}
43+
</div>
3544
</fieldset>

0 commit comments

Comments
 (0)