diff --git a/alliance_auth/settings.py.example b/alliance_auth/settings.py.example
index cfc68fce..3454c46b 100644
--- a/alliance_auth/settings.py.example
+++ b/alliance_auth/settings.py.example
@@ -426,11 +426,10 @@ BROADCAST_SERVICE_NAME = os.environ.get('AA_BROADCAST_SERVICE_NAME', "broadcast"
######################################
# Mumble Configuration
######################################
-# MUMBLE_URL - Mumble server url
-# MUMBLE_SERVER_ID - Mumble server id
+# MUMBLE_URL - Mumble server host
+# Do not include leading http:// or mumble://
######################################
-MUMBLE_URL = os.environ.get('AA_MUMBLE_URL', "https://example.com")
-MUMBLE_SERVER_ID = int(os.environ.get('AA_MUMBLE_SERVER_ID', '1'))
+MUMBLE_URL = os.environ.get('AA_MUMBLE_URL', "example.com")
######################################
# PHPBB3 Configuration
diff --git a/services/modules/discord/templates/registered/discord_service_ctrl.html b/services/modules/discord/templates/registered/discord_service_ctrl.html
index 7b7fa34b..a2449910 100644
--- a/services/modules/discord/templates/registered/discord_service_ctrl.html
+++ b/services/modules/discord/templates/registered/discord_service_ctrl.html
@@ -7,14 +7,14 @@
| https://discordapp.com |
{% if not discord_uid %}
-
+
{% else %}
-
+
-
+
{% endif %}
diff --git a/services/modules/discourse/templates/registered/discourse_service_ctrl.html b/services/modules/discourse/templates/registered/discourse_service_ctrl.html
index 7cae0cd2..e3c6d289 100644
--- a/services/modules/discourse/templates/registered/discourse_service_ctrl.html
+++ b/services/modules/discourse/templates/registered/discourse_service_ctrl.html
@@ -4,5 +4,5 @@
| {{ char.character_name }} |
{{ DISCOURSE_URL }} |
-
+
|
diff --git a/services/modules/mumble/auth_hooks.py b/services/modules/mumble/auth_hooks.py
index 4585744f..44f4024d 100644
--- a/services/modules/mumble/auth_hooks.py
+++ b/services/modules/mumble/auth_hooks.py
@@ -21,6 +21,7 @@ class MumbleService(ServicesHook):
self.urlpatterns = urlpatterns
self.service_url = settings.MUMBLE_URL
self.access_perm = 'mumble.access_mumble'
+ self.service_ctrl_template = 'registered/mumble_service_ctrl.html'
def delete_user(self, user, notify_user=False):
logging.debug("Deleting user %s %s account" % (user, self.name))
@@ -56,7 +57,8 @@ class MumbleService(ServicesHook):
return render_to_string(self.service_ctrl_template, {
'service_name': self.title,
'urls': urls,
- 'service_url': self.service_url,
+ 'service_url': 'mumble://' + self.service_url,
+ 'connect_url': 'mumble://' + str(request.user.mumble.username + '@' + self.service_url if MumbleTasks.has_account(request.user) else self.service_url),
'username': request.user.mumble.username if MumbleTasks.has_account(request.user) else '',
}, request=request)
diff --git a/services/modules/mumble/templates/registered/mumble_service_ctrl.html b/services/modules/mumble/templates/registered/mumble_service_ctrl.html
new file mode 100644
index 00000000..b668e110
--- /dev/null
+++ b/services/modules/mumble/templates/registered/mumble_service_ctrl.html
@@ -0,0 +1,25 @@
+
+ | {{ service_name }} |
+ {{ username }} |
+ {{ service_url }} |
+
+ {% ifequal username "" %}
+
+
+
+ {% else %}
+
+
+
+
+
+
+
+
+
+
+
+
+ {% endifequal %}
+ |
+
diff --git a/stock/templates/registered/services_ctrl.html b/stock/templates/registered/services_ctrl.html
index 272cf101..f34f9a8e 100644
--- a/stock/templates/registered/services_ctrl.html
+++ b/stock/templates/registered/services_ctrl.html
@@ -7,23 +7,23 @@
{% ifequal username "" %}
{% if urls.auth_activate %}
-
+
{% endif %}
{% else %}
{% if urls.auth_set_password %}
-
+
{% endif %}
{% if urls.auth_reset_password %}
-
+
{% endif %}
{% if urls.auth_deactivate %}
-
+
{% endif %}
|