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

Fix group management, improve dashboard

Browse Source
This commit is contained in:
ErikKalkoken 2020-02-15 22:49:48 +01:00
parent 1182b51e4b
commit 55a5070691
6 changed files with 359 additions and 298 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
allianceauth/authentication/templates/authentication/dashboard.html
View File

@ -19,6 +19,7 @@
<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="hidden-xs">
<div class="col-lg-4 col-sm-2"> <div class="col-lg-4 col-sm-2">
<table class="table"> <table class="table">
<tr> <tr>
@ -27,21 +28,12 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="text-center"> <td class="text-center">{{ main.character_name }}</td>
<span class="hidden-xs">
{{ main.character_name }}
</span>
<span class="visible-xs-block">
<strong>{{ main.character_name }}</strong><br>
{{ main.corporation_name }}<br>
{{ main.alliance_name }}
</span>
</td>
</tr> </tr>
</table> </table>
</div> </div>
<div class="col-lg-4 col-sm-2"> <div class="col-lg-4 col-sm-2">
<table class="table hidden-xs"> <table class="table">
<tr> <tr>
<td class="text-center"> <td class="text-center">
<img class="ra-avatar"src="{{ main.corporation_logo_url_128 }}"> <img class="ra-avatar"src="{{ main.corporation_logo_url_128 }}">
@ -54,7 +46,7 @@
</div> </div>
<div class="col-lg-4 col-sm-2"> <div class="col-lg-4 col-sm-2">
{% if main.alliance_id %} {% if main.alliance_id %}
<table class="table hidden-xs"> <table class="table">
<tr> <tr>
<td class="text-center"> <td class="text-center">
<img class="ra-avatar"src="{{ main.alliance_logo_url_128 }}"> <img class="ra-avatar"src="{{ main.alliance_logo_url_128 }}">
@ -66,9 +58,24 @@
</table> </table>
{% endif %} {% endif %}
</div> </div>
</div>
<div class="table visible-xs-block">
<p>
<img class="ra-avatar" src="{{ main.portrait_url_64 }}">
<img class="ra-avatar" src="{{ main.corporation_logo_url_64 }}">
<img class="ra-avatar" src="{{ main.alliance_logo_url_64 }}">
</p>
<p>
<strong>{{ main.character_name }}</strong><br>
{{ main.corporation_name }}<br>
{{ main.alliance_name }}
</p>
</div>
{% endwith %} {% 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">

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

@ -46,18 +46,23 @@
</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();

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

@ -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,23 +17,24 @@
<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">
<table class="table table-striped" id="tab_group_members">
<thead>
<tr> <tr>
<th class="text-center">{% trans "Leader" %}</th> <th class="text-right">{% trans "Portrait" %}</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 "Corporation" %}</th>
<th class="text-center">{% trans "Alliance" %}</th> <th class="text-center">{% trans "Alliance" %}</th>
<th class="text-center">{% trans "Action" %}</th> <th class="text-center"></th>
</tr> </tr>
</thead>
<tbody>
{% for member in members %} {% for member in members %}
<tr> <tr>
<td class="text-center"> <td class="text-right">
{% if member.is_leader %} {% if member.is_leader %}
<i class="fa fa-star"></i> <i class="fa fa-star"></i>&nbsp;
{% endif %} {% endif %}
</td>
<td class="text-center">
<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">
@ -60,12 +60,36 @@
</td> </td>
</tr> </tr>
{% endfor %} {% endfor %}
</tbody>
</table> </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 %}

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

@ -15,14 +15,18 @@
</div> </div>
<div class="panel-body"> <div class="panel-body">
{% if groups %} {% if groups %}
<table class="table"> <div class="table-responsive">
<table class="table table-striped">
<thead>
<tr> <tr>
<th class="text-center">{% trans "Name" %}</th> <th class="text-center">{% trans "Name" %}</th>
<th class="text-center">{% trans "Description" %}</th> <th class="text-center">{% trans "Description" %}</th>
<th class="text-center">{% trans "Status" %}</th> <th class="text-center">{% trans "Status" %}</th>
<th class="text-center">{% trans "Member Count" %}</th> <th class="text-center">{% trans "Member Count" %}</th>
<th class="text-center">{% trans "Action" %}</th> <th class="text-center"></th>
</tr> </tr>
</thead>
<tbody>
{% for group in groups %} {% for group in groups %}
<tr> <tr>
<td class="text-center">{{ group.name }}</td> <td class="text-center">{{ group.name }}</td>
@ -50,9 +54,13 @@
</td> </td>
</tr> </tr>
{% endfor %} {% endfor %}
</tbody>
</table> </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>

11
allianceauth/groupmanagement/templates/groupmanagement/groups.html
View File

@ -9,13 +9,15 @@ 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">
<thead>
<tr> <tr>
<th class="text-center">{% trans "Name" %}</th> <th class="text-center">{% trans "Name" %}</th>
<th class="text-center">{% trans "Description" %}</th> <th class="text-center">{% trans "Description" %}</th>
<th class="text-center">{% trans "Action" %}</th> <th class="text-center">{% trans "Action" %}</th>
</tr> </tr>
</thead>
<tbody>
{% for g in groups %} {% for g in groups %}
<tr> <tr>
<td class="text-center">{{ g.group.name }}</td> <td class="text-center">{{ g.group.name }}</td>
@ -49,9 +51,12 @@ url
</td> </td>
</tr> </tr>
{% endfor %} {% endfor %}
</tbody>
</table> </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
allianceauth/groupmanagement/templates/groupmanagement/index.html
View File

@ -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,7 +29,9 @@
<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">
<table class="table table-striped">
<thead>
<tr> <tr>
<th class="text-center">{% trans "#" %}</th> <th class="text-center">{% trans "#" %}</th>
<th class="text-center">{% trans "Portrait" %}</th> <th class="text-center">{% trans "Portrait" %}</th>
@ -39,6 +41,8 @@
<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>
<tbody>
{% for acceptrequest in acceptrequests %} {% for acceptrequest in acceptrequests %}
<tr> <tr>
<td class="text-center">{{ acceptrequest.id }}</td> <td class="text-center">{{ acceptrequest.id }}</td>
@ -71,7 +75,9 @@
</td> </td>
</tr> </tr>
{% endfor %} {% endfor %}
</tbody>
</table> </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,7 +87,9 @@
<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">
<table class="table table-striped">
<thead>
<tr> <tr>
<th class="text-center">{% trans "#" %}</th> <th class="text-center">{% trans "#" %}</th>
<th class="text-center">{% trans "Portrait" %}</th> <th class="text-center">{% trans "Portrait" %}</th>
@ -91,6 +99,8 @@
<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>
<tbody>
{% for leaverequest in leaverequests %} {% for leaverequest in leaverequests %}
<tr> <tr>
<td class="text-center">{{ leaverequest.id }}</td> <td class="text-center">{{ leaverequest.id }}</td>
@ -123,7 +133,9 @@
</td> </td>
</tr> </tr>
{% endfor %} {% endfor %}
</tbody>
</table> </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 %}