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

tables formatted properly

Browse Source 
align center is horrible to read ....
This commit is contained in:
Peter Pfeufer 2020-10-25 11:55:03 +01:00
parent 8a91e7f6ac
commit 87c0c3ac73
No known key found for this signature in database
GPG Key ID: 6051D2C6AD4EBC27
5 changed files with 226 additions and 206 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,48 +8,55 @@
<div class="col-lg-12"> <div class="col-lg-12">
<br> <br>
{% include 'groupmanagement/menu.html' %} {% include 'groupmanagement/menu.html' %}
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading"> <div class="panel-heading">
{{ group }} - {% trans 'Audit Log' %} {{ group }} - {% trans "Audit Log" %}
</div> </div>
<div class="panel-body"> <div class="panel-body">
<p> <p>
<a class="btn btn-default" href="{% url 'groupmanagement:membership' %}" role="button"> <a class="btn btn-default" href="{% url 'groupmanagement:membership' %}" role="button">
{% trans "Back" %} {% trans "Back" %}
</a> </a>
</p> </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">
<thead> <thead>
<th class="text-center" scope="col">{% trans "Date/Time" %}</th> <th scope="col">{% trans "Date/Time" %}</th>
<th class="text-center" scope="col">{% trans "Requestor" %}</th> <th scope="col">{% trans "Requestor" %}</th>
<th class="text-center" scope="col">{% trans "Character" %}</th> <th scope="col">{% trans "Character" %}</th>
<th class="text-center" scope="col">{% trans "Corporation" %}</th> <th scope="col">{% trans "Corporation" %}</th>
<th class="text-center" scope="col">{% trans "Type" %}</th> <th scope="col">{% trans "Type" %}</th>
<th class="text-center" scope="col">{% trans "Action" %}</th> <th scope="col">{% trans "Action" %}</th>
<th class="text-center" scope="col">{% trans "Actor" %}</th> <th 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|date:"Y-M-d, H:i" }}</td> <td>{{ entry.date|date:"Y-M-d, H:i" }}</td>
<td class="text-center">{{ entry.requestor }}</td> <td>{{ entry.requestor }}</td>
<td class="text-center">{{ entry.req_char }}</td> <td>{{ entry.req_char }}</td>
<td class="text-center">{{ entry.req_char.corporation_name }}</td> <td>{{ entry.req_char.corporation_name }}</td>
<td class="text-center">{{ entry.type_to_str }}</td> <td>{{ entry.type_to_str }}</td>
{% if entry.request_type is None %} {% if entry.request_type is None %}
<td class="text-center"> Removed</td> <td>{% trans "Removed" %}</td>
{% else %} {% else %}
<td class="text-center">{{ entry.action_to_str }}</td> <td>{{ entry.action_to_str }}</td>
{% endif %} {% endif %}
<td class="text-center">{{ entry.request_actor }}</td>
<td>{{ entry.request_actor }}</td>
</tr> </tr>
{% endfor %} {% endfor %}
</tbody> </tbody>
</table> </table>
<p class="text-muted"> <p class="text-muted">
All times displayed are EVE/UTC. {% trans "All times displayed are EVE/UTC." %}
</p> </p>
</div> </div>
{% else %} {% else %}
@ -75,7 +82,6 @@
{% endblock %} {% endblock %}
{% block extra_script %} {% block extra_script %}
$.fn.dataTable.moment = function(format, locale) { $.fn.dataTable.moment = function(format, locale) {
var types = $.fn.dataTable.ext.type; var types = $.fn.dataTable.ext.type;
@ -124,4 +130,3 @@
}); });
}); });
{% endblock %} {% endblock %}

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

@ -14,33 +14,30 @@
<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">
<p> <p>
<a class="btn btn-default" href="{% url 'groupmanagement:membership' %}" role="button"> <a class="btn btn-default" href="{% url 'groupmanagement:membership' %}" role="button">
{% trans "Back" %} {% trans "Back" %}
</a> </a>
</p> </p>
{% if group.user_set %} {% if group.user_set %}
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-aa" id="tab_group_members"> <table class="table table-aa" id="tab_group_members">
<thead> <thead>
<tr> <tr>
<th class="text-right">{% trans "Portrait" %}</th> <th>{% trans "Character" %}</th>
<th class="text-center">{% trans "Character" %}</th> <th>{% trans "Organization" %}</th>
<th class="text-center">{% trans "Organization" %}</th> <th></th>
<th class="text-center"></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{% for member in members %} {% for member in members %}
<tr> <tr>
<td class="text-right"> <td>
{% if member.is_leader %} <img src="{{ member.main_char|character_portrait_url:32 }}" class="img-circle" style="margin-right: 1rem;">
<i class="fas fa-star"></i>&nbsp;
{% endif %}
<img src="{{ member.main_char|character_portrait_url:32 }}" class="img-circle">
</td>
<td class="text-center">
{% if member.main_char %} {% 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 }}
@ -48,20 +45,25 @@
{% else %} {% else %}
{{ member.user.username }} {{ member.user.username }}
{% endif %} {% endif %}
{% if member.is_leader %}
<i class="fas fa-star" title="{% trans "Group leader" %}" style="margin-left: 1rem;"></i>&nbsp;
{% endif %}
</td> </td>
<td class="text-center">
<td>
{% if member.main_char %} {% 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><br> </a><br>
{{ member.main_char.alliance_name|default_if_none:"" }} {{ member.main_char.alliance_name|default_if_none:"" }}
{% else %} {% else %}
(unknown) {% trans "(unknown)" %}
{% endif %} {% endif %}
</td> </td>
<td class="text-center">
<a href="{% url 'groupmanagement:membership_remove' group.id member.user.id %}" class="btn btn-danger" <td class="text-right">
title="{% trans "Remove from group" %}"> <a href="{% url 'groupmanagement:membership_remove' group.id member.user.id %}" class="btn btn-danger" title="{% trans "Remove from group" %}">
<i class="glyphicon glyphicon-remove"></i> <i class="glyphicon glyphicon-remove"></i>
</a> </a>
</td> </td>
@ -69,7 +71,10 @@
{% endfor %} {% endfor %}
</tbody> </tbody>
</table> </table>
<p class="text-muted"><i class="fas fa-star"></i>: Group leader</p>
<p class="text-muted">
<i class="fas fa-star"></i>: {% trans "Group leader" %}
</p>
</div> </div>
{% else %} {% else %}
<div class="alert alert-warning text-center"> <div class="alert alert-warning text-center">
@ -93,9 +98,12 @@
{% block extra_script %} {% block extra_script %}
$(document).ready(function(){ $(document).ready(function(){
$('#tab_group_members').DataTable({ $('#tab_group_members').DataTable({
order: [ [ 1, "asc" ] ], order: [[0, "asc"]],
columnDefs: [ columnDefs: [
{ "sortable": false, "targets": [0, 3] }, {
"sortable": false,
"targets": [2]
},
] ]
}); });
}); });

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

@ -9,31 +9,36 @@
<div class="col-lg-12"> <div class="col-lg-12">
<br> <br>
{% include 'groupmanagement/menu.html' %} {% include 'groupmanagement/menu.html' %}
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading"> <div class="panel-heading">
{% trans "Groups" %} {% trans "Groups" %}
</div> </div>
<div class="panel-body"> <div class="panel-body">
{% if groups %} {% if groups %}
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-aa"> <table class="table table-aa">
<thead> <thead>
<tr> <tr>
<th class="text-center">{% trans "Name" %}</th> <th>{% trans "Name" %}</th>
<th class="text-center">{% trans "Description" %}</th> <th>{% trans "Description" %}</th>
<th class="text-center">{% trans "Status" %}</th> <th>{% trans "Status" %}</th>
<th class="text-center">{% trans "Member Count" %}</th> <th>{% trans "Member Count" %}</th>
<th class="text-center"></th> <th></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{% for group in groups %} {% for group in groups %}
<tr> <tr>
<td class="text-center"> <td>
<a href="{% url 'groupmanagement:membership' group.id %}">{{ group.name }}</a> <a href="{% url 'groupmanagement:membership' group.id %}">{{ group.name }}</a>
</td> </td>
<td class="text-center">{{ group.authgroup.description }}</td>
<td class="text-center"> <td>{{ group.authgroup.description }}</td>
<td>
{% if group.authgroup.hidden %} {% if group.authgroup.hidden %}
<span class="label label-info">{% trans "Hidden" %}</span> <span class="label label-info">{% trans "Hidden" %}</span>
{% elif group.authgroup.open %} {% elif group.authgroup.open %}
@ -42,16 +47,20 @@
<span class="label label-default">{% trans "Requestable" %}</span> <span class="label label-default">{% trans "Requestable" %}</span>
{% endif %} {% endif %}
</td> </td>
<td class="text-center">
<td>
{{ group.num_members }} {{ group.num_members }}
</td> </td>
<td class="text-center">
<td class="text-right">
<a href="{% url 'groupmanagement:membership' group.id %}" class="btn btn-primary" title="{% trans "View Members" %}"> <a href="{% url 'groupmanagement:membership' group.id %}" class="btn btn-primary" title="{% trans "View Members" %}">
<i class="glyphicon glyphicon-eye-open"></i> <i class="glyphicon glyphicon-eye-open"></i>
</a> </a>
<a href="{% url "groupmanagement:audit_log" group.id %}" class="btn btn-info" title="{% trans "Audit Members" %}"> <a href="{% url "groupmanagement:audit_log" group.id %}" class="btn btn-info" title="{% trans "Audit Members" %}">
<i class="glyphicon glyphicon-list-alt"></i> <i class="glyphicon glyphicon-list-alt"></i>
</a> </a>
<a id="clipboard-copy" data-clipboard-text="{{ request.scheme }}://{{request.get_host}}{% url 'groupmanagement:request_add' group.id %}" class="btn btn-warning" title="{% trans "Copy Direct Join Link" %}"> <a id="clipboard-copy" data-clipboard-text="{{ request.scheme }}://{{request.get_host}}{% url 'groupmanagement:request_add' group.id %}" class="btn btn-warning" title="{% trans "Copy Direct Join Link" %}">
<i class="glyphicon glyphicon-copy"></i> <i class="glyphicon glyphicon-copy"></i>
</a> </a>
@ -71,8 +80,10 @@
</div> </div>
</div> </div>
{% endblock content %} {% endblock content %}
{% block extra_javascript %} {% block extra_javascript %}
{% include 'bundles/clipboard-js.html' %} {% include 'bundles/clipboard-js.html' %}
<script> <script>
new ClipboardJS('#clipboard-copy'); new ClipboardJS('#clipboard-copy');
</script> </script>

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

@ -4,7 +4,7 @@
{% block page_title %}{% trans "Available Groups" %}{% endblock page_title %} {% block page_title %}{% trans "Available Groups" %}{% endblock page_title %}
{% block extra_css %}{% endblock extra_css %} {% block extra_css %}{% endblock extra_css %}
url
{% block content %} {% block content %}
<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>
@ -12,17 +12,18 @@ url
<table class="table table-aa"> <table class="table table-aa">
<thead> <thead>
<tr> <tr>
<th class="text-center">{% trans "Name" %}</th> <th>{% trans "Name" %}</th>
<th class="text-center">{% trans "Description" %}</th> <th>{% trans "Description" %}</th>
<th class="text-center">{% trans "Action" %}</th> <th></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{% for g in groups %} {% for g in groups %}
<tr> <tr>
<td class="text-center">{{ g.group.name }}</td> <td>{{ g.group.name }}</td>
<td class="text-center">{{ g.group.authgroup.description|urlize }}</td> <td>{{ g.group.authgroup.description|urlize }}</td>
<td class="text-center"> <td class="text-right">
{% if g.group in user.groups.all %} {% if g.group in user.groups.all %}
{% if not g.request %} {% if not g.request %}
<a href="{% url 'groupmanagement:request_leave' g.group.id %}" class="btn btn-danger"> <a href="{% url 'groupmanagement:request_leave' g.group.id %}" class="btn btn-danger">
@ -59,5 +60,4 @@ url
</div> </div>
{% endif %} {% endif %}
</div> </div>
{% endblock content %} {% endblock content %}

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

@ -4,14 +4,14 @@
{% load evelinks %} {% load evelinks %}
{% block page_title %}{% trans "Groups Management" %}{% endblock page_title %} {% block page_title %}{% trans "Groups Management" %}{% endblock page_title %}
{% block extra_css %} {% block extra_css %}
<style> <style>
.nav-tabs > li.active > a { .nav-tabs > li.active > a {
background-color: #ECF0F1 !important; background-color: rgb(236, 240, 241) !important;
color: #2C3E50; color: rgb(44, 62, 80);
} }
</style> </style>
{% endblock extra_css %} {% endblock extra_css %}
{% block content %} {% block content %}
@ -39,7 +39,6 @@
</ul> </ul>
<div class="tab-content"> <div class="tab-content">
<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 %}
@ -47,20 +46,18 @@
<table class="table table-aa"> <table class="table table-aa">
<thead> <thead>
<tr> <tr>
<th class="text-center"></th> <th>{% trans "Character" %}</th>
<th class="text-center">{% trans "Character" %}</th> <th>{% trans "Organization" %}</th>
<th class="text-center">{% trans "Organization" %}</th> <th>{% trans "Group" %}</th>
<th class="text-center">{% trans "Group" %}</th> <th></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-right"> <td>
<img src="{{ acceptrequest.main_char|character_portrait_url:32 }}" class="img-circle"> <img src="{{ acceptrequest.main_char|character_portrait_url:32 }}" class="img-circle" style="margin-right: 1rem;">
</td>
<td class="text-center">
{% if acceptrequest.main_char %} {% 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 }}
@ -69,21 +66,22 @@
{{ acceptrequest.user.username }} {{ acceptrequest.user.username }}
{% endif %} {% endif %}
</td> </td>
<td class="text-center"> <td>
{% if acceptrequest.main_char %} {% 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><br> </a><br>
{{ acceptrequest.main_char.alliance_name|default_if_none:"" }} {{ acceptrequest.main_char.alliance_name|default_if_none:"" }}
{% else %} {% else %}
(unknown) {% trans "(unknown)" %}
{% endif %} {% endif %}
</td> </td>
<td class="text-center">{{ acceptrequest.group.name }}</td> <td>{{ acceptrequest.group.name }}</td>
<td class="text-center"> <td class="text-right">
<a href="{% url 'groupmanagement:accept_request' acceptrequest.id %}" class="btn btn-success"> <a href="{% url 'groupmanagement:accept_request' acceptrequest.id %}" class="btn btn-success">
{% trans "Accept" %} {% trans "Accept" %}
</a> </a>
<a href="{% url 'groupmanagement:reject_request' acceptrequest.id %}" class="btn btn-danger"> <a href="{% url 'groupmanagement:reject_request' acceptrequest.id %}" class="btn btn-danger">
{% trans "Reject" %} {% trans "Reject" %}
</a> </a>
@ -106,20 +104,18 @@
<table class="table table-aa"> <table class="table table-aa">
<thead> <thead>
<tr> <tr>
<th class="text-center"></th> <th>{% trans "Character" %}</th>
<th class="text-center">{% trans "Character" %}</th> <th>{% trans "Organization" %}</th>
<th class="text-center">{% trans "Organization" %}</th> <th>{% trans "Group" %}</th>
<th class="text-center">{% trans "Group" %}</th> <th></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-right"> <td>
<img src="{{ leaverequest.main_char|character_portrait_url:32 }}" class="img-circle"> <img src="{{ leaverequest.main_char|character_portrait_url:32 }}" class="img-circle" style="margin-right: 1rem;">
</td>
<td class="text-center">
{% if leaverequest.main_char %} {% 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 }}
@ -128,7 +124,7 @@
{{ leaverequest.user.username }} {{ leaverequest.user.username }}
{% endif %} {% endif %}
</td> </td>
<td class="text-center"> <td>
{% if leaverequest.main_char %} {% 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 }}
@ -138,11 +134,12 @@
(unknown) (unknown)
{% endif %} {% endif %}
</td> </td>
<td class="text-center">{{ leaverequest.group.name }}</td> <td>{{ leaverequest.group.name }}</td>
<td class="text-center"> <td class="text-right">
<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">
{% trans "Accept" %} {% trans "Accept" %}
</a> </a>
<a href="{% url 'groupmanagement:leave_reject_request' leaverequest.id %}" class="btn btn-danger"> <a href="{% url 'groupmanagement:leave_reject_request' leaverequest.id %}" class="btn btn-danger">
{% trans "Reject" %} {% trans "Reject" %}
</a> </a>
@ -157,7 +154,6 @@
{% endif %} {% endif %}
</div> </div>
</div> </div>
</div> </div>
</div> </div>
{% endblock content %} {% endblock content %}