mirror of
https://gitlab.com/allianceauth/allianceauth.git
synced 2025-07-09 20:40:17 +02:00
[REMOVE] Unnecessary whitespaces
I know, purely aesthetic, but it bugs the hell out of me …
This commit is contained in:
parent
8b7e57494c
commit
aa1cb96c8a
@ -32,7 +32,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.card-login {
|
.card-login {
|
||||||
background: rgba(48 48 48 / 0.7);
|
background: rgba(48 48 48 / 0.7);
|
||||||
color: rgb(255 255 255);
|
color: rgb(255 255 255);
|
||||||
padding-bottom: 21px;
|
padding-bottom: 21px;
|
||||||
}
|
}
|
||||||
|
@ -45,7 +45,7 @@
|
|||||||
<td class="text-center">{{ fat.user }}</td>
|
<td class="text-center">{{ fat.user }}</td>
|
||||||
<td class="text-center">{{ fat.character.character_name }}</td>
|
<td class="text-center">{{ fat.character.character_name }}</td>
|
||||||
<td class="text-center">
|
<td class="text-center">
|
||||||
{% if fat.station != "No Station" %}
|
{% if fat.station != "No Station" %}
|
||||||
{% translate "Docked in" %}
|
{% translate "Docked in" %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{{ fat.system }}
|
{{ fat.system }}
|
||||||
|
@ -20,7 +20,7 @@
|
|||||||
<a href="{% url 'fatlink:user_statistics_month' char_id previous_month|date:'Y' previous_month|date:'m' %}" class="btn btn-info">
|
<a href="{% url 'fatlink:user_statistics_month' char_id previous_month|date:'Y' previous_month|date:'m' %}" class="btn btn-info">
|
||||||
{% translate "Previous month" %}
|
{% translate "Previous month" %}
|
||||||
</a>
|
</a>
|
||||||
<a href="{% url 'fatlink:user_statistics_month' char_id next_month|date:'Y' next_month|date:'m' %}" class="btn btn-info">
|
<a href="{% url 'fatlink:user_statistics_month' char_id next_month|date:'Y' next_month|date:'m' %}" class="btn btn-info">
|
||||||
{% translate "Next month" %}
|
{% translate "Next month" %}
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
@ -59,7 +59,7 @@
|
|||||||
<div class="card card-default">
|
<div class="card card-default">
|
||||||
<div class="card-header">
|
<div class="card-header">
|
||||||
<div class="card-title mb-0">
|
<div class="card-title mb-0">
|
||||||
{% blocktranslate count links=n_created_fats trimmed %}
|
{% blocktranslate count links=n_created_fats trimmed %}
|
||||||
{{ user }} has created one link this month.
|
{{ user }} has created one link this month.
|
||||||
{% plural %}
|
{% plural %}
|
||||||
{{ user }} has created {{ links }} links this month.
|
{{ user }} has created {{ links }} links this month.
|
||||||
@ -88,14 +88,14 @@
|
|||||||
<td class="text-center">{{ link.fatdatetime }}</td>
|
<td class="text-center">{{ link.fatdatetime }}</td>
|
||||||
<td class="text-center">{{ link.duration }}</td>
|
<td class="text-center">{{ link.duration }}</td>
|
||||||
<td class="text-center">
|
<td class="text-center">
|
||||||
<a href="{% url 'fatlink:modify' link.hash %}">
|
<a href="{% url 'fatlink:modify' link.hash %}">
|
||||||
<button type="button" class="btn btn-info">
|
<button type="button" class="btn btn-info">
|
||||||
<i class="fa-solid fa-pen-to-square fa-fw"></i>
|
<i class="fa-solid fa-pen-to-square fa-fw"></i>
|
||||||
</button>
|
</button>
|
||||||
</a>
|
</a>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -19,7 +19,7 @@
|
|||||||
<a href="{% url "fatlink:statistics_month" previous_month|date:"Y" previous_month|date:"m" %}" class="btn btn-info">{% translate "Previous month" %}</a>
|
<a href="{% url "fatlink:statistics_month" previous_month|date:"Y" previous_month|date:"m" %}" class="btn btn-info">{% translate "Previous month" %}</a>
|
||||||
|
|
||||||
{% if next_month %}
|
{% if next_month %}
|
||||||
<a href="{% url 'fatlink:statistics_month' next_month|date:"Y" next_month|date:"m" %}" class="btn btn-info">{% translate "Next month" %}</a>
|
<a href="{% url 'fatlink:statistics_month' next_month|date:"Y" next_month|date:"m" %}" class="btn btn-info">{% translate "Next month" %}</a>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
</h1>
|
</h1>
|
||||||
|
@ -377,12 +377,12 @@ def modify_fatlink_view(request, fat_hash=None):
|
|||||||
if request.GET.get('removechar', None):
|
if request.GET.get('removechar', None):
|
||||||
character_id = request.GET.get('removechar')
|
character_id = request.GET.get('removechar')
|
||||||
character = EveCharacter.objects.get(character_id=character_id)
|
character = EveCharacter.objects.get(character_id=character_id)
|
||||||
logger.debug(f"Removing character {character.character_name} from fleetactivitytracking {fatlink}")
|
logger.debug(f"Removing character {character.character_name} from fleetactivitytracking {fatlink}")
|
||||||
|
|
||||||
Fat.objects.filter(fatlink=fatlink).filter(character=character).delete()
|
Fat.objects.filter(fatlink=fatlink).filter(character=character).delete()
|
||||||
|
|
||||||
if request.GET.get('deletefat', None):
|
if request.GET.get('deletefat', None):
|
||||||
logger.debug("Removing fleetactivitytracking %s" % fatlink)
|
logger.debug("Removing fleetactivitytracking %s" % fatlink)
|
||||||
fatlink.delete()
|
fatlink.delete()
|
||||||
return redirect('fatlink:view')
|
return redirect('fatlink:view')
|
||||||
|
|
||||||
|
@ -74,11 +74,11 @@ class Migration(migrations.Migration):
|
|||||||
migrations.CreateModel(
|
migrations.CreateModel(
|
||||||
name='AuthGroup',
|
name='AuthGroup',
|
||||||
fields=[
|
fields=[
|
||||||
('group', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, primary_key=True, serialize=False, to='auth.Group')),
|
('group', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, primary_key=True, serialize=False, to='auth.Group')),
|
||||||
('internal', models.BooleanField(default=True, help_text='Internal group, users cannot see, join or request to join this group.<br>Used for groups such as Members, Corp_*, Alliance_* etc.<br><b>Overrides Hidden and Open options when selected.</b>')),
|
('internal', models.BooleanField(default=True, help_text='Internal group, users cannot see, join or request to join this group.<br>Used for groups such as Members, Corp_*, Alliance_* etc.<br><b>Overrides Hidden and Open options when selected.</b>')),
|
||||||
('hidden', models.BooleanField(default=True, help_text='Group is hidden from users but can still join with the correct link.')),
|
('hidden', models.BooleanField(default=True, help_text='Group is hidden from users but can still join with the correct link.')),
|
||||||
('open', models.BooleanField(default=False, help_text='Group is open and users will be automatically added upon request. <br>If the group is not open users will need their request manually approved.')),
|
('open', models.BooleanField(default=False, help_text='Group is open and users will be automatically added upon request. <br>If the group is not open users will need their request manually approved.')),
|
||||||
('description', models.CharField(max_length=512, blank=True, help_text='Description of the group shown to users.', )),
|
('description', models.CharField(max_length=512, blank=True, help_text='Description of the group shown to users.', )),
|
||||||
|
|
||||||
('group_leaders', models.ManyToManyField(related_name='leads_groups', to=settings.AUTH_USER_MODEL, blank=True, help_text='Group leaders can process group requests for this group specifically. Use the auth.group_management permission to allow a user to manage all groups.',)),
|
('group_leaders', models.ManyToManyField(related_name='leads_groups', to=settings.AUTH_USER_MODEL, blank=True, help_text='Group leaders can process group requests for this group specifically. Use the auth.group_management permission to allow a user to manage all groups.',)),
|
||||||
],
|
],
|
||||||
|
@ -24,7 +24,7 @@
|
|||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
|
|
||||||
{% if not show_leave_tab %}
|
{% if not show_leave_tab %}
|
||||||
<li>
|
<li>
|
||||||
<a class="nav-link" id="leave-tab" data-bs-toggle="tab" data-bs-target="#leave" type="button" role="tab" aria-controls="leave" aria-selected="false">
|
<a class="nav-link" id="leave-tab" data-bs-toggle="tab" data-bs-target="#leave" type="button" role="tab" aria-controls="leave" aria-selected="false">
|
||||||
{% translate "Leave Requests" %}
|
{% translate "Leave Requests" %}
|
||||||
@ -105,7 +105,7 @@
|
|||||||
{% endif %}
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{% if not show_leave_tab %}
|
{% if not show_leave_tab %}
|
||||||
<div id="leave" class="tab-pane">
|
<div id="leave" class="tab-pane">
|
||||||
{% if leaverequests %}
|
{% if leaverequests %}
|
||||||
<div class="table-responsive">
|
<div class="table-responsive">
|
||||||
|
@ -13,7 +13,7 @@ class ChoiceInline(admin.TabularInline):
|
|||||||
@admin.register(ApplicationQuestion)
|
@admin.register(ApplicationQuestion)
|
||||||
class QuestionAdmin(admin.ModelAdmin):
|
class QuestionAdmin(admin.ModelAdmin):
|
||||||
fieldsets = [
|
fieldsets = [
|
||||||
(None, {'fields': ['title', 'help_text', 'multi_select']}),
|
(None, {'fields': ['title', 'help_text', 'multi_select']}),
|
||||||
]
|
]
|
||||||
inlines = [ChoiceInline]
|
inlines = [ChoiceInline]
|
||||||
|
|
||||||
|
@ -43,7 +43,7 @@
|
|||||||
<td class="text-center">
|
<td class="text-center">
|
||||||
{% if personal_app.approved == None %}
|
{% if personal_app.approved == None %}
|
||||||
<div class="badge bg-warning">{% translate "Pending" %}</div>
|
<div class="badge bg-warning">{% translate "Pending" %}</div>
|
||||||
{% elif personal_app.approved == True %}
|
{% elif personal_app.approved == True %}
|
||||||
<div class="badge bg-success">{% translate "Approved" %}</div>
|
<div class="badge bg-success">{% translate "Approved" %}</div>
|
||||||
{% else %}
|
{% else %}
|
||||||
<div class="badge bg-danger">{% translate "Rejected" %}</div>
|
<div class="badge bg-danger">{% translate "Rejected" %}</div>
|
||||||
@ -135,7 +135,7 @@
|
|||||||
{% else %}
|
{% else %}
|
||||||
<div class="badge bg-warning">{% translate "Pending" %}</div>
|
<div class="badge bg-warning">{% translate "Pending" %}</div>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% elif app.approved == True %}
|
{% elif app.approved == True %}
|
||||||
<div class="badge bg-success">{% translate "Approved" %}</div>
|
<div class="badge bg-success">{% translate "Approved" %}</div>
|
||||||
{% else %}
|
{% else %}
|
||||||
<div class="badge bg-danger">{% translate "Rejected" %}</div>
|
<div class="badge bg-danger">{% translate "Rejected" %}</div>
|
||||||
@ -179,7 +179,7 @@
|
|||||||
{% else %}
|
{% else %}
|
||||||
<div class="badge bg-warning">{% translate "Pending" %}</div>
|
<div class="badge bg-warning">{% translate "Pending" %}</div>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% elif app.approved == True %}
|
{% elif app.approved == True %}
|
||||||
<div class="badge bg-success">{% translate "Approved" %}</div>
|
<div class="badge bg-success">{% translate "Approved" %}</div>
|
||||||
{% else %}
|
{% else %}
|
||||||
<div class="badge bg-danger">{% translate "Rejected" %}</div>
|
<div class="badge bg-danger">{% translate "Rejected" %}</div>
|
||||||
|
@ -45,7 +45,7 @@
|
|||||||
<td class="text-center">
|
<td class="text-center">
|
||||||
{% if app.approved == None %}
|
{% if app.approved == None %}
|
||||||
<div class="badge bg-warning">{% translate "Pending" %}</div>
|
<div class="badge bg-warning">{% translate "Pending" %}</div>
|
||||||
{% elif app.approved == True %}
|
{% elif app.approved == True %}
|
||||||
<div class="badge bg-success">{% translate "Approved" %}</div>
|
<div class="badge bg-success">{% translate "Approved" %}</div>
|
||||||
{% else %}
|
{% else %}
|
||||||
<div class="badge bg-danger">{% translate "Rejected" %}</div>
|
<div class="badge bg-danger">{% translate "Rejected" %}</div>
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
<div style="width: 350px;">
|
<div style="width: 350px;">
|
||||||
<div class="nav-padding navbar-dark bg-dark text-light px-0 d-flex flex-column overflow-hidden vh-100 auth-logo">
|
<div class="nav-padding navbar-dark bg-dark text-light px-0 d-flex flex-column overflow-hidden vh-100 auth-logo">
|
||||||
{% if user.is_authenticated %}
|
{% if user.is_authenticated %}
|
||||||
<ul style="z-index:5;" id="sidebar-menu" class="navbar-nav flex-column mb-auto overflow-auto pt-2">
|
<ul style="z-index:5;" id="sidebar-menu" class="navbar-nav flex-column mb-auto overflow-auto pt-2">
|
||||||
<li class="d-flex flex-wrap m-2 p-2 pt-0 pb-0 mt-0 mb-0 me-0 pe-0">
|
<li class="d-flex flex-wrap m-2 p-2 pt-0 pb-0 mt-0 mb-0 me-0 pe-0">
|
||||||
<i class="nav-link fas fa-tachometer-alt fa-fw align-self-center me-3 {% navactive request 'authentication:dashboard' %}"></i>
|
<i class="nav-link fas fa-tachometer-alt fa-fw align-self-center me-3 {% navactive request 'authentication:dashboard' %}"></i>
|
||||||
<a class="nav-link flex-fill align-self-center" href="{% url 'authentication:dashboard' %}">
|
<a class="nav-link flex-fill align-self-center" href="{% url 'authentication:dashboard' %}">
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
<!-- Start Moment.js from cdnjs -->
|
<!-- Start Moment.js from cdnjs -->
|
||||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.29.4/moment.min.js" integrity="sha512-+H4iLjY3JsKiF2V6N366in5IQHj2uEsGV7Pp/GRcm0fn76aPAk5V8xB6n8fQhhSonTqTXs/klFz4D0GIn6Br9g==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
|
<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.29.4/moment.min.js" integrity="sha512-+H4iLjY3JsKiF2V6N366in5IQHj2uEsGV7Pp/GRcm0fn76aPAk5V8xB6n8fQhhSonTqTXs/klFz4D0GIn6Br9g==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
|
||||||
{% if locale and LANGUAGE_CODE != 'en' %}
|
{% if locale and LANGUAGE_CODE != 'en' %}
|
||||||
<!-- Moment.JS Not EN-en -->
|
<!-- Moment.JS Not EN-en -->
|
||||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.29.4/locale/{{ LANGUAGE_CODE }}.js" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
|
<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.29.4/locale/{{ LANGUAGE_CODE }}.js" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
<!-- End Moment JS from cdnjs -->
|
<!-- End Moment JS from cdnjs -->
|
||||||
|
@ -121,7 +121,7 @@
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
const updateAllTimers = () => {
|
const updateAllTimers = () => {
|
||||||
const l = timers.length;
|
const l = timers.length;
|
||||||
|
|
||||||
for (let i=0; i < l; ++i) {
|
for (let i=0; i < l; ++i) {
|
||||||
@ -142,7 +142,7 @@
|
|||||||
/**
|
/**
|
||||||
* Set all local time fields
|
* Set all local time fields
|
||||||
*/
|
*/
|
||||||
const setAllLocalTimes = () => {
|
const setAllLocalTimes = () => {
|
||||||
const l = timers.length;
|
const l = timers.length;
|
||||||
|
|
||||||
for (let i=0; i < l; ++i) {
|
for (let i=0; i < l; ++i) {
|
||||||
@ -150,11 +150,11 @@
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
const updateClock = () => {
|
const updateClock = () => {
|
||||||
document.getElementById("current-time").innerHTML = getCurrentEveTimeString();
|
document.getElementById("current-time").innerHTML = getCurrentEveTimeString();
|
||||||
};
|
};
|
||||||
|
|
||||||
const timedUpdate = () => {
|
const timedUpdate = () => {
|
||||||
updateClock();
|
updateClock();
|
||||||
updateAllTimers();
|
updateAllTimers();
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user