Mathis/allianceauth
1
0
Fork 0
mirror of https://gitlab.com/allianceauth/allianceauth.git synced 2026-02-09 08:36:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Consolidate TS3 into base services table

Browse Source 
Beautify services table with hover and no borders
Unify formatting of mumble/jabber/ts3 service URLs in table
This commit is contained in:
Adarnof
2017-03-08 17:50:43 -05:00
parent 9897c0bbba
commit fb22aaf731
4 changed files with 14 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/modules/mumble/auth_hooks.py
View File

@@ -57,8 +57,8 @@ class MumbleService(ServicesHook):
return render_to_string(self.service_ctrl_template, {
'service_name': self.title,
'urls': urls,
'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),
'service_url': self.service_url,
'connect_url': 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)

4
services/modules/mumble/templates/registered/mumble_service_ctrl.html
View File

@@ -1,7 +1,7 @@
<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"><a href="mumble://{{ service_url }}">{{ service_url }}</a></td>
<td class="text-center">
{% ifequal username "" %}
<a href="{% url urls.auth_activate %}" title="Activate" class="btn btn-warning">
@@ -17,7 +17,7 @@
<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">
<a href="mumble://{{ connect_url }}" class="btn btn-success" title="Connect">
<span class="glyphicon glyphicon-arrow-right"></span>
</a>
{% endifequal %}