Mathis/allianceauth
1
0
Fork 0
mirror of https://gitlab.com/allianceauth/allianceauth.git synced 2025-07-12 22:10:16 +02: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
Show Stats 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, { return render_to_string(self.service_ctrl_template, {
'service_name': self.title, 'service_name': self.title,
'urls': urls, 'urls': urls,
'service_url': 'mumble://' + self.service_url, 'service_url': self.service_url,
'connect_url': 'mumble://' + str(request.user.mumble.username + '@' + self.service_url if MumbleTasks.has_account(request.user) else 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 '', 'username': request.user.mumble.username if MumbleTasks.has_account(request.user) else '',
}, request=request) }, request=request)

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

@ -1,7 +1,7 @@
<tr> <tr>
<td class="text-center">{{ service_name }}</td> <td class="text-center">{{ service_name }}</td>
<td class="text-center">{{ username }}</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"> <td class="text-center">
{% ifequal username "" %} {% ifequal username "" %}
<a href="{% url urls.auth_activate %}" title="Activate" class="btn btn-warning"> <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"> <a href="{% url urls.auth_deactivate %}" title="Deactivate" class="btn btn-danger">
<span class="glyphicon glyphicon-remove"></span> <span class="glyphicon glyphicon-remove"></span>
</a> </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> <span class="glyphicon glyphicon-arrow-right"></span>
</a> </a>
{% endifequal %} {% endifequal %}

25
services/modules/teamspeak3/templates/registered/teamspeak3_service_ctrl.html
View File

@ -1,34 +1,27 @@
{% load i18n %} {% load i18n %}
<tr>
<th class="text-center">{% trans "Service" %}</th>
<th class="text-center">{% trans "Unique ID" %}</th>
<th class="text-center">PermissionKey</th>
<th class="text-center">{% trans "Action" %}</th>
</tr>
<tr> <tr>
<td class="text-center">Teamspeak 3</td> <td class="text-center">Teamspeak 3</td>
<td class="text-center">{{ authinfo.teamspeak3_uid }}</td> <td class="text-center">{{ authinfo.teamspeak3_uid }}</td>
<td class="text-center">{{ authinfo.teamspeak3_perm_key }}</td> <td class="text-center"><a href="ts3server://{{ TEAMSPEAK3_PUBLIC_URL }}">{{ TEAMSPEAK3_PUBLIC_URL }}</a></td>
<td class="text-center"> <td class="text-center">
{% ifequal authinfo.teamspeak3_uid "" %} {% ifequal authinfo.teamspeak3_uid "" %}
<a href="{% url 'auth_activate_teamspeak3' %}" class="btn btn-warning"> <a href="{% url 'auth_activate_teamspeak3' %}" title="Activate" class="btn btn-warning">
<span class="glyphicon glyphicon-ok"></span> <span class="glyphicon glyphicon-ok"></span>
</a> </a>
{% else %} {% else %}
<a href="ts3server://{{ TEAMSPEAK3_PUBLIC_URL }}?token={{ authinfo.teamspeak3_perm_key }}&nickname={{ authinfo.teamspeak3_uid }}" <a href="{% url 'auth_verify_teamspeak3' %}" title="Verify Client ID" class="btn btn-success" title="Verify">
title="{% trans "Quick Link" %}" class="btn btn-info">
<span class="glyphicon glyphicon-link"></span>
</a>
<a href="{% url 'auth_verify_teamspeak3' %}" class="btn btn-success" title="Verify">
<span class="glyphicon glyphicon-log-in"></span> <span class="glyphicon glyphicon-log-in"></span>
</a> </a>
<a href="{% url 'auth_reset_teamspeak3_perm' %}" class="btn btn-primary"> <a href="{% url 'auth_reset_teamspeak3_perm' %}" title="Refresh Token" class="btn btn-primary">
<span class="glyphicon glyphicon-refresh"></span> <span class="glyphicon glyphicon-refresh"></span>
</a> </a>
<a href="{% url 'auth_deactivate_teamspeak3' %}" class="btn btn-danger"> <a href="{% url 'auth_deactivate_teamspeak3' %}" title="Deactivate" class="btn btn-danger">
<span class="glyphicon glyphicon-remove"></span> <span class="glyphicon glyphicon-remove"></span>
</a> </a>
<a href="ts3server://{{ TEAMSPEAK3_PUBLIC_URL }}?nickname={{ authinfo.teamspeak3_uid }}" title="Connect" class="btn btn-success">
<span class="glyphicon glyphicon-arrow-right"></span>
</a>
{% endifequal %} {% endifequal %}
</td> </td>
</tr> </tr>

2
stock/templates/registered/services.html
View File

@ -10,7 +10,7 @@
{% block content %} {% block content %}
<div class="col-lg-12"> <div class="col-lg-12">
<h1 class="page-header text-center">{% trans "Available Services" %}</h1> <h1 class="page-header text-center">{% trans "Available Services" %}</h1>
<table class="table table-bordered"> <table class="table table-hover">
<tr> <tr>
<th class="text-center">{% trans "Service" %}</th> <th class="text-center">{% trans "Service" %}</th>
<th class="text-center">{% trans "Username" %}</th> <th class="text-center">{% trans "Username" %}</th>