mirror of
https://gitlab.com/allianceauth/allianceauth.git
synced 2025-07-13 14:30:17 +02:00
Fix spr, permissions_tool, improve group_management
This commit is contained in:
ErikKalkoken
parent
8771477884
commit
fffb21bb4f
@ -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">
|
||||||
|
|
||||||
|
<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">
|
||||||
|
|||||||
@ -14,17 +14,23 @@
|
|||||||
<div class="panel-heading">
|
<div class="panel-heading">
|
||||||
{{ group.name }} - {% trans 'Members' %}
|
{{ group.name }} - {% trans 'Members' %}
|
||||||
</div>
|
</div>
|
||||||
<div class="panel-body">
|
<div class="panel-body">
|
||||||
<div id="list" class="">
|
<p>
|
||||||
{% if group.user_set %}
|
<span class="pull-right">
|
||||||
|
|
||||||
|
<a class="btn btn-default" href="{% url 'groupmanagement:membership' %}" role="button">
|
||||||
|
Back
|
||||||
|
</a>
|
||||||
|
</span>
|
||||||
|
</p>
|
||||||
|
{% 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">
|
||||||
<thead>
|
<thead>
|
||||||
<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,20 +44,24 @@
|
|||||||
<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">
|
||||||
<a href="{{ member.main_char|evewho_character_url }}" target="_blank">
|
{% if member.main_char %}
|
||||||
{{ member.main_char.character_name }}
|
<a href="{{ member.main_char|evewho_character_url }}" target="_blank">
|
||||||
</a>
|
{{ member.main_char.character_name }}
|
||||||
|
</a>
|
||||||
|
{% else %}
|
||||||
|
{{ member.user.username }}
|
||||||
|
{% endif %}
|
||||||
</td>
|
</td>
|
||||||
<td class="text-center">
|
<td class="text-center">
|
||||||
<a href="{{ member.main_char|dotlan_corporation_url }}" target="_blank">
|
{% if member.main_char %}
|
||||||
{{ member.main_char.corporation_name }}
|
<a href="{{ member.main_char|dotlan_corporation_url }}" target="_blank">
|
||||||
</a>
|
{{ member.main_char.corporation_name }}
|
||||||
</td>
|
</a><br>
|
||||||
<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 %}
|
||||||
</td>
|
(unknown)
|
||||||
|
{% endif %}
|
||||||
|
</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"
|
||||||
title="{% trans "Remove from group" %}">
|
title="{% trans "Remove from group" %}">
|
||||||
@ -64,13 +74,13 @@
|
|||||||
</table>
|
</table>
|
||||||
<p class="text-muted"><i class="fa fa-star"></i>: Group leader</p>
|
<p class="text-muted"><i class="fa fa-star"></i>: Group leader</p>
|
||||||
</div>
|
</div>
|
||||||
{% else %}
|
{% else %}
|
||||||
<div class="alert alert-warning text-center">
|
<div class="alert alert-warning text-center">
|
||||||
{% trans "No group members to list." %}
|
{% trans "No group members to list." %}
|
||||||
</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] },
|
||||||
]
|
]
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
@ -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 %}
|
||||||
|
|||||||
@ -32,38 +32,39 @@
|
|||||||
<div class="table-responsive">
|
<div class="table-responsive">
|
||||||
<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>
|
||||||
</thead>
|
</thead>
|
||||||
<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">
|
||||||
<a href="{{ acceptrequest.main_char|evewho_character_url }}" target="_blank">
|
{% if acceptrequest.main_char %}
|
||||||
{{ acceptrequest.main_char.character_name }}
|
<a href="{{ acceptrequest.main_char|evewho_character_url }}" target="_blank">
|
||||||
</a>
|
{{ acceptrequest.main_char.character_name }}
|
||||||
|
</a>
|
||||||
|
{% else %}
|
||||||
|
{{ acceptrequest.user.username }}
|
||||||
|
{% endif %}
|
||||||
</td>
|
</td>
|
||||||
<td class="text-center">
|
<td class="text-center">
|
||||||
<a href="{{ acceptrequest.main_char|dotlan_corporation_url }}" target="_blank">
|
{% if acceptrequest.main_char %}
|
||||||
{{ acceptrequest.main_char.corporation_name }}
|
<a href="{{ acceptrequest.main_char|dotlan_corporation_url }}" target="_blank">
|
||||||
</a>
|
{{ acceptrequest.main_char.corporation_name }}
|
||||||
</td>
|
</a><br>
|
||||||
<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 %}
|
||||||
</td>
|
(unknown)
|
||||||
|
{% endif %}
|
||||||
|
</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">
|
||||||
<a href="{% url 'groupmanagement:accept_request' acceptrequest.id %}" class="btn btn-success">
|
<a href="{% url 'groupmanagement:accept_request' acceptrequest.id %}" class="btn btn-success">
|
||||||
@ -90,38 +91,39 @@
|
|||||||
<div class="table-responsive">
|
<div class="table-responsive">
|
||||||
<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>
|
||||||
</thead>
|
</thead>
|
||||||
<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">
|
||||||
<a href="{{ leaverequest.main_char|evewho_character_url }}" target="_blank">
|
{% if leaverequest.main_char %}
|
||||||
{{ leaverequest.main_char.character_name }}
|
<a href="{{ leaverequest.main_char|evewho_character_url }}" target="_blank">
|
||||||
</a>
|
{{ leaverequest.main_char.character_name }}
|
||||||
|
</a>
|
||||||
|
{% else %}
|
||||||
|
{{ leaverequest.user.username }}
|
||||||
|
{% endif %}
|
||||||
</td>
|
</td>
|
||||||
<td class="text-center">
|
<td class="text-center">
|
||||||
<a href="{{ leaverequest.main_char|dotlan_corporation_url }}" target="_blank">
|
{% if leaverequest.main_char %}
|
||||||
{{ leaverequest.main_char.corporation_name }}
|
<a href="{{ leaverequest.main_char|dotlan_corporation_url }}" target="_blank">
|
||||||
</a>
|
{{ leaverequest.main_char.corporation_name }}
|
||||||
</td>
|
</a><br>
|
||||||
<td class="text-center">
|
{{ leaverequest.main_char.alliance_name|default_if_none:"" }}
|
||||||
<a href="{{ leaverequest.main_char|dotlan_alliance_url }}" target="_blank">
|
{% else %}
|
||||||
{{ leaverequest.main_char.alliance_name|default_if_none:"" }}
|
(unknown)
|
||||||
</a>
|
{% 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">
|
||||||
<a href="{% url 'groupmanagement:leave_accept_request' leaverequest.id %}" class="btn btn-success">
|
<a href="{% url 'groupmanagement:leave_accept_request' leaverequest.id %}" class="btn btn-success">
|
||||||
|
|||||||
@ -11,38 +11,41 @@
|
|||||||
<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">
|
||||||
<thead>
|
<table class="table table-striped">
|
||||||
<tr>
|
<thead>
|
||||||
<th class="col-md-3">
|
<tr>
|
||||||
{% trans "Group" %}
|
<th class="col-md-3">
|
||||||
</th>
|
{% trans "Group" %}
|
||||||
<th class="col-md-3">
|
</th>
|
||||||
{% trans "User" %}
|
<th class="col-md-3">
|
||||||
</th>
|
{% trans "User" %}
|
||||||
</tr>
|
</th>
|
||||||
</thead>
|
</tr>
|
||||||
<tbody>
|
</thead>
|
||||||
{% for user in permission.users %}
|
<tbody>
|
||||||
<tr>
|
{% for user in permission.users %}
|
||||||
{% include 'permissions_tool/audit_row.html' with group="Permission Granted Directly (No Group)" %}
|
<tr>
|
||||||
</tr>
|
{% include 'permissions_tool/audit_row.html' with group="Permission Granted Directly (No Group)" %}
|
||||||
{% endfor %}
|
</tr>
|
||||||
{% for group in permission.groups %}
|
|
||||||
{% for user in group.user_set.all %}
|
|
||||||
{% include 'permissions_tool/audit_row.html' %}
|
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
{% endfor %}
|
{% for group in permission.groups %}
|
||||||
{% for state in permission.states %}
|
{% for user in group.user_set.all %}
|
||||||
{% for profile in state.userprofile_set.all %}
|
{% include 'permissions_tool/audit_row.html' %}
|
||||||
{% with profile.user as user %}
|
{% endfor %}
|
||||||
<tr>
|
|
||||||
{% include 'permissions_tool/audit_state_row.html' %}
|
|
||||||
</tr>
|
|
||||||
{% endwith %}
|
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
{% endfor %}
|
{% for state in permission.states %}
|
||||||
</tbody>
|
{% for profile in state.userprofile_set.all %}
|
||||||
</table>
|
{% with profile.user as user %}
|
||||||
|
<tr>
|
||||||
|
{% include 'permissions_tool/audit_state_row.html' %}
|
||||||
|
</tr>
|
||||||
|
{% endwith %}
|
||||||
|
{% endfor %}
|
||||||
|
{% endfor %}
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{% endblock content %}
|
{% endblock content %}
|
||||||
|
|
||||||
|
|||||||
@ -19,61 +19,79 @@
|
|||||||
<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">
|
||||||
<thead>
|
<table class="table table-striped" id="tab_permissions_overview">
|
||||||
<tr>
|
<thead>
|
||||||
<th>
|
<tr>
|
||||||
{% trans "App" %}
|
<th>
|
||||||
</th>
|
{% trans "App" %}
|
||||||
<th>
|
</th>
|
||||||
{% trans "Model" %}
|
<th>
|
||||||
</th>
|
{% trans "Model" %}
|
||||||
<th>
|
</th>
|
||||||
{% trans "Code Name" %}
|
<th>
|
||||||
</th>
|
{% trans "Code Name" %}
|
||||||
<th>
|
</th>
|
||||||
{% trans "Name" %}
|
<th>
|
||||||
</th>
|
{% trans "Name" %}
|
||||||
<th class="col-md-1">
|
</th>
|
||||||
{% trans "Users" %}
|
<th class="col-md-1">
|
||||||
</th>
|
{% trans "Users" %}
|
||||||
<th class="col-md-1">
|
</th>
|
||||||
{% trans "Groups" %}
|
<th class="col-md-1">
|
||||||
</th>
|
{% trans "Groups" %}
|
||||||
<th class="col-md-1">
|
</th>
|
||||||
{% trans "States" %}
|
<th class="col-md-1">
|
||||||
</th>
|
{% trans "States" %}
|
||||||
</tr>
|
</th>
|
||||||
</thead>
|
</tr>
|
||||||
<tbody>
|
</thead>
|
||||||
{% for perm in permissions %}
|
<tbody>
|
||||||
<tr>
|
{% for perm in permissions %}
|
||||||
<td>
|
<tr>
|
||||||
{{ perm.permission.content_type.app_label }}
|
<td>
|
||||||
</td>
|
{{ perm.permission.content_type.app_label }}
|
||||||
<td>
|
</td>
|
||||||
{{ perm.permission.content_type.model }}
|
<td>
|
||||||
</td>
|
{{ perm.permission.content_type.model }}
|
||||||
<td>
|
</td>
|
||||||
<a href="{% url "permissions_tool:audit" app_label=perm.permission.content_type.app_label model=perm.permission.content_type.model codename=perm.permission.codename %}">
|
<td>
|
||||||
{{ perm.permission.codename }}
|
<a href="{% url "permissions_tool:audit" app_label=perm.permission.content_type.app_label model=perm.permission.content_type.model codename=perm.permission.codename %}">
|
||||||
</a>
|
{{ perm.permission.codename }}
|
||||||
</td>
|
</a>
|
||||||
<td>
|
</td>
|
||||||
{{ perm.permission.name }}
|
<td>
|
||||||
</td>
|
{{ perm.permission.name }}
|
||||||
<td class="{% if perm.users > 0 %}info {% endif %}text-right">
|
</td>
|
||||||
{{ perm.users }}
|
<td class="{% if perm.users > 0 %}info {% endif %}text-right">
|
||||||
</td>
|
{{ perm.users }}
|
||||||
<td class="{% if perm.groups > 0 %}info {% endif %}text-right">
|
</td>
|
||||||
{{ perm.groups }} ({{ perm.group_users }})
|
<td class="{% if perm.groups > 0 %}info {% endif %}text-right">
|
||||||
</td>
|
{{ perm.groups }} ({{ perm.group_users }})
|
||||||
<td class="{% if perm.states > 0 %}info {% endif %}text-right">
|
</td>
|
||||||
{{ perm.states }} ({{ perm.state_users }})
|
<td class="{% if perm.states > 0 %}info {% endif %}text-right">
|
||||||
</td>
|
{{ perm.states }} ({{ perm.state_users }})
|
||||||
</tr>
|
</td>
|
||||||
{% endfor %}
|
</tr>
|
||||||
</tbody>
|
{% endfor %}
|
||||||
</table>
|
</tbody>
|
||||||
|
</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 %}
|
||||||
@ -62,104 +62,107 @@
|
|||||||
</h1>
|
</h1>
|
||||||
|
|
||||||
{% if srpfleetrequests %}
|
{% if srpfleetrequests %}
|
||||||
<form method="POST">
|
<form method="POST">
|
||||||
{% csrf_token %}
|
{% csrf_token %}
|
||||||
<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>
|
||||||
<b><span style="padding-right:2.5em">{% trans "Total ISK Cost:" %} {{ totalcost | intcomma }}</span></b>
|
<b><span style="padding-right:2.5em">{% trans "Total ISK Cost:" %} {{ totalcost | intcomma }}</span></b>
|
||||||
{% if perms.auth.srp_management %}
|
|
||||||
<button type="submit" title="Approve" class="btn btn-success" formaction="{% url 'srp:request_approve' %}">
|
|
||||||
<span class="glyphicon glyphicon-ok"></span>
|
|
||||||
</button>
|
|
||||||
<button type="submit" title="Reject" class="btn btn-warning" formaction="{% url 'srp:request_reject' %}">
|
|
||||||
<span class="glyphicon glyphicon-remove"></span>
|
|
||||||
</button>
|
|
||||||
<button type="submit" title="Remove" onclick="return confirm('{% trans "Are you sure you want to delete SRP requests?" %}')" class="btn btn-danger" formaction="{% url 'srp:request_remove' %}">
|
|
||||||
<span class="glyphicon glyphicon-trash"></span>
|
|
||||||
</button>
|
|
||||||
{% endif %}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<table class="table">
|
|
||||||
<tr>
|
|
||||||
<th class="text-center">{% trans "Pilot Name" %}</th>
|
|
||||||
<th class="text-center">{% trans "Killboard Link" %}</th>
|
|
||||||
<th class="text-center">{% trans "Additional Info" %}</th>
|
|
||||||
<th class="text-center">{% trans "Ship Type" %}</th>
|
|
||||||
<th class="text-center">{% trans "Killboard Loss Amt" %}</th>
|
|
||||||
<th class="text-center">{% trans "SRP ISK Cost" %}
|
|
||||||
{% blocktrans %}<i class="glyphicon glyphicon-question-sign" rel="tooltip" title="Click value to edit
|
|
||||||
Enter to save&next
|
|
||||||
ESC to cancel"
|
|
||||||
id="blah"></i></th>{% endblocktrans %}
|
|
||||||
<th class="text-center">{% trans "Post Time" %}</th>
|
|
||||||
<th class="text-center">{% trans "Status" %}</th>
|
|
||||||
{% if perms.auth.srp_management %}
|
|
||||||
<th class="text-center">{% trans "Actions" %}</th>
|
|
||||||
{% endif %}
|
|
||||||
</tr>
|
|
||||||
{% for srpfleetrequest in srpfleetrequests %}
|
|
||||||
<tr>
|
|
||||||
<td class="text-center">{{ srpfleetrequest.character.character_name }}</td>
|
|
||||||
<td class="text-center">
|
|
||||||
<a href="{{ srpfleetrequest.killboard_link }}"
|
|
||||||
target="_blank" class="label label-warning">Link</a>
|
|
||||||
</td>
|
|
||||||
<td class="text-center">{{ srpfleetrequest.additional_info }}</td>
|
|
||||||
<td class="text-center">{{ srpfleetrequest.srp_ship_name }}</td>
|
|
||||||
<td class="text-center">{{ srpfleetrequest.kb_total_loss | intcomma }} ISK</td>
|
|
||||||
<td class="srp" data-name="srp_total_amount" data-type="number" data-pk="{{srpfleetrequest.id}}" data-url="{% url 'srp:request_update_amount' srpfleetrequest.id %}" data-params="{csrfmiddlewaretoken:'{{csrf_token}}'}" class="text-center">{{ srpfleetrequest.srp_total_amount | intcomma }} ISK</td>
|
|
||||||
<td class="text-center">{{ srpfleetrequest.post_time | date:"Y-m-d H:i" }}</td>
|
|
||||||
<td class="text-center">
|
|
||||||
{% if srpfleetrequest.srp_status == "Approved" %}
|
|
||||||
<div class="label label-success">
|
|
||||||
{% trans "Approved" %}
|
|
||||||
</div>
|
|
||||||
{% elif srpfleetrequest.srp_status == "Rejected" %}
|
|
||||||
<div class="label label-danger">
|
|
||||||
{% trans "Rejected" %}
|
|
||||||
</div>
|
|
||||||
{% else %}
|
|
||||||
<div class="label label-warning">
|
|
||||||
{% trans "Pending" %}
|
|
||||||
</div>
|
|
||||||
{% endif %}
|
|
||||||
</td>
|
|
||||||
{% if perms.auth.srp_management %}
|
{% if perms.auth.srp_management %}
|
||||||
<td class="text-center">
|
<button type="submit" title="Approve" class="btn btn-success" formaction="{% url 'srp:request_approve' %}">
|
||||||
<div class="checkbox">
|
<span class="glyphicon glyphicon-ok"></span>
|
||||||
<label style="font-size: 1.5em">
|
</button>
|
||||||
<input type="checkbox" name="{{srpfleetrequest.id}}">
|
<button type="submit" title="Reject" class="btn btn-warning" formaction="{% url 'srp:request_reject' %}">
|
||||||
<span class="cr"><i class="cr-icon fa fa-check"></i></span>
|
<span class="glyphicon glyphicon-remove"></span>
|
||||||
</label>
|
</button>
|
||||||
</div>
|
<button type="submit" title="Remove" onclick="return confirm('{% trans "Are you sure you want to delete SRP requests?" %}')" class="btn btn-danger" formaction="{% url 'srp:request_remove' %}">
|
||||||
</td>
|
<span class="glyphicon glyphicon-trash"></span>
|
||||||
|
</button>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</tr>
|
</div>
|
||||||
{% endfor %}
|
|
||||||
</table>
|
|
||||||
<div class="alert alert-info" role="alert">
|
|
||||||
<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 ISK Cost:" %} {{ totalcost | intcomma }}</span></b>
|
|
||||||
{% if perms.auth.srp_management %}
|
|
||||||
<button type="submit" title="Approve" class="btn btn-success" formaction="{% url 'srp:request_approve' %}">
|
|
||||||
<span class="glyphicon glyphicon-ok"></span>
|
|
||||||
</button>
|
|
||||||
<button type="submit" title="Reject" class="btn btn-warning" formaction="{% url 'srp:request_reject' %}">
|
|
||||||
<span class="glyphicon glyphicon-remove"></span>
|
|
||||||
</button>
|
|
||||||
<button type="submit" title="Remove" onclick="return confirm('{% trans "Are you sure you want to delete SRP requests?" %}')" class="btn btn-danger" formaction="{% url 'srp:request_remove' %}">
|
|
||||||
<span class="glyphicon glyphicon-trash"></span>
|
|
||||||
</button>
|
|
||||||
{% endif %}
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
<div class="table-responsive">
|
||||||
</form>
|
<table class="table">
|
||||||
|
<tr>
|
||||||
|
<th class="text-center">{% trans "Pilot Name" %}</th>
|
||||||
|
<th class="text-center">{% trans "Killboard Link" %}</th>
|
||||||
|
<th class="text-center">{% trans "Additional Info" %}</th>
|
||||||
|
<th class="text-center">{% trans "Ship Type" %}</th>
|
||||||
|
<th class="text-center">{% trans "Killboard Loss Amt" %}</th>
|
||||||
|
<th class="text-center">{% trans "SRP ISK Cost" %}
|
||||||
|
{% blocktrans %}<i class="glyphicon glyphicon-question-sign" rel="tooltip" title="Click value to edit
|
||||||
|
Enter to save&next
|
||||||
|
ESC to cancel"
|
||||||
|
id="blah"></i></th>{% endblocktrans %}
|
||||||
|
<th class="text-center">{% trans "Post Time" %}</th>
|
||||||
|
<th class="text-center">{% trans "Status" %}</th>
|
||||||
|
{% if perms.auth.srp_management %}
|
||||||
|
<th class="text-center">{% trans "Actions" %}</th>
|
||||||
|
{% endif %}
|
||||||
|
</tr>
|
||||||
|
{% for srpfleetrequest in srpfleetrequests %}
|
||||||
|
<tr>
|
||||||
|
<td class="text-center">{{ srpfleetrequest.character.character_name }}</td>
|
||||||
|
<td class="text-center">
|
||||||
|
<a href="{{ srpfleetrequest.killboard_link }}"
|
||||||
|
target="_blank" class="label label-warning">Link</a>
|
||||||
|
</td>
|
||||||
|
<td class="text-center">{{ srpfleetrequest.additional_info }}</td>
|
||||||
|
<td class="text-center">{{ srpfleetrequest.srp_ship_name }}</td>
|
||||||
|
<td class="text-center">{{ srpfleetrequest.kb_total_loss | intcomma }} ISK</td>
|
||||||
|
<td class="srp" data-name="srp_total_amount" data-type="number" data-pk="{{srpfleetrequest.id}}" data-url="{% url 'srp:request_update_amount' srpfleetrequest.id %}" data-params="{csrfmiddlewaretoken:'{{csrf_token}}'}" class="text-center">{{ srpfleetrequest.srp_total_amount | intcomma }} ISK</td>
|
||||||
|
<td class="text-center">{{ srpfleetrequest.post_time | date:"Y-m-d H:i" }}</td>
|
||||||
|
<td class="text-center">
|
||||||
|
{% if srpfleetrequest.srp_status == "Approved" %}
|
||||||
|
<div class="label label-success">
|
||||||
|
{% trans "Approved" %}
|
||||||
|
</div>
|
||||||
|
{% elif srpfleetrequest.srp_status == "Rejected" %}
|
||||||
|
<div class="label label-danger">
|
||||||
|
{% trans "Rejected" %}
|
||||||
|
</div>
|
||||||
|
{% else %}
|
||||||
|
<div class="label label-warning">
|
||||||
|
{% trans "Pending" %}
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
|
</td>
|
||||||
|
{% if perms.auth.srp_management %}
|
||||||
|
<td class="text-center">
|
||||||
|
<div class="checkbox">
|
||||||
|
<label style="font-size: 1.5em">
|
||||||
|
<input type="checkbox" name="{{srpfleetrequest.id}}">
|
||||||
|
<span class="cr"><i class="cr-icon fa fa-check"></i></span>
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
</td>
|
||||||
|
{% endif %}
|
||||||
|
</tr>
|
||||||
|
{% endfor %}
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
<div class="alert alert-info" role="alert">
|
||||||
|
<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 ISK Cost:" %} {{ totalcost | intcomma }}</span></b>
|
||||||
|
{% if perms.auth.srp_management %}
|
||||||
|
<button type="submit" title="Approve" class="btn btn-success" formaction="{% url 'srp:request_approve' %}">
|
||||||
|
<span class="glyphicon glyphicon-ok"></span>
|
||||||
|
</button>
|
||||||
|
<button type="submit" title="Reject" class="btn btn-warning" formaction="{% url 'srp:request_reject' %}">
|
||||||
|
<span class="glyphicon glyphicon-remove"></span>
|
||||||
|
</button>
|
||||||
|
<button type="submit" title="Remove" onclick="return confirm('{% trans "Are you sure you want to delete SRP requests?" %}')" class="btn btn-danger" formaction="{% url 'srp:request_remove' %}">
|
||||||
|
<span class="glyphicon glyphicon-trash"></span>
|
||||||
|
</button>
|
||||||
|
{% endif %}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</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>
|
||||||
|
|||||||
@ -31,94 +31,98 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{% if srpfleets %}
|
{% if srpfleets %}
|
||||||
<table class="table">
|
<div class="table-responsive">
|
||||||
<tr>
|
<table class="table">
|
||||||
<th class="text-center">{% trans "Fleet Name" %}</th>
|
<tr>
|
||||||
<th class="text-center">{% trans "Fleet Time" %}</th>
|
<th class="text-center">{% trans "Fleet Name" %}</th>
|
||||||
<th class="text-center">{% trans "Fleet Doctrine" %}</th>
|
<th class="text-center">{% trans "Fleet Time" %}</th>
|
||||||
<th class="text-center">{% trans "Fleet Commander" %}</th>
|
<th class="text-center">{% trans "Fleet Doctrine" %}</th>
|
||||||
<th class="text-center">{% trans "Fleet AAR" %}</th>
|
<th class="text-center">{% trans "Fleet Commander" %}</th>
|
||||||
<th class="text-center">{% trans "Fleet SRP Code" %}</th>
|
<th class="text-center">{% trans "Fleet AAR" %}</th>
|
||||||
<th class="text-center">{% trans "Fleet ISK Cost" %}</th>
|
<th class="text-center">{% trans "Fleet SRP Code" %}</th>
|
||||||
<th class="text-center">{% trans "SRP Status" %}</th>
|
<th class="text-center">{% trans "Fleet ISK Cost" %}</th>
|
||||||
<th class="text-center">{% trans "Pending Requests" %}</th>
|
<th class="text-center">{% trans "SRP Status" %}</th>
|
||||||
<th width="100px" class="text-center">{% trans "Actions" %}</th>
|
<th class="text-center">{% trans "Pending Requests" %}</th>
|
||||||
</tr>
|
<th width="100px" class="text-center">{% trans "Actions" %}</th>
|
||||||
{% for srpfleet in srpfleets %}
|
</tr>
|
||||||
<tr>
|
{% for srpfleet in srpfleets %}
|
||||||
<td class="text-center">
|
<tr>
|
||||||
<div class="label label-info">
|
<td class="text-center">
|
||||||
{{ srpfleet.fleet_name }}
|
<div class="label label-info">
|
||||||
</div>
|
{{ srpfleet.fleet_name }}
|
||||||
</td>
|
</div>
|
||||||
<td class="text-center">{{ srpfleet.fleet_time | date:"Y-m-d H:i" }}</td>
|
</td>
|
||||||
<td class="text-center">{{ srpfleet.fleet_doctrine }}</td>
|
<td class="text-center">{{ srpfleet.fleet_time | date:"Y-m-d H:i" }}</td>
|
||||||
<td class="text-center">
|
<td class="text-center">{{ srpfleet.fleet_doctrine }}</td>
|
||||||
<div class="label label-success">
|
<td class="text-center">
|
||||||
{{ srpfleet.fleet_commander.character_name }}
|
<div class="label label-success">
|
||||||
</div>
|
{{ srpfleet.fleet_commander.character_name }}
|
||||||
</td>
|
</div>
|
||||||
<td class="text-center">
|
</td>
|
||||||
{% if srpfleet.fleet_srp_aar_link %}
|
<td class="text-center">
|
||||||
<a href="{{ srpfleet.fleet_srp_aar_link }}" target="_blank" class="label label-primary">{% trans 'Link' %}</a>
|
{% if srpfleet.fleet_srp_aar_link %}
|
||||||
{% endif %}
|
<a href="{{ srpfleet.fleet_srp_aar_link }}" target="_blank" class="label label-primary">{% trans 'Link' %}</a>
|
||||||
</td>
|
{% endif %}
|
||||||
<td class="text-center">
|
</td>
|
||||||
{% if srpfleet.fleet_srp_code %}
|
<td class="text-center">
|
||||||
<a class="label label-warning" href="{% url 'srp:request' srpfleet.fleet_srp_code %}">{{ srpfleet.fleet_srp_code }}</a>
|
{% if srpfleet.fleet_srp_code %}
|
||||||
{% else %}
|
<a class="label label-warning" href="{% url 'srp:request' srpfleet.fleet_srp_code %}">{{ srpfleet.fleet_srp_code }}</a>
|
||||||
<div class="label label-danger">
|
{% else %}
|
||||||
{% trans "Disabled" %}
|
<div class="label label-danger">
|
||||||
</div>
|
{% trans "Disabled" %}
|
||||||
{% endif %}
|
</div>
|
||||||
</td>
|
{% endif %}
|
||||||
<td class="text-center">ISK: {{ srpfleet.total_cost | intcomma }}</td>
|
</td>
|
||||||
|
<td class="text-center">ISK: {{ srpfleet.total_cost | intcomma }}</td>
|
||||||
|
|
||||||
<td class="text-center">
|
<td class="text-center">
|
||||||
{% if srpfleet.fleet_srp_status == "" %}
|
{% if srpfleet.fleet_srp_status == "" %}
|
||||||
<div class="label label-warning">
|
<div class="label label-warning">
|
||||||
{% trans "Pending" %}
|
{% trans "Pending" %}
|
||||||
</div>
|
</div>
|
||||||
{% else %}
|
{% else %}
|
||||||
<div class="label label-success">
|
<div class="label label-success">
|
||||||
{% trans "Completed" %}
|
{% trans "Completed" %}
|
||||||
</div>
|
</div>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</td>
|
</td>
|
||||||
<td class="text-center">
|
<td class="text-center">
|
||||||
<div class="label label-warning">{{ srpfleet.pending_requests }}</div>
|
<div class="label label-warning">{{ srpfleet.pending_requests }}</div>
|
||||||
</td>
|
</td>
|
||||||
<td class="text-center">
|
<td class="text-center">
|
||||||
|
|
||||||
<a href="{% url 'srp:fleet' srpfleet.id %}" class="btn btn-primary" title="View">
|
<a href="{% url 'srp:fleet' srpfleet.id %}" class="btn btn-primary" title="View">
|
||||||
<span class="glyphicon glyphicon-eye-open"></span>
|
<span class="glyphicon glyphicon-eye-open"></span>
|
||||||
</a>
|
|
||||||
|
|
||||||
{% if perms.auth.srp_management %}
|
|
||||||
<a href="{% url 'srp:edit' srpfleet.id %}" class="btn btn-info" title="Edit">
|
|
||||||
<span class="glyphicon glyphicon-pencil"></span>
|
|
||||||
</a>
|
|
||||||
|
|
||||||
<a href="{% url 'srp:remove' srpfleet.id %}" onclick="return confirm('{% trans "Are you sure you want to delete this SRP code and its contents?" %}')" class="btn btn-danger" title="Remove">
|
|
||||||
<span class="glyphicon glyphicon-trash"></span>
|
|
||||||
</a>
|
|
||||||
{% if srpfleet.fleet_srp_code %}
|
|
||||||
<a href="{% url 'srp:disable' srpfleet.id %}" class="btn btn-warning" title="Disable">
|
|
||||||
<span class="glyphicon glyphicon-remove-sign"></span>
|
|
||||||
</a>
|
</a>
|
||||||
{% else %}
|
|
||||||
<a href="{% url 'srp:enable' srpfleet.id %}" class="btn btn-success" title="Enable">
|
|
||||||
<span class="glyphicon glyphicon-ok-sign"></span>
|
|
||||||
</a>
|
|
||||||
{% endif %}
|
|
||||||
|
|
||||||
{% endif %}
|
{% if perms.auth.srp_management %}
|
||||||
</td>
|
<a href="{% url 'srp:edit' srpfleet.id %}" class="btn btn-info" title="Edit">
|
||||||
</tr>
|
<span class="glyphicon glyphicon-pencil"></span>
|
||||||
{% endfor %}
|
</a>
|
||||||
</table>
|
|
||||||
|
<a href="{% url 'srp:remove' srpfleet.id %}" onclick="return confirm('{% trans "Are you sure you want to delete this SRP code and its contents?" %}')" class="btn btn-danger" title="Remove">
|
||||||
|
<span class="glyphicon glyphicon-trash"></span>
|
||||||
|
</a>
|
||||||
|
{% if srpfleet.fleet_srp_code %}
|
||||||
|
<a href="{% url 'srp:disable' srpfleet.id %}" class="btn btn-warning" title="Disable">
|
||||||
|
<span class="glyphicon glyphicon-remove-sign"></span>
|
||||||
|
</a>
|
||||||
|
{% else %}
|
||||||
|
<a href="{% url 'srp:enable' srpfleet.id %}" class="btn btn-success" title="Enable">
|
||||||
|
<span class="glyphicon glyphicon-ok-sign"></span>
|
||||||
|
</a>
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
{% endif %}
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
{% endfor %}
|
||||||
|
</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>
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user