From e63f9f1391cd2ec9dbcea9988d8124297b0ce780 Mon Sep 17 00:00:00 2001
From: Michael Ziegler <diese-addy@funzt-halt.net>
Date: Thu, 5 Jan 2012 12:30:31 +0100
Subject: [PATCH] add USERS_ABOVE_CHANNELS setting to settings.py

---
 pyweb/mumble/templates/mumble/embed.html  | 3 +++
 pyweb/mumble/templates/mumble/mumble.html | 3 +++
 pyweb/mumble/views.py                     | 2 ++
 pyweb/settings.py                         | 3 +++
 4 files changed, 11 insertions(+)

diff --git a/pyweb/mumble/templates/mumble/embed.html b/pyweb/mumble/templates/mumble/embed.html
index 410d75d..b6c8304 100644
--- a/pyweb/mumble/templates/mumble/embed.html
+++ b/pyweb/mumble/templates/mumble/embed.html
@@ -17,6 +17,9 @@
             mainpanel = new Ext.ux.MumbleChannelViewer({
                 //title: "ohai",
                 renderTo: Ext.getBody(),
+                {% if UsersAboveChannels %}
+                    usersAboveChannels: true,
+                {% endif %}
                 source_url: "{% url mumble.views.cvp_json MumbleServer.id %}",
                 imageurl: '{{MUMBLE_MEDIA_PREFIX}}/img',
                 tbar: [],
diff --git a/pyweb/mumble/templates/mumble/mumble.html b/pyweb/mumble/templates/mumble/mumble.html
index e1274c0..294f285 100644
--- a/pyweb/mumble/templates/mumble/mumble.html
+++ b/pyweb/mumble/templates/mumble/mumble.html
@@ -76,6 +76,9 @@
                     region: "west",
                     width: 350,
                     split: true,
+                    {% if UsersAboveChannels %}
+                        usersAboveChannels: true,
+                    {% endif %}
                     enableDD: true,
                     plugins: [
                         new Ext.ux.MumbleUserEditor({
diff --git a/pyweb/mumble/views.py b/pyweb/mumble/views.py
index 224af8e..4fba059 100644
--- a/pyweb/mumble/views.py
+++ b/pyweb/mumble/views.py
@@ -198,6 +198,7 @@ def show( request, server ):
             'MumbleAccount':user,
             'QRAvailable':  qravail,
             'IsAdmin':      isAdmin,
+            'UsersAboveChannels': settings.USERS_ABOVE_CHANNELS
         }, context_instance = RequestContext(request) )
 
 def mobile_show( request, server ):
@@ -226,6 +227,7 @@ def embed( request, server ):
     return render_to_response( 'mumble/embed.html', {
             'MumbleServer': srv,
             'MumbleActive': True,
+            'UsersAboveChannels': settings.USERS_ABOVE_CHANNELS
         }, context_instance = RequestContext(request) )
 
 @EXT_DIRECT_PROVIDER.register_method( "Mumble" )
diff --git a/pyweb/settings.py b/pyweb/settings.py
index 5d99e73..79b344b 100644
--- a/pyweb/settings.py
+++ b/pyweb/settings.py
@@ -137,6 +137,9 @@ MUNIN_CATEGORY = 'mumble'
 # Set to True if you do not wish offline servers to appear in the server list.
 HIDE_OFFLINE_SERVERS=False
 
+# True to display users above channels in the channel viewer.
+USERS_ABOVE_CHANNELS=False
+
 ###################################################################
 ##                                                               ##
 ##  The following settings normally do not require changes, and  ##