Mathis/allianceauth
1
0
Fork 0
mirror of https://gitlab.com/allianceauth/allianceauth.git synced 2026-02-13 02:26:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add new standard table style, improve UI for group management

Browse Source
This commit is contained in:
ErikKalkoken
2020-02-17 23:45:00 +01:00
parent 59855a71ef
commit 0f9927686b
7 changed files with 69 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,12 +14,9 @@
</div>
<div class="panel-body">
<p>
<span class="pull-right">
&nbsp;
<a class="btn btn-default" href="{% url 'groupmanagement:membership' %}" role="button">
Back
</a>
</span>
<a class="btn btn-default" href="{% url 'groupmanagement:membership' %}" role="button">
Back
</a>
</p>
{% if entries %}
<div class="table-responsive">
@@ -27,8 +24,8 @@
<thead>
<th class="text-center" scope="col">{% trans "Date/Time" %}</th>
<th class="text-center" scope="col">{% trans "Requestor" %}</th>
<th class="text-center" scope="col">{% trans "Main Character" %}</th>
<th class="text-center" scope="col">{% trans "Group" %}</th>
<th class="text-center" scope="col">{% trans "Character" %}</th>
<th class="text-center" scope="col">{% trans "Corporation" %}</th>
<th class="text-center" scope="col">{% trans "Type" %}</th>
<th class="text-center" scope="col">{% trans "Action" %}</th>
<th class="text-center" scope="col">{% trans "Actor" %}</th>
@@ -39,7 +36,7 @@
<td class="text-center">{{ entry.date }}</td>
<td class="text-center">{{ entry.requestor }}</td>
<td class="text-center">{{ entry.req_char }}</td>
<td class="text-center">{{ entry.group }}</td>
<td class="text-center">{{ entry.req_char.corporation_name }}</td>
<td class="text-center">{{ entry.type_to_str }}</td>
{% if entry.request_type is None %}
<td class="text-center"> Removed</td>
@@ -55,10 +52,12 @@
All times displayed are EVE/UTC.
</p>
</div>
{% else %}
<div class="alert alert-warning text-center">
{% else %}
<div class="clearfix"></div>
<br>
<div class="alert alert-warning text-center">
{% trans "No entries found for this group." %}
</div>
</div>
{% endif %}
</div>
</div>
@@ -67,6 +66,7 @@
{% block extra_javascript %}
{% include 'bundles/datatables-js.html' %}
<script type="text/javascript" src="{% static 'js/filterDropDown/filterDropDown.min.js' %}"></script>
{% endblock %}
{% block extra_css %}
@@ -75,7 +75,33 @@
{% block extra_script %}
$(document).ready(function(){
$('#log-entries').DataTable();
$('#log-entries').DataTable({
order: [[ 0, 'desc' ], [ 1, 'asc' ] ],
filterDropDown:
{
columns: [
{
idx: 1
},
{
idx: 2
},
{
idx: 3
},
{
idx: 4
},
{
idx: 5
},
{
idx: 6
}
],
bootstrap: true
},
});
});
{% endblock %}

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

@@ -15,17 +15,14 @@
{{ group.name }} - {% trans 'Members' %}
</div>
<div class="panel-body">
<p>
<span class="pull-right">
&nbsp;
<a class="btn btn-default" href="{% url 'groupmanagement:membership' %}" role="button">
Back
</a>
</span>
<p>
<a class="btn btn-default" href="{% url 'groupmanagement:membership' %}" role="button">
Back
</a>
</p>
{% if group.user_set %}
<div class="table-responsive">
<table class="table table-striped" id="tab_group_members">
<table class="table table-aa" id="tab_group_members">
<thead>
<tr>
<th class="text-right">{% trans "Portrait" %}</th>

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

@@ -16,7 +16,7 @@
<div class="panel-body">
{% if groups %}
<div class="table-responsive">
<table class="table table-striped">
<table class="table table-aa">
<thead>
<tr>
<th class="text-center">{% trans "Name" %}</th>

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

@@ -9,7 +9,7 @@ url
<div class="col-lg-12">
<h1 class="page-header text-center">{% trans "Available Groups" %}</h1>
{% if groups %}
<table class="table table-striped">
<table class="table table-aa">
<thead>
<tr>
<th class="text-center">{% trans "Name" %}</th>

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

@@ -30,7 +30,7 @@
<div class="panel-body">
{% if acceptrequests %}
<div class="table-responsive">
<table class="table table-striped">
<table class="table table-aa">
<thead>
<tr>
<th class="text-center"></th>
@@ -89,7 +89,7 @@
<div class="panel-body">
{% if leaverequests %}
<div class="table-responsive">
<table class="table table-striped">
<table class="table table-aa">
<thead>
<tr>
<th class="text-center"></th>