From e6b114b849a39898a927618226e78a883a32c6fc Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Mon, 29 Nov 2021 14:26:19 +0000 Subject: [PATCH] CSS: Replace btn-block with buttons wrapped in d-grid Signed-off-by: Michael Tremer --- src/templates/about.html | 8 ++++--- src/templates/auth/activate.html | 8 ++++--- src/templates/auth/activated.html | 8 ++++--- src/templates/auth/login.html | 16 ++++++++----- .../auth/password-reset-initiation.html | 8 ++++--- src/templates/auth/password-reset.html | 8 ++++--- src/templates/auth/register.html | 8 ++++--- src/templates/base.html | 22 +++++++---------- src/templates/blog/compose.html | 18 +++++++------- src/templates/blog/delete.html | 6 +++-- src/templates/blog/modules/post.html | 16 ++++++++----- src/templates/blog/publish.html | 6 +++-- src/templates/donate/donate.html | 24 +++++++++++-------- src/templates/download/release.html | 8 ++++--- src/templates/fireinfo/index.html | 16 ++++++++----- src/templates/fireinfo/profile.html | 8 ++++--- src/templates/location/lookup.html | 8 ++++--- src/templates/modules/christmas-banner.html | 8 ++++--- src/templates/nopaste/create.html | 4 +++- src/templates/nopaste/view.html | 10 ++++---- src/templates/people/group.html | 8 ++++--- src/templates/people/index.html | 8 ++++--- src/templates/people/passwd.html | 4 +++- src/templates/people/subscribed.html | 8 ++++--- src/templates/people/unsubscribe.html | 16 ++++++++----- src/templates/people/unsubscribed.html | 8 ++++--- src/templates/people/user-edit.html | 4 +++- src/templates/static/features.html | 16 ++++++++----- src/templates/wiki/404.html | 8 ++++--- src/templates/wiki/confirm-delete.html | 8 ++++--- src/templates/wiki/confirm-restore.html | 8 ++++--- src/templates/wiki/edit.html | 8 ++++--- src/templates/wiki/files/detail.html | 22 ++++++++++------- src/templates/wiki/files/index.html | 4 +++- src/templates/wiki/page.html | 10 ++++---- 35 files changed, 219 insertions(+), 139 deletions(-) diff --git a/src/templates/about.html b/src/templates/about.html index 0a63667e..7893fff9 100644 --- a/src/templates/about.html +++ b/src/templates/about.html @@ -162,9 +162,11 @@
- - {{ _("Download IPFire now. It's free!") }} - +
+ + {{ _("Download IPFire now. It's free!") }} + +
diff --git a/src/templates/auth/activate.html b/src/templates/auth/activate.html index 472a41ea..6d59ad42 100644 --- a/src/templates/auth/activate.html +++ b/src/templates/auth/activate.html @@ -17,9 +17,11 @@ {% module Password() %} - +
+ +
diff --git a/src/templates/auth/activated.html b/src/templates/auth/activated.html index 70b8c926..eff7ffdb 100644 --- a/src/templates/auth/activated.html +++ b/src/templates/auth/activated.html @@ -11,9 +11,11 @@ {{ _("To kick things off, would you like to setup a donation to the IPFire Project?") }}

- - {{ _("Donate Now") }} - +
+ + {{ _("Donate Now") }} + +
{{ _("No thanks, I have already donated") }} diff --git a/src/templates/auth/login.html b/src/templates/auth/login.html index 5810d4a1..238e06fb 100644 --- a/src/templates/auth/login.html +++ b/src/templates/auth/login.html @@ -32,9 +32,11 @@ name="password" placeholder="{{ _("Password") }}" required> - +
+ +

@@ -45,9 +47,11 @@

{{ _("New to IPFire?") }}
- - {{ _("Register") }} - +
+ + {{ _("Register") }} + +
{% end block %} diff --git a/src/templates/auth/password-reset-initiation.html b/src/templates/auth/password-reset-initiation.html index b3d09056..fb368d36 100644 --- a/src/templates/auth/password-reset-initiation.html +++ b/src/templates/auth/password-reset-initiation.html @@ -18,9 +18,11 @@ value="{{ username or "" }}" required autofocus> - +
+ +
diff --git a/src/templates/auth/password-reset.html b/src/templates/auth/password-reset.html index 3a26a170..17657d62 100644 --- a/src/templates/auth/password-reset.html +++ b/src/templates/auth/password-reset.html @@ -12,9 +12,11 @@ {% module Password(account) %} - +
+ +
diff --git a/src/templates/auth/register.html b/src/templates/auth/register.html index 52193be6..86842060 100644 --- a/src/templates/auth/register.html +++ b/src/templates/auth/register.html @@ -61,9 +61,11 @@ - +
+ +
diff --git a/src/templates/base.html b/src/templates/base.html index 6db06e02..fe272d21 100644 --- a/src/templates/base.html +++ b/src/templates/base.html @@ -281,19 +281,15 @@
- +
+ + {{ _("Donate") }} + + + + {{ _("Buy") }} + +
diff --git a/src/templates/blog/compose.html b/src/templates/blog/compose.html index 880869bb..9051e765 100644 --- a/src/templates/blog/compose.html +++ b/src/templates/blog/compose.html @@ -26,15 +26,17 @@ - +
+ - {% if post %} - - {{ _("Delete") }} - - {% end %} + {% if post %} + + {{ _("Delete") }} + + {% end %} +
diff --git a/src/templates/blog/delete.html b/src/templates/blog/delete.html index b4230b9a..410e057c 100644 --- a/src/templates/blog/delete.html +++ b/src/templates/blog/delete.html @@ -15,8 +15,10 @@
{% raw xsrf_form_html() %} - - {{ _("Cancel") }} +
+ + {{ _("Cancel") }} +
diff --git a/src/templates/blog/modules/post.html b/src/templates/blog/modules/post.html index c8ddc8c0..8ff9c1ba 100644 --- a/src/templates/blog/modules/post.html +++ b/src/templates/blog/modules/post.html @@ -35,15 +35,19 @@ {% if not post.is_published() and post.is_editable(current_user) %}
- - {{ _("Edit") }} - +
+ + {{ _("Edit") }} + +
- - {{ _("Publish") }} - +
+ + {{ _("Publish") }} + +
{% end %} diff --git a/src/templates/blog/publish.html b/src/templates/blog/publish.html index 2e881222..e4d4cde7 100644 --- a/src/templates/blog/publish.html +++ b/src/templates/blog/publish.html @@ -20,8 +20,10 @@ pattern="[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}" required> - - {{ _("Cancel") }} +
+ + {{ _("Cancel") }} +
diff --git a/src/templates/donate/donate.html b/src/templates/donate/donate.html index 11928550..a6f3c09f 100644 --- a/src/templates/donate/donate.html +++ b/src/templates/donate/donate.html @@ -204,20 +204,24 @@
{% for factor, default in ((3, False), (2, True), (1, False)) %}
- +
+ +
{% end %}
- +
+ +
diff --git a/src/templates/download/release.html b/src/templates/download/release.html index 52828137..566292fd 100644 --- a/src/templates/download/release.html +++ b/src/templates/download/release.html @@ -91,9 +91,11 @@ {{ _("All downloads will be served from one of our mirror servers that are sponsored by various organisations from all around the world to help us make IPFire available for everyone") }}

- - {{ _("Browse Mirrors") }} - +
+ + {{ _("Browse Mirrors") }} + +
{% end block %} diff --git a/src/templates/fireinfo/index.html b/src/templates/fireinfo/index.html index 40e86be8..d2d59b28 100644 --- a/src/templates/fireinfo/index.html +++ b/src/templates/fireinfo/index.html @@ -12,9 +12,11 @@ data from IPFire systems

- - {{ _("Show a Random Profile") }} - +
+ + {{ _("Show a Random Profile") }} + +
@@ -101,9 +103,11 @@ {% end %} - - {{ _("Processor Features") }} - +
+ + {{ _("Processor Features") }} + +
diff --git a/src/templates/fireinfo/profile.html b/src/templates/fireinfo/profile.html index 11bf8300..e9ad437f 100644 --- a/src/templates/fireinfo/profile.html +++ b/src/templates/fireinfo/profile.html @@ -27,9 +27,11 @@
- - {{ _("Go to Lightning Wire Labs") }} - +
+ + {{ _("Go to Lightning Wire Labs") }} + +
diff --git a/src/templates/location/lookup.html b/src/templates/location/lookup.html index 097d3e7c..59cea88f 100644 --- a/src/templates/location/lookup.html +++ b/src/templates/location/lookup.html @@ -41,9 +41,11 @@ - - {{ _("Blacklist Status") }} - +
+ + {{ _("Blacklist Status") }} + +
{% end block %} diff --git a/src/templates/modules/christmas-banner.html b/src/templates/modules/christmas-banner.html index ad7e67da..168be009 100644 --- a/src/templates/modules/christmas-banner.html +++ b/src/templates/modules/christmas-banner.html @@ -16,9 +16,11 @@
- - {{ _("Give A Gift Today") }} - +
+ + {{ _("Give A Gift Today") }} + +
diff --git a/src/templates/nopaste/create.html b/src/templates/nopaste/create.html index b82fcb90..719ba99d 100644 --- a/src/templates/nopaste/create.html +++ b/src/templates/nopaste/create.html @@ -69,7 +69,9 @@ - +
+ +
{% end block %} diff --git a/src/templates/nopaste/view.html b/src/templates/nopaste/view.html index 48b9b866..63bef1f3 100644 --- a/src/templates/nopaste/view.html +++ b/src/templates/nopaste/view.html @@ -29,9 +29,11 @@ {% end %} - - - {{ _("Download") }} ({{ format_size(entry.size) }}) - +
+ + + {{ _("Download") }} ({{ format_size(entry.size) }}) + +
{% end block %} diff --git a/src/templates/people/group.html b/src/templates/people/group.html index 272593db..a31f6d66 100644 --- a/src/templates/people/group.html +++ b/src/templates/people/group.html @@ -16,9 +16,11 @@
{% if group.email %}
- - {{ _("Email Group") }} - +
+ + {{ _("Email Group") }} + +
{% end %} diff --git a/src/templates/people/index.html b/src/templates/people/index.html index bbf4ab8b..b0f1b2d6 100644 --- a/src/templates/people/index.html +++ b/src/templates/people/index.html @@ -34,9 +34,11 @@
{% raw xsrf_form_html() %} - +
+ +
diff --git a/src/templates/people/passwd.html b/src/templates/people/passwd.html index c4c66825..aadc69f7 100644 --- a/src/templates/people/passwd.html +++ b/src/templates/people/passwd.html @@ -19,7 +19,9 @@ {% module Password(account) %} - +
+ +
diff --git a/src/templates/people/subscribed.html b/src/templates/people/subscribed.html index 6710f8de..5a26825f 100644 --- a/src/templates/people/subscribed.html +++ b/src/templates/people/subscribed.html @@ -15,9 +15,11 @@ - - {{ _("Back") }} - +
+ + {{ _("Back") }} + +
{% end block %} diff --git a/src/templates/people/unsubscribe.html b/src/templates/people/unsubscribe.html index 6578f58c..04a264b1 100644 --- a/src/templates/people/unsubscribe.html +++ b/src/templates/people/unsubscribe.html @@ -23,17 +23,21 @@
{% raw xsrf_form_html() %} - +
+ +
{% raw xsrf_form_html() %} - +
+ +
diff --git a/src/templates/people/unsubscribed.html b/src/templates/people/unsubscribed.html index c85a1806..164f4426 100644 --- a/src/templates/people/unsubscribed.html +++ b/src/templates/people/unsubscribed.html @@ -18,9 +18,11 @@
{% raw xsrf_form_html() %} - +
+ +
diff --git a/src/templates/people/user-edit.html b/src/templates/people/user-edit.html index 39311eac..5c4d4e78 100644 --- a/src/templates/people/user-edit.html +++ b/src/templates/people/user-edit.html @@ -144,7 +144,9 @@ {% end %} - +
+ +
diff --git a/src/templates/static/features.html b/src/templates/static/features.html index 68dee8c7..313ee978 100644 --- a/src/templates/static/features.html +++ b/src/templates/static/features.html @@ -135,15 +135,19 @@
- - VPN with IPsec - +
+ + VPN with IPsec + +
- - VPN with OpenVPN - +
+ + VPN with OpenVPN + +
diff --git a/src/templates/wiki/404.html b/src/templates/wiki/404.html index c410a7a4..2a873f13 100644 --- a/src/templates/wiki/404.html +++ b/src/templates/wiki/404.html @@ -17,9 +17,11 @@ {{ _("This wiki page does not exist, yet.") }}

- - {{ _("Create Now") }} - +
+ + {{ _("Create Now") }} + +
diff --git a/src/templates/wiki/confirm-delete.html b/src/templates/wiki/confirm-delete.html index 031b9176..042a61f4 100644 --- a/src/templates/wiki/confirm-delete.html +++ b/src/templates/wiki/confirm-delete.html @@ -15,9 +15,11 @@
{% raw xsrf_form_html() %} - +
+ +
diff --git a/src/templates/wiki/confirm-restore.html b/src/templates/wiki/confirm-restore.html index 5fce19f1..d4c792b8 100644 --- a/src/templates/wiki/confirm-restore.html +++ b/src/templates/wiki/confirm-restore.html @@ -23,9 +23,11 @@ placeholder="{{ _("Comment") }}"> - +
+ +
diff --git a/src/templates/wiki/edit.html b/src/templates/wiki/edit.html index 4f727fd7..f474f016 100644 --- a/src/templates/wiki/edit.html +++ b/src/templates/wiki/edit.html @@ -89,9 +89,11 @@ {% end %} - +
+ +
diff --git a/src/templates/wiki/files/detail.html b/src/templates/wiki/files/detail.html index a1c55f70..9527cdae 100644 --- a/src/templates/wiki/files/detail.html +++ b/src/templates/wiki/files/detail.html @@ -21,10 +21,12 @@ {% end %} - - - {{ _("Download") }} ({{ format_size(file.size) }}) - +
+ + + {{ _("Download") }} ({{ format_size(file.size) }}) + +
{% if file.is_image() %}
{{ _("Usage") }}
@@ -76,9 +78,11 @@
{{ _("Delete") }}
- - {{ _("Delete") }} - +
+ + {{ _("Delete") }} + +
{{ _("Upload Newer Revision") }}
@@ -97,7 +101,9 @@ - +
+ +
diff --git a/src/templates/wiki/files/index.html b/src/templates/wiki/files/index.html index 5565c365..bc6f99bb 100644 --- a/src/templates/wiki/files/index.html +++ b/src/templates/wiki/files/index.html @@ -64,7 +64,9 @@ - +
+ +
diff --git a/src/templates/wiki/page.html b/src/templates/wiki/page.html index ebcd5520..9edd2538 100644 --- a/src/templates/wiki/page.html +++ b/src/templates/wiki/page.html @@ -36,10 +36,12 @@ - - {{ _("Edit Page") }} - {% if not current_user %}‐ {{ _("Yes, you can edit!") }}{% end %} - +
+ + {{ _("Edit Page") }} + {% if not current_user %}‐ {{ _("Yes, you can edit!") }}{% end %} + +

{% if current_user %} -- 2.47.3