Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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 Gazit authored June 09, 2011
1  django/contrib/admin/media/css/base.css
@@ -350,6 +350,7 @@ table thead th.sorted a span.clear {
350 350
 }
351 351
 
352 352
 #sorting-popup-div {
  353
+    display: none;
353 354
     position: absolute;
354 355
     background-color: white;
355 356
     border: 1px solid #ddd;
4  django/contrib/admin/media/css/forms.css
@@ -167,6 +167,10 @@ fieldset.monospace textarea {
167 167
     overflow: hidden;
168 168
 }
169 169
 
  170
+body.popup .submit-row {
  171
+    overflow: auto;
  172
+}
  173
+
170 174
 .submit-row input {
171 175
     margin: 0 0 0 5px;
172 176
 }
2  django/contrib/admin/templates/admin/change_list_results.html
@@ -36,7 +36,7 @@
36 36
 </div>
37 37
 
38 38
 {# Sorting popup: #}
39  
-<div style="display: none;" id="sorting-popup-div">
  39
+<div id="sorting-popup-div">
40 40
 <table>
41 41
   <caption>
42 42
    {% trans "Sorting by:" %}
2  django/contrib/admin/templates/admin/submit_line.html
... ...
@@ -1,5 +1,5 @@
1 1
 {% load i18n %}
2  
-<div class="submit-row" {% if is_popup %}style="overflow: auto;"{% endif %}>
  2
+<div class="submit-row">
3 3
 {% if show_save %}<input type="submit" value="{% trans 'Save' %}" class="default" name="_save" {{ onclick_attrib }}/>{% endif %}
4 4
 {% if show_delete_link %}<p class="deletelink-box"><a href="delete/" class="deletelink">{% trans "Delete" %}</a></p>{% endif %}
5 5
 {% if show_save_as_new %}<input type="submit" value="{% trans 'Save as new' %}" name="_saveasnew" {{ onclick_attrib }}/>{%endif%}

0 notes on commit dfcde78

Please sign in to comment.
Something went wrong with that request. Please try again.