summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorRussell Keith-Magee <russell@keith-magee.com>2011-02-19 08:10:57 +0000
committerRussell Keith-Magee <russell@keith-magee.com>2011-02-19 08:10:57 +0000
commitb3c7e399a4a6600a48c95bb0989e82e181603b2d (patch)
treebd3d3d836ad2f18db754561916872862c928272e /django
parentd3cc5dbb325d83dff69db5ac1487ac4b8518e2d3 (diff)
Fixed #15291 -- Corrected alignment issue when actions are disabled in a ModelAdmin. Thanks to Julien Phalip for the report and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15573 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django')
-rw-r--r--django/contrib/admin/media/css/changelists.css5
-rw-r--r--django/contrib/admin/templatetags/admin_list.py2
2 files changed, 6 insertions, 1 deletions
diff --git a/django/contrib/admin/media/css/changelists.css b/django/contrib/admin/media/css/changelists.css
index e01a89817c..315b8c7a38 100644
--- a/django/contrib/admin/media/css/changelists.css
+++ b/django/contrib/admin/media/css/changelists.css
@@ -67,7 +67,10 @@
#changelist table tbody td:first-child, #changelist table tbody th:first-child {
border-left: 0;
border-right: 1px solid #ddd;
- text-align: center;
+}
+
+#changelist table tbody td.action-checkbox {
+ text-align:center;
}
#changelist table tfoot {
diff --git a/django/contrib/admin/templatetags/admin_list.py b/django/contrib/admin/templatetags/admin_list.py
index 813c38a7d7..33f01753c4 100644
--- a/django/contrib/admin/templatetags/admin_list.py
+++ b/django/contrib/admin/templatetags/admin_list.py
@@ -139,6 +139,8 @@ def items_for_result(cl, result, form):
result_repr = EMPTY_CHANGELIST_VALUE
else:
if f is None:
+ if field_name == u'action_checkbox':
+ row_class = ' class="action-checkbox"'
allow_tags = getattr(attr, 'allow_tags', False)
boolean = getattr(attr, 'boolean', False)
if boolean: