Browse Source

use the icons from mumble 1.2.0 instead of 1.1.8. fixes #67

Natenom/support-murmur-13-1446181288462
Michael Ziegler 15 years ago
parent
commit
6bc848eaa5
  1. BIN
      htdocs/mumble/authenticated.png
  2. BIN
      htdocs/mumble/channel.png
  3. BIN
      htdocs/mumble/channel_linked.png
  4. BIN
      htdocs/mumble/comment.png
  5. BIN
      htdocs/mumble/comment_seen.png
  6. BIN
      htdocs/mumble/deafened_self.png
  7. BIN
      htdocs/mumble/deafened_server.png
  8. BIN
      htdocs/mumble/muted_self.png
  9. BIN
      htdocs/mumble/muted_server.png
  10. BIN
      htdocs/mumble/talking_off.png
  11. 5
      pyweb/mumble/mmobjects.py
  12. 2
      template/mobile_index.htm
  13. 5
      template/mumble/player.htm

BIN
htdocs/mumble/authenticated.png

Before

Width: 16  |  Height: 16  |  Size: 926 B

After

Width: 16  |  Height: 16  |  Size: 650 B

BIN
htdocs/mumble/channel.png

Before

Width: 16  |  Height: 16  |  Size: 942 B

After

Width: 16  |  Height: 16  |  Size: 710 B

BIN
htdocs/mumble/channel_linked.png

Before

Width: 16  |  Height: 16  |  Size: 947 B

After

Width: 16  |  Height: 16  |  Size: 726 B

BIN
htdocs/mumble/comment.png

After

Width: 16  |  Height: 16  |  Size: 630 B

BIN
htdocs/mumble/comment_seen.png

After

Width: 16  |  Height: 16  |  Size: 603 B

BIN
htdocs/mumble/deafened_self.png

Before

Width: 16  |  Height: 16  |  Size: 1.1 KiB

After

Width: 16  |  Height: 16  |  Size: 791 B

BIN
htdocs/mumble/deafened_server.png

Before

Width: 16  |  Height: 16  |  Size: 1.1 KiB

After

Width: 16  |  Height: 16  |  Size: 821 B

BIN
htdocs/mumble/muted_self.png

Before

Width: 16  |  Height: 16  |  Size: 999 B

After

Width: 16  |  Height: 16  |  Size: 814 B

BIN
htdocs/mumble/muted_server.png

Before

Width: 16  |  Height: 16  |  Size: 992 B

After

Width: 16  |  Height: 16  |  Size: 794 B

BIN
htdocs/mumble/talking_off.png

Before

Width: 16  |  Height: 16  |  Size: 724 B

After

Width: 16  |  Height: 16  |  Size: 615 B

5
pyweb/mumble/mmobjects.py

@ -185,6 +185,11 @@ class mmPlayer( object ):
def __str__( self ): def __str__( self ):
return '<Player "%s" (%d, %d)>' % ( self.name, self.session, self.userid ); return '<Player "%s" (%d, %d)>' % ( self.name, self.session, self.userid );
hasComment = property(
lambda self: hasattr( self.playerObj, "comment" ) and bool(self.playerObj.comment),
doc="True if this player has a comment set."
);
isAuthed = property( isAuthed = property(
lambda self: self.userid != -1, lambda self: self.userid != -1,
doc="True if this player is authenticated (+A)." doc="True if this player is authenticated (+A)."

2
template/mobile_index.htm

@ -18,7 +18,7 @@
</div> </div>
<!-- footer --> <!-- footer -->
<div id="footerpanel"> <div id="footerpanel">
<a href="http://bitbucket.org/Svedrin/mumble-django" target="_blank">Mumble-Django</a>
<a href="http://bitbucket.org/Svedrin/mumble-django" target="_blank" style="color:white">Mumble-Django</a>
</div> </div>
</body> </body>
</html> </html>

5
template/mumble/player.htm

@ -2,7 +2,7 @@
<div class="mumble" style="background-image: url( {{ MEDIA_URL }}/mumble/linie_v.png )"> <div class="mumble" style="background-image: url( {{ MEDIA_URL }}/mumble/linie_v.png )">
<span class="mumble"> <span class="mumble">
{% if Player.isAuthed %} {% if Player.isAuthed %}
<img src="{{ MEDIA_URL }}/mumble/authenticated.png" alt="authed" title="Authenticated" />
<img src="{{ MEDIA_URL }}/mumble/authenticated.png" alt="authed" title="Authenticated" />
{% endif %} {% endif %}
{% if Player.mute or Player.suppress %} {% if Player.mute or Player.suppress %}
<img src="{{ MEDIA_URL }}/mumble/muted_server.png" alt="muted" title="Muted by server" /> <img src="{{ MEDIA_URL }}/mumble/muted_server.png" alt="muted" title="Muted by server" />
@ -16,6 +16,9 @@
{% if Player.selfDeaf %} {% if Player.selfDeaf %}
<img src="{{ MEDIA_URL }}/mumble/deafened_self.png" alt="self-deafened" title="Deafened by themselves" /> <img src="{{ MEDIA_URL }}/mumble/deafened_self.png" alt="self-deafened" title="Deafened by themselves" />
{% endif %} {% endif %}
{% if Player.hasComment %}
<img src="{{ MEDIA_URL }}/mumble/comment.png" alt="has comment" title="has a User Comment set" />
{% endif %}
</span> </span>
<span> <span>
<img src="{{ MEDIA_URL }}/mumble/knoten_v.png" /> <img src="{{ MEDIA_URL }}/mumble/knoten_v.png" />

Loading…
Cancel
Save