mirror of
https://gitlab.com/allianceauth/allianceauth.git
synced 2025-07-12 14:00:17 +02:00
Fix group management, improve dashboard
This commit is contained in:
ErikKalkoken
parent
1182b51e4b
commit
55a5070691
@ -18,57 +18,64 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="panel-body">
|
<div class="panel-body">
|
||||||
{% if request.user.profile.main_character %}
|
{% if request.user.profile.main_character %}
|
||||||
{% with request.user.profile.main_character as main %}
|
{% with request.user.profile.main_character as main %}
|
||||||
<div class="col-lg-4 col-sm-2">
|
<div class="hidden-xs">
|
||||||
<table class="table">
|
<div class="col-lg-4 col-sm-2">
|
||||||
<tr>
|
<table class="table">
|
||||||
<td class="text-center">
|
<tr>
|
||||||
<img class="ra-avatar"src="{{ main.portrait_url_128 }}">
|
<td class="text-center">
|
||||||
</td>
|
<img class="ra-avatar"src="{{ main.portrait_url_128 }}">
|
||||||
</tr>
|
</td>
|
||||||
<tr>
|
</tr>
|
||||||
<td class="text-center">
|
<tr>
|
||||||
<span class="hidden-xs">
|
<td class="text-center">{{ main.character_name }}</td>
|
||||||
{{ main.character_name }}
|
</tr>
|
||||||
</span>
|
</table>
|
||||||
<span class="visible-xs-block">
|
</div>
|
||||||
<strong>{{ main.character_name }}</strong><br>
|
<div class="col-lg-4 col-sm-2">
|
||||||
{{ main.corporation_name }}<br>
|
<table class="table">
|
||||||
{{ main.alliance_name }}
|
<tr>
|
||||||
</span>
|
<td class="text-center">
|
||||||
</td>
|
<img class="ra-avatar"src="{{ main.corporation_logo_url_128 }}">
|
||||||
</tr>
|
</td>
|
||||||
</table>
|
</tr>
|
||||||
</div>
|
<tr>
|
||||||
<div class="col-lg-4 col-sm-2">
|
<td class="text-center">{{ main.corporation_name }}</td>
|
||||||
<table class="table hidden-xs">
|
</tr>
|
||||||
<tr>
|
</table>
|
||||||
<td class="text-center">
|
</div>
|
||||||
<img class="ra-avatar"src="{{ main.corporation_logo_url_128 }}">
|
<div class="col-lg-4 col-sm-2">
|
||||||
</td>
|
{% if main.alliance_id %}
|
||||||
</tr>
|
<table class="table">
|
||||||
<tr>
|
<tr>
|
||||||
<td class="text-center">{{ main.corporation_name }}</td>
|
<td class="text-center">
|
||||||
</tr>
|
<img class="ra-avatar"src="{{ main.alliance_logo_url_128 }}">
|
||||||
</table>
|
</td>
|
||||||
</div>
|
</tr>
|
||||||
<div class="col-lg-4 col-sm-2">
|
<tr>
|
||||||
{% if main.alliance_id %}
|
<td class="text-center">{{ main.alliance_name }}</td>
|
||||||
<table class="table hidden-xs">
|
<tr>
|
||||||
<tr>
|
</table>
|
||||||
<td class="text-center">
|
{% endif %}
|
||||||
<img class="ra-avatar"src="{{ main.alliance_logo_url_128 }}">
|
</div>
|
||||||
</td>
|
</div>
|
||||||
</tr>
|
<div class="table visible-xs-block">
|
||||||
<tr>
|
<p>
|
||||||
<td class="text-center">{{ main.alliance_name }}</td>
|
<img class="ra-avatar" src="{{ main.portrait_url_64 }}">
|
||||||
<tr>
|
<img class="ra-avatar" src="{{ main.corporation_logo_url_64 }}">
|
||||||
</table>
|
<img class="ra-avatar" src="{{ main.alliance_logo_url_64 }}">
|
||||||
{% endif %}
|
</p>
|
||||||
</div>
|
<p>
|
||||||
{% endwith %}
|
<strong>{{ main.character_name }}</strong><br>
|
||||||
|
{{ main.corporation_name }}<br>
|
||||||
|
{{ main.alliance_name }}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
{% endwith %}
|
||||||
{% else %}
|
{% else %}
|
||||||
<div class="alert alert-danger" role="alert">{% trans "No main character set." %}</div>
|
<div class="alert alert-danger" role="alert">
|
||||||
|
{% trans "No main character set." %}
|
||||||
|
</div>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
<div class="clearfix"></div>
|
<div class="clearfix"></div>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
@ -93,9 +100,9 @@
|
|||||||
<div style="height: 240px;overflow:-moz-scrollbars-vertical;overflow-y:auto;">
|
<div style="height: 240px;overflow:-moz-scrollbars-vertical;overflow-y:auto;">
|
||||||
<table class="table table-striped">
|
<table class="table table-striped">
|
||||||
{% for group in user.groups.all %}
|
{% for group in user.groups.all %}
|
||||||
<tr>
|
<tr>
|
||||||
<td>{{ group.name }}</td>
|
<td>{{ group.name }}</td>
|
||||||
</tr>
|
</tr>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
@ -123,13 +130,13 @@
|
|||||||
<tbody>
|
<tbody>
|
||||||
{% for ownership in request.user.character_ownerships.all %}
|
{% for ownership in request.user.character_ownerships.all %}
|
||||||
{% with ownership.character as char %}
|
{% with ownership.character as char %}
|
||||||
<tr>
|
<tr>
|
||||||
<td class="text-center"><img class="ra-avatar img-circle" src="{{ char.portrait_url_32 }}">
|
<td class="text-center"><img class="ra-avatar img-circle" src="{{ char.portrait_url_32 }}">
|
||||||
</td>
|
</td>
|
||||||
<td class="text-center">{{ char.character_name }}</td>
|
<td class="text-center">{{ char.character_name }}</td>
|
||||||
<td class="text-center">{{ char.corporation_name }}</td>
|
<td class="text-center">{{ char.corporation_name }}</td>
|
||||||
<td class="text-center">{{ char.alliance_name }}</td>
|
<td class="text-center">{{ char.alliance_name }}</td>
|
||||||
</tr>
|
</tr>
|
||||||
{% endwith %}
|
{% endwith %}
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</tbody>
|
</tbody>
|
||||||
@ -138,16 +145,16 @@
|
|||||||
<tbody>
|
<tbody>
|
||||||
{% for ownership in request.user.character_ownerships.all %}
|
{% for ownership in request.user.character_ownerships.all %}
|
||||||
{% with ownership.character as char %}
|
{% with ownership.character as char %}
|
||||||
<tr>
|
<tr>
|
||||||
<td class="text-center" style="vertical-align: middle">
|
<td class="text-center" style="vertical-align: middle">
|
||||||
<img class="ra-avatar img-circle" src="{{ char.portrait_url_32 }}">
|
<img class="ra-avatar img-circle" src="{{ char.portrait_url_32 }}">
|
||||||
</td>
|
</td>
|
||||||
<td class="text-center" style="vertical-align: middle; width: 100%">
|
<td class="text-center" style="vertical-align: middle; width: 100%">
|
||||||
<strong>{{ char.character_name }}</strong><br>
|
<strong>{{ char.character_name }}</strong><br>
|
||||||
{{ char.corporation_name }}<br>
|
{{ char.corporation_name }}<br>
|
||||||
{{ char.alliance_name|default:"" }}
|
{{ char.alliance_name|default:"" }}
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
{% endwith %}
|
{% endwith %}
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</tbody>
|
</tbody>
|
||||||
|
|||||||
@ -27,37 +27,42 @@
|
|||||||
<th class="text-center" scope="col">{% trans "Actor" %}</th>
|
<th class="text-center" scope="col">{% trans "Actor" %}</th>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
{% for entry in entries %}
|
{% for entry in entries %}
|
||||||
<tr>
|
<tr>
|
||||||
<td class="text-center">{{ entry.date }}</td>
|
<td class="text-center">{{ entry.date }}</td>
|
||||||
<td class="text-center">{{ entry.requestor }}</td>
|
<td class="text-center">{{ entry.requestor }}</td>
|
||||||
<td class="text-center">{{ entry.req_char }}</td>
|
<td class="text-center">{{ entry.req_char }}</td>
|
||||||
<td class="text-center">{{ entry.group }}</td>
|
<td class="text-center">{{ entry.group }}</td>
|
||||||
<td class="text-center">{{ entry.type_to_str }}</td>
|
<td class="text-center">{{ entry.type_to_str }}</td>
|
||||||
{% if entry.request_type is None %}
|
{% if entry.request_type is None %}
|
||||||
<td class="text-center"> Removed</td>
|
<td class="text-center"> Removed</td>
|
||||||
{% else %}
|
{% else %}
|
||||||
<td class="text-center">{{ entry.action_to_str }}</td>
|
<td class="text-center">{{ entry.action_to_str }}</td>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
<td class="text-center">{{ entry.request_actor }}</td>
|
<td class="text-center">{{ entry.request_actor }}</td>
|
||||||
</tr>
|
</tr>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
{% else %}
|
{% else %}
|
||||||
<div class="alert alert-warning text-center">{% trans "No entries found for this group." %}</div>
|
<div class="alert alert-warning text-center">
|
||||||
|
{% trans "No entries found for this group." %}
|
||||||
|
</div>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
{% block extra_javascript %}
|
{% block extra_javascript %}
|
||||||
{% include 'bundles/datatables-js.html' %}
|
{% include 'bundles/datatables-js.html' %}
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
{% block extra_css %}
|
{% block extra_css %}
|
||||||
{% include 'bundles/datatables-css.html' %}
|
{% include 'bundles/datatables-css.html' %}
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
{% block extra_script %}
|
{% block extra_script %}
|
||||||
$(document).ready(function(){
|
$(document).ready(function(){
|
||||||
$('#log-entries').DataTable();
|
$('#log-entries').DataTable();
|
||||||
|
|||||||
@ -4,7 +4,6 @@
|
|||||||
{% load evelinks %}
|
{% load evelinks %}
|
||||||
|
|
||||||
{% block page_title %}{% trans "Group Members" %}{% endblock page_title %}
|
{% block page_title %}{% trans "Group Members" %}{% endblock page_title %}
|
||||||
{% block extra_css %}{% endblock extra_css %}
|
|
||||||
|
|
||||||
{% block content %}
|
{% block content %}
|
||||||
<div class="col-lg-12">
|
<div class="col-lg-12">
|
||||||
@ -18,54 +17,79 @@
|
|||||||
<div class="panel-body">
|
<div class="panel-body">
|
||||||
<div id="list" class="">
|
<div id="list" class="">
|
||||||
{% if group.user_set %}
|
{% if group.user_set %}
|
||||||
<table class="table">
|
<div class="table-responsive">
|
||||||
<tr>
|
<table class="table table-striped" id="tab_group_members">
|
||||||
<th class="text-center">{% trans "Leader" %}</th>
|
<thead>
|
||||||
<th class="text-center">{% trans "Portrait" %}</th>
|
<tr>
|
||||||
<th class="text-center">{% trans "Character" %}</th>
|
<th class="text-right">{% trans "Portrait" %}</th>
|
||||||
<th class="text-center">{% trans "Corporation" %}</th>
|
<th class="text-center">{% trans "Character" %}</th>
|
||||||
<th class="text-center">{% trans "Alliance" %}</th>
|
<th class="text-center">{% trans "Corporation" %}</th>
|
||||||
<th class="text-center">{% trans "Action" %}</th>
|
<th class="text-center">{% trans "Alliance" %}</th>
|
||||||
</tr>
|
<th class="text-center"></th>
|
||||||
{% for member in members %}
|
</tr>
|
||||||
<tr>
|
</thead>
|
||||||
<td class="text-center">
|
<tbody>
|
||||||
{% if member.is_leader %}
|
{% for member in members %}
|
||||||
<i class="fa fa-star"></i>
|
<tr>
|
||||||
{% endif %}
|
<td class="text-right">
|
||||||
</td>
|
{% if member.is_leader %}
|
||||||
<td class="text-center">
|
<i class="fa fa-star"></i>
|
||||||
<img src="{{ member.main_char|character_portrait_url:32 }}" class="img-circle">
|
{% endif %}
|
||||||
</td>
|
<img src="{{ member.main_char|character_portrait_url:32 }}" class="img-circle">
|
||||||
<td class="text-center">
|
</td>
|
||||||
<a href="{{ member.main_char|evewho_character_url }}" target="_blank">
|
<td class="text-center">
|
||||||
{{ member.main_char.character_name }}
|
<a href="{{ member.main_char|evewho_character_url }}" target="_blank">
|
||||||
</a>
|
{{ member.main_char.character_name }}
|
||||||
</td>
|
</a>
|
||||||
<td class="text-center">
|
</td>
|
||||||
<a href="{{ member.main_char|dotlan_corporation_url }}" target="_blank">
|
<td class="text-center">
|
||||||
{{ member.main_char.corporation_name }}
|
<a href="{{ member.main_char|dotlan_corporation_url }}" target="_blank">
|
||||||
</a>
|
{{ member.main_char.corporation_name }}
|
||||||
</td>
|
</a>
|
||||||
<td class="text-center">
|
</td>
|
||||||
<a href="{{ member.main_char|dotlan_alliance_url }}" target="_blank">
|
<td class="text-center">
|
||||||
{{ member.main_char.alliance_name|default_if_none:"" }}
|
<a href="{{ member.main_char|dotlan_alliance_url }}" target="_blank">
|
||||||
</a>
|
{{ member.main_char.alliance_name|default_if_none:"" }}
|
||||||
</td>
|
</a>
|
||||||
<td class="text-center">
|
</td>
|
||||||
<a href="{% url 'groupmanagement:membership_remove' group.id member.user.id %}" class="btn btn-danger"
|
<td class="text-center">
|
||||||
title="{% trans "Remove from group" %}">
|
<a href="{% url 'groupmanagement:membership_remove' group.id member.user.id %}" class="btn btn-danger"
|
||||||
<i class="glyphicon glyphicon-remove"></i>
|
title="{% trans "Remove from group" %}">
|
||||||
</a>
|
<i class="glyphicon glyphicon-remove"></i>
|
||||||
</td>
|
</a>
|
||||||
</tr>
|
</td>
|
||||||
{% endfor %}
|
</tr>
|
||||||
</table>
|
{% endfor %}
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
<p class="text-muted"><i class="fa fa-star"></i>: Group leader</p>
|
||||||
|
</div>
|
||||||
{% else %}
|
{% else %}
|
||||||
<div class="alert alert-warning text-center">{% trans "No group members to list." %}</div>
|
<div class="alert alert-warning text-center">
|
||||||
|
{% trans "No group members to list." %}
|
||||||
|
</div>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</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_group_members').DataTable({
|
||||||
|
order: [ [ 1, "asc" ] ],
|
||||||
|
columnDefs: [
|
||||||
|
{ "sortable": false, "targets": [0, 4] },
|
||||||
|
]
|
||||||
|
});
|
||||||
|
});
|
||||||
|
{% endblock %}
|
||||||
@ -15,44 +15,52 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="panel-body">
|
<div class="panel-body">
|
||||||
{% if groups %}
|
{% if groups %}
|
||||||
<table class="table">
|
<div class="table-responsive">
|
||||||
<tr>
|
<table class="table table-striped">
|
||||||
<th class="text-center">{% trans "Name" %}</th>
|
<thead>
|
||||||
<th class="text-center">{% trans "Description" %}</th>
|
<tr>
|
||||||
<th class="text-center">{% trans "Status" %}</th>
|
<th class="text-center">{% trans "Name" %}</th>
|
||||||
<th class="text-center">{% trans "Member Count" %}</th>
|
<th class="text-center">{% trans "Description" %}</th>
|
||||||
<th class="text-center">{% trans "Action" %}</th>
|
<th class="text-center">{% trans "Status" %}</th>
|
||||||
</tr>
|
<th class="text-center">{% trans "Member Count" %}</th>
|
||||||
{% for group in groups %}
|
<th class="text-center"></th>
|
||||||
<tr>
|
</tr>
|
||||||
<td class="text-center">{{ group.name }}</td>
|
</thead>
|
||||||
<td class="text-center">{{ group.authgroup.description }}</td>
|
<tbody>
|
||||||
<td class="text-center">
|
{% for group in groups %}
|
||||||
{% if group.authgroup.hidden %}
|
<tr>
|
||||||
<span class="label label-info">{% trans "Hidden" %}</span>
|
<td class="text-center">{{ group.name }}</td>
|
||||||
{% elif group.authgroup.open %}
|
<td class="text-center">{{ group.authgroup.description }}</td>
|
||||||
<span class="label label-success">{% trans "Open" %}</span>
|
<td class="text-center">
|
||||||
{% else %}
|
{% if group.authgroup.hidden %}
|
||||||
<span class="label label-default">{% trans "Requestable" %}</span>
|
<span class="label label-info">{% trans "Hidden" %}</span>
|
||||||
{% endif %}
|
{% elif group.authgroup.open %}
|
||||||
</td>
|
<span class="label label-success">{% trans "Open" %}</span>
|
||||||
<td class="text-center">
|
{% else %}
|
||||||
{{ group.num_members }}
|
<span class="label label-default">{% trans "Requestable" %}</span>
|
||||||
</td>
|
{% endif %}
|
||||||
<td class="text-center">
|
</td>
|
||||||
<a href="{% url 'groupmanagement:membership_list' group.id %}" class="btn btn-primary"
|
<td class="text-center">
|
||||||
title="{% trans "View Members" %}">
|
{{ group.num_members }}
|
||||||
<i class="glyphicon glyphicon-eye-open"></i>
|
</td>
|
||||||
</a>
|
<td class="text-center">
|
||||||
<a href="{% url "groupmanagement:audit_log" group.id %}" class="btn btn-info" title="{% trans "Audit Members" %}">
|
<a href="{% url 'groupmanagement:membership_list' group.id %}" class="btn btn-primary"
|
||||||
<i class="glyphicon glyphicon-list-alt"></i>
|
title="{% trans "View Members" %}">
|
||||||
</a>
|
<i class="glyphicon glyphicon-eye-open"></i>
|
||||||
</td>
|
</a>
|
||||||
</tr>
|
<a href="{% url "groupmanagement:audit_log" group.id %}" class="btn btn-info" title="{% trans "Audit Members" %}">
|
||||||
{% endfor %}
|
<i class="glyphicon glyphicon-list-alt"></i>
|
||||||
</table>
|
</a>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
{% endfor %}
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
{% else %}
|
{% else %}
|
||||||
<div class="alert alert-warning text-center">{% trans "No groups to list." %}</div>
|
<div class="alert alert-warning text-center">
|
||||||
|
{% trans "No groups to list." %}
|
||||||
|
</div>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@ -9,49 +9,54 @@ url
|
|||||||
<div class="col-lg-12">
|
<div class="col-lg-12">
|
||||||
<h1 class="page-header text-center">{% trans "Available Groups" %}</h1>
|
<h1 class="page-header text-center">{% trans "Available Groups" %}</h1>
|
||||||
{% if groups %}
|
{% if groups %}
|
||||||
<table class="table">
|
<table class="table table-striped">
|
||||||
<tr>
|
<thead>
|
||||||
<th class="text-center">{% trans "Name" %}</th>
|
<tr>
|
||||||
<th class="text-center">{% trans "Description" %}</th>
|
<th class="text-center">{% trans "Name" %}</th>
|
||||||
<th class="text-center">{% trans "Action" %}</th>
|
<th class="text-center">{% trans "Description" %}</th>
|
||||||
</tr>
|
<th class="text-center">{% trans "Action" %}</th>
|
||||||
|
</tr>
|
||||||
{% for g in groups %}
|
</thead>
|
||||||
<tr>
|
<tbody>
|
||||||
<td class="text-center">{{ g.group.name }}</td>
|
{% for g in groups %}
|
||||||
<td class="text-center">{{ g.group.authgroup.description|urlize }}</td>
|
<tr>
|
||||||
<td class="text-center">
|
<td class="text-center">{{ g.group.name }}</td>
|
||||||
{% if g.group in user.groups.all %}
|
<td class="text-center">{{ g.group.authgroup.description|urlize }}</td>
|
||||||
{% if not g.request %}
|
<td class="text-center">
|
||||||
<a href="{% url 'groupmanagement:request_leave' g.group.id %}" class="btn btn-danger">
|
{% if g.group in user.groups.all %}
|
||||||
{% trans "Leave" %}
|
{% if not g.request %}
|
||||||
</a>
|
<a href="{% url 'groupmanagement:request_leave' g.group.id %}" class="btn btn-danger">
|
||||||
{% else %}
|
{% trans "Leave" %}
|
||||||
<button type="button" class="btn btn-primary" disabled>
|
</a>
|
||||||
{{ g.request.status }}
|
{% else %}
|
||||||
</button>
|
<button type="button" class="btn btn-primary" disabled>
|
||||||
{% endif %}
|
{{ g.request.status }}
|
||||||
{% elif not g.request %}
|
</button>
|
||||||
{% if g.group.authgroup.open %}
|
{% endif %}
|
||||||
<a href="{% url 'groupmanagement:request_add' g.group.id %}" class="btn btn-success">
|
{% elif not g.request %}
|
||||||
{% trans "Join" %}
|
{% if g.group.authgroup.open %}
|
||||||
</a>
|
<a href="{% url 'groupmanagement:request_add' g.group.id %}" class="btn btn-success">
|
||||||
{% else %}
|
{% trans "Join" %}
|
||||||
<a href="{% url 'groupmanagement:request_add' g.group.id %}" class="btn btn-primary">
|
</a>
|
||||||
{% trans "Request" %}
|
{% else %}
|
||||||
</a>
|
<a href="{% url 'groupmanagement:request_add' g.group.id %}" class="btn btn-primary">
|
||||||
{% endif %}
|
{% trans "Request" %}
|
||||||
{% else %}
|
</a>
|
||||||
<button type="button" class="btn btn-primary" disabled>
|
{% endif %}
|
||||||
{{ g.request.status }}
|
{% else %}
|
||||||
</button>
|
<button type="button" class="btn btn-primary" disabled>
|
||||||
{% endif %}
|
{{ g.request.status }}
|
||||||
</td>
|
</button>
|
||||||
</tr>
|
{% endif %}
|
||||||
{% endfor %}
|
</td>
|
||||||
</table>
|
</tr>
|
||||||
|
{% endfor %}
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
{% else %}
|
{% else %}
|
||||||
<div class="alert alert-warning text-center">{% trans "No groups available." %}</div>
|
<div class="alert alert-warning text-center">
|
||||||
|
{% trans "No groups available." %}
|
||||||
|
</div>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|||||||
@ -20,8 +20,8 @@
|
|||||||
{% include 'groupmanagement/menu.html' %}
|
{% include 'groupmanagement/menu.html' %}
|
||||||
|
|
||||||
<ul class="nav nav-tabs">
|
<ul class="nav nav-tabs">
|
||||||
<li class="active"><a data-toggle="tab" href="#add">{% trans "Group Add Requests" %}</a></li>
|
<li class="active"><a data-toggle="tab" href="#add">{% trans "Join Requests" %}</a></li>
|
||||||
<li><a data-toggle="tab" href="#leave">{% trans "Group Leave Requests" %}</a></li>
|
<li><a data-toggle="tab" href="#leave">{% trans "Leave Requests" %}</a></li>
|
||||||
</ul>
|
</ul>
|
||||||
|
|
||||||
<div class="tab-content">
|
<div class="tab-content">
|
||||||
@ -29,49 +29,55 @@
|
|||||||
<div id="add" class="tab-pane fade in active panel panel-default">
|
<div id="add" class="tab-pane fade in active panel panel-default">
|
||||||
<div class="panel-body">
|
<div class="panel-body">
|
||||||
{% if acceptrequests %}
|
{% if acceptrequests %}
|
||||||
<table class="table">
|
<div class="table-responsive">
|
||||||
<tr>
|
<table class="table table-striped">
|
||||||
<th class="text-center">{% trans "#" %}</th>
|
<thead>
|
||||||
<th class="text-center">{% trans "Portrait" %}</th>
|
<tr>
|
||||||
<th class="text-center">{% trans "Character" %}</th>
|
<th class="text-center">{% trans "#" %}</th>
|
||||||
<th class="text-center">{% trans "Corporation" %}</th>
|
<th class="text-center">{% trans "Portrait" %}</th>
|
||||||
<th class="text-center">{% trans "Alliance" %}</th>
|
<th class="text-center">{% trans "Character" %}</th>
|
||||||
<th class="text-center">{% trans "Group" %}</th>
|
<th class="text-center">{% trans "Corporation" %}</th>
|
||||||
<th class="text-center"></th>
|
<th class="text-center">{% trans "Alliance" %}</th>
|
||||||
</tr>
|
<th class="text-center">{% trans "Group" %}</th>
|
||||||
{% for acceptrequest in acceptrequests %}
|
<th class="text-center"></th>
|
||||||
<tr>
|
</tr>
|
||||||
<td class="text-center">{{ acceptrequest.id }}</td>
|
</thead>
|
||||||
<td class="text-center">
|
<tbody>
|
||||||
<img src="{{ acceptrequest.main_char|character_portrait_url:32 }}" class="img-circle">
|
{% for acceptrequest in acceptrequests %}
|
||||||
</td>
|
<tr>
|
||||||
<td class="text-center">
|
<td class="text-center">{{ acceptrequest.id }}</td>
|
||||||
<a href="{{ acceptrequest.main_char|evewho_character_url }}" target="_blank">
|
<td class="text-center">
|
||||||
{{ acceptrequest.main_char.character_name }}
|
<img src="{{ acceptrequest.main_char|character_portrait_url:32 }}" class="img-circle">
|
||||||
</a>
|
</td>
|
||||||
</td>
|
<td class="text-center">
|
||||||
<td class="text-center">
|
<a href="{{ acceptrequest.main_char|evewho_character_url }}" target="_blank">
|
||||||
<a href="{{ acceptrequest.main_char|dotlan_corporation_url }}" target="_blank">
|
{{ acceptrequest.main_char.character_name }}
|
||||||
{{ acceptrequest.main_char.corporation_name }}
|
</a>
|
||||||
</a>
|
</td>
|
||||||
</td>
|
<td class="text-center">
|
||||||
<td class="text-center">
|
<a href="{{ acceptrequest.main_char|dotlan_corporation_url }}" target="_blank">
|
||||||
<a href="{{ acceptrequest.main_char|dotlan_alliance_url }}" target="_blank">
|
{{ acceptrequest.main_char.corporation_name }}
|
||||||
{{ acceptrequest.main_char.alliance_name|default_if_none:"" }}
|
</a>
|
||||||
</a>
|
</td>
|
||||||
</td>
|
<td class="text-center">
|
||||||
<td class="text-center">{{ acceptrequest.group.name }}</td>
|
<a href="{{ acceptrequest.main_char|dotlan_alliance_url }}" target="_blank">
|
||||||
<td class="text-center">
|
{{ acceptrequest.main_char.alliance_name|default_if_none:"" }}
|
||||||
<a href="{% url 'groupmanagement:accept_request' acceptrequest.id %}" class="btn btn-success">
|
</a>
|
||||||
{% trans "Accept" %}
|
</td>
|
||||||
</a>
|
<td class="text-center">{{ acceptrequest.group.name }}</td>
|
||||||
<a href="{% url 'groupmanagement:reject_request' acceptrequest.id %}" class="btn btn-danger">
|
<td class="text-center">
|
||||||
{% trans "Reject" %}
|
<a href="{% url 'groupmanagement:accept_request' acceptrequest.id %}" class="btn btn-success">
|
||||||
</a>
|
{% trans "Accept" %}
|
||||||
</td>
|
</a>
|
||||||
</tr>
|
<a href="{% url 'groupmanagement:reject_request' acceptrequest.id %}" class="btn btn-danger">
|
||||||
{% endfor %}
|
{% trans "Reject" %}
|
||||||
</table>
|
</a>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
{% endfor %}
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
{% else %}
|
{% else %}
|
||||||
<div class="alert alert-warning text-center">{% trans "No group add requests." %}</div>
|
<div class="alert alert-warning text-center">{% trans "No group add requests." %}</div>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
@ -81,49 +87,55 @@
|
|||||||
<div id="leave" class="tab-pane fade panel panel-default">
|
<div id="leave" class="tab-pane fade panel panel-default">
|
||||||
<div class="panel-body">
|
<div class="panel-body">
|
||||||
{% if leaverequests %}
|
{% if leaverequests %}
|
||||||
<table class="table">
|
<div class="table-responsive">
|
||||||
<tr>
|
<table class="table table-striped">
|
||||||
<th class="text-center">{% trans "#" %}</th>
|
<thead>
|
||||||
<th class="text-center">{% trans "Portrait" %}</th>
|
<tr>
|
||||||
<th class="text-center">{% trans "Character" %}</th>
|
<th class="text-center">{% trans "#" %}</th>
|
||||||
<th class="text-center">{% trans "Corporation" %}</th>
|
<th class="text-center">{% trans "Portrait" %}</th>
|
||||||
<th class="text-center">{% trans "Alliance" %}</th>
|
<th class="text-center">{% trans "Character" %}</th>
|
||||||
<th class="text-center">{% trans "Group" %}</th>
|
<th class="text-center">{% trans "Corporation" %}</th>
|
||||||
<th class="text-center"></th>
|
<th class="text-center">{% trans "Alliance" %}</th>
|
||||||
</tr>
|
<th class="text-center">{% trans "Group" %}</th>
|
||||||
{% for leaverequest in leaverequests %}
|
<th class="text-center"></th>
|
||||||
<tr>
|
</tr>
|
||||||
<td class="text-center">{{ leaverequest.id }}</td>
|
</thead>
|
||||||
<td class="text-center">
|
<tbody>
|
||||||
<img src="{{ leaverequest.main_char|character_portrait_url:32 }}" class="img-circle">
|
{% for leaverequest in leaverequests %}
|
||||||
</td>
|
<tr>
|
||||||
<td class="text-center">
|
<td class="text-center">{{ leaverequest.id }}</td>
|
||||||
<a href="{{ leaverequest.main_char|evewho_character_url }}" target="_blank">
|
<td class="text-center">
|
||||||
{{ leaverequest.main_char.character_name }}
|
<img src="{{ leaverequest.main_char|character_portrait_url:32 }}" class="img-circle">
|
||||||
</a>
|
</td>
|
||||||
</td>
|
<td class="text-center">
|
||||||
<td class="text-center">
|
<a href="{{ leaverequest.main_char|evewho_character_url }}" target="_blank">
|
||||||
<a href="{{ leaverequest.main_char|dotlan_corporation_url }}" target="_blank">
|
{{ leaverequest.main_char.character_name }}
|
||||||
{{ leaverequest.main_char.corporation_name }}
|
</a>
|
||||||
</a>
|
</td>
|
||||||
</td>
|
<td class="text-center">
|
||||||
<td class="text-center">
|
<a href="{{ leaverequest.main_char|dotlan_corporation_url }}" target="_blank">
|
||||||
<a href="{{ leaverequest.main_char|dotlan_alliance_url }}" target="_blank">
|
{{ leaverequest.main_char.corporation_name }}
|
||||||
{{ leaverequest.main_char.alliance_name|default_if_none:"" }}
|
</a>
|
||||||
</a>
|
</td>
|
||||||
</td>
|
<td class="text-center">
|
||||||
<td class="text-center">{{ leaverequest.group.name }}</td>
|
<a href="{{ leaverequest.main_char|dotlan_alliance_url }}" target="_blank">
|
||||||
<td class="text-center">
|
{{ leaverequest.main_char.alliance_name|default_if_none:"" }}
|
||||||
<a href="{% url 'groupmanagement:leave_accept_request' leaverequest.id %}" class="btn btn-success">
|
</a>
|
||||||
{% trans "Accept" %}
|
</td>
|
||||||
</a>
|
<td class="text-center">{{ leaverequest.group.name }}</td>
|
||||||
<a href="{% url 'groupmanagement:leave_reject_request' leaverequest.id %}" class="btn btn-danger">
|
<td class="text-center">
|
||||||
{% trans "Reject" %}
|
<a href="{% url 'groupmanagement:leave_accept_request' leaverequest.id %}" class="btn btn-success">
|
||||||
</a>
|
{% trans "Accept" %}
|
||||||
</td>
|
</a>
|
||||||
</tr>
|
<a href="{% url 'groupmanagement:leave_reject_request' leaverequest.id %}" class="btn btn-danger">
|
||||||
{% endfor %}
|
{% trans "Reject" %}
|
||||||
</table>
|
</a>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
{% endfor %}
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
{% else %}
|
{% else %}
|
||||||
<div class="alert alert-warning text-center">{% trans "No group leave requests." %}</div>
|
<div class="alert alert-warning text-center">{% trans "No group leave requests." %}</div>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user