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

Merge branch 'admin-dash-improvement' into 'v2.11.x'

Browse Source 
Improve Admin Celery Bar

See merge request allianceauth/allianceauth!1414
This commit is contained in:
Ariel Rin 2022-05-12 03:57:02 +00:00
commit 945bc92898
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
allianceauth/templates/allianceauth/admin-status/celery_bar_partial.html
View File

@ -1,11 +1,12 @@
{% load humanize %}
{% load admin_status %}
<div
class="progress-bar progress-bar-{{ level }} task-status-progress-bar"
role="progressbar"
aria-valuenow="{% widthratio tasks_count tasks_total 100 %}"
aria-valuenow="{% decimal_widthratio tasks_count tasks_total 100 %}"
aria-valuemin="0"
aria-valuemax="100"
style="width: {% widthratio tasks_count tasks_total 100 %}%;">
{% widthratio tasks_count tasks_total 100 %}%
style="width: {% decimal_widthratio tasks_count tasks_total 100 %}%;">
<p style="margin-top:5px;">{% widthratio tasks_count tasks_total 100 %}%</p>
</div>

5
allianceauth/templatetags/admin_status.py
View File

@ -36,6 +36,11 @@ GITLAB_AUTH_ANNOUNCEMENT_ISSUES_URL = (
logger = logging.getLogger(__name__)
@register.simple_tag()
def decimal_widthratio(this_value, max_value, max_width) -> str:
return str(round(this_value/max_value * max_width, 2))
@register.inclusion_tag('allianceauth/admin-status/overview.html')
def status_overview() -> dict:
response = {