test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixes #16186 -- remove inline CSS in contrib.admin 

Thanks to bsimons for the report and the patches from cscheng, nvandijk!

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16346 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Idan Gazit 2011-06-09 15:39:12 +00:00
parent 865d684a8a
commit dfcde78161
4 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
django/contrib/admin/media/css/base.css
View File

@ -350,6 +350,7 @@ table thead th.sorted a span.clear {
} }
#sorting-popup-div { #sorting-popup-div {
display: none;
position: absolute; position: absolute;
background-color: white; background-color: white;
border: 1px solid #ddd; border: 1px solid #ddd;

4
django/contrib/admin/media/css/forms.css
View File

@ -167,6 +167,10 @@ fieldset.monospace textarea {
overflow: hidden; overflow: hidden;
} }
body.popup .submit-row {
overflow: auto;
}
.submit-row input { .submit-row input {
margin: 0 0 0 5px; margin: 0 0 0 5px;
} }

2
django/contrib/admin/templates/admin/change_list_results.html
View File

@ -36,7 +36,7 @@
</div> </div>
{# Sorting popup: #} {# Sorting popup: #}
<div style="display: none;" id="sorting-popup-div"> <div id="sorting-popup-div">
<table> <table>
<caption> <caption>
{% trans "Sorting by:" %} {% trans "Sorting by:" %}

2
django/contrib/admin/templates/admin/submit_line.html
View File

@ -1,5 +1,5 @@
{% load i18n %} {% load i18n %}
<div class="submit-row" {% if is_popup %}style="overflow: auto;"{% endif %}> <div class="submit-row">
{% if show_save %}<input type="submit" value="{% trans 'Save' %}" class="default" name="_save" {{ onclick_attrib }}/>{% endif %} {% if show_save %}<input type="submit" value="{% trans 'Save' %}" class="default" name="_save" {{ onclick_attrib }}/>{% endif %}
{% if show_delete_link %}<p class="deletelink-box"><a href="delete/" class="deletelink">{% trans "Delete" %}</a></p>{% endif %} {% if show_delete_link %}<p class="deletelink-box"><a href="delete/" class="deletelink">{% trans "Delete" %}</a></p>{% endif %}
{% if show_save_as_new %}<input type="submit" value="{% trans 'Save as new' %}" name="_saveasnew" {{ onclick_attrib }}/>{%endif%} {% if show_save_as_new %}<input type="submit" value="{% trans 'Save as new' %}" name="_saveasnew" {{ onclick_attrib }}/>{%endif%}