Mathis/allianceauth
1
0
Fork 0
mirror of https://gitlab.com/allianceauth/allianceauth.git synced 2025-07-13 22:40:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix spr, permissions_tool, improve group_management

Browse Source
This commit is contained in:
ErikKalkoken 2020-02-17 00:59:47 +01:00
parent 8771477884
commit fffb21bb4f
8 changed files with 380 additions and 328 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
allianceauth/groupmanagement/templates/groupmanagement/audit.html
View File

@ -13,7 +13,14 @@
{{ group }} - {% trans 'Audit Log' %} {{ group }} - {% trans 'Audit Log' %}
</div> </div>
<div class="panel-body"> <div class="panel-body">
<p> All times displayed are EVE/UTC.</p> <p>
<span class="pull-right">
&nbsp;
<a class="btn btn-default" href="{% url 'groupmanagement:membership' %}" role="button">
Back
</a>
</span>
</p>
{% if entries %} {% if entries %}
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-striped" id="log-entries"> <table class="table table-striped" id="log-entries">
@ -44,6 +51,9 @@
{% endfor %} {% endfor %}
</tbody> </tbody>
</table> </table>
<p class="text-muted">
All times displayed are EVE/UTC.
</p>
</div> </div>
{% else %} {% else %}
<div class="alert alert-warning text-center"> <div class="alert alert-warning text-center">

30
allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html
View File

@ -15,7 +15,14 @@
{{ group.name }} - {% trans 'Members' %} {{ group.name }} - {% trans 'Members' %}
</div> </div>
<div class="panel-body"> <div class="panel-body">
<div id="list" class=""> <p>
<span class="pull-right">
&nbsp;
<a class="btn btn-default" href="{% url 'groupmanagement:membership' %}" role="button">
Back
</a>
</span>
</p>
{% if group.user_set %} {% if group.user_set %}
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-striped" id="tab_group_members"> <table class="table table-striped" id="tab_group_members">
@ -23,8 +30,7 @@
<tr> <tr>
<th class="text-right">{% trans "Portrait" %}</th> <th class="text-right">{% trans "Portrait" %}</th>
<th class="text-center">{% trans "Character" %}</th> <th class="text-center">{% trans "Character" %}</th>
<th class="text-center">{% trans "Corporation" %}</th> <th class="text-center">{% trans "Organization" %}</th>
<th class="text-center">{% trans "Alliance" %}</th>
<th class="text-center"></th> <th class="text-center"></th>
</tr> </tr>
</thead> </thead>
@ -38,19 +44,23 @@
<img src="{{ member.main_char|character_portrait_url:32 }}" class="img-circle"> <img src="{{ member.main_char|character_portrait_url:32 }}" class="img-circle">
</td> </td>
<td class="text-center"> <td class="text-center">
{% if member.main_char %}
<a href="{{ member.main_char|evewho_character_url }}" target="_blank"> <a href="{{ member.main_char|evewho_character_url }}" target="_blank">
{{ member.main_char.character_name }} {{ member.main_char.character_name }}
</a> </a>
{% else %}
{{ member.user.username }}
{% endif %}
</td> </td>
<td class="text-center"> <td class="text-center">
{% if member.main_char %}
<a href="{{ member.main_char|dotlan_corporation_url }}" target="_blank"> <a href="{{ member.main_char|dotlan_corporation_url }}" target="_blank">
{{ member.main_char.corporation_name }} {{ member.main_char.corporation_name }}
</a> </a><br>
</td>
<td class="text-center">
<a href="{{ member.main_char|dotlan_alliance_url }}" target="_blank">
{{ member.main_char.alliance_name|default_if_none:"" }} {{ member.main_char.alliance_name|default_if_none:"" }}
</a> {% else %}
(unknown)
{% endif %}
</td> </td>
<td class="text-center"> <td class="text-center">
<a href="{% url 'groupmanagement:membership_remove' group.id member.user.id %}" class="btn btn-danger" <a href="{% url 'groupmanagement:membership_remove' group.id member.user.id %}" class="btn btn-danger"
@ -70,7 +80,7 @@
</div> </div>
{% endif %} {% endif %}
</div> </div>
</div>
</div> </div>
</div> </div>
{% endblock content %} {% endblock content %}
@ -88,7 +98,7 @@
$('#tab_group_members').DataTable({ $('#tab_group_members').DataTable({
order: [ [ 1, "asc" ] ], order: [ [ 1, "asc" ] ],
columnDefs: [ columnDefs: [
{ "sortable": false, "targets": [0, 4] }, { "sortable": false, "targets": [0, 3] },
] ]
}); });
}); });

4
allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html
View File

@ -29,7 +29,9 @@
<tbody> <tbody>
{% for group in groups %} {% for group in groups %}
<tr> <tr>
<td class="text-center">{{ group.name }}</td> <td class="text-center">
<a href="{% url 'groupmanagement:membership_list' group.id %}">{{ group.name }}</a>
</td>
<td class="text-center">{{ group.authgroup.description }}</td> <td class="text-center">{{ group.authgroup.description }}</td>
<td class="text-center"> <td class="text-center">
{% if group.authgroup.hidden %} {% if group.authgroup.hidden %}

46
allianceauth/groupmanagement/templates/groupmanagement/index.html
View File

@ -33,11 +33,9 @@
<table class="table table-striped"> <table class="table table-striped">
<thead> <thead>
<tr> <tr>
<th class="text-center">{% trans "#" %}</th> <th class="text-center"></th>
<th class="text-center">{% trans "Portrait" %}</th>
<th class="text-center">{% trans "Character" %}</th> <th class="text-center">{% trans "Character" %}</th>
<th class="text-center">{% trans "Corporation" %}</th> <th class="text-center">{% trans "Organization" %}</th>
<th class="text-center">{% trans "Alliance" %}</th>
<th class="text-center">{% trans "Group" %}</th> <th class="text-center">{% trans "Group" %}</th>
<th class="text-center"></th> <th class="text-center"></th>
</tr> </tr>
@ -45,24 +43,27 @@
<tbody> <tbody>
{% for acceptrequest in acceptrequests %} {% for acceptrequest in acceptrequests %}
<tr> <tr>
<td class="text-center">{{ acceptrequest.id }}</td> <td class="text-right">
<td class="text-center">
<img src="{{ acceptrequest.main_char|character_portrait_url:32 }}" class="img-circle"> <img src="{{ acceptrequest.main_char|character_portrait_url:32 }}" class="img-circle">
</td> </td>
<td class="text-center"> <td class="text-center">
{% if acceptrequest.main_char %}
<a href="{{ acceptrequest.main_char|evewho_character_url }}" target="_blank"> <a href="{{ acceptrequest.main_char|evewho_character_url }}" target="_blank">
{{ acceptrequest.main_char.character_name }} {{ acceptrequest.main_char.character_name }}
</a> </a>
{% else %}
{{ acceptrequest.user.username }}
{% endif %}
</td> </td>
<td class="text-center"> <td class="text-center">
{% if acceptrequest.main_char %}
<a href="{{ acceptrequest.main_char|dotlan_corporation_url }}" target="_blank"> <a href="{{ acceptrequest.main_char|dotlan_corporation_url }}" target="_blank">
{{ acceptrequest.main_char.corporation_name }} {{ acceptrequest.main_char.corporation_name }}
</a> </a><br>
</td>
<td class="text-center">
<a href="{{ acceptrequest.main_char|dotlan_alliance_url }}" target="_blank">
{{ acceptrequest.main_char.alliance_name|default_if_none:"" }} {{ acceptrequest.main_char.alliance_name|default_if_none:"" }}
</a> {% else %}
(unknown)
{% endif %}
</td> </td>
<td class="text-center">{{ acceptrequest.group.name }}</td> <td class="text-center">{{ acceptrequest.group.name }}</td>
<td class="text-center"> <td class="text-center">
@ -91,11 +92,9 @@
<table class="table table-striped"> <table class="table table-striped">
<thead> <thead>
<tr> <tr>
<th class="text-center">{% trans "#" %}</th> <th class="text-center"></th>
<th class="text-center">{% trans "Portrait" %}</th>
<th class="text-center">{% trans "Character" %}</th> <th class="text-center">{% trans "Character" %}</th>
<th class="text-center">{% trans "Corporation" %}</th> <th class="text-center">{% trans "Organization" %}</th>
<th class="text-center">{% trans "Alliance" %}</th>
<th class="text-center">{% trans "Group" %}</th> <th class="text-center">{% trans "Group" %}</th>
<th class="text-center"></th> <th class="text-center"></th>
</tr> </tr>
@ -103,24 +102,27 @@
<tbody> <tbody>
{% for leaverequest in leaverequests %} {% for leaverequest in leaverequests %}
<tr> <tr>
<td class="text-center">{{ leaverequest.id }}</td> <td class="text-right">
<td class="text-center">
<img src="{{ leaverequest.main_char|character_portrait_url:32 }}" class="img-circle"> <img src="{{ leaverequest.main_char|character_portrait_url:32 }}" class="img-circle">
</td> </td>
<td class="text-center"> <td class="text-center">
{% if leaverequest.main_char %}
<a href="{{ leaverequest.main_char|evewho_character_url }}" target="_blank"> <a href="{{ leaverequest.main_char|evewho_character_url }}" target="_blank">
{{ leaverequest.main_char.character_name }} {{ leaverequest.main_char.character_name }}
</a> </a>
{% else %}
{{ leaverequest.user.username }}
{% endif %}
</td> </td>
<td class="text-center"> <td class="text-center">
{% if leaverequest.main_char %}
<a href="{{ leaverequest.main_char|dotlan_corporation_url }}" target="_blank"> <a href="{{ leaverequest.main_char|dotlan_corporation_url }}" target="_blank">
{{ leaverequest.main_char.corporation_name }} {{ leaverequest.main_char.corporation_name }}
</a> </a><br>
</td>
<td class="text-center">
<a href="{{ leaverequest.main_char|dotlan_alliance_url }}" target="_blank">
{{ leaverequest.main_char.alliance_name|default_if_none:"" }} {{ leaverequest.main_char.alliance_name|default_if_none:"" }}
</a> {% else %}
(unknown)
{% endif %}
</td> </td>
<td class="text-center">{{ leaverequest.group.name }}</td> <td class="text-center">{{ leaverequest.group.name }}</td>
<td class="text-center"> <td class="text-center">

5
allianceauth/permissions_tool/templates/permissions_tool/audit.html
View File

@ -11,7 +11,8 @@
<a href="{% url 'permissions_tool:overview' %}" class="btn btn-default"> <a href="{% url 'permissions_tool:overview' %}" class="btn btn-default">
<i class="glyphicon glyphicon-chevron-left"></i> {% trans "Back" %} <i class="glyphicon glyphicon-chevron-left"></i> {% trans "Back" %}
</a> </a>
<table class="table table-hover"> <div class="table-responsive">
<table class="table table-striped">
<thead> <thead>
<tr> <tr>
<th class="col-md-3"> <th class="col-md-3">
@ -45,4 +46,6 @@
</tbody> </tbody>
</table> </table>
</div> </div>
</div>
{% endblock content %} {% endblock content %}

20
allianceauth/permissions_tool/templates/permissions_tool/overview.html
View File

@ -19,7 +19,8 @@
<a href="{% url 'permissions_tool:overview' %}?all=no" class="btn btn-primary">{% trans "Show Applied" %}</a> <a href="{% url 'permissions_tool:overview' %}?all=no" class="btn btn-primary">{% trans "Show Applied" %}</a>
</span> </span>
{% endif %} {% endif %}
<table class="table table-hover"> <div class="table-responsive">
<table class="table table-striped" id="tab_permissions_overview">
<thead> <thead>
<tr> <tr>
<th> <th>
@ -76,4 +77,21 @@
</tbody> </tbody>
</table> </table>
</div> </div>
</div>
{% endblock content %} {% endblock content %}
{% block extra_javascript %}
{% include 'bundles/datatables-js.html' %}
{% endblock %}
{% block extra_css %}
{% include 'bundles/datatables-css.html' %}
{% endblock %}
{% block extra_script %}
$(document).ready(function(){
$('#tab_permissions_overview').DataTable({
order: [ [ 0, "asc" ], [ 1, "asc" ], [ 2, "asc" ] ]
});
});
{% endblock %}

7
allianceauth/srp/templates/srp/data.html
View File

@ -81,7 +81,7 @@
{% endif %} {% endif %}
</div> </div>
</div> </div>
<div class="table-responsive">
<table class="table"> <table class="table">
<tr> <tr>
<th class="text-center">{% trans "Pilot Name" %}</th> <th class="text-center">{% trans "Pilot Name" %}</th>
@ -140,6 +140,7 @@ ESC to cancel"
</tr> </tr>
{% endfor %} {% endfor %}
</table> </table>
</div>
<div class="alert alert-info" role="alert"> <div class="alert alert-info" role="alert">
<div class="text-right"> <div class="text-right">
<b><span style="padding-right:2.5em">{% trans "Total Losses:" %} {{ srpfleetrequests.count }}</span></b> <b><span style="padding-right:2.5em">{% trans "Total Losses:" %} {{ srpfleetrequests.count }}</span></b>
@ -159,7 +160,9 @@ ESC to cancel"
</div> </div>
</form> </form>
{% else %} {% else %}
<div class="alert alert-warning text-center">{% trans "No SRP requests for this fleet." %}</div> <div class="alert alert-warning text-center">
{% trans "No SRP requests for this fleet." %}
</div>
{% endif %} {% endif %}
</div> </div>
</div> </div>

6
allianceauth/srp/templates/srp/management.html
View File

@ -31,6 +31,7 @@
</div> </div>
</div> </div>
{% if srpfleets %} {% if srpfleets %}
<div class="table-responsive">
<table class="table"> <table class="table">
<tr> <tr>
<th class="text-center">{% trans "Fleet Name" %}</th> <th class="text-center">{% trans "Fleet Name" %}</th>
@ -117,8 +118,11 @@
</tr> </tr>
{% endfor %} {% endfor %}
</table> </table>
</div>
{% else %} {% else %}
<div class="alert alert-warning text-center">{% trans "No SRP fleets created." %}</div> <div class="alert alert-warning text-center">
{% trans "No SRP fleets created." %}
</div>
{% endif %} {% endif %}
</div> </div>
</div> </div>