diff --git a/simpleui/__init__.py b/simpleui/__init__.py index ff42687e..45b9a8a3 100644 --- a/simpleui/__init__.py +++ b/simpleui/__init__.py @@ -1,2 +1,2 @@ def get_version(): - return '2.0.5' + return '2.0.6' diff --git a/simpleui/static/admin/simpleui-x/css/base.css b/simpleui/static/admin/simpleui-x/css/base.css index e68fefc7..6ad8f0e9 100644 --- a/simpleui/static/admin/simpleui-x/css/base.css +++ b/simpleui/static/admin/simpleui-x/css/base.css @@ -22,7 +22,7 @@ margin-left: 0px; } -#content { +.change-list #content { padding: 0px; } diff --git a/simpleui/templates/admin/actions.html b/simpleui/templates/admin/actions.html index b4bd7664..285d3803 100644 --- a/simpleui/templates/admin/actions.html +++ b/simpleui/templates/admin/actions.html @@ -22,15 +22,14 @@ {% endif %} {% endfor %} - -{# {% trans "Show all" %}({{ cl.full_result_count }})#} -{# #} - {% if cl.formset and cl.result_count %} {% trans 'Save' %} {% endif %} + +{# #} +{# #} + diff --git a/simpleui/templates/admin/change_list.html b/simpleui/templates/admin/change_list.html index cb1d580f..55fe35fa 100644 --- a/simpleui/templates/admin/change_list.html +++ b/simpleui/templates/admin/change_list.html @@ -4,7 +4,7 @@ {% block extrastyle %} {{ block.super }} -{# #} + {# #} {% if cl.formset %} {% endif %} @@ -44,6 +44,29 @@ {% endblock %} {% block content %} + + {% block object-tools %} + + {% endblock %} +
{% if cl.formset.errors %} @@ -65,7 +88,7 @@ {% block result_list %} - {% if action_form %} + {% if action_form %} {% admin_actions %} {% endif %}