diff --git a/django/contrib/admin/static/admin/css/base.css b/django/contrib/admin/static/admin/css/base.css index 23fddafd7a..89f2225c7c 100644 --- a/django/contrib/admin/static/admin/css/base.css +++ b/django/contrib/admin/static/admin/css/base.css @@ -189,6 +189,10 @@ p.mini { color: #999; } +img.help-tooltip { + cursor: help; +} + p img, h1 img, h2 img, h3 img, h4 img, td img { vertical-align: middle; } diff --git a/django/contrib/admin/templates/admin/edit_inline/tabular.html b/django/contrib/admin/templates/admin/edit_inline/tabular.html index ea0ca8c732..71b097e9d9 100644 --- a/django/contrib/admin/templates/admin/edit_inline/tabular.html +++ b/django/contrib/admin/templates/admin/edit_inline/tabular.html @@ -10,7 +10,7 @@ {% for field in inline_admin_formset.fields %} {% if not field.widget.is_hidden %} {{ field.label|capfirst }} - {% if field.help_text %} ({{ field.help_text|striptags }}){% endif %} + {% if field.help_text %} ({{ field.help_text|striptags }}){% endif %} {% endif %} {% endfor %} diff --git a/tests/regressiontests/admin_inlines/tests.py b/tests/regressiontests/admin_inlines/tests.py index 61d4634f8b..45ecb702af 100644 --- a/tests/regressiontests/admin_inlines/tests.py +++ b/tests/regressiontests/admin_inlines/tests.py @@ -111,7 +111,7 @@ class TestInline(TestCase): """ response = self.client.get('/test_admin/admin/admin_inlines/holder4/add/') self.assertContains(response, '

Awesome stacked help text is awesome.

', 4) - self.assertContains(response, '(Awesome tabular help text is awesome.)', 1) + self.assertContains(response, '(Awesome tabular help text is awesome.)', 1) class TestInlineMedia(TestCase): fixtures = ['admin-views-users.xml']