Ticket #16059: 16059-filteredselectmultiple-better-ui.diff

diff --git a/django/contrib/admin/media/img/admin/selector-remove.gif b/django/contrib/admin/media/img/admin/selector-remove.gif
index 2b9b0a2ac35a2051834bb9a49a7d57aaeebdcb48..6c5d45ae6e7722a0f0c568a20c21458bb1cc2f99 100644
GIT binary patch
literal 370
zcmZ?wbh9u|6krfwxXQp#yYM&=wXHY<L4E5k^l!L0ecM$yTD<oL5G_4$8;CX?zY9cb
zjy>3N<}ncMyYTeLwHH8i>&g2&&ptkR^96|BeEbeXUw{0DAO;*j6e`XLrP*+(!zB#U
zr}&cv$W&m^0VxFeiGi)(VS+$OBtu^lTbjikn@N*aq$pOD%xY*Z(KfVc>vv9(nK<Ei
z>wDFk8R2GcE0{M#N{IdNQg42*&m|Pe&MqR`Cf&i?%*M*V#wOG@sjaNvot2e)@}&A1
z9!yN^lO&h0FJPLvoN1Qis^$FR3^QhMOKjd;qTt`(&%UQW)Jb|%^U<RReRm&YV+iwc
Oa&>3$^mcY+um%9w4umuS

literal 398
zcmV;90df9ENk%w1VGsZi0M$MK!NI}2yu9=C^R%?Iv9Ynv*4?eOy|A&e#l^+DySw1v
z;PCM9vb)91%*?sDx%~b8tgyARva;st@73Jn!^6YAzP`)L%gV~i`T6;>yTq=rvah$l
z-QC^j?C`?E!rI!}-rnBp>+8?Y&$F|$v%JQ(wzkK|$N2d8?d|R4>Fx3H@xZ{qud%ZB
z_V&`!(&Fap*x1<3&CRj8!??J(+uPg8$;r;n&b76*)z#I=$jG<1x5UK6zrVlr`1}9=
z{{R30A^8LW002G!EC2ui01yBW000K7K%dYz*=R~SmZ2~lJ~9pwN1*_@60%NHMxlAX
zUK2qgWbklk^e2tm$$Y6>%tp5<1a<nXK&s^aIUGGIfPVl65Ig{jFg-md0+AO0D+C7t
zm^h9-7@Ikm5eGA)2%DXb2%`}Y12?V|jx7tbJgx)`13J1or6{|)HwG^wJjKNpA;!f6
sObiY?(9k*2J6J<92{qc=+7)9?88;pm4Gk7MI$2FZMH;OKOHDxlJ9N|8EC2ui

diff --git a/django/contrib/admin/media/img/admin/selector-removeall.gif b/django/contrib/admin/media/img/admin/selector-removeall.gif
index 5a4421926d9c352abcf3b114ccd296197b9c9fdf..28b4fad628aabdf644d01457404c81577a44d42b 100644
GIT binary patch
literal 234
zcmZ?wbh9u|6krfwIKseCzvN{5$}<quv-ZN2EmweO(ViPXwDI^|AX;(c0T69F`vi#g
zTzGo?+A}!1eDBqb$M1mX&HK-9KYsc4{Ra>+paR98EQ|~c(hNEvVUV2+tmzNb`cg9I
zy$F+aEC|V%#&UF%h~uQ0o)`b{dn}%y5z4gfD6{iM)`Z2*4+|Pnj6_~dajA|qp3r1*
zKvhOBo+Ht>kBN!p)YpqlG9ID_W?f)d&lsR=oD}SAsb*A_#KK^up{=X0IeCh@B7-#m
D>j`T<

literal 355
zcmZ?wbhEHb6krfwxT?c&_3G8rr%&(Szkl`W)oa$Q*|TTQ&6_u`UAuPg-o0hZmTlU!
z>Bx~ID^{#HdGh3{RjW2`-1y|llXdIX?cBNZ+_`frSFT*Tbm`{Jn=f9xc=ztz_wV0-
z|Ni~?^XIp2-MVq(#`*K-_wCzv>C&Zd-@aYHe*MaoE4y~>`t<43?%lh$ZQJ(v@#E#o
zmmfcV{Kt<U|NsAIAQve9WMO1r&;ddq0Qrf5t-)bhfrpM%zlYcohlL^vC#Gs$vXGGy
zyn1TIB!+!TEDnpb7O^#&ENJoK4{*8csqi2pOybu`7av;>Y3(LiF)@D4T0VKnCT(SA
zX1)$*HBn6#jwS_7P0<=>4NmpN;)-mGISX90xU|;Ev8_pU4PxOI7UpJ&^3YJ@;Za-V
LdE}_8BZD;nhnJNG

diff --git a/django/contrib/admin/media/img/admin/selector_stacked-remove.gif b/django/contrib/admin/media/img/admin/selector_stacked-remove.gif
index 60412cee19c6b5d2ff5d1f86f765988ddddbb6dc..aa8b67f90449c32d7b52bd4bb352940ca6a7f7a8 100644
GIT binary patch
literal 262
zcmZ?wbh9u|6krfwIKseCyYM&=wXQe=L4E5k^l!L0ZR-^{TD<oL5G^}!8;CX?zY9cb
zjy>3N`VkQAx$xxHllQltet7))GZ4M`_#KG8{`d_+3}B%6lZBCiL5@KO!~@yMz}mb(
zy((Op;YCpI<8KVd6y@7Kq`Xl+^CytOqQB2Q^Fz)&o&^VV0?cN+eh$CLxlTx<q;Rj-
z?#Q>>y0hZ+9(5m0_;K*Y8y*wpbp2%GpK6zxJ-E0VxvM0bxY?Q+c)NLp`h<GawE0;D
kr%j*1&aceR)<0i}-9guiTS!D?f|;X^s=B7OvLb^u04`vA&j0`b

literal 401
zcmV;C0dD?BNk%w1VGsZi0M$GI!NI}K*4@0kyz%kzt+l<hw6w9YvAesw-QC^F%F434
z#o*xJu(7i4?(VO*zpk*dxw*O3+~dH&z_PNk=IZaVyTteR_rAWq=<M+M`T6|){msqI
z%*@QJu(j~;@Y2%K&(F`cwzlHt>*eL;*Vos_$H(O9?cUzr!^6YN%ge8^vckf`>gwvV
zyvDP$v)I_!vAV;~&d%H0+sMes)z#I>$;r33x4*x?xVX5rwY9{=#P#_5|Ns9000000
z00000A^8LW002AyEC2ui01yBW000KAK%S5naXdmc6(KMjYAO&AVzD@V4lqm;hLU-|
z-jabLRNQE28e){D>0mrlZWF7McDqHrjtjIdGl3s?cnE<r00bR3000|=gfEQ}1`GlM
z5-bfC85tH04LX+-3^=By19$_crV||nIk7n&cpkE`1_}i>yf&#j1HCpm1R^ds$Tu?y
v2{Xwz1xyMMI@Q+KSVJ%eHQnCb7h_HpIV%Yq94R_BSxrJk53meNO+f%VqdU!B

diff --git a/django/contrib/admin/media/js/SelectFilter2.js b/django/contrib/admin/media/js/SelectFilter2.js
index 92eff2ecfa7536b865fee5c140d90e2a26a46cb2..fcd5f03ec5a5ac7fbd729fbc4e97e3981ef1534a 100644
--- a/django/contrib/admin/media/js/SelectFilter2.js
+++ b/django/contrib/admin/media/js/SelectFilter2.js
@@ -57,6 +57,11 @@ var SelectFilter = {
 
         var filter_input = quickElement('input', filter_p, '', 'type', 'text');
         filter_input.id = field_id + '_input';
+        
+        var selector_filter_available = quickElement('p', selector_available, gettext('To add, select your choice(s) and click '));
+        selector_filter_available.className = 'selector-filter';
+        quickElement('img', selector_filter_available, '', 'src', admin_media_prefix + (is_stacked ? 'img/admin/selector_stacked-add.gif':'img/admin/selector-add.gif'), 'alt', 'Add');
+        
         selector_available.appendChild(from_box);
         var choose_all = quickElement('a', selector_available, gettext('Choose all'), 'href', 'javascript: (function(){ SelectBox.move_all("' + field_id + '_from", "' + field_id + '_to"); })()');
         choose_all.className = 'selector-chooseall';
@@ -73,9 +78,9 @@ var SelectFilter = {
         var selector_chosen = quickElement('div', selector_div, '');
         selector_chosen.className = 'selector-chosen';
         quickElement('h2', selector_chosen, interpolate(gettext('Chosen %s'), [field_name]));
-        var selector_filter = quickElement('p', selector_chosen, gettext('Select your choice(s) and click '));
-        selector_filter.className = 'selector-filter';
-        quickElement('img', selector_filter, '', 'src', admin_media_prefix + (is_stacked ? 'img/admin/selector_stacked-add.gif':'img/admin/selector-add.gif'), 'alt', 'Add');
+        var selector_filter_chosen = quickElement('p', selector_chosen, gettext('To remove, select your choice(s) and click '));
+        selector_filter_chosen.className = 'selector-filter';
+        quickElement('img', selector_filter_chosen, '', 'src', admin_media_prefix + (is_stacked ? 'img/admin/selector_stacked-remove.gif':'img/admin/selector-remove.gif'), 'alt', 'Add');
         var to_box = quickElement('select', selector_chosen, '', 'id', field_id + '_to', 'multiple', 'multiple', 'size', from_box.size, 'name', from_box.getAttribute('name'));
         to_box.className = 'filtered';
         var clear_all = quickElement('a', selector_chosen, gettext('Clear all'), 'href', 'javascript: (function() { SelectBox.move_all("' + field_id + '_to", "' + field_id + '_from");})()');