From 6bebc1b828ce9aca0f464fcdd4b2b76e7249774f Mon Sep 17 00:00:00 2001
From: Michael Ziegler <diese-addy@funzt-halt.net>
Date: Mon, 2 Aug 2010 20:05:02 +0200
Subject: [PATCH] add the "priority speaker" status icon, and reorder the icons
 to appear like they do in the mumble client

---
 COPYRIGHT                          |   8 ++++++++
 htdocs/js/channelviewer.js         |  15 ++++++++-------
 htdocs/mumble/priority_speaker.png | Bin 0 -> 701 bytes
 3 files changed, 16 insertions(+), 7 deletions(-)
 create mode 100644 htdocs/mumble/priority_speaker.png

diff --git a/COPYRIGHT b/COPYRIGHT
index 3327567..b88f171 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -119,3 +119,11 @@ License:
     SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
+===============================================================================
+
+The image "htdocs/mumble/priority_speaker.jpg" is an svg rendering of
+"actions/audio-input-microphone.svg" from the Tango Icon Library, which has
+been placed in the public domain by the Tango Desktop Project:
+
+http://tango.freedesktop.org/Tango_Desktop_Project
+
diff --git a/htdocs/js/channelviewer.js b/htdocs/js/channelviewer.js
index 9abab64..2aea19b 100644
--- a/htdocs/js/channelviewer.js
+++ b/htdocs/js/channelviewer.js
@@ -27,13 +27,14 @@ Ext.ux.MumbleUserNodeUI = Ext.extend(Ext.tree.TreeNodeUI, {
             '<img style="position: absolute; top: 0px; right: {pos}px;" src="/static/mumble/{icon}.png"/>'
             );
         var icons = []
-        if( a.userdata.userid != 0 )   icons.push( "authenticated" );
-        if( a.userdata.selfMute )      icons.push( "muted_self" );
-        if( a.userdata.mute )          icons.push( "muted_server" );
-        if( a.userdata.suppress )      icons.push( "muted_suppressed" );
-        if( a.userdata.selfDeaf )      icons.push( "deafened_self" );
-        if( a.userdata.deaf )          icons.push( "deafened_server" );
-        if( a.userdata.comment != "" ) icons.push( "comment_seen" );
+        if( a.userdata.userid != 0 )     icons.push( "authenticated" );
+        if( a.userdata.selfDeaf )        icons.push( "deafened_self" );
+        if( a.userdata.deaf )            icons.push( "deafened_server" );
+        if( a.userdata.selfMute )        icons.push( "muted_self" );
+        if( a.userdata.suppress )        icons.push( "muted_suppressed" );
+        if( a.userdata.mute )            icons.push( "muted_server" );
+        if( a.userdata.comment != "" )   icons.push( "comment_seen" );
+        if( a.userdata.prioritySpeaker ) icons.push( "priority_speaker" );
         var pos = 8;
         for( var i = 0; i < icons.length; i++ ){
             tpl.append( this.elNode, {'icon': icons[i], 'pos': pos} );
diff --git a/htdocs/mumble/priority_speaker.png b/htdocs/mumble/priority_speaker.png
new file mode 100644
index 0000000000000000000000000000000000000000..9dee784d651eb2adcd5deb664c29cf948e0fce04
GIT binary patch
literal 701
zcmV;u0z&<XP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x0&+=2K~y-6eUm{*+h7#O|6h~VG+C&_iir|iS#Y$l-3CHIFGGeGZ!*|v
z2M->0+;vn0ck02h^Vq#7VXPpGUc_BQT5!rbVrO+$Xw=x6l;r!8>?CMV-|_MPe*E6!
zeFS$@sZ`Q(x!gyN;~pO!9qpZ-p03yH^`GT(*^g#Pv{5V;6SK3kzcfwLJ<kJU3>Oy{
z!P(hatJP|KURqiz-OR_LfWg7Rx1CN$uU4xFf&h#$@H`)rWjQ-OKEAxVx|+Y4=c9np
z(b1P-7=kf|Mx%jpxr`tPFflQKsi`RmKmowsy#@mV1J5X>006@<5Cj1fMS-fSFio@X
zdESqEM_5@|c`67(rrmBMkw~D?XdsnJLDMv}+ike6+bkA~2loQf>GT`NafJQ-eZ=E&
zP)eceI&9kpAq1P7o5NA#TY!;~kr%tWyO1OamSsWLbpU|x`#3y21Y@ig1>9O9AtW&~
zGlL)qaCLPB+qQ9jehyI-A<MFRe0==<K?Bn?*BN8X^E`xMh)gDf$;nBmstQVJk5Xzq
z2v}TP{8X#e-c>4<-;U$7eBWmr$HDjggKoEb5Pb{)T(n`DW<3^*y>B*~FikUYd3ouF
zVMr~@8k1%D-_Fj?#&vdUYbzN&WodeP`gNgDSfi9mCnqQ9_xm7(AeBl%QIw9ND9e&0
zeaq+bW4&IleshU20J0zmPb5ha2_YC78iH-x;CUXN=fSq^N7ZVzJ3l}F+_J2Vxw$zv
zY9Ig@URYT8peV{KQ54m9JkGhUOC87gYZ%7YN~Q7zfC+#Bcl^d{n{+xYWwY5_GMQBS
j{l2liz5NG(8x8&kAqX9|8E|J400000NkvXXu0mjf&lx-6

literal 0
HcmV?d00001