nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-09-19 04:59:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

power: Refactor display of package manager busy alerts

Browse Source 
Tests:

- Trigger the message using code change and observe the messages displayed.

Signed-off-by: Sunil Mohan Adapa <sunil@medhas.org>
Reviewed-by: Veiko Aasa <veiko17@disroot.org>
This commit is contained in:
Sunil Mohan Adapa 2024-11-14 08:34:53 -08:00 committed by Veiko Aasa
parent 62dad9336b
commit f6f5b7a478
No known key found for this signature in database
GPG Key ID: 478539CAE680674E
4 changed files with 23 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
plinth/modules/power/templates/power.html
View File

@ -8,20 +8,7 @@
{% block configuration %} {% block configuration %}
{% if pkg_manager_is_busy %} {% include "power_busy_warning.html" %}
<div class="alert alert-danger d-flex align-items-center">
<div class="me-2">
<span class="fa fa-exclamation-triangle" aria-hidden="true"></span>
<span class="visually-hidden">{% trans "Caution:" %}</span>
</div>
<div>
{% blocktrans trimmed %}
Currently an installation or upgrade is running.
Consider waiting until it's finished before shutting down or restarting.
{% endblocktrans %}
</div>
</div>
{% endif %}
<div class="btn-toolbar"> <div class="btn-toolbar">
<a class="btn btn-default btn-md" href="{% url 'power:restart' %}"> <a class="btn btn-default btn-md" href="{% url 'power:restart' %}">

20
plinth/modules/power/templates/power_busy_warning.html Normal file
View File

@ -0,0 +1,20 @@
{% comment %}
# SPDX-License-Identifier: AGPL-3.0-or-later
{% endcomment %}
{% load i18n %}
{% if pkg_manager_is_busy %}
<div class="alert alert-danger d-flex align-items-center">
<div class="me-2">
<span class="fa fa-exclamation-triangle" aria-hidden="true"></span>
<span class="visually-hidden">{% trans "Caution:" %}</span>
</div>
<div>
{% blocktrans trimmed %}
Currently an installation or upgrade is running. Consider waiting
until it's finished before shutting down or restarting.
{% endblocktrans %}
</div>
</div>
{% endif %}

15
plinth/modules/power/templates/power_restart.html
View File

@ -29,20 +29,7 @@
</p> </p>
{% endif %} {% endif %}
{% if pkg_manager_is_busy %} {% include "power_busy_warning.html" %}
<div class="alert alert-danger d-flex align-items-center">
<div class="me-2">
<span class="fa fa-exclamation-triangle" aria-hidden="true"></span>
<span class="visually-hidden">{% trans "Caution:" %}</span>
</div>
<div>
{% blocktrans trimmed %}
Currently an installation or upgrade is running.
Consider waiting until it's finished before shutting down or restarting.
{% endblocktrans %}
</div>
</div>
{% endif %}
<form class="form" method="post"> <form class="form" method="post">
{% csrf_token %} {% csrf_token %}

15
plinth/modules/power/templates/power_shutdown.html
View File

@ -28,20 +28,7 @@
</p> </p>
{% endif %} {% endif %}
{% if pkg_manager_is_busy %} {% include "power_busy_warning.html" %}
<div class="alert alert-danger d-flex align-items-center">
<div class="me-2">
<span class="fa fa-exclamation-triangle" aria-hidden="true"></span>
<span class="visually-hidden">{% trans "Caution:" %}</span>
</div>
<div>
{% blocktrans trimmed %}
Currently an installation or upgrade is running.
Consider waiting until it's finished before shutting down or restarting.
{% endblocktrans %}
</div>
</div>
{% endif %}
<form class="form" method="post"> <form class="form" method="post">
{% csrf_token %} {% csrf_token %}