diff --git a/plinth/modules/backups/templates/backups_delete.html b/plinth/modules/backups/templates/backups_delete.html index a3d97ab35..9f16ec78d 100644 --- a/plinth/modules/backups/templates/backups_delete.html +++ b/plinth/modules/backups/templates/backups_delete.html @@ -11,18 +11,20 @@

{% trans "Delete this archive permanently?" %}

- - - - - - - - - - - -
{% trans "Name" %}{% trans "Time" %}
{{ archive.name }}{{ archive.time }}
+
+ + + + + + + + + + + +
{% trans "Name" %}{% trans "Time" %}
{{ archive.name }}{{ archive.time }}
+

diff --git a/plinth/modules/backups/templates/backups_repository.html b/plinth/modules/backups/templates/backups_repository.html index d4fd1ffe7..01e3f7f0f 100644 --- a/plinth/modules/backups/templates/backups_repository.html +++ b/plinth/modules/backups/templates/backups_repository.html @@ -4,106 +4,108 @@ {% load i18n %} - - - -
- - {% if repository.error %} - - {% elif repository.is_encrypted %} - - {% endif %} +
+ + + + + + - {% endif %} - - - - + + {% if repository.mounted %} - - {% if repository.mounted %} + {% for archive in repository.archives %} + + + + + {% endfor %} - {% for archive in repository.archives %} - - - - - {% endfor %} + {% if repository.error %} + + + + {% endif %} + + {% if not repository.error and not repository.archives %} + + + + {% endif %} - {% if repository.error %} - - - {% endif %} - - {% if not repository.error and not repository.archives %} - - - - {% endif %} - - {% endif %} - -
+ + {% if repository.error %} + + {% elif repository.is_encrypted %} + + {% endif %} - {{ repository.name }} + {{ repository.name }} - - {% if repository.flags.mountable %} + + {% if repository.flags.mountable %} - {% if repository.mounted %} + {% if repository.mounted %} - - {% csrf_token %} - - +
+ {% csrf_token %} + +
- {% else %} + {% else %} -
- {% csrf_token %} - -
+
+ {% csrf_token %} + +
+ + {% endif %} {% endif %} - {% endif %} + {% if repository.flags.removable %} - {% if repository.flags.removable %} + + + - - - + {% endif %} + +
{{ archive.name }} + + {% trans "Download" %} + + + {% trans "Restore" %} + + + + +
{{ archive.name }} - - {% trans "Download" %} - - - {% trans "Restore" %} - - - - -
+

{{ repository.error }}

+
+

{% trans 'No archives currently exist.' %}

+
-

{{ repository.error }}

-
-

{% trans 'No archives currently exist.' %}

-
+ +
+ diff --git a/plinth/modules/bepasty/templates/bepasty.html b/plinth/modules/bepasty/templates/bepasty.html index 4b9148d00..10357dab0 100644 --- a/plinth/modules/bepasty/templates/bepasty.html +++ b/plinth/modules/bepasty/templates/bepasty.html @@ -22,34 +22,36 @@ {% if not passwords %}

{% trans 'No passwords currently configured.' %}

{% else %} - - - - - - - - - - - - {% for password in passwords %} - - - - - +
+
{% trans "Password" %}{% trans "Permissions" %}{% trans "Comment" %}
{{ password.password }}{{ password.permissions }}{% trans password.comment %} -
- {% csrf_token %} - -
-
+ + + + + + - {% endfor %} - -
{% trans "Password" %}{% trans "Permissions" %}{% trans "Comment" %}
+ + + + {% for password in passwords %} + + {{ password.password }} + {{ password.permissions }} + {% trans password.comment %} + +
+ {% csrf_token %} + +
+ + + {% endfor %} + + + {% endif %} {% endblock %} diff --git a/plinth/modules/bind/templates/bind.html b/plinth/modules/bind/templates/bind.html index 2a152808a..5f6fa5105 100644 --- a/plinth/modules/bind/templates/bind.html +++ b/plinth/modules/bind/templates/bind.html @@ -10,26 +10,28 @@

{% trans "Serving Domains" %}

- - - - - - - - - - - {% for domain in domains_table %} +
+
{% trans "Type" %}{% trans "Domain Names" %}{% trans "Serving" %}{% trans "IP addresses" %}
+ - - - - + + + + - {% endfor %} - -
{{ domain.type}}{{ domain.domain_name}}{{ domain.serving }}{{ domain.ip_address }}{% trans "Type" %}{% trans "Domain Names" %}{% trans "Serving" %}{% trans "IP addresses" %}
+ + + {% for domain in domains_table %} + + {{ domain.type}} + {{ domain.domain_name}} + {{ domain.serving }} + {{ domain.ip_address }} + + {% endfor %} + + +
diff --git a/plinth/modules/diagnostics/templates/diagnostics_results.html b/plinth/modules/diagnostics/templates/diagnostics_results.html index 45f6797bb..488341014 100644 --- a/plinth/modules/diagnostics/templates/diagnostics_results.html +++ b/plinth/modules/diagnostics/templates/diagnostics_results.html @@ -4,29 +4,31 @@ {% load i18n %} - - - - - - - - - {% for test, result in results %} +
+
{% trans "Test" %}{% trans "Result" %}
+ - - + + - {% endfor %} - -
{{ test }} - {% if result == 'passed' %} - {% trans result %} - {% elif result == 'failed' %} - {% trans result %} - {% elif result == 'error' %} - {% trans result %} - {% else %} - {{ result }} - {% endif %} - {% trans "Test" %}{% trans "Result" %}
+ + + {% for test, result in results %} + + {{ test }} + + {% if result == 'passed' %} + {% trans result %} + {% elif result == 'failed' %} + {% trans result %} + {% elif result == 'error' %} + {% trans result %} + {% else %} + {{ result }} + {% endif %} + + + {% endfor %} + + +
diff --git a/plinth/modules/firewall/templates/firewall.html b/plinth/modules/firewall/templates/firewall.html index bf8bde8a9..888ff2184 100644 --- a/plinth/modules/firewall/templates/firewall.html +++ b/plinth/modules/firewall/templates/firewall.html @@ -23,65 +23,67 @@ {% else %} - - - - - - +
+
{% trans "Show Ports" %}
{% trans "Service/Port" %}{% trans "Status" %}
+ + + + + - - {% for component in components|dictsort:"name" %} - {% if component.ports %} - - - - - - {% for port in component.ports_details %} - - - + + {% for component in components|dictsort:"name" %} + {% if component.ports %} + + + - {% endfor %} - {% endif %} - {% endfor %} - -
{% trans "Show Ports" %}
{% trans "Service/Port" %}{% trans "Status" %}
-
- -
- 		{{ component.name }} - {% if component.is_enabled %} - - {% trans "Enabled" %} - {% else %} - - {% trans "Disabled" %} - {% endif %} -
{{ port.name }}: - {% for port_number, protocol in port.details %} - {{ port_number }}/{{ protocol }} - {% endfor %} -
- {% if port.name in internal_enabled_ports and port.name in external_enabled_ports %} +
+ +
+ 		{{ component.name }} + {% if component.is_enabled %} - {% trans "Permitted" %} - {% elif port.name in internal_enabled_ports %} - - {% trans "Permitted (internal only)" %} - {% elif port.name in external_enabled_ports %} - - {% trans "Permitted (external only)" %} + {% trans "Enabled" %} {% else %} - - {% trans "Blocked" %} + + {% trans "Disabled" %} {% endif %}
+ {% for port in component.ports_details %} + + + {{ port.name }}: + {% for port_number, protocol in port.details %} + {{ port_number }}/{{ protocol }} + {% endfor %} + + + {% 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 %} + + + {% endfor %} + {% endif %} + {% endfor %} + + +

diff --git a/plinth/modules/letsencrypt/templates/letsencrypt.html b/plinth/modules/letsencrypt/templates/letsencrypt.html index d88887cf1..399c53a7c 100644 --- a/plinth/modules/letsencrypt/templates/letsencrypt.html +++ b/plinth/modules/letsencrypt/templates/letsencrypt.html @@ -23,95 +23,96 @@

{% trans "Status" %}

{% if status.domains %} - - - - - - - - - - - {% for domain, domain_status in status.domains.items %} +
+
{% trans "Domain" %}{% trans "Certificate Status" %}{% trans "Website Security" %}{% trans "Actions" %}
+ - - + + + + + + + {% for domain, domain_status in status.domains.items %} + + + - - + + - - {% endfor %} - -
{{ domain }} - {% if domain_status.certificate_available and domain_status.validity == "valid" %} - - {% blocktrans trimmed with expiry_date=domain_status.expiry_date %} - Valid, expires on {{ expiry_date }} - {% endblocktrans %} - - {% elif domain_status.certificate_available and not domain_status.validity == "valid" %} - - {% if "revoked" in domain_status.validity %} - {% blocktrans trimmed %} - Revoked - {% endblocktrans %} - {% elif "expired" in domain_status.validity %} + {% trans "Domain" %}{% trans "Certificate Status" %}{% trans "Website Security" %}{% trans "Actions" %}
{{ domain }} + {% if domain_status.certificate_available and domain_status.validity == "valid" %} + {% blocktrans trimmed with expiry_date=domain_status.expiry_date %} - Expired on {{ expiry_date }} + Valid, expires on {{ expiry_date }} {% endblocktrans %} - {% elif "test" in domain_status.validity %} - {% blocktrans trimmed %} - Invalid test certificate - {% endblocktrans %} - {% else %} - {% blocktrans trimmed with reason=domain_status.validity %} - Invalid ({{ reason }}) - {% endblocktrans %} - {% endif %} - - {% else %} - - {% trans "No certificate" %} - - {% endif %} - - {% if domain_status.web_enabled %} - {% trans "Enabled" %} - {% else %} - {% trans "Disabled" %} - {% endif %} - - {% if domain_status.certificate_available %} -
- {% csrf_token %} - -
-
- {% csrf_token %} - -
- {% if "revoked" not in domain_status.validity %} + + {% elif domain_status.certificate_available and not domain_status.validity == "valid" %} + + {% if "revoked" in domain_status.validity %} + {% blocktrans trimmed %} + Revoked + {% endblocktrans %} + {% elif "expired" in domain_status.validity %} + {% blocktrans trimmed with expiry_date=domain_status.expiry_date %} + Expired on {{ expiry_date }} + {% endblocktrans %} + {% elif "test" in domain_status.validity %} + {% blocktrans trimmed %} + Invalid test certificate + {% endblocktrans %} + {% else %} + {% blocktrans trimmed with reason=domain_status.validity %} + Invalid ({{ reason }}) + {% endblocktrans %} + {% endif %} + + {% else %} + + {% trans "No certificate" %} + + {% endif %} + 		+ {% if domain_status.web_enabled %} + {% trans "Enabled" %} + {% else %} + {% trans "Disabled" %} + {% endif %} + + {% if domain_status.certificate_available %}
+ action="{% url 'letsencrypt:re-obtain' domain %}"> {% csrf_token %} + {% trans "Re-obtain" %} +
+
+ {% csrf_token %} + +
+ {% if "revoked" not in domain_status.validity %} +
+ {% csrf_token %} + +
+ {% endif %} + {% else %} +
+ {% csrf_token %} +
{% endif %} - {% else %} -
- {% csrf_token %} - -
- {% endif %} -
- + + + {% endfor %} + + + {% else %} {% url 'config:index' as config_url %} {% blocktrans trimmed %} diff --git a/plinth/modules/minetest/templates/minetest.html b/plinth/modules/minetest/templates/minetest.html index a7b2f27a8..24b195f7d 100644 --- a/plinth/modules/minetest/templates/minetest.html +++ b/plinth/modules/minetest/templates/minetest.html @@ -10,23 +10,25 @@ {{ block.super }} {% if domains %} - - - - - - - - - {% for domain in domains %} +
+
{% trans "Address" %}{% trans "Port" %}
+ - - + + - {% endfor %} - -
- {{ domain }} - {{ 30000 }}{% trans "Address" %}{% trans "Port" %}
+ + + {% for domain in domains %} + + + {{ domain }} + + {{ 30000 }} + + {% endfor %} + + + {% endif %} {% endblock %} diff --git a/plinth/modules/monkeysphere/templates/monkeysphere.html b/plinth/modules/monkeysphere/templates/monkeysphere.html index b3aef6795..d32356ec2 100644 --- a/plinth/modules/monkeysphere/templates/monkeysphere.html +++ b/plinth/modules/monkeysphere/templates/monkeysphere.html @@ -48,106 +48,108 @@

{% endif %} - - - - - - - - - - - {% for key in status.keys.values|dictsort:"ssh_fingerprint" %} - - - - - + + {% endfor %} + +
{% trans "Service" %}{% trans "Domains" %}{% trans "OpenPGP Fingerprint" %}
- {% if key.service == 'ssh' %} - {% trans "Secure Shell" %} - {% elif key.service == 'https' %} - {% trans "Web Server" %} - {% else %} - {% trans "Other" %} - {% endif %} - -
    - {% for domain in key.all_domains %} - {% if domain not in key.imported_domains %} -
  • - - {{ domain }} -
    • - {% elif domain not in key.available_domains %} -
  • - - {{ domain }} -
    • - {% else %} -
  • - - {{ domain }} -
    • - {% endif %} - {% endfor %} -
- 		- {% if key.openpgp_fingerprint %} - - {{ key.openpgp_fingerprint }} - - {% else %} - {% trans "-" %} - {% endif %} - - {% if not key.openpgp_fingerprint %} -
- {% csrf_token %} - - -
- {% else %} - {% if not running %} -
- {% csrf_token %} - - -
+
+ + + + + + + + + + + {% for key in status.keys.values|dictsort:"ssh_fingerprint" %} + + + + - - {% endfor %} - -
{% trans "Service" %}{% trans "Domains" %}{% trans "OpenPGP Fingerprint" %}
+ {% if key.service == 'ssh' %} + {% trans "Secure Shell" %} + {% elif key.service == 'https' %} + {% trans "Web Server" %} + {% else %} + {% trans "Other" %} {% endif %} - {% if key.importable_domains %} -
+
+
    + {% for domain in key.all_domains %} + {% if domain not in key.imported_domains %} +
  • + + {{ domain }} +
    • + {% elif domain not in key.available_domains %} +
  • + + {{ domain }} +
    • + {% else %} +
  • + + {{ domain }} +
    • + {% endif %} + {% endfor %} +
+ 		+ {% if key.openpgp_fingerprint %} + + {{ key.openpgp_fingerprint }} + + {% else %} + {% trans "-" %} + {% endif %} + + {% if not key.openpgp_fingerprint %} + {% csrf_token %} - + + {% else %} + {% if not running %} +
+ {% csrf_token %} + + +
+ {% endif %} + {% if key.importable_domains %} +
+ {% csrf_token %} + + +
+ {% endif %} {% endif %} - {% endif %} -
+
+ {% endblock %} diff --git a/plinth/modules/monkeysphere/templates/monkeysphere_details.html b/plinth/modules/monkeysphere/templates/monkeysphere_details.html index 6f056ad79..d3a74ffd1 100644 --- a/plinth/modules/monkeysphere/templates/monkeysphere_details.html +++ b/plinth/modules/monkeysphere/templates/monkeysphere_details.html @@ -10,58 +10,60 @@

{% trans "Monkeysphere" %}

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{% trans "OpenPGP Fingerprint" %}{{ key.openpgp_fingerprint }}
{% trans "OpenPGP User IDs" %}{{ key.uids|join:', ' }}
{% trans "Key Import Date" %}{{ key.date }}
{% trans "SSH Key Type" %}{{ key.ssh_key_type }}
{% trans "SSH Key Size" %}{{ key.ssh_key_size }}
{% trans "SSH Fingerprint" %}{{ key.ssh_fingerprint }}
{% trans "Service" %} - {% if key.service == 'ssh' %} - {% trans "Secure Shell" %} - {% elif key.service == 'https' %} - {% trans "Web Server" %} - {% else %} - {% trans "Other" %} - {% endif %} -
{% trans "Key File" %}{{ key.key_file }}
{% trans "Available Domains" %}{{ key.available_domains|join:', ' }}
{% trans "Added Domains" %}{{ key.imported_domains|join:', ' }}
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{% trans "OpenPGP Fingerprint" %}{{ key.openpgp_fingerprint }}
{% trans "OpenPGP User IDs" %}{{ key.uids|join:', ' }}
{% trans "Key Import Date" %}{{ key.date }}
{% trans "SSH Key Type" %}{{ key.ssh_key_type }}
{% trans "SSH Key Size" %}{{ key.ssh_key_size }}
{% trans "SSH Fingerprint" %}{{ key.ssh_fingerprint }}
{% trans "Service" %} + {% if key.service == 'ssh' %} + {% trans "Secure Shell" %} + {% elif key.service == 'https' %} + {% trans "Web Server" %} + {% else %} + {% trans "Other" %} + {% endif %} +
{% trans "Key File" %}{{ key.key_file }}
{% trans "Available Domains" %}{{ key.available_domains|join:', ' }}
{% trans "Added Domains" %}{{ key.imported_domains|join:', ' }}
+

{% blocktrans trimmed %} diff --git a/plinth/modules/names/templates/names.html b/plinth/modules/names/templates/names.html index 06c0cbf93..2c6f1b409 100644 --- a/plinth/modules/names/templates/names.html +++ b/plinth/modules/names/templates/names.html @@ -8,44 +8,46 @@ {% block configuration %} - - - - - - - - - - - {% for domain in status.domains|dictsort:"domain_type.display_name" %} +
+
{% trans "Type" %}{% trans "Domain Name" %}{% trans "Services" %}
+ - - - - + + + + - {% endfor %} + + + {% for domain in status.domains|dictsort:"domain_type.display_name" %} + + + + + + + {% endfor %} - {% for domain_type in status.unused_domain_types %} - - - - - - - {% endfor %} - -
{{ domain.domain_type.display_name }}{{ domain.name }}{{ domain.get_readable_services|join:', ' }} - - {% trans "Configure" %} - - {% trans "Type" %}{% trans "Domain Name" %}{% trans "Services" %}
{{ domain.domain_type.display_name }}{{ domain.name }}{{ domain.get_readable_services|join:', ' }} + + {% trans "Configure" %} + +
{{ domain_type.display_name }}-- - - {% trans "Configure" %} - -
+ {% for domain_type in status.unused_domain_types %} + + {{ domain_type.display_name }} + - + - + + + {% trans "Configure" %} + + + + {% endfor %} + + + {% endblock %} diff --git a/plinth/modules/samba/templates/samba.html b/plinth/modules/samba/templates/samba.html index 9ad32ac38..d796d8e5e 100644 --- a/plinth/modules/samba/templates/samba.html +++ b/plinth/modules/samba/templates/samba.html @@ -69,49 +69,51 @@ {% csrf_token %} - - - - - - - - - - {% for share_type in share_types %} - - - - +
+
{% trans 'Type' %}{% trans 'Name' %}{% trans 'Status' %}
+ + + + + - {% endfor %} - -
{% trans 'Type' %}{% trans 'Name' %}{% trans 'Status' %}
+ + + {% for share_type in share_types %} + + + {{ share_type.type }} + + + {{ disk.share_name_prefix }}{{ share_type.share_name_suffix }} + + + + + + {% endfor %} + + + {% endfor %} @@ -143,31 +145,33 @@ is plugged back in, sharing will be automatically enabled. {% endblocktrans %}

- - - - - - - - - {% for share in unavailable_shares %} - - - - - {% endfor %} - -
{% trans "Share name" %}{% trans "Action" %}
{{ share.name }} -
- {% csrf_token %} - -
-
+
+ + + + + + + + + {% for share in unavailable_shares %} + + + + + {% endfor %} + +
{% trans "Share name" %}{% trans "Action" %}
{{ share.name }} +
+ {% csrf_token %} + +
+
+
{% endif %} {% endif %} {% endblock %} diff --git a/plinth/modules/security/templates/security_report.html b/plinth/modules/security/templates/security_report.html index dca137c39..d0e0139f3 100644 --- a/plinth/modules/security/templates/security_report.html +++ b/plinth/modules/security/templates/security_report.html @@ -34,40 +34,42 @@ running. {% endblocktrans %}

- - - - - - - - - - - - {% for app in apps_report %} +
+
{% trans "App Name" %}{% trans "Current Vulnerabilities" %}{% trans "Past Vulnerabilities" %}{% trans "Sandboxed" %}{% trans "Sandbox Coverage" %}
+ - - - - - + + + + + - {% endfor %} - -
{{ app.name }}{{ app.vulns }}{{ app.past_vulns|default_if_none:"❗"}} - {% if app.sandboxed is None %} - {% trans "N/A" %} - {% elif app.sandboxed %} - {% trans "Yes" %} - {% else %} - {% trans "No" %} - {% endif %} - - {% if app.sandbox_coverage %} - {{ app.sandbox_coverage }}% - {% elif app.sandboxed %} - {% trans "Not running" %} - {% endif %} - {% trans "App Name" %}{% trans "Current Vulnerabilities" %}{% trans "Past Vulnerabilities" %}{% trans "Sandboxed" %}{% trans "Sandbox Coverage" %}
+ + + {% for app in apps_report %} + + {{ app.name }} + {{ app.vulns }} + {{ app.past_vulns|default_if_none:"❗"}} + + {% if app.sandboxed is None %} + {% trans "N/A" %} + {% elif app.sandboxed %} + {% trans "Yes" %} + {% else %} + {% trans "No" %} + {% endif %} + + + {% if app.sandbox_coverage %} + {{ app.sandbox_coverage }}% + {% elif app.sandboxed %} + {% trans "Not running" %} + {% endif %} + + + {% endfor %} + + + {% endblock %} diff --git a/plinth/modules/sharing/templates/sharing.html b/plinth/modules/sharing/templates/sharing.html index 614990e04..e0818528c 100644 --- a/plinth/modules/sharing/templates/sharing.html +++ b/plinth/modules/sharing/templates/sharing.html @@ -31,50 +31,52 @@ {% if not shares %}

{% trans 'No shares currently configured.' %}

{% else %} - - - - - - - - - - - - - {% for share in shares %} - - - - - - +
+
{% trans "Name" %}{% trans "Disk Path" %}{% trans "Shared Over" %}{% trans "With Groups" %}
+ + + + + + + - {% endfor %} - -
{% trans "Name" %}{% trans "Disk Path" %}{% trans "Shared Over" %}{% trans "With Groups" %}
+ + + + {% for share in shares %} + + {{ share.name }} + {{ share.path }} + + + {{ share.url }} + + + + {% if not share.groups %} + {% trans "public access" %} + {% else %} + {{ share.groups|join:", " }} + {% endif %} + + + +
+ {% csrf_token %} + +
+ + + {% endfor %} + + + {% endif %} {% endblock %} diff --git a/plinth/modules/snapshot/templates/snapshot_delete_selected.html b/plinth/modules/snapshot/templates/snapshot_delete_selected.html index 2972b6885..5310a9bf3 100644 --- a/plinth/modules/snapshot/templates/snapshot_delete_selected.html +++ b/plinth/modules/snapshot/templates/snapshot_delete_selected.html @@ -11,22 +11,24 @@

{% trans "Delete the following snapshots permanently?" %}

- - - - - - - - {% for snapshot in snapshots %} - - - - - - {% endfor %} - -
{% trans "Number" %}{% trans "Date" %}{% trans "Description" %}
{{ snapshot.number }}{{ snapshot.date }}{{ snapshot.description }}
+
+ + + + + + + + {% for snapshot in snapshots %} + + + + + + {% endfor %} + +
{% trans "Number" %}{% trans "Date" %}{% trans "Description" %}
{{ snapshot.number }}{{ snapshot.date }}{{ snapshot.description }}
+

diff --git a/plinth/modules/snapshot/templates/snapshot_manage.html b/plinth/modules/snapshot/templates/snapshot_manage.html index 82064186c..20f14277f 100644 --- a/plinth/modules/snapshot/templates/snapshot_manage.html +++ b/plinth/modules/snapshot/templates/snapshot_manage.html @@ -21,51 +21,53 @@ {{ has_deletable_snapshots|yesno:',disabled="disabled"' }}/> - - - - - - - - - - {% for snapshot in snapshots %} - - - - - - - - {% endfor %} - -
{% trans "Number" %}{% trans "Date" %}{% trans "Description" %}{% trans "Rollback" %}
- {{ snapshot.number }} - {% if snapshot.is_default %} - - {% trans "will be used at next boot" %} - - {% endif %} - {% if snapshot.is_active %} - - {% trans "in use" %} - - {% endif %} - {{ snapshot.date }}{% trans snapshot.description %} - - - - - {% if not snapshot.is_default and not snapshot.is_active %} - - {% endif %} -
+
+ + + + + + + + + + {% for snapshot in snapshots %} + + + + + + + + {% endfor %} + +
{% trans "Number" %}{% trans "Date" %}{% trans "Description" %}{% trans "Rollback" %}
+ {{ snapshot.number }} + {% if snapshot.is_default %} + + {% trans "will be used at next boot" %} + + {% endif %} + {% if snapshot.is_active %} + + {% trans "in use" %} + + {% endif %} + {{ snapshot.date }}{% trans snapshot.description %} + + + + + {% if not snapshot.is_default and not snapshot.is_active %} + + {% endif %} +
+
{% endblock %} diff --git a/plinth/modules/snapshot/templates/snapshot_rollback.html b/plinth/modules/snapshot/templates/snapshot_rollback.html index 3bff938fe..718679575 100644 --- a/plinth/modules/snapshot/templates/snapshot_rollback.html +++ b/plinth/modules/snapshot/templates/snapshot_rollback.html @@ -19,20 +19,22 @@ {% endblocktrans %}

- - - - - - - - - - - - - -
{% trans "Number" %}{% trans "Date" %}{% trans "Description" %}
{{ snapshot.number }}{{ snapshot.date }}{{ snapshot.description }}
+
+ + + + + + + + + + + + + +
{% trans "Number" %}{% trans "Date" %}{% trans "Description" %}
{{ snapshot.number }}{{ snapshot.date }}{{ snapshot.description }}
+

diff --git a/plinth/modules/ssh/templates/ssh.html b/plinth/modules/ssh/templates/ssh.html index 795f0d6bc..54b91f3ed 100644 --- a/plinth/modules/ssh/templates/ssh.html +++ b/plinth/modules/ssh/templates/ssh.html @@ -17,20 +17,22 @@ {% endblocktrans %}

- - - - - - - - - {% for host_key in host_keys %} +
+
{% trans "Algorithm" %}{% trans "Fingerprint" %}
+ - - + + - {% endfor %} - -
{{ host_key.algorithm }}{{ host_key.fingerprint }}{% trans "Algorithm" %}{% trans "Fingerprint" %}
+ + + {% for host_key in host_keys %} + + {{ host_key.algorithm }} + {{ host_key.fingerprint }} + + {% endfor %} + + + {% endblock %} diff --git a/plinth/modules/storage/templates/storage.html b/plinth/modules/storage/templates/storage.html index 409e7a63d..d81c924fb 100644 --- a/plinth/modules/storage/templates/storage.html +++ b/plinth/modules/storage/templates/storage.html @@ -19,60 +19,62 @@

{% trans "The following storage devices are in use:" %}

- - - - - - - - - - - - - {% for disk in disks %} +
+
{% trans "Device" %}{% trans "Label" %}{% trans "Mount Point" %}{% trans "Type" %}{% trans "Used" %}{% trans "Actions" %}
+ - - - - - - + + + + + + - {% endfor %} - -
{{ disk.device }}{{ disk.label|default_if_none:"" }}{{ disk.mount_points|join:"
" }}		{{ disk.filesystem_type }} - {% if 'percent_used' in disk %} -
-
- {{ disk.percent_used }}% -
-
-
{{ disk.used_str }} / {{ disk.size_str }}
- {% endif %} - 		- {% if disk.is_removable %} - - {% csrf_token %} - - - - {% endif %} - {% trans "Device" %}{% trans "Label" %}{% trans "Mount Point" %}{% trans "Type" %}{% trans "Used" %}{% trans "Actions" %}
+ + + {% for disk in disks %} + + {{ disk.device }} + {{ disk.label|default_if_none:"" }} + {{ disk.mount_points|join:"
" }} + {{ disk.filesystem_type }} + + {% if 'percent_used' in disk %} +
+
+ {{ disk.percent_used }}% +
+
+
{{ disk.used_str }} / {{ disk.size_str }}
+ {% endif %} + + + {% if disk.is_removable %} +
+ {% csrf_token %} + + +
+ {% endif %} + + + {% endfor %} + + + {% if expandable_root_size %}

{% trans "Partition Expansion" %}

diff --git a/plinth/modules/tahoe/templates/tahoe-post-setup.html b/plinth/modules/tahoe/templates/tahoe-post-setup.html index bdd8e8bf3..e59011e5d 100644 --- a/plinth/modules/tahoe/templates/tahoe-post-setup.html +++ b/plinth/modules/tahoe/templates/tahoe-post-setup.html @@ -27,18 +27,20 @@ {{ block.super }}

{% trans "Local introducer" %}

- - +
+
+ + + + + + - - + + - - - - - -
{% trans "Pet Name" %} furl
{% trans "Pet Name" %} furl {{ local_introducer.0 }}{{ local_introducer.1 }}
{{ local_introducer.0 }}{{ local_introducer.1 }}
+ +
@@ -60,28 +62,30 @@

{% trans "Connected introducers" %}

- - - - - - - - {% for introducer, furl in introducers %} - - - - - - {% endfor %} -
{% trans "Pet Name" %} furl
{{ introducer }}{{ furl }} - - {% csrf_token %} - - -
+
+ + + + + + + + {% for introducer, furl in introducers %} + + + + + + {% endfor %} +
{% trans "Pet Name" %} furl
{{ introducer }}{{ furl }} +
+ {% csrf_token %} + +
+
+
{% endblock %} diff --git a/plinth/modules/tor/templates/tor.html b/plinth/modules/tor/templates/tor.html index 48a117520..e48adf12a 100644 --- a/plinth/modules/tor/templates/tor.html +++ b/plinth/modules/tor/templates/tor.html @@ -19,24 +19,26 @@ {{ block.super }} {% if status.hs_enabled %} - - - - - - - - - - - - - - - -
{% trans "Onion Service" %}{% trans "Status" %}{% trans "Ports" %}
{{ status.hs_hostname }}{{ status.hs_status }} - {{ status.hs_services|join:', ' }} -
+
+ + + + + + + + + + + + + + + +
{% trans "Onion Service" %}{% trans "Status" %}{% trans "Ports" %}
{{ status.hs_hostname }}{{ status.hs_status }} + {{ status.hs_services|join:', ' }} +
+
{% endif %} {% endif %} {% endblock %} @@ -62,25 +64,23 @@ necessary: {% endblocktrans %}

-
-
- - +
+
+ + + + + + + + {% for name, port in status.ports.items %} - - + + - - - {% for name, port in status.ports.items %} - - - - - {% endfor %} - -
{% trans "Service" %}{% trans "Port" %}
{% trans "Service" %}{% trans "Port" %}{{ name }}{{ port }}
{{ name }}{{ port }}
-
+ {% endfor %} + +
{% endif %} diff --git a/plinth/modules/wireguard/templates/wireguard.html b/plinth/modules/wireguard/templates/wireguard.html index fc03f9a13..b0ce88025 100644 --- a/plinth/modules/wireguard/templates/wireguard.html +++ b/plinth/modules/wireguard/templates/wireguard.html @@ -11,36 +11,38 @@

{% trans "Peers allowed to connect to this server:" %}

- - - - - - - {% if server.peers %} - {% for peer in server.peers.values %} - {% if peer.public_key %} - - - - - - {% endif %} - {% endfor %} - {% else %} +
+
{% trans "Public Key" %}{% trans "Allowed IPs" %}{% trans "Last Connected Time" %}
- - {{ peer.public_key }} - - {{ peer.allowed_ips|join:", " }}{{ peer.status.latest_handshake|default:'' }}
- + + + - {% endif %} -
- {% blocktrans trimmed %} - No peers configured to connect to this {{ box_name }} yet. - {% endblocktrans %} - {% trans "Public Key" %}{% trans "Allowed IPs" %}{% trans "Last Connected Time" %}
+ {% if server.peers %} + {% for peer in server.peers.values %} + {% if peer.public_key %} + + + + {{ peer.public_key }} + + + {{ peer.allowed_ips|join:", " }} + {{ peer.status.latest_handshake|default:'' }} + + {% endif %} + {% endfor %} + {% else %} + + + {% blocktrans trimmed %} + No peers configured to connect to this {{ box_name }} yet. + {% endblocktrans %} + + + {% endif %} + +

{% blocktrans trimmed %} @@ -66,38 +68,40 @@ Servers that {{ box_name }} will connect to: {% endblocktrans %}

- - - - - - - {% if client_peers %} - {% for interface, server in client_peers.items %} - {% for peer in server.peers.values %} - {% if forloop.first %} - - - - - - {% endif %} - {% endfor %} - {% endfor %} - {% else %} +
+
{% trans "Endpoint" %}{% trans "Public Key" %}{% trans "Last Connected Time" %}
{{ peer.endpoint }} - - {{ peer.public_key }} - - {{ peer.status.latest_handshake|default:'' }}
- + + + - {% endif %} -
- {% blocktrans trimmed %} - No connections to remote servers are configured yet. - {% endblocktrans %} - {% trans "Endpoint" %}{% trans "Public Key" %}{% trans "Last Connected Time" %}
+ {% if client_peers %} + {% for interface, server in client_peers.items %} + {% for peer in server.peers.values %} + {% if forloop.first %} + + {{ peer.endpoint }} + + + {{ peer.public_key }} + + + {{ peer.status.latest_handshake|default:'' }} + + {% endif %} + {% endfor %} + {% endfor %} + {% else %} + + + {% blocktrans trimmed %} + No connections to remote servers are configured yet. + {% endblocktrans %} + + + {% endif %} + + {% trans "Are you sure that you want to delete this server?" %}

- - - - - - - - - - - -
{% trans "Endpoint" %}{{ peer_endpoint }}
{% trans "Public Key" %}{{ peer_public_key }}
+
+ + + + + + + + + + + +
{% trans "Endpoint" %}{{ peer_endpoint }}
{% trans "Public Key" %}{{ peer_public_key }}
+
{% csrf_token %} diff --git a/plinth/modules/wireguard/templates/wireguard_show_client.html b/plinth/modules/wireguard/templates/wireguard_show_client.html index 647f1225d..b3e164e87 100644 --- a/plinth/modules/wireguard/templates/wireguard_show_client.html +++ b/plinth/modules/wireguard/templates/wireguard_show_client.html @@ -14,52 +14,56 @@ client is configured with the following information. {% endblocktrans %}

- - - - - - - - - - - - - - - - - - - - - - - -
{% trans "Client public key:" %}{{ client.public_key }}
{% trans "IP address to use for client:" %}{{ client.allowed_ips|join:", " }}
{% trans "Pre-shared key:" %}{{ client.preshared_key }}
{% trans "Server endpoints:" %} - {% for endpoint in endpoints %} -
{{ endpoint }}
- {% endfor %} -
{% trans "Server public key:" %}{{ server.public_key }}
+
+ + + + + + + + + + + + + + + + + + + + + + + +
{% trans "Client public key:" %}{{ client.public_key }}
{% trans "IP address to use for client:" %}{{ client.allowed_ips|join:", " }}
{% trans "Pre-shared key:" %}{{ client.preshared_key }}
{% trans "Server endpoints:" %} + {% for endpoint in endpoints %} +
{{ endpoint }}
+ {% endfor %} +
{% trans "Server public key:" %}{{ server.public_key }}
+

{% trans "Status" %}

- - - - - - - - - - - - - - - -
{% trans "Data transmitted:" %}{{ client.status.transfer_tx|filesizeformat }}
{% trans "Data received:" %}{{ client.status.transfer_rx|filesizeformat }}
{% trans "Latest handshake:" %}{{ client.status.latest_handshake|default:'' }}
+
+ + + + + + + + + + + + + + + +
{% trans "Data transmitted:" %}{{ client.status.transfer_tx|filesizeformat }}
{% trans "Data received:" %}{{ client.status.transfer_rx|filesizeformat }}
{% trans "Latest handshake:" %}{{ client.status.latest_handshake|default:'' }}
+

- - - - - - - - - - - - - - - - - - - - - - - -
{% trans "Server endpoint:" %}{{ peer.endpoint }}
{% trans "Server public key:" %}{{ peer.public_key }}
{% trans "Pre-shared key:" %}{{ peer.preshared_key }}
{% trans "Public key of this machine:" %}{{ server.public_key }}
{% trans "IP address of this machine:" %}{{ server.ip_address }}
+

+ + + + + + + + + + + + + + + + + + + + + + + +
{% trans "Server endpoint:" %}{{ peer.endpoint }}
{% trans "Server public key:" %}{{ peer.public_key }}
{% trans "Pre-shared key:" %}{{ peer.preshared_key }}
{% trans "Public key of this machine:" %}{{ server.public_key }}
{% trans "IP address of this machine:" %}{{ server.ip_address }}
+

{% trans "Status" %}

- - - - - - - - - - - - - - - -
{% trans "Data transmitted:" %}{{ peer.status.transfer_tx|filesizeformat }}
{% trans "Data received:" %}{{ peer.status.transfer_rx|filesizeformat }}
{% trans "Latest handshake:" %}{{ peer.status.latest_handshake|default:'' }}
+
+ + + + + + + + + + + + + + + +
{% trans "Data transmitted:" %}{{ peer.status.transfer_tx|filesizeformat }}
{% trans "Data received:" %}{{ peer.status.transfer_rx|filesizeformat }}
{% trans "Latest handshake:" %}{{ peer.status.latest_handshake|default:'' }}
+
{% endif %} {% endfor %} diff --git a/plinth/templates/clients.html b/plinth/templates/clients.html index 261c663e8..ccd280880 100644 --- a/plinth/templates/clients.html +++ b/plinth/templates/clients.html @@ -7,7 +7,7 @@ {% load static %} {% if clients %} -
+
{% with clients|clients_of_type:'web' as web_clients %} diff --git a/plinth/templates/port-forwarding-info.html b/plinth/templates/port-forwarding-info.html index 7b987da76..a051e716e 100644 --- a/plinth/templates/port-forwarding-info.html +++ b/plinth/templates/port-forwarding-info.html @@ -30,24 +30,26 @@ {{ service_name }}: {% endblocktrans %} -
- - - - - - - - - {% for port in port_forwarding_info.ports %} - - - - - - {% endfor %} - -
{% trans "Protocol" %}{% trans "From Router/WAN Ports" %}{% blocktrans %}To {{box_name}} Ports{% endblocktrans %}
{{ port.protocol }}{{ port.ports }}{{ port.ports }}
+
+ + + + + + + + + + {% for port in port_forwarding_info.ports %} + + + + + + {% endfor %} + +
{% trans "Protocol" %}{% trans "From Router/WAN Ports" %}{% blocktrans %}To {{box_name}} Ports{% endblocktrans %}
{{ port.protocol }}{{ port.ports }}{{ port.ports }}
+
{% endif %}

diff --git a/static/themes/default/css/main.css b/static/themes/default/css/main.css index a0428a187..6d896c488 100644 --- a/static/themes/default/css/main.css +++ b/static/themes/default/css/main.css @@ -530,7 +530,7 @@ a.menu_link_active { } /* Button table - Tables with a list of actions as buttons on top */ -.button-table > .button-row + .table { +.button-table > .button-row + .table-responsive { margin-top: 10px; }