Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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
  • Loading branch information...
commit dfcde78161866ad2c2c863c0a8c48480c3228f84 1 parent 865d684
@idan idan authored
View
1  django/contrib/admin/media/css/base.css
@@ -350,6 +350,7 @@ table thead th.sorted a span.clear {
}
#sorting-popup-div {
+ display: none;
position: absolute;
background-color: white;
border: 1px solid #ddd;
View
4 django/contrib/admin/media/css/forms.css
@@ -167,6 +167,10 @@ fieldset.monospace textarea {
overflow: hidden;
}
+body.popup .submit-row {
+ overflow: auto;
+}
+
.submit-row input {
margin: 0 0 0 5px;
}
View
2  django/contrib/admin/templates/admin/change_list_results.html
@@ -36,7 +36,7 @@
</div>
{# Sorting popup: #}
-<div style="display: none;" id="sorting-popup-div">
+<div id="sorting-popup-div">
<table>
<caption>
{% trans "Sorting by:" %}
View
2  django/contrib/admin/templates/admin/submit_line.html
@@ -1,5 +1,5 @@
{% 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_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%}
Please sign in to comment.
Something went wrong with that request. Please try again.