Skip to content

Commit 2526f9b

Browse files
erikerik
committed
Merge remote-tracking branch 'mhindery/develop' into django3-compat
2 parents 6a9ad46 + b0e5dbe commit 2526f9b

24 files changed

+217
-100
lines changed

‎CHANGELOG.rst

+5
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@ Changelog
44
Only important changes are mentioned below. See `commit log <https://github.com/darklow/django-suit/commits/develop>`_, `closed issues <https://github.com/darklow/django-suit/issues?direction=desc&sort=updated&state=closed>`_ and `closed pull
55
requests <https://github.com/darklow/django-suit/pulls?q=sort%3Aupdated-desc+is%3Apr+is%3Aclosed>`_ for full changes.
66

7+
v.0.2.29 (2021-04-28)
8+
--------------------
9+
* This is a 'maintenance fork' which contains some fixes for compatibility with the latest Django releases.
10+
11+
712
v0.2.28 (2019-10-02)
813
--------------------
914

‎docs/conf.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
# built documents.
5757
#
5858
# The short X.Y version.
59-
version = '0.2.28'
59+
version = '0.2.29'
6060
# The full version, including alpha/beta/rc tags.
6161
release = version
6262

‎suit/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
VERSION = '0.2.28'
1+
VERSION = '0.2.29'

‎suit/static/suit/css/suit.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎suit/static/suit/less/ui/list.less

+13-7
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,23 @@
2424

2525
/* ACTIONS */
2626

27-
#changelist .actions span.all,
28-
#changelist .actions span.action-counter,
29-
#changelist .actions span.clear,
30-
#changelist .actions span.question {
31-
display: none;
32-
}
27+
// Added .hidden clause, and commended out the next to blocks since Django 3.2
3328

34-
#changelist #action-toggle {
29+
.hidden {
3530
display: none;
3631
}
3732

33+
// #changelist .actions span.all {
34+
// #changelist .actions span.action-counter,
35+
// #changelist .actions span.clear {
36+
// #changelist .actions span.question {
37+
// display: none;
38+
// }
39+
40+
// #changelist #action-toggle {
41+
// display: none;
42+
// }
43+
3844
/* Decided to hide action label */
3945
#changelist .actions span.action-label {
4046
display: none;

‎suit/static/suit/less/ui/pagination.less

+67
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@
99
ul {
1010
margin: 0;
1111
}
12+
13+
// Up until Django 3.2
14+
1215
ul li.active a, ul li.active span {
1316
color: #fff;
1417
font-weight: bold;
@@ -29,6 +32,70 @@
2932
line-height: 26px;
3033
padding: 0 10px;
3134
}
35+
36+
37+
// Starting with Django 3.2
38+
39+
// Pages
40+
ul a {
41+
display: inline;
42+
line-height: 26px;
43+
padding: 0 10px;
44+
45+
float: left;
46+
47+
// padding: 4px 12px;
48+
// line-height: 18px;
49+
text-decoration: none;
50+
background-color: #ffffff;
51+
border: 1px solid #dddddd;
52+
border-left-width: 0;
53+
54+
color: #0088cc;
55+
}
56+
57+
// Ellipsis
58+
ul span.disabled {
59+
display: inline;
60+
line-height: 26px;
61+
padding: 0 10px;
62+
63+
float: left;
64+
65+
// padding: 4px 12px;
66+
// line-height: 18px;
67+
text-decoration: none;
68+
background-color: transparent;
69+
border: 1px solid #dddddd;
70+
border-left-width: 0;
71+
72+
color: #999999;
73+
}
74+
75+
// Active page
76+
ul span.this-page {
77+
display: inline;
78+
line-height: 26px;
79+
padding: 0 10px;
80+
81+
float: left;
82+
83+
text-decoration: none;
84+
background-color: #2f96b4;
85+
border: 1px solid #cccccc;
86+
border-left-width: 0;
87+
88+
color: #ffffff;
89+
90+
// Border
91+
border-left-width: 1px;
92+
-webkit-border-top-left-radius: 4px;
93+
-moz-border-radius-topleft: 4px;
94+
border-top-left-radius: 4px;
95+
-webkit-border-bottom-left-radius: 4px;
96+
-moz-border-radius-bottomleft: 4px;
97+
border-bottom-left-radius: 4px;
98+
}
3299
}
33100

34101
.pagination-info {

‎suit/templates/admin/actions.html

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@
1515
&nbsp;
1616
{% if actions_selection_counter %}
1717
<script type="text/javascript">var _actions_icnt = "{{ cl.result_list|length|default:"0" }}";</script>
18-
<span class="action-counter">{{ selection_note }}</span>
18+
<span class="action-counter" data-actions-icnt="{{ cl.result_list|length }}">{{ selection_note }}</span>
1919
{% if cl.result_count != cl.result_list|length %}
20-
<span class="all">{{ selection_note_all }}</span>
21-
<span class="question">
20+
<span class="all hidden">{{ selection_note_all }}</span>
21+
<span class="question hidden">
2222
<a href="javascript:;" title="{% trans "Click here to select the objects across all pages" %}">
2323
{% blocktrans with cl.result_count as total_count %}Select all {{ total_count }}
2424
{{ module_name }}{% endblocktrans %}</a>
2525
</span>
26-
<span class="clear"><a href="javascript:;">{% trans "Clear selection" %}</a></span>
26+
<span class="clear hidden"><a href="javascript:;">{% trans "Clear selection" %}</a></span>
2727
{% endif %}
2828
{% endif %}
2929
</div>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{% extends "admin/base_site.html" %}
2-
{% load i18n admin_static admin_modify admin_urls %}
2+
{% load i18n static admin_modify admin_urls %}
33
{% load url from suit_compat %}
44

55
{% block extrahead %}{{ block.super }}

‎suit/templates/admin/base.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{% load admin_static %}{% load suit_tags %}{% load url from suit_compat %}<!DOCTYPE html>
1+
{% load static %}{% load suit_tags %}{% load url from suit_compat %}<!DOCTYPE html>
22
<html lang="{{ LANGUAGE_CODE|default:"en-us" }}" {% if LANGUAGE_BIDI %}dir="rtl"{% endif %}>
33
<head>
44
<meta http-equiv="X-UA-Compatible" content="IE=edge">

‎suit/templates/admin/base_site.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{% extends "admin/base.html" %}
2-
{% load admin_static %}
2+
{% load static %}
33

44
{# Additional <head> content here, some extra meta tags or favicon #}
55
{#{% block extrahead %}#}

‎suit/templates/admin/change_form.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{% extends "admin/base_site.html" %}
2-
{% load i18n admin_static admin_modify suit_tags admin_urls %}
2+
{% load i18n static admin_modify suit_tags admin_urls %}
33
{% load url from suit_compat %}
44

55
{% block extrahead %}{{ block.super }}

‎suit/templates/admin/change_list.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{% extends "admin/base_site.html" %}
2-
{% load i18n admin_static admin_list admin_urls suit_list suit_tags %}
2+
{% load i18n static admin_list admin_urls suit_list suit_tags %}
33
{% load url from suit_compat %}
44

55
{% block extrastyle %}

‎suit/templates/admin/change_list_results.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{% load i18n admin_static suit_list %}
1+
{% load i18n static suit_list %}
22
{% if result_hidden_fields %}
33
<div class="hiddenfields">{# DIV for HTML validation #}
44
{% for item in result_hidden_fields %}{{ item }}{% endfor %}

‎suit/templates/admin/edit_inline/stacked.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{% load i18n admin_static admin_urls suit_tags %}
1+
{% load i18n static admin_urls suit_tags %}
22
<div class="inline-group {{ inline_admin_formset.opts.suit_classes }}" id="{{ inline_admin_formset.formset.prefix }}-group">
33
<h2>{{ inline_admin_formset.opts.verbose_name_plural|capfirst }}</h2>
44
{{ inline_admin_formset.formset.management_form }}

‎suit/templates/admin/edit_inline/tabular.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{% load i18n admin_static admin_modify suit_tags admin_urls %}
1+
{% load i18n static admin_modify suit_tags admin_urls %}
22
<div class="inline-group {{ inline_admin_formset.opts.suit_classes }}" id="{{ inline_admin_formset.formset.prefix }}-group">
33
<div class="tabular inline-related {% if forloop.last %}last-related{% endif %}">
44
{{ inline_admin_formset.formset.management_form }}

‎suit/templates/admin/import_export/base.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{% extends "admin/base_site.html" %}
2-
{% load i18n admin_static admin_modify %}
2+
{% load i18n static admin_modify %}
33
{% load admin_urls %}
44
{% load url from suit_compat %}
55

‎suit/templates/admin/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{% extends "admin/base_site.html" %}
2-
{% load i18n admin_static %}
2+
{% load i18n static %}
33

44
{% block extrastyle %}
55
{{ block.super }}

‎suit/templates/admin/login.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{% extends "admin/base_site.html" %}
2-
{% load i18n admin_static suit_tags %}
2+
{% load i18n static suit_tags %}
33
{% load url from suit_compat %}
44

55
{% block extrastyle %}{{ block.super }}

‎suit/templates/admin/search_form.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{% load i18n admin_static suit_list admin_list suit_tags %}
1+
{% load i18n static suit_list admin_list suit_tags %}
22
{% if cl.search_fields or cl.has_filters %}
33
{% suit_bc_value 1.5 'pop' 1.6 '_popup' as POPUP_VAR %}
44
<div id="toolbar" class="clearfix">

‎suit/templates/suit/error_base.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{% load admin_static i18n %}{% load url from suit_compat %}<!DOCTYPE html>
1+
{% load static i18n %}{% load url from suit_compat %}<!DOCTYPE html>
22
<!--[if lt IE 9 ]><html lang="en"> <![endif]-->
33
<!--[if (gte IE 9)|!(IE)]><!-->
44
<html lang="en" xmlns="http://www.w3.org/1999/html"> <!--<![endif]-->

0 commit comments

Comments
 (0)