Ticket #16212: 16212.better-admin-multiple-sort.diff

diff --git a/django/contrib/admin/media/css/base.css b/django/contrib/admin/media/css/base.css
index 6d1b673..a3c68be 100644
--- a/django/contrib/admin/media/css/base.css
+++ b/django/contrib/admin/media/css/base.css
@@ -305,38 +305,49 @@ tr.alt {
 
 /* SORTABLE TABLES */
 
+thead th {
+    padding: 0;
+    line-height: normal;
+}
+
 thead th a:link, thead th a:visited {
     color: #666;
-    display: block;
+}
+
+thead th a.sortremove {
+    display: none; /* Hide by default */
 }
 
 thead th.sorted {
     background: #c5c5c5 url(../img/admin/nav-bg-selected.gif) top left repeat-x;
 }
 
-table thead th.sorted a {
-    padding-right: 13px;
+table thead th .text a {
+   display: block;
+   padding: 2px 5px;
+   cursor: pointer; /* IE needs this */
 }
 
-table thead th.ascending a {
-    background: url(../img/admin/arrow-up.gif) right .4em no-repeat;
+table thead th .text a:hover {
+   background-color: #ffffcc;
 }
 
-table thead th.descending a {
-    background: url(../img/admin/arrow-down.gif) right .4em no-repeat;
+table thead th.sorted .sortoptions {
+   display: block;
+   padding: 2px 5px;
+   float: right;
+   text-align: right;
 }
 
-table thead th.sorted a span.text {
-   display: block;
-   float: left;
-   cursor: pointer; /* IE needs this */
+table thead th.sorted img#primary-sort-icon {
+    cursor: pointer;
 }
 
-table thead th.sorted a span.sortpos {
-   display: block;
-   float: right;
-   font-size: .6em;
-   text-align: right;
+table thead th.sorted .sortposition {
+   font-size: .8em;
+   min-width: 12px;
+   text-align: center;
+   display:inline-block;
    cursor: pointer; /* IE needs this */
 }
 
@@ -344,7 +355,7 @@ table thead th.sorted a img {
    vertical-align: top;
 }
 
-table thead th.sorted a span.clear {
+table thead th.sorted a .clear {
    display: block;
    clear: both;
 }
diff --git a/django/contrib/admin/media/css/rtl.css b/django/contrib/admin/media/css/rtl.css
index ec2bb2a..f433a4f 100644
--- a/django/contrib/admin/media/css/rtl.css
+++ b/django/contrib/admin/media/css/rtl.css
@@ -80,22 +80,7 @@ div.breadcrumbs {
 
 /* SORTABLE TABLES */
 
-
-table thead th.sorted a {
-    padding-left: 13px;
-    padding-right: 0px;
-}
-
-table thead th.ascending a,
-table thead th.descending a {
-    background-position: left;
-}
-
-table thead th.sorted a span.text {
-   float: right;
-}
-
-table thead th.sorted a span.sortpos {
+table thead th.sorted .sortoptions {
    float: left;
 }
 
@@ -260,4 +245,4 @@ div.colM {
 
 .submit-row input {
     float: left;
-}
\ No newline at end of file
+}
diff --git a/django/contrib/admin/media/img/admin/arrow-down-hover.gif b/django/contrib/admin/media/img/admin/arrow-down-hover.gif
new file mode 100644
index 0000000000000000000000000000000000000000..30d63d61788f7cc03d18f1516738b11f89cdf36f
GIT binary patch
literal 69
zcmZ?wbh9u|<Y(Yvn8?5o*tzh<ix&)Fp!k!8k%57UK?lSG$ulsCP3d2Gx|Tti$IB~9
RH|~1pOUY=DX?~0h)&ML^5a$2@

literal 0
HcmV?d00001

diff --git a/django/contrib/admin/media/img/admin/arrow-down.gif b/django/contrib/admin/media/img/admin/arrow-down.gif
index a967b9fd5563a0fc2f5fde8ec0f7de3fc8fbc5a9..1161248023ee7d02f6bdc9eb0f4185cf6c1280ac 100644
GIT binary patch
literal 88
zcmZ?wbhEHb<Y(YvSj50EbLPyA8#kUfapJ{`7Ys;1@h1x>0|N_#4oD27mVsH;W7nO3
g26_(KvV1HDEe}L0u*EN#xFFKY>(oAjISdTe06$F_qW}N^

literal 80
zcmZ?wbhEHb<YZuDSj5I~;>3wfn>L+1d2-{%jW1rjm^pLi|Ns9P7#I|PvM@3LmFNK3
i3?Q`(%%TyyyiA!oB04G)Te5yh$2@OMO7G-kum%ACMICAY

diff --git a/django/contrib/admin/media/img/admin/arrow-up-hover.gif b/django/contrib/admin/media/img/admin/arrow-up-hover.gif
new file mode 100644
index 0000000000000000000000000000000000000000..29a3dc500b6ae6f442e46da95ec10b63dabf0a58
GIT binary patch
literal 70
zcmZ?wbh9u|<Y(Yvn8?5o*tzh<ix&(G40Db#D*j|)WME)o&;fE8K=KSs;#2xpp5FVA
YkKw}E$m@G0-`<s!7oVCI$-rO@0ITy9_y7O^

literal 0
HcmV?d00001

diff --git a/django/contrib/admin/media/img/admin/arrow-up.gif b/django/contrib/admin/media/img/admin/arrow-up.gif
index 3fe4851399a37337891ccf5452ee5d59bbedeec7..d0842b3545151ab949a84aeefa39bcfdd83c828b 100644
GIT binary patch
literal 87
zcmZ?wbhEHb<Y(YvSj50EbLPyA8#kUfapJ{`7Ys;1@h1x>0|N_#4oD27mVsHuW7nO3
f2KyAn8A6x@3+_0+uuRZMJF|3E#?yU)ObpflIM^AU

literal 838
zcmZ?wbhEHb<YZuD_|Cv^;>3wfn>L+1d2-{%jW1rjm^pJM!zdUHfe{k|ia%Kx8Gu<q
z2jpW=o?zfmX5i&8aY$HjkcpK`j>SOX;Q=NFCLWFl0*@NH#f6pb?3n1_z+epkX4f1j

diff --git a/django/contrib/admin/media/img/admin/icon-remove-small.gif b/django/contrib/admin/media/img/admin/icon-remove-small.gif
new file mode 100644
index 0000000000000000000000000000000000000000..288c2ad7cc7b807ab02d035c098c80b2c11458b6
GIT binary patch
literal 189
zcmZ?wbh9u|<YC}pIKsfNO;diiuJQ>RQwTcgWCKJO94ybcJ6`ei0HUkGen50BGysSm
z$45O*h<cTs{-vh;{Dkfc6M8Psn|W=)90mpkW@aD(1R7A<2TCjcWMO1r5NFT<NrLQT
zV6}Rn+Lw|!OH4H=EK}DvRMFKssP~FWzrob0ZciFl%+T7?dcb3mf&#}u#ShYvT&KMl
R5;m{WoBS@*hmVoL8UXbGKC1u#

literal 0
HcmV?d00001

diff --git a/django/contrib/admin/media/img/admin/icon_cog-hover.gif b/django/contrib/admin/media/img/admin/icon_cog-hover.gif
new file mode 100644
index 0000000000000000000000000000000000000000..45611686ee942ed9ee4277564f7c00a83684417b
GIT binary patch
literal 131
zcmZ?wbh9u|<Y(Yv*v!BX*tzf&7+eQ~mtgSq>sJOGK=CIFBLf2mgAPa@WCjC^fq-Wu
z*DB*+1}^zqPYUBLCTUnK)R{i_pzEsa$}HX4yq4nG%g-ySFn?gMf26QY#!rdC8UTGS
BDRlq<

literal 0
HcmV?d00001

diff --git a/django/contrib/admin/templates/admin/change_list_results.html b/django/contrib/admin/templates/admin/change_list_results.html
index 738ff28..cc09533 100644
--- a/django/contrib/admin/templates/admin/change_list_results.html
+++ b/django/contrib/admin/templates/admin/change_list_results.html
@@ -12,15 +12,18 @@
 <tr>
 {% for header in result_headers %}
 <th scope="col" {{ header.class_attrib }}>
-  {% if header.sortable %}<a href="{{ header.url_primary }}">{% endif %}
-  <span class="text">{{ header.text|capfirst }}</span>
   {% if header.sortable %}
-    {% if header.sort_pos > 0 %}<span class="sortpos">
-      {% if header.sort_pos == 1 %}<img id="primary-sort-icon" src="{% admin_media_prefix %}img/admin/icon_cog.gif" alt="" />&nbsp;{% endif %}
-      {{ header.sort_pos }}</span>
+    {% if header.sort_pos > 0 %}
+      <div class="sortoptions">
+      {% if header.sort_pos == 1 %}<img id="primary-sort-icon" src="{% admin_media_prefix %}img/admin/icon_cog.gif" alt="{% trans "options" %}" title="{% trans "Sorting options" %}"/>&nbsp;{% endif %}
+      <span class="sortposition">{{ header.sort_pos }}</span>
+      <a class="sortremove" href="{{ header.url_remove }}" title="{% trans "Remove from sorting" %}"><img src="{% admin_media_prefix %}img/admin/icon-remove-small.gif"></a>
+      <a href="{{ header.url_toggle }}" class="toggle {% if header.ascending %}ascending{% else %}descending{% endif %}"><img src="{% admin_media_prefix %}img/admin/arrow-{% if header.ascending %}up{% else %}down{% endif %}.gif" alt="{% trans "toggle" %}" title="{% trans "Toggle sorting" %}" /></a>
+      </div>
     {% endif %}
-    <span class="clear"></span></a>
   {% endif %}
+  <div class="text">{% if header.sortable %}<a href="{{ header.url_primary }}" title="{% trans "Make primary sorting column and toggle sorting" %}">{{ header.text|capfirst }}</a>{% else %}{{ header.text|capfirst }}{% endif %}</div>
+  <div class="clear"></div>
 </th>{% endfor %}
 </tr>
 </thead>
@@ -115,6 +118,33 @@
             hidePopup();
             ev.preventDefault()
         });
+
+        $('a.toggle.ascending img').mouseenter(function(){
+            $(this).attr('src', '{% admin_media_prefix %}img/admin/arrow-up-hover.gif');
+        });
+        $('a.toggle.ascending img').mouseout(function(){
+            $(this).attr('src', '{% admin_media_prefix %}img/admin/arrow-up.gif');
+        });
+        $('a.toggle.descending img').mouseenter(function(){
+            $(this).attr('src', '{% admin_media_prefix %}img/admin/arrow-down-hover.gif');
+        });
+        $('a.toggle.descending img').mouseout(function(){
+            $(this).attr('src', '{% admin_media_prefix %}img/admin/arrow-down.gif');
+        });
+        $('img#primary-sort-icon').mouseenter(function(){
+            $(this).attr('src', '{% admin_media_prefix %}img/admin/icon_cog-hover.gif');
+        });
+        $('img#primary-sort-icon').mouseout(function(){
+            $(this).attr('src', '{% admin_media_prefix %}img/admin/icon_cog.gif');
+        });
+        $('span.sortposition').mouseover(function(){
+            $(this).hide();
+            $(this).siblings('a.sortremove').show();
+        });
+        $('a.sortremove').mouseleave(function(){
+            $(this).hide();
+            $(this).siblings('span.sortposition').show();
+        });
     });
 })(django.jQuery);
 //-->