summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--django/contrib/admin/media/css/base.css3
-rw-r--r--django/contrib/admin/templates/admin/change_list_results.html11
2 files changed, 12 insertions, 2 deletions
diff --git a/django/contrib/admin/media/css/base.css b/django/contrib/admin/media/css/base.css
index 0aab2b3f8a..485be92604 100644
--- a/django/contrib/admin/media/css/base.css
+++ b/django/contrib/admin/media/css/base.css
@@ -329,12 +329,15 @@ table thead th.descending a {
table thead th.sorted a span.text {
display: block;
float: left;
+ cursor: pointer; /* IE needs this */
}
table thead th.sorted a span.sortpos {
display: block;
float: right;
font-size: .6em;
+ text-align: right;
+ cursor: pointer; /* IE needs this */
}
table thead th.sorted a img {
diff --git a/django/contrib/admin/templates/admin/change_list_results.html b/django/contrib/admin/templates/admin/change_list_results.html
index ae62ce8548..6c1c399562 100644
--- a/django/contrib/admin/templates/admin/change_list_results.html
+++ b/django/contrib/admin/templates/admin/change_list_results.html
@@ -65,8 +65,12 @@
var popup = $('#sorting-popup-div');
var img = $('#primary-sort-icon');
/* These next lines seems necessary to prime the popup: */
- popup.offset({left:-1000, top:0});
+ popup.offset({left:0, top:-1000});
popup.show();
+ if ($.browser.msie) {
+ // Can't find a way to make IE autosize the div.
+ popup.width(300);
+ }
var popupWidth = popup.width();
popup.hide();
@@ -107,7 +111,10 @@
}
});
- $('#sorting-popup-dismiss').click(hidePopup);
+ $('#sorting-popup-dismiss').click(function(ev) {
+ hidePopup();
+ ev.preventDefault()
+ });
});
})(django.jQuery);
//-->