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

Merge branch 'master' of gitlab.com:allianceauth/allianceauth into v5.x

Browse Source
This commit is contained in:
Joel Falknau
2025-07-04 10:02:40 +10:00
parent 6dede0ddb5 34b94ae685
commit 196d97271c
122 changed files with 4079 additions and 2305 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
allianceauth/admin_status/templates/admin-status/celery_bar_partial.html
View File

@@ -2,7 +2,7 @@
{% load admin_status %}
<div
class="progress-bar bg-{{ level }} task-status-progress-bar"
class="progress-bar text-bg-{{ level }} task-status-progress-bar"
role="progressbar"
aria-valuenow="{% decimal_widthratio tasks_count tasks_total 100 %}"
aria-valuemin="0"

34
allianceauth/admin_status/templates/admin-status/overview.html
View File

@@ -11,15 +11,31 @@
<div>
<ul class="list-group">
{% for notif in notifications %}
{% if not notif.is_hidden %}
<li class="list-group-item">
<span class="badge bg-info me-2">{{ notif.application_name }}</span>
<a href="{{ notif.announcement_url }}" target="_blank">#{{ notif.announcement_number }} {{ notif.announcement_text }}</a>
</li>
{% endif %}
<li class="list-group-item">
<span class="badge text-bg-success me-2">{% translate "Open" %}</span>
<a href="{{ notif.web_url }}" target="_blank">#{{ notif.iid }} {{ notif.title }}</a>
</li>
{% empty %}
<div class="alert alert-primary" role="alert">
{% translate "No notifications at this time" %}
</div>
{% endfor %}
</ul>
{# TODO maybe add some disclaimer that those are managed by application devs? #}
<div class="text-end pt-3">
<a href="https://gitlab.com/allianceauth/allianceauth/issues" target="_blank" class="me-1 text-decoration-none">
<span class="badge text-bg-danger">
<i class="fab fa-gitlab" aria-hidden="true"></i>
{% translate 'Powered by GitLab' %}
</span>
</a>
<a href="https://discord.com/invite/fjnHAmk" target="_blank" class="text-decoration-none">
<span class="badge text-bg-info">
<i class="fab fa-discord" aria-hidden="true"></i>
{% translate 'Support Discord' %}
</span>
</a>
</div>
</div>
</div>
</div>
@@ -42,7 +58,7 @@
</div>
</li>
<li class="list-group-item bg-{% if latest_patch %}success{% elif latest_minor %}warning{% else %}danger{% endif %} w-100">
<li class="list-group-item text-bg-{% if latest_patch %}success{% elif latest_minor %}warning{% else %}danger{% endif %} w-100">
<a class="btn h-100 w-100" href="https://gitlab.com/allianceauth/allianceauth/-/releases/v{{ latest_patch_version }}">
<h5 class="list-group-item-heading">{% translate "Latest Stable" %}</h5>
@@ -55,7 +71,7 @@
</li>
{% if latest_beta %}
<li class="list-group-item bg-info w-100">
<li class="list-group-item text-bg-info w-100">
<a class="btn h-100 w-100" href="https://gitlab.com/allianceauth/allianceauth/-/releases/v{{ latest_beta_version }}">
<h5 class="list-group-item-heading">{% translate "Latest Pre-Release" %}</h5>