Attachment 173509 Details for Bug 37980 – Bug 37980: Style corrections for installer and onboarding following Bootstrap 5 update

[patch] Bug 37980: Style corrections for installer and onboarding following Bootstrap 5 update

Bug-37980-Style-corrections-for-installer-and-onbo.patch (text/plain), 32.84 KB, created by Martin Renvoize (ashimema) on 2024-10-28 10:56:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2024-10-28 10:56:33 UTC

Size: 32.84 KB

patch

obsolete

>From e204b17c3e7f02de41f39640ae310a9dd53aeba8 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Mon, 7 Oct 2024 17:56:45 +0000
>Subject: [PATCH] Bug 37980: Style corrections for installer and onboarding
> following Bootstrap 5 update
>
>This patch makes a couple of CSS updates to the installer and and
>onboarding pages:
>
>1. Add more Bootstrap imports to the installer SCSS. I included a
> pared-down selection of components to save file size. I should have
> included more.
>2. Add a temporary fix for the fact that the Font Awesome checkbox icons
> aren't working correctly. According to the docs the "empty check box"
> icons should look like a square border, not a solid square. They
> don't, and I've included a temporary fix for it.
>
>To test apply the patch and rebuild the staff interface CSS.
>
>- Drop and recreate the Koha database. Run 'restart_all' if necessary.
>- Navigate to the staff interface. You should be presented with the
> installer login. The form should be centered on the page.
>- Log in. In the list of steps displayed on the "Choose your language"
> page you should see square icons resembling empty checkboxes (not
> solid black squares).
>- Select your language and proceed to the next step. The "Choose your
> language" line should now have a green icon of a checked checkbox.
>- Follow the rest of the installer and onboarding steps to confirm that
> there aren't other unreported style issues.
>
>Signed-off-by: Phil Ringnalda <phil@chetcolibrary.org>
>Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>---
> .../intranet-tmpl/prog/css/src/installer.scss | 45 ++++++++++++++--
> .../prog/en/modules/installer/step1.tt | 52 +++++++++----------
> .../prog/en/modules/installer/step2.tt | 8 +--
> .../prog/en/modules/installer/step3.tt | 32 ++++++------
> .../en/modules/onboarding/onboardingstep1.tt | 12 ++---
> .../en/modules/onboarding/onboardingstep2.tt | 10 ++--
> .../en/modules/onboarding/onboardingstep3.tt | 8 +--
> .../en/modules/onboarding/onboardingstep4.tt | 6 +--
> .../en/modules/onboarding/onboardingstep5.tt | 4 +-
> 9 files changed, 108 insertions(+), 69 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/installer.scss b/koha-tmpl/intranet-tmpl/prog/css/src/installer.scss
>index 873bb6f4354..48691d67a05 100644
>--- a/koha-tmpl/intranet-tmpl/prog/css/src/installer.scss
>+++ b/koha-tmpl/intranet-tmpl/prog/css/src/installer.scss
>@@ -1,7 +1,9 @@
>+@import "~bootstrap/scss/mixins/_banner";
>+@include bsBanner("");
>+
> // scss-docs-start import-stack
>-// Configuration
> @import "~bootstrap/scss/_functions";
>-
>+// Configuration
> // Include any default variable overrides here
> @import "_variables";
> 
>@@ -13,20 +15,42 @@ $enable-dark-mode: false;
> 
> @import "~bootstrap/scss/_maps";
> @import "~bootstrap/scss/_utilities";
>+
>+// Layout & components
> @import "~bootstrap/scss/_root";
> @import "~bootstrap/scss/_reboot";
> @import "~bootstrap/scss/_type";
>+@import "~bootstrap/scss/_images";
> @import "~bootstrap/scss/_containers";
> @import "~bootstrap/scss/_grid";
>+@import "~bootstrap/scss/_tables";
> @import "~bootstrap/scss/_forms";
> @import "~bootstrap/scss/_buttons";
> @import "~bootstrap/scss/_transitions";
>+@import "~bootstrap/scss/_dropdown";
>+@import "~bootstrap/scss/_button-group";
>+@import "~bootstrap/scss/_nav";
>+@import "~bootstrap/scss/_navbar";
> @import "~bootstrap/scss/_breadcrumb";
>+@import "~bootstrap/scss/_pagination";
> @import "~bootstrap/scss/_badge";
> @import "~bootstrap/scss/_alert";
>+@import "~bootstrap/scss/_progress";
>+@import "~bootstrap/scss/_list-group";
>+@import "~bootstrap/scss/_close";
>+@import "~bootstrap/scss/_placeholders";
>+
>+// Helpers
> @import "~bootstrap/scss/_helpers";
>-@import "~bootstrap/scss/_utilities/api";
>+
>+// Utilities
>+@import "~bootstrap/scss/utilities/_api";
>+// scss-docs-end import-stack
>+
>+@import "_mixins";
>+@import "_tables";
> @import "_flatpickr";
>+@import "_fonts";
> 
> body {
> background-color: #EEE;
>@@ -278,3 +302,18 @@ span.breadcrumbs {
> color: #727272;
> font-size: 90%;
> }
>+
>+.fa-svg-icon {
>+ &.checkbox-square {
>+ &::before {
>+ background: transparent url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 448 512'%3E%3C!--!Font Awesome Free 6.6.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2024 Fonticons, Inc.--%3E%3Cpath d='M384 80c8.8 0 16 7.2 16 16l0 320c0 8.8-7.2 16-16 16L64 432c-8.8 0-16-7.2-16-16L48 96c0-8.8 7.2-16 16-16l320 0zM64 32C28.7 32 0 60.7 0 96L0 416c0 35.3 28.7 64 64 64l320 0c35.3 0 64-28.7 64-64l0-320c0-35.3-28.7-64-64-64L64 32z'/%3E%3C/svg%3E") 50% 50% no-repeat;
>+ background-size: 12px;
>+ content: "";
>+ display: inline-block;
>+ float: none;
>+ height: .8em;
>+ margin-right: .3rem;
>+ width: .8em;
>+ }
>+ }
>+}
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step1.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step1.tt
>index 034a856a96e..ea7fc9b9f5f 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step1.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step1.tt
>@@ -33,12 +33,12 @@
> 
> <div id="steps">
> <ol>
>- <li class="current open"> Choose your language</li>
>- <li class="open"> Check Perl dependencies</li>
>- <li class="open"> Database settings</li>
>- <li class="open"> Set up database</li>
>- <li class="open"> Install basic configuration settings</li>
>- <li class="open"> Onboarding</li>
>+ <li class="current open"> Choose your language</li>
>+ <li class="open"> Check Perl dependencies</li>
>+ <li class="open"> Database settings</li>
>+ <li class="open"> Set up database</li>
>+ <li class="open"> Install basic configuration settings</li>
>+ <li class="open"> Onboarding</li>
> </ol>
> </div>
> 
>@@ -77,11 +77,11 @@
> <div id="steps">
> <ol>
> <li class="complete"> Choose your language</li>
>- <li class="current open"> Check Perl dependencies</li>
>- <li class="open"> Database settings</li>
>- <li class="open"> Set up database</li>
>- <li class="open"> Install basic configuration settings</li>
>- <li class="open"> Onboarding</li>
>+ <li class="current open"> Check Perl dependencies</li>
>+ <li class="open"> Database settings</li>
>+ <li class="open"> Set up database</li>
>+ <li class="open"> Install basic configuration settings</li>
>+ <li class="open"> Onboarding</li>
> </ol>
> </div>
> 
>@@ -101,11 +101,11 @@
> <div id="steps">
> <ol>
> <li class="complete"> Choose your language</li>
>- <li class="current open"> Check Perl dependencies</li>
>- <li class="open"> Database settings</li>
>- <li class="open"> Set up database</li>
>- <li class="open"> Install basic configuration settings</li>
>- <li class="open"> Onboarding</li>
>+ <li class="current open"> Check Perl dependencies</li>
>+ <li class="open"> Database settings</li>
>+ <li class="open"> Set up database</li>
>+ <li class="open"> Install basic configuration settings</li>
>+ <li class="open"> Onboarding</li>
> </ol>
> </div>
> 
>@@ -127,11 +127,11 @@
> <div id="steps">
> <ol>
> <li class="complete"> Choose your language</li>
>- <li class="current open"> Check Perl dependencies</li>
>- <li class="open"> Database settings</li>
>- <li class="open"> Set up database</li>
>- <li class="open"> Install basic configuration settings</li>
>- <li class="open"> Onboarding</li>
>+ <li class="current open"> Check Perl dependencies</li>
>+ <li class="open"> Database settings</li>
>+ <li class="open"> Set up database</li>
>+ <li class="open"> Install basic configuration settings</li>
>+ <li class="open"> Onboarding</li>
> </ol>
> </div>
> 
>@@ -156,11 +156,11 @@
> <div id="steps">
> <ol>
> <li class="complete"> Choose your language</li>
>- <li class="current open"> Check Perl dependencies</li>
>- <li class="open"> Database settings</li>
>- <li class="open"> Set up database</li>
>- <li class="open"> Install basic configuration settings</li>
>- <li class="open"> Onboarding</li>
>+ <li class="current open"> Check Perl dependencies</li>
>+ <li class="open"> Database settings</li>
>+ <li class="open"> Set up database</li>
>+ <li class="open"> Install basic configuration settings</li>
>+ <li class="open"> Onboarding</li>
> </ol>
> </div>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step2.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step2.tt
>index a7271f99b86..882db4fc236 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step2.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step2.tt
>@@ -23,10 +23,10 @@
> <ol>
> <li class="complete"> Choose your language</li>
> <li class="complete"> Check Perl dependencies</li>
>- <li class="current open"> Database settings</li>
>- <li class="open"> Set up database</li>
>- <li class="open"> Install basic configuration settings</li>
>- <li class="open"> Onboarding</li>
>+ <li class="current open"> Database settings</li>
>+ <li class="open"> Set up database</li>
>+ <li class="open"> Install basic configuration settings</li>
>+ <li class="open"> Onboarding</li>
> </ol>
> </div>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt
>index a0c7081036d..6590b93e7ec 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt
>@@ -57,7 +57,7 @@
> <li class="complete"> Database settings</li>
> <li class="complete"> Set up database</li>
> <li class="complete"> Install basic configuration settings</li>
>- <li class="open"> Onboarding</li>
>+ <li class="open"> Onboarding</li>
> </ol>
> </div>
> 
>@@ -74,12 +74,12 @@
> <li class="complete"> Check Perl dependencies</li>
> <li class="complete"> Database settings</li>
> <li class="complete"> Set up database</li>
>- <li class="current open"> Install basic configuration settings</li>
>+ <li class="current open"> Install basic configuration settings</li>
> <ol>
>- <li class="current open"> Select your MARC flavor</li>
>- <li class="open"> Selecting default settings</li>
>+ <li class="current open"> Select your MARC flavor</li>
>+ <li class="open"> Selecting default settings</li>
> </ol>
>- <li class="open"> Onboarding</li>
>+ <li class="open"> Onboarding</li>
> </ol>
> </div>
> 
>@@ -114,12 +114,12 @@
> <li class="complete"> Check Perl dependencies</li>
> <li class="complete"> Database settings</li>
> <li class="complete"> Set up database</li>
>- <li class="current open"> Install basic configuration settings</li>
>+ <li class="current open"> Install basic configuration settings</li>
> <ol>
> <li class="complete"> Select your MARC flavor</li>
>- <li class="current open"> Selecting default settings</li>
>+ <li class="current open"> Selecting default settings</li>
> </ol>
>- <li class="open"> Onboarding</li>
>+ <li class="open"> Onboarding</li>
> </ol>
> </div>
> 
>@@ -223,7 +223,7 @@
> <li class="complete"> Select your MARC flavor</li>
> <li class="complete"> Selecting default settings</li>
> </ol>
>- <li class="open"> Onboarding</li>
>+ <li class="open"> Onboarding</li>
> </ol>
> </div>
> 
>@@ -286,8 +286,8 @@
> <li class="complete"> Check Perl dependencies</li>
> <li class="complete"> Database settings</li>
> <li class="complete"> Set up database</li>
>- <li class="open"> Install basic configuration settings</li>
>- <li class="open"> Onboarding</li>
>+ <li class="open"> Install basic configuration settings</li>
>+ <li class="open"> Onboarding</li>
> </ol>
> </div>
> 
>@@ -306,9 +306,9 @@
> <li class="complete"> Choose your language</li>
> <li class="complete"> Check Perl dependencies</li>
> <li class="complete"> Database settings</li>
>- <li class="current open"> Set up database</li>
>- <li class="open"> Install basic configuration settings</li>
>- <li class="open"> Onboarding</li>
>+ <li class="current open"> Set up database</li>
>+ <li class="open"> Install basic configuration settings</li>
>+ <li class="open"> Onboarding</li>
> </ol>
> </div>
> 
>@@ -340,8 +340,8 @@
> <li class="complete"> Check Perl dependencies</li>
> <li class="complete"> Database settings</li>
> <li class="complete"> Set up database</li>
>- <li class="current open"> Install basic configuration settings</li>
>- <li class="open"> Onboarding</li>
>+ <li class="current open"> Install basic configuration settings</li>
>+ <li class="open"> Onboarding</li>
> </ol>
> </div>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep1.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep1.tt
>index fa25acb9ee9..000f75ab433 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep1.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep1.tt
>@@ -22,13 +22,13 @@
> <div id="steps">
> <ol>
> <li class="complete"> Installation</li>
>- <li class="current open"> Onboarding
>+ <li class="current open"> Onboarding
> <ol>
>- <li class="current open"> Create a library</li>
>- <li class="open"> Create a patron category</li>
>- <li class="open"> Create Koha administrator patron</li>
>- <li class="open"> Create a new item type</li>
>- <li class="open"> Create a new circulation rule</li>
>+ <li class="current open"> Create a library</li>
>+ <li class="open"> Create a patron category</li>
>+ <li class="open"> Create Koha administrator patron</li>
>+ <li class="open"> Create a new item type</li>
>+ <li class="open"> Create a new circulation rule</li>
> </ol>
> </li>
> </ol>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt
>index 38a15d0e63a..205ad997453 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt
>@@ -32,13 +32,13 @@
> <div id="steps">
> <ol>
> <li class="complete"> Installation</li>
>- <li class="current open"> Onboarding
>+ <li class="current open"> Onboarding
> <ol>
> <li class="complete"> Create a library</li>
>- <li class="current open"> Create a patron category</li>
>- <li class="open"> Create Koha administrator patron</li>
>- <li class="open"> Create a new item type</li>
>- <li class="open"> Create a new circulation rule</li>
>+ <li class="current open"> Create a patron category</li>
>+ <li class="open"> Create Koha administrator patron</li>
>+ <li class="open"> Create a new item type</li>
>+ <li class="open"> Create a new circulation rule</li>
> </ol>
> </li>
> </ol>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep3.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep3.tt
>index 3876246cba5..40b041cc236 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep3.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep3.tt
>@@ -23,13 +23,13 @@
> <div id="steps">
> <ol>
> <li class="complete"> Installation</li>
>- <li class="current open"> Onboarding
>+ <li class="current open"> Onboarding
> <ol>
> <li class="complete"> Create a library</li>
> <li class="complete"> Create a patron category</li>
>- <li class="current open"> Create Koha administrator patron</li>
>- <li class="open"> Create a new item type</li>
>- <li class="open"> Create a new circulation rule</li>
>+ <li class="current open"> Create Koha administrator patron</li>
>+ <li class="open"> Create a new item type</li>
>+ <li class="open"> Create a new circulation rule</li>
> </ol>
> </li>
> </ol>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep4.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep4.tt
>index 3ee60a0c33a..2e059abbb0f 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep4.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep4.tt
>@@ -21,13 +21,13 @@
> <div id="steps">
> <ol>
> <li class="complete"> Installation</li>
>- <li class="current open"> Onboarding
>+ <li class="current open"> Onboarding
> <ol>
> <li class="complete"> Create a library</li>
> <li class="complete"> Create a patron category</li>
> <li class="complete"> Create Koha administrator patron</li>
>- <li class="current open"> Create a new item type</li>
>- <li class="open"> Create a new circulation rule</li>
>+ <li class="current open"> Create a new item type</li>
>+ <li class="open"> Create a new circulation rule</li>
> </ol>
> </li>
> </ol>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt
>index 4470516b96d..ca4fc333248 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt
>@@ -43,13 +43,13 @@
> <div id="steps">
> <ol>
> <li class="complete"> Installation</li>
>- <li class="current open"> Onboarding
>+ <li class="current open"> Onboarding
> <ol>
> <li class="complete"> Create a library</li>
> <li class="complete"> Create a patron category</li>
> <li class="complete"> Create Koha administrator patron</li>
> <li class="complete"> Create a new item type</li>
>- <li class="current open"> Create a new circulation rule</li>
>+ <li class="current open"> Create a new circulation rule</li>
> </ol>
> </li>
> </ol>
>-- 
>2.47.0

Actions: View | Diff | Splinter Review

Attachments on bug 37980: 172518 | 172672 | 173509