From 47dc521d57414f16b9f159da9598ca31cba1d750 Mon Sep 17 00:00:00 2001
From: Michael Ziegler <diese-addy@funzt-halt.net>
Date: Fri, 12 Jun 2009 15:39:46 +0200
Subject: [PATCH] fixed "Username@" missing from the channel links

---
 pyweb/mumble/views.py       | 16 +++++++++-------
 template/mumble/content.htm |  4 ++--
 template/mumble/mumble.htm  |  2 +-
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/pyweb/mumble/views.py b/pyweb/mumble/views.py
index 67efbd5..ac781a6 100755
--- a/pyweb/mumble/views.py
+++ b/pyweb/mumble/views.py
@@ -73,6 +73,7 @@ def show( request, server ):
 		adminform = None;
 	
 	registered = False;
+	user = None;
 	
 	if request.user.is_authenticated():
 		if request.method == 'POST' and 'mode' in request.POST and request.POST['mode'] == 'reg':
@@ -119,13 +120,14 @@ def show( request, server ):
 			'DBaseObject':  srv,
 			'ServerObject': o,
 			'ChannelTable': Storage.s,
-			"CurrentUserIsAdmin": isAdmin,
-			"AdminForm":    adminform,
-			"RegForm":      regform,
-			"TextureForm":  textureform,
-			"Registered":   registered,
-			"DisplayTab":   displayTab,
-			'MumbleActive':  True,
+			'CurrentUserIsAdmin': isAdmin,
+			'AdminForm':    adminform,
+			'RegForm':      regform,
+			'TextureForm':  textureform,
+			'Registered':   registered,
+			'DisplayTab':   displayTab,
+			'MumbleActive': True,
+			'MumbleAccount':user,
 		},
 		context_instance = RequestContext(request)
 		);
diff --git a/template/mumble/content.htm b/template/mumble/content.htm
index 7cbe061..27c9dde 100644
--- a/template/mumble/content.htm
+++ b/template/mumble/content.htm
@@ -4,7 +4,7 @@
     <tr>
       <td class="mumble" id="server" colspan="2">
         <img src="/static/mumble/mumble.16x16.png" alt="mumble" />
-        <a href="mumble://{% if mumbleAccount %}{{ mumbleAccount.name }}@{% endif %}{{ DBaseObject.addr }}:{{ DBaseObject.port }}/" class="dingen" id="link_server">
+        <a href="mumble://{% if MumbleAccount %}{{ MumbleAccount.name }}@{% endif %}{{ DBaseObject.addr }}:{{ DBaseObject.port }}/" class="dingen" id="link_server">
           {{ ServerObject.rootName }}
         </a>
     </tr>
@@ -33,7 +33,7 @@
             {% else %}
               <img src="/static/mumble/channel.png" alt="channel"/>
             {% endif %}
-            <a href="mumble://{% if mumbleAccount %}{{ mumbleAccount.name }}@{% endif %}{{ DBaseObject.addr }}:{{ DBaseObject.port }}/{% for chan in item.2 %}{{ chan|urlencode }}/{% endfor %}{{ item.1.name|urlencode }}" class="dingen" id="link_{{ item.1.id }}" title="{{ item.1.name }}">{{ item.1.name|trunc:30 }}</a>
+            <a href="mumble://{% if MumbleAccount %}{{ MumbleAccount.name }}@{% endif %}{{ DBaseObject.addr }}:{{ DBaseObject.port }}/{% for chan in item.2 %}{{ chan|urlencode }}/{% endfor %}{{ item.1.name|urlencode }}" class="dingen" id="link_{{ item.1.id }}" title="{{ item.1.name }}">{{ item.1.name|trunc:30 }}</a>
           {% endif %}
         </span>
       </td>
diff --git a/template/mumble/mumble.htm b/template/mumble/mumble.htm
index 5c25e8a..3beba4c 100644
--- a/template/mumble/mumble.htm
+++ b/template/mumble/mumble.htm
@@ -98,7 +98,7 @@
     {% else %}
     <div id="mumble_{{ item.1.id }}" class="x-hide-display">
       <h2>Channel {{ item.1.name }}</h2>
-      <a href="mumble://{% if mumbleAccount %}{{ mumbleAccount.name }}@{% endif %}{{ DBaseObject.addr }}:{{ DBaseObject.port }}/{% for chan in item.2 %}{{ chan|urlencode }}/{% endfor %}{{ item.1.name|urlencode }}" class="dingen">Connect</a>
+      <a href="mumble://{% if MumbleAccount %}{{ MumbleAccount.name }}@{% endif %}{{ DBaseObject.addr }}:{{ DBaseObject.port }}/{% for chan in item.2 %}{{ chan|urlencode }}/{% endfor %}{{ item.1.name|urlencode }}" class="dingen">Connect</a>
     </div>
     {% endif %}
   {% endfor %}