diff --git a/debian/control b/debian/control index 5654161dc..ea7cfade4 100644 --- a/debian/control +++ b/debian/control @@ -17,7 +17,7 @@ Build-Depends: docbook-xsl, e2fsprogs, gir1.2-nm-1.0, - libjs-bootstrap, + libjs-bootstrap4, python3-all, python3-apt, python3-augeas, @@ -84,7 +84,7 @@ Depends: ldapscripts, # For gdbus used to call hooks into service libglib2.0-bin, - libjs-bootstrap, + libjs-bootstrap4, libjs-jquery, libjs-modernizr, lsof, diff --git a/plinth/modules/backups/templates/backups_delete.html b/plinth/modules/backups/templates/backups_delete.html index 51d901d49..2840f1835 100644 --- a/plinth/modules/backups/templates/backups_delete.html +++ b/plinth/modules/backups/templates/backups_delete.html @@ -12,8 +12,8 @@
{% trans "Delete this archive permanently?" %}
| {% trans "Name" %} | {% trans "Time" %} | diff --git a/plinth/modules/backups/templates/backups_repository.html b/plinth/modules/backups/templates/backups_repository.html index 0be5cfb57..9277f5a8e 100644 --- a/plinth/modules/backups/templates/backups_repository.html +++ b/plinth/modules/backups/templates/backups_repository.html @@ -65,7 +65,7 @@ - + {% if repository.mounted %} {% for archive in repository.archives %} diff --git a/plinth/modules/backups/templates/verify_ssh_hostkey.html b/plinth/modules/backups/templates/verify_ssh_hostkey.html index c660af4a7..caaa1173f 100644 --- a/plinth/modules/backups/templates/verify_ssh_hostkey.html +++ b/plinth/modules/backups/templates/verify_ssh_hostkey.html @@ -40,7 +40,7 @@ {% trans "How to verify?" %} -{{ test }} |
{% if result == 'passed' %}
- {% trans result %}
+ {% trans result %}
{% elif result == 'failed' %}
- {% trans result %}
+ {% trans result %}
{% elif result == 'error' %}
- {% trans result %}
+ {% trans result %}
{% else %}
{{ result }}
{% endif %}
diff --git a/plinth/modules/diaspora/templates/diaspora-pre-setup.html b/plinth/modules/diaspora/templates/diaspora-pre-setup.html
index 15ef66b0b..cf0892860 100644
--- a/plinth/modules/diaspora/templates/diaspora-pre-setup.html
+++ b/plinth/modules/diaspora/templates/diaspora-pre-setup.html
@@ -33,7 +33,7 @@
{% block configuration %}
{% if domain_names|length > 0 %}
- Configuration+{% trans "Configuration" %} |
{{ component.name }} | {% if component.is_enabled %} - + {% trans "Enabled" %} {% else %} - + {% trans "Disabled" %} {% endif %} | {% for port in component.ports_details %} -
|---|---|---|
| {{ port.name }}: @@ -63,16 +63,16 @@ | {% if port.name in internal_enabled_ports and port.name in external_enabled_ports %} - + {% trans "Permitted" %} {% elif port.name in internal_enabled_ports %} - + {% trans "Permitted (internal only)" %} {% elif port.name in external_enabled_ports %} - + {% trans "Permitted (external only)" %} {% else %} - + {% trans "Blocked" %} {% endif %} | diff --git a/plinth/modules/gitweb/templates/gitweb_configure.html b/plinth/modules/gitweb/templates/gitweb_configure.html index 93813c452..0401afc17 100644 --- a/plinth/modules/gitweb/templates/gitweb_configure.html +++ b/plinth/modules/gitweb/templates/gitweb_configure.html @@ -39,7 +39,7 @@