From fef8da230f76cc87cbb1fe7b931a9d3aded57e6d Mon Sep 17 00:00:00 2001 From: Sunil Mohan Adapa Date: Sat, 5 Dec 2020 11:50:58 -0800 Subject: [PATCH] ui: Adopt a consistent and new table style Rows in bootstrap 4 tables are taller by default. This is better suited for mobile layouts and look prettier on desktops too. Adopting this approach instead of condensed tables eliminates the need for striping, bordering and narrower tables. Signed-off-by: Sunil Mohan Adapa Reviewed-by: Veiko Aasa --- .../backups/templates/backups_delete.html | 28 ++++++------- .../backups/templates/backups_repository.html | 3 +- plinth/modules/bepasty/templates/bepasty.html | 3 +- plinth/modules/bind/templates/bind.html | 2 +- .../templates/diagnostics_results.html | 2 +- .../letsencrypt/templates/letsencrypt.html | 2 +- .../modules/minetest/templates/minetest.html | 40 +++++++++---------- .../monkeysphere/templates/monkeysphere.html | 2 +- .../templates/monkeysphere_details.html | 2 +- plinth/modules/names/templates/names.html | 2 +- plinth/modules/samba/templates/samba.html | 4 +- .../security/templates/security_report.html | 2 +- plinth/modules/sharing/templates/sharing.html | 2 +- .../templates/snapshot_delete_selected.html | 2 +- .../snapshot/templates/snapshot_manage.html | 2 +- .../snapshot/templates/snapshot_rollback.html | 2 +- plinth/modules/ssh/templates/ssh.html | 2 +- plinth/modules/storage/templates/storage.html | 2 +- .../tahoe/templates/tahoe-post-setup.html | 4 +- plinth/modules/tor/templates/tor.html | 4 +- .../wireguard/templates/wireguard.html | 6 +-- .../templates/wireguard_delete_server.html | 2 +- .../templates/wireguard_show_client.html | 4 +- .../templates/wireguard_show_server.html | 4 +- plinth/templates/clients.html | 2 +- plinth/templates/port-forwarding-info.html | 2 +- 26 files changed, 60 insertions(+), 72 deletions(-) diff --git a/plinth/modules/backups/templates/backups_delete.html b/plinth/modules/backups/templates/backups_delete.html index 2840f1835..a3d97ab35 100644 --- a/plinth/modules/backups/templates/backups_delete.html +++ b/plinth/modules/backups/templates/backups_delete.html @@ -11,22 +11,18 @@

{% 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 9277f5a8e..d4fd1ffe7 100644 --- a/plinth/modules/backups/templates/backups_repository.html +++ b/plinth/modules/backups/templates/backups_repository.html @@ -4,8 +4,7 @@ {% load i18n %} - +
diff --git a/plinth/modules/bepasty/templates/bepasty.html b/plinth/modules/bepasty/templates/bepasty.html index f6965f475..4b9148d00 100644 --- a/plinth/modules/bepasty/templates/bepasty.html +++ b/plinth/modules/bepasty/templates/bepasty.html @@ -22,8 +22,7 @@ {% if not passwords %}

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

{% else %} - +
diff --git a/plinth/modules/bind/templates/bind.html b/plinth/modules/bind/templates/bind.html index 129304445..2a152808a 100644 --- a/plinth/modules/bind/templates/bind.html +++ b/plinth/modules/bind/templates/bind.html @@ -10,7 +10,7 @@

{% trans "Serving Domains" %}

-
{% trans "Password" %}
+
diff --git a/plinth/modules/diagnostics/templates/diagnostics_results.html b/plinth/modules/diagnostics/templates/diagnostics_results.html index 885d7112a..45f6797bb 100644 --- a/plinth/modules/diagnostics/templates/diagnostics_results.html +++ b/plinth/modules/diagnostics/templates/diagnostics_results.html @@ -4,7 +4,7 @@ {% load i18n %} -
{% trans "Type" %}
+
diff --git a/plinth/modules/letsencrypt/templates/letsencrypt.html b/plinth/modules/letsencrypt/templates/letsencrypt.html index e57c1575e..d88887cf1 100644 --- a/plinth/modules/letsencrypt/templates/letsencrypt.html +++ b/plinth/modules/letsencrypt/templates/letsencrypt.html @@ -23,7 +23,7 @@

{% trans "Status" %}

{% if status.domains %} -
{% trans "Test" %}
+
diff --git a/plinth/modules/minetest/templates/minetest.html b/plinth/modules/minetest/templates/minetest.html index 23264b363..a7b2f27a8 100644 --- a/plinth/modules/minetest/templates/minetest.html +++ b/plinth/modules/minetest/templates/minetest.html @@ -10,27 +10,23 @@ {{ block.super }} {% if domains %} -
-
-
{% trans "Domain" %}
- - - - - - - - {% for domain in domains %} - - - - - {% endfor %} - -
{% trans "Address" %}{% trans "Port" %}
- {{ domain }} - {{ 30000 }}
- - + + + + + + + + + {% for domain in domains %} + + + + + {% endfor %} + +
{% trans "Address" %}{% trans "Port" %}
+ {{ domain }} + {{ 30000 }}
{% endif %} {% endblock %} diff --git a/plinth/modules/monkeysphere/templates/monkeysphere.html b/plinth/modules/monkeysphere/templates/monkeysphere.html index 515151b8e..b3aef6795 100644 --- a/plinth/modules/monkeysphere/templates/monkeysphere.html +++ b/plinth/modules/monkeysphere/templates/monkeysphere.html @@ -48,7 +48,7 @@

{% endif %} - +
diff --git a/plinth/modules/monkeysphere/templates/monkeysphere_details.html b/plinth/modules/monkeysphere/templates/monkeysphere_details.html index e5e177bb2..6f056ad79 100644 --- a/plinth/modules/monkeysphere/templates/monkeysphere_details.html +++ b/plinth/modules/monkeysphere/templates/monkeysphere_details.html @@ -10,7 +10,7 @@

{% trans "Monkeysphere" %}

-
{% trans "Service" %}
+
diff --git a/plinth/modules/names/templates/names.html b/plinth/modules/names/templates/names.html index 646b7f7ad..06c0cbf93 100644 --- a/plinth/modules/names/templates/names.html +++ b/plinth/modules/names/templates/names.html @@ -8,7 +8,7 @@ {% block configuration %} -
{% trans "OpenPGP Fingerprint" %}
+
diff --git a/plinth/modules/samba/templates/samba.html b/plinth/modules/samba/templates/samba.html index 9f0df343b..9ad32ac38 100644 --- a/plinth/modules/samba/templates/samba.html +++ b/plinth/modules/samba/templates/samba.html @@ -69,7 +69,7 @@ {% csrf_token %} -
{% trans "Type" %}
@@ -143,7 +143,7 @@ is plugged back in, sharing will be automatically enabled. {% endblocktrans %}

-
+
diff --git a/plinth/modules/security/templates/security_report.html b/plinth/modules/security/templates/security_report.html index ecc2506d5..dca137c39 100644 --- a/plinth/modules/security/templates/security_report.html +++ b/plinth/modules/security/templates/security_report.html @@ -34,7 +34,7 @@ running. {% endblocktrans %}

-
{% trans "Share name" %}
+
diff --git a/plinth/modules/sharing/templates/sharing.html b/plinth/modules/sharing/templates/sharing.html index 6ccc7454f..614990e04 100644 --- a/plinth/modules/sharing/templates/sharing.html +++ b/plinth/modules/sharing/templates/sharing.html @@ -31,7 +31,7 @@ {% if not shares %}

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

{% else %} -
{% trans "App Name" %}
+
diff --git a/plinth/modules/snapshot/templates/snapshot_delete_selected.html b/plinth/modules/snapshot/templates/snapshot_delete_selected.html index 964bb9846..2972b6885 100644 --- a/plinth/modules/snapshot/templates/snapshot_delete_selected.html +++ b/plinth/modules/snapshot/templates/snapshot_delete_selected.html @@ -11,7 +11,7 @@

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

-
{% trans "Name" %}
+
diff --git a/plinth/modules/snapshot/templates/snapshot_manage.html b/plinth/modules/snapshot/templates/snapshot_manage.html index c9c132537..82064186c 100644 --- a/plinth/modules/snapshot/templates/snapshot_manage.html +++ b/plinth/modules/snapshot/templates/snapshot_manage.html @@ -21,7 +21,7 @@ {{ has_deletable_snapshots|yesno:',disabled="disabled"' }}/> -
{% trans "Number" %} {% trans "Date" %}
+
diff --git a/plinth/modules/snapshot/templates/snapshot_rollback.html b/plinth/modules/snapshot/templates/snapshot_rollback.html index ca5a00d81..3bff938fe 100644 --- a/plinth/modules/snapshot/templates/snapshot_rollback.html +++ b/plinth/modules/snapshot/templates/snapshot_rollback.html @@ -19,7 +19,7 @@ {% endblocktrans %}

-
{% trans "Number" %} {% trans "Date" %}
+
diff --git a/plinth/modules/ssh/templates/ssh.html b/plinth/modules/ssh/templates/ssh.html index 2f19d876f..795f0d6bc 100644 --- a/plinth/modules/ssh/templates/ssh.html +++ b/plinth/modules/ssh/templates/ssh.html @@ -17,7 +17,7 @@ {% endblocktrans %}

-
{% trans "Number" %} {% trans "Date" %}
+
diff --git a/plinth/modules/storage/templates/storage.html b/plinth/modules/storage/templates/storage.html index 4ba3cb6c7..409e7a63d 100644 --- a/plinth/modules/storage/templates/storage.html +++ b/plinth/modules/storage/templates/storage.html @@ -19,7 +19,7 @@

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

-
{% trans "Algorithm" %}
+
diff --git a/plinth/modules/tahoe/templates/tahoe-post-setup.html b/plinth/modules/tahoe/templates/tahoe-post-setup.html index 5ad56edf6..bdd8e8bf3 100644 --- a/plinth/modules/tahoe/templates/tahoe-post-setup.html +++ b/plinth/modules/tahoe/templates/tahoe-post-setup.html @@ -27,7 +27,7 @@ {{ block.super }}

{% trans "Local introducer" %}

-
{% trans "Device" %}
+
@@ -60,7 +60,7 @@

{% trans "Connected introducers" %}

-
{% trans "Pet Name" %}
+
diff --git a/plinth/modules/tor/templates/tor.html b/plinth/modules/tor/templates/tor.html index e4b2911c9..48a117520 100644 --- a/plinth/modules/tor/templates/tor.html +++ b/plinth/modules/tor/templates/tor.html @@ -19,7 +19,7 @@ {{ block.super }} {% if status.hs_enabled %} -
{% trans "Pet Name" %}
+
@@ -64,7 +64,7 @@

-
{% trans "Onion Service" %}
+
diff --git a/plinth/modules/wireguard/templates/wireguard.html b/plinth/modules/wireguard/templates/wireguard.html index 7de5d08c7..fc03f9a13 100644 --- a/plinth/modules/wireguard/templates/wireguard.html +++ b/plinth/modules/wireguard/templates/wireguard.html @@ -11,8 +11,7 @@

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

-
{% trans "Service" %}
+
@@ -67,8 +66,7 @@ Servers that {{ box_name }} will connect to: {% endblocktrans %}

-
{% trans "Public Key" %} {% trans "Allowed IPs" %}
+
diff --git a/plinth/modules/wireguard/templates/wireguard_delete_server.html b/plinth/modules/wireguard/templates/wireguard_delete_server.html index 79493bb87..0eeb65e56 100644 --- a/plinth/modules/wireguard/templates/wireguard_delete_server.html +++ b/plinth/modules/wireguard/templates/wireguard_delete_server.html @@ -13,7 +13,7 @@

{% trans "Are you sure that you want to delete this server?" %}

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

-
{% trans "Endpoint" %}
+
@@ -44,7 +44,7 @@
{% trans "Client public key:" %}

{% trans "Status" %}

- +
diff --git a/plinth/modules/wireguard/templates/wireguard_show_server.html b/plinth/modules/wireguard/templates/wireguard_show_server.html index 3a6018c63..f1795f022 100644 --- a/plinth/modules/wireguard/templates/wireguard_show_server.html +++ b/plinth/modules/wireguard/templates/wireguard_show_server.html @@ -17,7 +17,7 @@ {{ box_name }}'s public key and IP address. {% endblocktrans %}

-
{% trans "Data transmitted:" %}
+
@@ -43,7 +43,7 @@
{% trans "Server endpoint:" %}

{% trans "Status" %}

- +
diff --git a/plinth/templates/clients.html b/plinth/templates/clients.html index 56efcc382..261c663e8 100644 --- a/plinth/templates/clients.html +++ b/plinth/templates/clients.html @@ -8,7 +8,7 @@ {% if clients %}
-
{% trans "Data transmitted:" %}
+
{% with clients|clients_of_type:'web' as web_clients %} {% for client in web_clients %} diff --git a/plinth/templates/port-forwarding-info.html b/plinth/templates/port-forwarding-info.html index c37737c62..7b987da76 100644 --- a/plinth/templates/port-forwarding-info.html +++ b/plinth/templates/port-forwarding-info.html @@ -30,7 +30,7 @@ {{ service_name }}: {% endblocktrans %} -
+
{% trans "Protocol" %}