Commit 3e65f963 authored by Julien Phalip's avatar Julien Phalip
Browse files

Further improved on the work done in r16622 by making the help text icons look... 

Further improved on the work done in r16622 by making the help text icons look hoverable in the admin tabular inline headers.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16690 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 804a6db8

django/contrib/admin/static/admin/css/base.css

+4 −0
Original line number Diff line number Diff line
@@ -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;

}

django/contrib/admin/templates/admin/edit_inline/tabular.html

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
     {% for field in inline_admin_formset.fields %}

       {% if not field.widget.is_hidden %}

         <th{% if forloop.first %} colspan="2"{% endif %}{% if field.required %} class="required"{% endif %}>{{ field.label|capfirst }}

         {% if field.help_text %}&nbsp;<img src="{% static "admin/img/icon-unknown.gif" %}" alt="({{ field.help_text|striptags }})" title="{{ field.help_text|striptags }}" />{% endif %}

         {% if field.help_text %}&nbsp;<img src="{% static "admin/img/icon-unknown.gif" %}" class="help help-tooltip" width="10" height="10" alt="({{ field.help_text|striptags }})" title="{{ field.help_text|striptags }}" />{% endif %}

         </th>

       {% endif %}

     {% endfor %}

tests/regressiontests/admin_inlines/tests.py

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ class TestInline(TestCase): 
        """

        response = self.client.get('/test_admin/admin/admin_inlines/holder4/add/')

        self.assertContains(response, '<p class="help">Awesome stacked help text is awesome.</p>', 4)

        self.assertContains(response, '<img src="/static/admin/img/icon-unknown.gif" alt="(Awesome tabular help text is awesome.)" title="Awesome tabular help text is awesome." />', 1)

        self.assertContains(response, '<img src="/static/admin/img/icon-unknown.gif" class="help help-tooltip" width="10" height="10" alt="(Awesome tabular help text is awesome.)" title="Awesome tabular help text is awesome." />', 1)



class TestInlineMedia(TestCase):

    fixtures = ['admin-views-users.xml']