Skip to content

Commit

Permalink
Merge branch 'release/1.7.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
@wuyue92tree
wuyue92tree committed Jul 12, 2022
2 parents b8b5cd0 + 6f4b0e9 commit 95e4956
Show file tree
Hide file tree
Showing 7 changed files with 195 additions and 135 deletions.
2 changes: 1 addition & 1 deletion adminlteui/__init__.py
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
version = '1.7.1'
version = '1.7.2'
default_app_config = 'adminlteui.apps.AdminlteUIConfig'
39 changes: 36 additions & 3 deletions adminlteui/static/admin/dist/css/app.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ ul.timelist, .timelist li {

.selector-available, .selector-chosen {
float: left;
width: 48%;
width: calc(50% - 11px);
text-align: center;
margin-bottom: 5px;
}
Expand All @@ -255,8 +255,10 @@ ul.timelist, .timelist li {

.selector-available h2, .selector-chosen h2 {
border: 1px solid #ccc;
border-radius: 3px 3px 0 0;
font-size: 16px;
padding: 5px;
margin: 0;
}

.selector-chosen h2 {
Expand Down Expand Up @@ -309,7 +311,7 @@ ul.timelist, .timelist li {

.selector ul.selector-chooser {
float: left;
width: 4%;
width: 22px;
background-color: #eee;
border-radius: 10px;
margin: 10em 0 0;
Expand Down Expand Up @@ -433,7 +435,7 @@ input[type="password"] {

input[type="checkbox"] {
width: auto;
height: 26px;
/*height: 26px;*/
padding: 6px 12px;
font-size: 14px;
line-height: 1.42857143;
Expand All @@ -445,3 +447,34 @@ input[type="checkbox"] {
.control-label {
margin-top: 7px;
}

ul.errorlist {
margin: 0;
padding-left: 5px;
display: inherit;
}

ul.errorlist li {
font-size: 13px;
display: block;
margin-bottom: 4px;
overflow-wrap: break-word;
}

ul.errorlist li:first-child {
margin-top: 0;
}

ul.errorlist li a {
color: inherit;
text-decoration: underline;
}

td ul.errorlist {
margin: 0;
padding: 0;
}

td ul.errorlist li {
margin: 0;
}
187 changes: 93 additions & 94 deletions adminlteui/templates/admin/change_form.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,130 +2,129 @@
{% load i18n admin_urls static admin_modify %}

{% block extrahead %}{{ block.super }}
<script type="text/javascript" src="{% url 'admin:jsi18n' %}"></script>
{{ media }}
<script type="text/javascript" src="{% url 'admin:jsi18n' %}"></script>
{{ media }}
{% endblock %}

{% block extrastyle %}
{{ block.super }}
<link rel="stylesheet" href="{% static "admin/dist/css/app.css" %}">
{{ 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 %}

{% if not is_popup %}
{% block breadcrumbs %}
<ol class="breadcrumb">
<li><a href="{% url 'admin:index' %}"><i class="fa fa-dashboard"></i> {% trans 'Home' %}</a></li>
<li><a href="{% url 'admin:app_list' app_label=opts.app_label %}">{{ opts.app_config.verbose_name }}</a></li>
<li>{% if has_view_permission %}<a href="{% url opts|admin_urlname:'changelist' %}">{{ opts.verbose_name_plural|capfirst }}</a>{% else %}{{ opts.verbose_name_plural|capfirst }}{% endif %}</li>
<li class="active">{% if add %}{% blocktrans with name=opts.verbose_name %}Add {{ name }}{% endblocktrans %}{% else %}{{ original|truncatewords:"18" }}{% endif %}</li>
</ol>
{% endblock %}
{% block breadcrumbs %}
<ol class="breadcrumb">
<li><a href="{% url 'admin:index' %}"><i class="fa fa-dashboard"></i> {% trans 'Home' %}</a></li>
<li><a href="{% url 'admin:app_list' app_label=opts.app_label %}">{{ opts.app_config.verbose_name }}</a></li>
<li>{% if has_view_permission %}<a href="{% url opts|admin_urlname:'changelist' %}">{{ opts.verbose_name_plural|capfirst }}</a>{% else %}{{ opts.verbose_name_plural|capfirst }}{% endif %}</li>
<li class="active">{% if add %}{% blocktrans with name=opts.verbose_name %}Add {{ name }}{% endblocktrans %}{% else %}{{ original|truncatewords:"18" }}{% endif %}</li>
</ol>
{% endblock %}
{% endif %}

{% block content_title %} {{ opts.verbose_name_plural|capfirst }} {% endblock %}


{% block content %}

<div class="row">
<form {% if has_file_field %}enctype="multipart/form-data" {% endif %}action="{{ form_url }}" method="post" id="{{ opts.model_name }}_form" novalidate>
<div class="col-md-9">
<div class="box box-primary">
<div class="box-header with-border">
<h4 class="box-title">
{{title}}{% block pretitle %}{% endblock %}
</h4>
</div>
<div class="row">
<form {% if has_file_field %}enctype="multipart/form-data" {% endif %}action="{{ form_url }}" method="post" id="{{ opts.model_name }}_form" novalidate>
<div class="col-md-9">
<div class="box box-primary">
<div class="box-header with-border">
<h4 class="box-title">
{{title}}{% block pretitle %}{% endblock %}
</h4>
</div>

<div class="box-body">
<div id="content-main">
<div>
{% csrf_token %}{% block form_top %}{% endblock %}
{% if is_popup %}<input type="hidden" name="{{ is_popup_var }}" value="1">{% endif %}
{% if to_field %}<input type="hidden" name="{{ to_field_var }}" value="{{ to_field }}">{% endif %}
{% if save_on_top %}{% block submit_buttons_top %}{% submit_row %}{% endblock %}{% endif %}
{% if errors %}
<div class="errornote text-red text-center" style="margin: 20px;">
{% if errors|length == 1 %}{% trans "Please correct the error below." %}{% else %}{% trans "Please correct the errors below." %}{% endif %}
</div>
{{ adminform.form.non_field_errors }}
{% endif %}

{% block field_sets %}
{% for fieldset in adminform %}
{% include "admin/includes/fieldset.html" %}
{% endfor %}
{% endblock %}

{% block after_field_sets %}{% endblock %}

{% block inline_field_sets %}
{% for inline_admin_formset in inline_admin_formsets %}
{% include inline_admin_formset.opts.template %}
{% endfor %}
{% endblock %}

{% block after_related_objects %}{% endblock %}

{% block admin_change_form_document_ready %}
<script type="text/javascript"
id="django-admin-form-add-constants"
src="{% static 'admin/js/change_form.js' %}"
{% if adminform and add %}
data-model-name="{{ opts.model_name }}"
{% endif %}>
</script>
{% endblock %}

{# JavaScript for prepopulated fields #}
{% prepopulated_fields_js %}
<div class="form-inline visible-sm visible-xs">
<br class="clear" />
{% submit_row %}
<div class="box-body">
<div id="content-main">
<div>
{% csrf_token %}{% block form_top %}{% endblock %}
{% if is_popup %}<input type="hidden" name="{{ is_popup_var }}" value="1">{% endif %}
{% if to_field %}<input type="hidden" name="{{ to_field_var }}" value="{{ to_field }}">{% endif %}
{% if errors %}
<div class="errornote text-red text-center" style="margin: 20px;">
{% if errors|length == 1 %}{% trans "Please correct the error below." %}{% else %}{% trans "Please correct the errors below." %}{% endif %}
</div>
{{ adminform.form.non_field_errors }}
{% endif %}

{% block field_sets %}
{% for fieldset in adminform %}
{% include "admin/includes/fieldset.html" %}
{% endfor %}
{% endblock %}

{% block after_field_sets %}{% endblock %}

{% block inline_field_sets %}
{% for inline_admin_formset in inline_admin_formsets %}
{% include inline_admin_formset.opts.template %}
{% endfor %}
{% endblock %}

{% block after_related_objects %}{% endblock %}

{% block admin_change_form_document_ready %}
<script type="text/javascript"
id="django-admin-form-add-constants"
src="{% static 'admin/js/change_form.js' %}"
{% if adminform and add %}
data-model-name="{{ opts.model_name }}"
{% endif %}>
</script>
{% endblock %}

{# JavaScript for prepopulated fields #}
{% prepopulated_fields_js %}
<div class="form-inline visible-sm visible-xs">
<br class="clear" />
{% block submit_buttons_top %}{% submit_row %}{% endblock %}
</div>
</div>
</div>
</div>
</div>
<br class="clear" />
</div>
<br class="clear" />
</div>
<div class="col-md-3 hidden-sm hidden-xs">
<div class="box box-primary">
<div class="box-header with-border">
<h4 class="box-title">
{% trans 'change form tools' %}
</h4>
</div>

<div class="box-body">
{% block submit_buttons_bottom %}{% submit_row %}{% endblock %}
<div class="col-md-3 hidden-sm hidden-xs" style="position: fixed; width: calc(25% - 57.5px); right: 0px;">
<div class="box box-primary">
<div class="box-header with-border">
<h4 class="box-title">
{% trans 'change form tools' %}
</h4>
</div>

{% block object-tools %}
{% if change %}{% if not is_popup %}
<ul class="object-tools">
{% block object-tools-items %}
{% change_form_object_tools %}
<div class="box-body">
{% block submit_buttons_bottom %}{% submit_row %}{% endblock %}

{% block object-tools %}
{% if change %}{% if not is_popup %}
<ul class="object-tools">
{% block object-tools-items %}
{% change_form_object_tools %}
{% endblock %}
</ul>
{% endif %}{% endif %}
{% endblock %}
</ul>
{% endif %}{% endif %}
{% endblock %}
</div>
</div>

</div>
<br class="clear" />
</div>
<br class="clear" />
</div>
</form>
</div>
</form>
</div>


{% endblock %}

{% block extrajs %}
<script>
$('[required]').before('<span class="text-red" style="margin-left: -10px;">* </span>');
</script>
<script>
$('[required]').before('<span class="text-red" style="margin-left: -10px;">* </span>');
</script>
{% endblock %}
Loading

0 comments on commit 95e4956

Please sign in to comment.