nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-05-27 10:44:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

ui: Use Bootstrap 5 styling for all alerts

Browse Source 
- Ensure that .sr-only is replaced with newer classes.

- Ensure that icons are present for all alerts.

- Use flex-box for display of icons on the left center of the alert.

- .close has been renamed to .btn-close.

- × is no longer required for close buttons.

Tests:

- Visually verify all the changes by triggering them with code changes.

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-13 16:30:57 -08:00 committed by Veiko Aasa
parent ac6cca95e3
commit 62dad9336b
No known key found for this signature in database
GPG Key ID: 478539CAE680674E
26 changed files with 390 additions and 193 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
plinth/modules/backups/templates/backups_add_remote_repository.html
View File

@ -15,13 +15,19 @@
{{ form|bootstrap }} {{ form|bootstrap }}
<div class="alert alert-warning" role="alert"> <div class="alert alert-warning d-flex align-items-center" role="alert">
{% blocktrans trimmed %} <div class="me-2">
The credentials for this repository are stored on your {{ box_name }}. <span class="fa fa-exclamation-triangle" aria-hidden="true"></span>
<br /> <span class="visually-hidden">{% trans "Caution:" %}</span>
To restore a backup on a new {{ box_name }} you need the SSH </div>
credentials and, if chosen, the encryption passphrase. <div>
{% endblocktrans %} {% blocktrans trimmed %}
The credentials for this repository are stored on your {{ box_name }}.
<br />
To restore a backup on a new {{ box_name }} you need the SSH credentials
and, if chosen, the encryption passphrase.
{% endblocktrans %}
</div>
</div> </div>
<input type="submit" class="btn btn-primary" <input type="submit" class="btn btn-primary"

18
plinth/modules/backups/templates/backups_upload.html
View File

@ -22,13 +22,17 @@
</p> </p>
{% if max_filesize %} {% if max_filesize %}
<div class="alert alert-warning" role="alert"> <div class="alert alert-warning d-flex align-items-center" role="alert">
<span class="fa fa-exclamation-triangle" aria-hidden="true"></span> <div class="me-2">
<span class="sr-only">{% trans "Caution:" %}</span> <span class="fa fa-exclamation-triangle" aria-hidden="true"></span>
{% blocktrans trimmed %} <span class="visually-hidden">{% trans "Caution:" %}</span>
You have {{ max_filesize }} available to restore a backup. </div>
Exceeding this limit can leave your {{ box_name }} unusable. <div>
{% endblocktrans %} {% blocktrans trimmed %}
You have {{ max_filesize }} available to restore a backup.
Exceeding this limit can leave your {{ box_name }} unusable.
{% endblocktrans %}
</div>
</div> </div>
{% endif %} {% endif %}

8
plinth/modules/backups/templates/verify_ssh_hostkey.html
View File

@ -21,7 +21,13 @@
{% endblocktrans %} {% endblocktrans %}
</p> </p>
{% if form.keyscan_error %} {% if form.keyscan_error %}
<pre class="alert alert-danger">{{ form.keyscan_error }}</pre> <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>
<pre class="mb-0">{{ form.keyscan_error }}</pre>
</div>
{% endif %} {% endif %}
{% else %} {% else %}
<p> <p>

10
plinth/modules/diagnostics/templates/diagnostics_app.html
View File

@ -25,8 +25,14 @@
{% if results %} {% if results %}
{% include "diagnostics_results.html" with results=results %} {% include "diagnostics_results.html" with results=results %}
{% elif exception %} {% elif exception %}
<div class="alert alert-danger" role="alert"> <div class="alert alert-danger d-flex align-items-center" role="alert">
{{ exception }} <div class="me-2">
<span class="fa fa-exclamation-triangle" aria-hidden="true"></span>
<span class="visually-hidden">{% trans "Caution:" %}</span>
</div>
<div>
{{ exception }}
</div>
</div> </div>
{% else %} {% else %}
<p>{% trans "This app does not support diagnostics" %}</p> <p>{% trans "This app does not support diagnostics" %}</p>

10
plinth/modules/diagnostics/templates/diagnostics_full.html
View File

@ -53,8 +53,14 @@
{% if app_data.diagnosis %} {% if app_data.diagnosis %}
{% include "diagnostics_results.html" with results=app_data.diagnosis %} {% include "diagnostics_results.html" with results=app_data.diagnosis %}
{% elif app_data.exception %} {% elif app_data.exception %}
<div class="alert alert-danger" role="alert"> <div class="alert alert-danger d-flex align-items-center" role="alert">
{{ app_data.exception }} <div class="me-2">
<span class="fa fa-exclamation-triangle" aria-hidden="true"></span>
<span class="visually-hidden">{% trans "Caution:" %}</span>
</div>
<div>
{{ app_data.exception }}
</div>
</div> </div>
{% else %} {% else %}
<p><span class="fa fa-hourglass-o"></span></p> <p><span class="fa fa-hourglass-o"></span></p>

42
plinth/modules/help/templates/help_about.html
View File

@ -14,22 +14,34 @@
</p> </p>
{% if version %} {% if version %}
<div class="alert {% if new_version %}alert-warning{% else %}alert-success{% endif %}"> <div class="alert {% if new_version %}alert-warning{% else %}alert-success{% endif %}
{% blocktrans trimmed %} d-flex align-items-center">
You are running {{ os_release }} and {{ box_name }} version {{ version }}. <div class="me-2">
{% endblocktrans %} {% if new_version %}
<span class="fa fa-exclamation-triangle" aria-hidden="true"></span>
<span class="visually-hidden">{% trans "Caution:" %}</span>
{% else %}
<span class="fa fa-check-circle" aria-hidden="true"></span>
<span class="visually-hidden">{% trans "Success:" %}</span>
{% endif %}
</div>
<div>
{% blocktrans trimmed %}
You are running {{ os_release }} and {{ box_name }} version {{ version }}.
{% endblocktrans %}
{% if new_version %} {% if new_version %}
{% url 'upgrades:index' as upgrades_url %} {% url 'upgrades:index' as upgrades_url %}
{% blocktrans trimmed %} {% blocktrans trimmed %}
There is a new {{ box_name }} version There is a new {{ box_name }} version
<a href="{{ upgrades_url }}">available</a>. <a href="{{ upgrades_url }}">available</a>.
{% endblocktrans %} {% endblocktrans %}
{% else %} {% else %}
{% blocktrans trimmed %} {% blocktrans trimmed %}
{{ box_name }} is up to date. {{ box_name }} is up to date.
{% endblocktrans %} {% endblocktrans %}
{% endif %} {% endif %}
</div>
</div> </div>
{% endif %} {% endif %}

20
plinth/modules/help/templates/statuslog.html
View File

@ -18,14 +18,18 @@
{% endblocktrans %} {% endblocktrans %}
</p> </p>
<p class="alert alert-warning"> <div class="alert alert-warning d-flex align-items-center">
<span class="fa fa-exclamation-triangle" aria-hidden="true"></span> <div class="me-2">
<span class="sr-only">{% trans "Caution:" %}</span> <span class="fa fa-exclamation-triangle" aria-hidden="true"></span>
{% blocktrans trimmed %} <span class="visually-hidden">{% trans "Caution:" %}</span>
Please remove any personal information from the log before submitting the </div>
bug report. <div>
{% endblocktrans %} {% blocktrans trimmed %}
</p> Please remove any personal information from the log before submitting
the bug report.
{% endblocktrans %}
</div>
</div>
<p> <p>
<pre class="status-log">{{ data }}</pre> <pre class="status-log">{{ data }}</pre>

14
plinth/modules/kiwix/templates/kiwix-add-package.html
View File

@ -20,10 +20,16 @@
</p> </p>
{% if max_filesize %} {% if max_filesize %}
<div class="alert alert-warning" role="alert"> <div class="alert alert-warning d-flex align-items-center" role="alert">
{% blocktrans trimmed %} <div class="me-2">
You have {{ max_filesize }} of free disk space available. <span class="fa fa-exclamation-triangle" aria-hidden="true"></span>
{% endblocktrans %} <span class="visually-hidden">{% trans "Caution:" %}</span>
</div>
<div>
{% blocktrans trimmed %}
You have {{ max_filesize }} of free disk space available.
{% endblocktrans %}
</div>
</div> </div>
{% endif %} {% endif %}

17
plinth/modules/matrixsynapse/templates/matrix-synapse-pre-setup.html
View File

@ -22,11 +22,18 @@
{% endblocktrans %} {% endblocktrans %}
</p> </p>
<div class="alert alert-warning" role="alert"> <div class="alert alert-warning d-flex align-items-center" role="alert">
{% blocktrans trimmed %} <div class="me-2">
<strong>Warning!</strong> Changing the domain name after this step will <span class="fa fa-exclamation-triangle" aria-hidden="true"></span>
require uninstalling and reinstalling the app which will wipe app's data. <span class="visually-hidden">{% trans "Caution:" %}</span>
{% endblocktrans %} </div>
<div>
{% blocktrans trimmed %}
<strong>Warning!</strong> Changing the domain name after this step will
require uninstalling and reinstalling the app which will wipe app's
data.
{% endblocktrans %}
</div>
</div> </div>
{% if not domain_names %} {% if not domain_names %}

22
plinth/modules/matrixsynapse/templates/matrix-synapse.html
View File

@ -70,14 +70,20 @@
{% endif %} {% endif %}
{% if certificate_status != "valid" %} {% if certificate_status != "valid" %}
<div class="alert alert-warning" role="alert"> <div class="alert alert-warning d-flex align-items-center" role="alert">
{% url 'letsencrypt:index' as letsencrypt_url %} <div class="me-2">
{% blocktrans trimmed %} <span class="fa fa-exclamation-triangle" aria-hidden="true"></span>
The configured domain name is using a self-signed certificate. <span class="visually-hidden">{% trans "Caution:" %}</span>
Federation with other Matrix Synapse instances requires a valid TLS </div>
certificate. Please go to <a href="{{ letsencrypt_url }}">Let's <div>
Encrypt</a> to obtain one. {% url 'letsencrypt:index' as letsencrypt_url %}
{% endblocktrans %} {% blocktrans trimmed %}
The configured domain name is using a self-signed certificate.
Federation with other Matrix Synapse instances requires a valid TLS
certificate. Please go to <a href="{{ letsencrypt_url }}">Let's
Encrypt</a> to obtain one.
{% endblocktrans %}
</div>
</div> </div>
{% endif %} {% endif %}
{% endblock %} {% endblock %}

10
plinth/modules/names/templates/names.html
View File

@ -122,8 +122,14 @@
</form> </form>
</p> </p>
{% else %} {% else %}
<div class="alert alert-danger"> <div class="alert alert-danger d-flex align-items-center">
{% trans "Error retrieving status:" %} {{ resolved_status_error }} <div class="me-2">
<span class="fa fa-exclamation-triangle" aria-hidden="true"></span>
<span class="visually-hidden">{% trans "Caution:" %}</span>
</div>
<div>
{% trans "Error retrieving status:" %} {{ resolved_status_error }}
</div>
</div> </div>
{% endif %} {% endif %}

95
plinth/modules/networks/templates/connection_show.html
View File

@ -18,15 +18,19 @@
<div class="row"> <div class="row">
<div class="col-md-8 offset-md-2"> <div class="col-md-8 offset-md-2">
{% if connection.primary %} {% if connection.primary %}
<div class="alert alert-warning" role="alert"> <div class="alert alert-warning d-flex align-items-center" role="alert">
<span class="fa fa-exclamation-triangle" aria-hidden="true"></span> <div class="me-2">
<span class="sr-only">{% trans "Caution:" %}</span> <span class="fa fa-exclamation-triangle" aria-hidden="true"></span>
{% blocktrans trimmed %} <span class="visually-hidden">{% trans "Caution:" %}</span>
This is the primary connection that {{ box_name }} relies on for </div>
Internet connectivity. Altering it may render your {{ box_name }} <div>
unreachable. Ensure that you have other means to access {% blocktrans trimmed %}
{{ box_name }} before altering this connection. This is the primary connection that {{ box_name }} relies on for
{% endblocktrans %} Internet connectivity. Altering it may render your {{ box_name }}
unreachable. Ensure that you have other means to access
{{ box_name }} before altering this connection.
{% endblocktrans %}
</div>
</div> </div>
{% endif %} {% endif %}
@ -279,15 +283,20 @@
</div> </div>
</div> </div>
<div class="alert alert-info"> <div class="alert alert-info d-flex align-items-center" role="alert">
<span class="fa fa-info-circle" aria-hidden="true"></span> <div class="me-2">
{% blocktrans trimmed %} <span class="fa fa-info-circle" aria-hidden="true"></span>
This interface should be connected to a local <span class="visually-hidden">{% trans "Info:" %}</span>
network/machine. If you connect this interface to a </div>
public network, services meant to be available only <div>
internally will become available externally. This is a {% blocktrans trimmed %}
security risk. This interface should be connected to a local
{% endblocktrans %} network/machine. If you connect this interface to a
public network, services meant to be available only
internally will become available externally. This is a
security risk.
{% endblocktrans %}
</div>
</div> </div>
{% elif connection.zone == "external" %} {% elif connection.zone == "external" %}
<div class="list-group list-group-two-column"> <div class="list-group list-group-two-column">
@ -299,14 +308,19 @@
</div> </div>
</div> </div>
<div class="alert alert-info"> <div class="alert alert-info d-flex align-items-center" role="alert">
<span class="fa fa-info-circle" aria-hidden="true"></span> <div class="me-2">
{% blocktrans trimmed %} <span class="fa fa-info-circle" aria-hidden="true"></span>
This interface should receive your Internet connection. <span class="visually-hidden">{% trans "Info:" %}</span>
If you connect it to a local network/machine, many </div>
services meant to available only internally will not be <div>
available. {% blocktrans trimmed %}
{% endblocktrans %} This interface should receive your Internet connection.
If you connect it to a local network/machine, many
services meant to available only internally will not be
available.
{% endblocktrans %}
</div>
</div> </div>
{% else %} {% else %}
<div class="list-group list-group-two-column"> <div class="list-group list-group-two-column">
@ -318,18 +332,23 @@
</div> </div>
</div> </div>
<div class="alert alert-info"> <div class="alert alert-info d-flex align-items-center" role="alert">
<span class="fa fa-info-circle" aria-hidden="true"></span> <div class="me-2">
{% blocktrans trimmed %} <span class="fa fa-info-circle" aria-hidden="true"></span>
This interface is not maintained by {{ box_name }}. For security, <span class="visually-hidden">{% trans "Info:" %}</span>
it is automatically assigned to the external zone. </div>
{% endblocktrans %} <div>
{% blocktrans trimmed %} {% blocktrans trimmed %}
This interface should receive your Internet connection. This interface is not maintained by {{ box_name }}. For security,
If you connect it to a local network/machine, many it is automatically assigned to the external zone.
services meant to available only internally will not be {% endblocktrans %}
available. {% blocktrans trimmed %}
{% endblocktrans %} This interface should receive your Internet connection.
If you connect it to a local network/machine, many
services meant to available only internally will not be
available.
{% endblocktrans %}
</div>
</div> </div>
{% endif %} {% endif %}
</div> </div>

13
plinth/modules/networks/templates/connections_fields.html
View File

@ -6,11 +6,20 @@
{% load i18n %} {% load i18n %}
{% if form.non_field_errors %} {% if form.non_field_errors %}
<div class="alert alert-danger"> <div class="alert alert-danger alert-dismissible
<a class="close" data-dismiss="alert">&times;</a> d-flex align-items-center fade show">
<div class="me-2">
<span class="fa fa-exclamation-triangle" aria-hidden="true"></span>
<span class="visually-hidden">{% trans "Error:" %}</span>
</div>
<div>
{% for non_field_error in form.non_field_errors %} {% for non_field_error in form.non_field_errors %}
{{ non_field_error }} {{ non_field_error }}
{% endfor %} {% endfor %}
<button type="button" class="btn-close" data-bs-dismiss="alert"
aria-label="{% trans "Close" %}">
</button>
</div>
</div> </div>
{% endif %} {% endif %}

12
plinth/modules/nextcloud/__init__.py
View File

@ -21,6 +21,15 @@ from plinth.utils import format_lazy
from . import manifest, privileged from . import manifest, privileged
_alert = '''
<div class="alert alert-warning d-flex align-items-center" role="alert">
<div class="me-2">
<span class="fa fa-exclamation-triangle" aria-hidden="true"></span>
<span class="visually-hidden">{}</span>
</div>
<div>{}</div>
</div>
'''
_description = [ _description = [
_('Nextcloud is a self-hosted productivity platform which provides ' _('Nextcloud is a self-hosted productivity platform which provides '
'private and secure functions for file sharing, collaborative work, ' 'private and secure functions for file sharing, collaborative work, '
@ -36,8 +45,7 @@ _description = [
'and legal reviews are done by the upstream project and not by ' 'and legal reviews are done by the upstream project and not by '
'Debian/{box_name}. Updates are performed following an independent ' 'Debian/{box_name}. Updates are performed following an independent '
'cycle.'), box_name=_(cfg.box_name)), 'cycle.'), box_name=_(cfg.box_name)),
format_lazy('<div class="alert alert-warning" role="alert">{}</div>', format_lazy(_alert, _('Caution:'), _('This app is experimental.')),
_('This app is experimental.')),
] ]

19
plinth/modules/pagekite/templates/pagekite_custom_services.html
View File

@ -10,13 +10,18 @@
{% block content %} {% block content %}
<h3>{% trans 'Add custom PageKite service' %}</h3> <h3>{% trans 'Add custom PageKite service' %}</h3>
<div class="alert alert-warning" role="alert"> <div class="alert alert-warning d-flex align-items-center" role="alert">
{% blocktrans trimmed %} <div class="me-2">
<b>Warning:</b><br>Your PageKite frontend server may not support <span class="fa fa-exclamation-triangle" aria-hidden="true"></span>
all the protocol/port combinations that you are able to define <span class="visually-hidden">{% trans "Caution:" %}</span>
here. For example, HTTPS on ports other than 443 is known to </div>
cause problems. <div>
{% endblocktrans %} {% blocktrans trimmed %}
Your PageKite frontend server may not support all the protocol/port
combinations that you are able to define here. For example, HTTPS on
ports other than 443 is known to cause problems.
{% endblocktrans %}
</div>
</div> </div>
<form class="form" method="post"> <form class="form" method="post">

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

@ -9,11 +9,17 @@
{% block configuration %} {% block configuration %}
{% if pkg_manager_is_busy %} {% if pkg_manager_is_busy %}
<div class="alert alert-danger"> <div class="alert alert-danger d-flex align-items-center">
{% blocktrans trimmed %} <div class="me-2">
Currently an installation or upgrade is running. <span class="fa fa-exclamation-triangle" aria-hidden="true"></span>
Consider waiting until it's finished before shutting down or restarting. <span class="visually-hidden">{% trans "Caution:" %}</span>
{% endblocktrans %} </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> </div>
{% endif %} {% endif %}

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

@ -30,11 +30,17 @@
{% endif %} {% endif %}
{% if pkg_manager_is_busy %} {% if pkg_manager_is_busy %}
<div class="alert alert-danger"> <div class="alert alert-danger d-flex align-items-center">
{% blocktrans trimmed %} <div class="me-2">
Currently an installation or upgrade is running. <span class="fa fa-exclamation-triangle" aria-hidden="true"></span>
Consider waiting until it's finished before restarting. <span class="visually-hidden">{% trans "Caution:" %}</span>
{% endblocktrans %} </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> </div>
{% endif %} {% endif %}

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

@ -29,11 +29,17 @@
{% endif %} {% endif %}
{% if pkg_manager_is_busy %} {% if pkg_manager_is_busy %}
<div class="alert alert-danger"> <div class="alert alert-danger d-flex align-items-center">
{% blocktrans trimmed %} <div class="me-2">
Currently an installation or upgrade is running. <span class="fa fa-exclamation-triangle" aria-hidden="true"></span>
Consider waiting until it's finished before shutting down. <span class="visually-hidden">{% trans "Caution:" %}</span>
{% endblocktrans %} </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> </div>
{% endif %} {% endif %}

18
plinth/modules/snapshot/templates/snapshot_not_supported.html
View File

@ -7,11 +7,17 @@
{% load i18n %} {% load i18n %}
{% block configuration %} {% block configuration %}
<div id="snapshot-not-supported" class="alert alert-danger"> <div id="snapshot-not-supported" class="alert alert-danger d-flex align-items-center">
{% blocktrans trimmed with fs_types_supported|join:', ' as types_supported %} <div class="me-2">
You have a filesystem of type <strong>{{ fs_type }}</strong>. Snapshots <span class="fa fa-exclamation-triangle" aria-hidden="true"></span>
are currently only available on <strong>{{ types_supported }}</strong> <span class="visually-hidden">{% trans "Caution:" %}</span>
filesystems. </div>
{% endblocktrans %} <div>
{% blocktrans trimmed with fs_types_supported|join:', ' as types_supported %}
You have a filesystem of type <strong>{{ fs_type }}</strong>. Snapshots
are currently only available on <strong>{{ types_supported }}</strong>
filesystems.
{% endblocktrans %}
</div>
</div> </div>
{% endblock %} {% endblock %}

16
plinth/modules/upgrades/templates/backports-firstboot.html
View File

@ -29,11 +29,17 @@
{% endblocktrans %} {% endblocktrans %}
</p> </p>
<div class="alert alert-warning" role="alert"> <div class="alert alert-warning d-flex align-items-center" role="alert">
{% blocktrans trimmed %} <div class="me-2">
<strong>Note:</strong> Once frequent feature updates are activated, <span class="fa fa-exclamation-triangle" aria-hidden="true"></span>
they cannot be deactivated. <span class="visually-hidden">{% trans "Caution:" %}</span>
{% endblocktrans %} </div>
<div>
{% blocktrans trimmed %}
<strong>Note:</strong> Once frequent feature updates are activated, they
cannot be deactivated.
{% endblocktrans %}
</div>
</div> </div>
<form class="form" method="post"> <form class="form" method="post">

20
plinth/modules/upgrades/templates/upgrades_configure.html
View File

@ -72,13 +72,19 @@
{% endif %} {% endif %}
</p> </p>
{% if can_activate_backports and not is_backports_requested %} {% if can_activate_backports and not is_backports_requested %}
<div class="alert alert-warning" role="alert"> <div class="alert alert-warning d-flex align-items-center" role="alert">
{% url 'snapshot:index' as snapshot_url %} <div class="me-2">
{% blocktrans trimmed %} <span class="fa fa-exclamation-triangle" aria-hidden="true"></span>
<strong>Warning!</strong> Once frequent feature updates are activated, <span class="visually-hidden">{% trans "Caution:" %}</span>
they cannot be deactivated. You may wish to take a snapshot using </div>
<a href="{{ snapshot_url }}">Storage Snapshots</a> before continuing. <div>
{% endblocktrans %} {% url 'snapshot:index' as snapshot_url %}
{% blocktrans trimmed %}
<strong>Warning!</strong> Once frequent feature updates are activated,
they cannot be deactivated. You may wish to take a snapshot using
<a href="{{ snapshot_url }}">Storage Snapshots</a> before continuing.
{% endblocktrans %}
</div>
</div> </div>
<p> <p>
<form class="form" method="post" <form class="form" method="post"

14
plinth/modules/users/templates/users_firstboot.html
View File

@ -28,10 +28,16 @@
value="{% trans "Create Account" %}"/> value="{% trans "Create Account" %}"/>
</form> </form>
{% else %} {% else %}
<div class="alert alert-danger" role="alert"> <div class="alert alert-danger d-flex align-items-center" role="alert">
{% blocktrans trimmed %} <div class="me-2">
An administrator account already exists. <span class="fa fa-exclamation-triangle" aria-hidden="true"></span>
{% endblocktrans %} <span class="visually-hidden">{% trans "Caution:" %}</span>
</div>
<div>
{% blocktrans trimmed %}
An administrator account already exists.
{% endblocktrans %}
</div>
</div> </div>
<p> <p>

14
plinth/templates/app.html
View File

@ -25,10 +25,16 @@
{% block status %} {% block status %}
{% if is_running is not None and not is_running %} {% if is_running is not None and not is_running %}
<div id='service-not-running' role="alert" <div id='service-not-running' role="alert"
class="alert alert-danger {{ is_enabled|yesno:',d-none' }}"> class="alert alert-danger d-flex align-items-center {{ is_enabled|yesno:',d-none' }}">
{% blocktrans trimmed with service_name=app_info.name %} <div class="me-2">
Service <em>{{ service_name }}</em> is not running. <span class="fa fa-exclamation-triangle" aria-hidden="true"></span>
{% endblocktrans %} <span class="visually-hidden">{% trans "Caution:" %}</span>
</div>
<div>
{% blocktrans trimmed with service_name=app_info.name %}
Service <em>{{ service_name }}</em> is not running.
{% endblocktrans %}
</div>
</div> </div>
{% endif %} {% endif %}
{% endblock %} {% endblock %}

48
plinth/templates/internal-zone.html
View File

@ -7,26 +7,34 @@
{% block internal_zone_warning %} {% block internal_zone_warning %}
{% for component in firewall %} {% for component in firewall %}
{% if not component.is_external %} {% if not component.is_external %}
<div class="alert alert-info" role="alert"> <div class="alert alert-info d-flex align-items-center" role="alert">
{% blocktrans trimmed with service_name=component.name %} <div class="me-2">
<em>{{ service_name }}</em> is available only on internal networks or <span class="fa fa-info-circle" aria-hidden="true"></span>
when the client is connected to {{ box_name }} through VPN. <span class="visually-hidden">{% trans "Info:" %}</span>
{% endblocktrans %} </div>
<p> <div>
{% with interfaces=component.get_internal_interfaces %} <div>
{% if not interfaces %} {% blocktrans trimmed with service_name=component.name %}
{% blocktrans trimmed %} <em>{{ service_name }}</em> is available only on internal networks
Currently there are no network interfaces configured as or when the client is connected to {{ box_name }} through VPN.
internal. {% endblocktrans %}
{% endblocktrans %} </div>
{% else %} <div>
{% blocktrans trimmed with interface_list=interfaces|join:", " %} {% with interfaces=component.get_internal_interfaces %}
Currently the following network interfaces are configured as {% if not interfaces %}
internal: {{ interface_list }} {% blocktrans trimmed %}
{% endblocktrans %} Currently there are no network interfaces configured as
{% endif %} internal.
{% endwith %} {% endblocktrans %}
</p> {% else %}
{% blocktrans trimmed with interface_list=interfaces|join:", " %}
Currently the following network interfaces are configured as
internal: {{ interface_list }}
{% endblocktrans %}
{% endif %}
{% endwith %}
</div>
</div>
</div> </div>
{% endif %} {% endif %}
{% endfor %} {% endfor %}

31
plinth/templates/messages.html
View File

@ -5,11 +5,30 @@
{% load i18n %} {% load i18n %}
{% for message in messages %} {% for message in messages %}
<div class='alert alert-{{ message.tags }} alert-dismissible'> <div class="alert alert-{{ message.tags }} alert-dismissible
{{ message }} d-flex align-items-center fade show"
<button type="button" class="close" data-dismiss="alert" role="alert">
aria-label="{% trans "Close" %}"> <div class="me-2">
<span aria-hidden="true">&times;</span> {% if message.tags == 'danger' %}
</button> <span class="fa fa-exclamation-triangle" aria-hidden="true"></span>
<span class="visually-hidden">{% trans "Error:" %}</span>
{% elif message.tags == 'warning' %}
<span class="fa fa-exclamation-triangle" aria-hidden="true"></span>
<span class="visually-hidden">{% trans "Caution:" %}</span>
{% elif message.tags == 'info' %}
<span class="fa fa-info-circle" aria-hidden="true"></span>
<span class="visually-hidden">{% trans "Info:" %}</span>
{% elif message.tags == 'success' %}
<span class="fa fa-check-circle" aria-hidden="true"></span>
<span class="visually-hidden">{% trans "Success:" %}</span>
{% endif %}
</div>
<div>
{{ message }}
<button type="button" class="btn-close" data-bs-dismiss="alert"
aria-label="{% trans "Close" %}">
</button>
</div>
</div> </div>
{% endfor %} {% endfor %}

44
plinth/templates/setup.html
View File

@ -37,24 +37,36 @@
{% csrf_token %} {% csrf_token %}
{% if has_unavailable_packages %} {% if has_unavailable_packages %}
<div class="alert alert-warning" role="alert"> <div class="alert alert-warning d-flex align-items-center" role="alert">
{% blocktrans trimmed %} <div class="me-2">
This application is currently not available in your distribution. <span class="fa fa-exclamation-triangle" aria-hidden="true"></span>
{% endblocktrans %} <span class="visually-hidden">{% trans "Caution:" %}</span>
<button type="submit" class="btn btn-default btn-sm" name="refresh-packages"> </div>
<span class="fa fa-refresh"></span> {% trans "Check again" %} <div>
</button> {% blocktrans trimmed %}
This application is currently not available in your distribution.
{% endblocktrans %}
<button type="submit" class="btn btn-default btn-sm" name="refresh-packages">
<span class="fa fa-refresh"></span> {% trans "Check again" %}
</button>
</div>
</div> </div>
{% elif package_conflicts and package_conflicts_action.value != 'ignore' %} {% elif package_conflicts and package_conflicts_action.value != 'ignore' %}
<div class="alert alert-warning" role="alert"> <div class="alert alert-warning d-flex align-items-center" role="alert">
{% blocktrans trimmed %} <div class="me-2">
<strong>Conflicting Packages:</strong> Some packages installed on <span class="fa fa-exclamation-triangle" aria-hidden="true"></span>
the system conflict with the installation of this app. The following <span class="visually-hidden">{% trans "Caution:" %}</span>
packages will be removed if you proceed: </div>
{% endblocktrans %} <div>
{% for package in package_conflicts %} {% blocktrans trimmed %}
{{ package }} <strong>Conflicting Packages:</strong> Some packages installed on
{% endfor %} the system conflict with the installation of this app. The following
packages will be removed if you proceed:
{% endblocktrans %}
{% for package in package_conflicts %}
{{ package }}
{% endfor %}
</div>
</div> </div>
{% endif %} {% endif %}