From 9897c0bbbabccf7e6578dc54a9f94b2a17d72a60 Mon Sep 17 00:00:00 2001
From: Adarnof <adarnof@gmail.com>
Date: Wed, 8 Mar 2017 17:31:41 -0500
Subject: [PATCH] Provide mumble quick join link Add button titles to services

---
 alliance_auth/settings.py.example             |  7 +++---
 .../registered/discord_service_ctrl.html      |  6 ++---
 .../registered/discourse_service_ctrl.html    |  2 +-
 services/modules/mumble/auth_hooks.py         |  4 ++-
 .../registered/mumble_service_ctrl.html       | 25 +++++++++++++++++++
 stock/templates/registered/services_ctrl.html |  8 +++---
 6 files changed, 39 insertions(+), 13 deletions(-)
 create mode 100644 services/modules/mumble/templates/registered/mumble_service_ctrl.html

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 @@
     <td class="text-center"><a href="https://discordapp.com/channels/{{ DISCORD_SERVER_ID }}/{{ DISCORD_SERVER_ID}}">https://discordapp.com</a></td>
     <td class="text-center">
         {% if not discord_uid %}
-            <a href="{% url 'auth_activate_discord' %}" class="btn btn-warning">
+            <a href="{% url 'auth_activate_discord' %}" title="Activate" class="btn btn-warning">
                 <span class="glyphicon glyphicon-ok"></span>
             </a>
         {% else %}
-            <a href="{% url 'auth_reset_discord' %}" class="btn btn-primary">
+            <a href="{% url 'auth_reset_discord' %}" title="Reset" class="btn btn-primary">
                 <span class="glyphicon glyphicon-refresh"></span>
             </a>
-            <a href="{% url 'auth_deactivate_discord' %}" class="btn btn-danger">
+            <a href="{% url 'auth_deactivate_discord' %}" title="Deactivate" class="btn btn-danger">
                 <span class="glyphicon glyphicon-remove"></span>
             </a>
         {% 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 @@
 <td class="text-center">{{ char.character_name }}</td>
 <td class="text-center"><a href="{{ DISCOURSE_URL }}">{{ DISCOURSE_URL }}</a></td>
 <td class="text-center">
-    <a class="btn btn-success" href="{{ DISCOURSE_URL }}"><span class="glyphicon glyphicon-arrow-right"></span></a>
+    <a title="Go To Forums" class="btn btn-success" href="{{ DISCOURSE_URL }}"><span class="glyphicon glyphicon-arrow-right"></span></a>
 </td>
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 @@
+<tr>
+    <td class="text-center">{{ service_name }}</td>
+    <td class="text-center">{{ username }}</td>
+    <td class="text-center"><a href="{{ service_url }}">{{ service_url }}</a></td>
+    <td class="text-center">
+        {% ifequal username "" %}
+            <a href="{% url urls.auth_activate %}" title="Activate" class="btn btn-warning">
+                <span class="glyphicon glyphicon-ok"></span>
+            </a>
+        {% else %}
+            <a href="{% url urls.auth_set_password %}" title="Set Password" class="btn btn-warning">
+                <span class="glyphicon glyphicon-pencil"></span>
+            </a>
+            <a href="{% url urls.auth_reset_password %}" title="Reset Password" class="btn btn-primary">
+                <span class="glyphicon glyphicon-refresh"></span>
+            </a>
+            <a href="{% url urls.auth_deactivate %}" title="Deactivate" class="btn btn-danger">
+                <span class="glyphicon glyphicon-remove"></span>
+            </a>
+            <a  href="{{ connect_url }}" class="btn btn-success" title="Connect">
+                <span class="glyphicon glyphicon-arrow-right"></span>
+            </a>
+        {% endifequal %}
+    </td>
+</tr>
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 @@
     <td class="text-center">
         {% ifequal username "" %}
             {% if urls.auth_activate %}
-            <a href="{% url urls.auth_activate %}" class="btn btn-warning">
+            <a href="{% url urls.auth_activate %}" title="Activate" class="btn btn-warning">
                 <span class="glyphicon glyphicon-ok"></span>
             </a>
             {% endif %}
         {% else %}
             {% if urls.auth_set_password %}
-            <a href="{% url urls.auth_set_password %}" class="btn btn-warning">
+            <a href="{% url urls.auth_set_password %}" title="Set Password" class="btn btn-warning">
                 <span class="glyphicon glyphicon-pencil"></span>
             </a>
             {% endif %}
             {% if urls.auth_reset_password %}
-            <a href="{% url urls.auth_reset_password %}" class="btn btn-primary">
+            <a href="{% url urls.auth_reset_password %}" title="Reset Password" class="btn btn-primary">
                 <span class="glyphicon glyphicon-refresh"></span>
             </a>
             {% endif %}
             {% if urls.auth_deactivate %}
-            <a href="{% url urls.auth_deactivate %}" class="btn btn-danger">
+            <a href="{% url urls.auth_deactivate %}" title="Deactivate" class="btn btn-danger">
                 <span class="glyphicon glyphicon-remove"></span>
             </a>
             {% endif %}