From 488f6ca085cd28d2b71dea51736d0648765fef97 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Fri, 3 Feb 2023 18:22:45 +0000
Subject: [PATCH] Bug 32605: (follow-up) Additional fixes

This patch makes some further changes to form CSS in order to improve
consistency. Some templates have also been modified to improve layout.

- Acquisitions -> New vendor
- Staff interface home ->  Patrons requesting modifications
- Reports -> Saved SQL reports
- Serials -> New subscription
- Tools -> Import patrons

Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 898aeaad9a095d1ebf5c64cee0ca2d16b57dfade)
Signed-off-by: Pedro Amorim <pedro.amorim@ptfs-europe.com>
---
 .../intranet-tmpl/prog/css/src/_forms.scss    | 37 +++++++------------
 .../prog/css/src/staff-global.scss            |  3 +-
 .../prog/en/modules/acqui/supplier.tt         |  8 ++--
 .../prog/en/modules/members/members-update.tt | 12 +++---
 .../modules/reports/guided_reports_start.tt   |  4 +-
 .../en/modules/serials/subscription-add.tt    | 24 ++++++------
 .../prog/en/modules/tools/import_borrowers.tt |  4 +-
 7 files changed, 41 insertions(+), 51 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/_forms.scss b/koha-tmpl/intranet-tmpl/prog/css/src/_forms.scss
index d9d7caa54c..99f8adfbca 100644
--- a/koha-tmpl/intranet-tmpl/prog/css/src/_forms.scss
+++ b/koha-tmpl/intranet-tmpl/prog/css/src/_forms.scss
@@ -6,7 +6,7 @@ fieldset {
         color: #696969;
         float: left;
         font-weight: bold;
-        margin-bottom: 0;
+        margin-bottom: .5rem;
 
         ~ * {
             clear: left;
@@ -17,9 +17,7 @@ fieldset {
         box-shadow: none;
         padding: 0;
     }
-}
 
-fieldset {
     &.rows {
         clear: left;
         float: left;
@@ -40,10 +38,9 @@ fieldset {
         &.inputnote {
             clear: left;
             float: left;
-            margin: 1em 0 0 11em;
+            margin: 1em 0 0 9em;
         }
 
-
         &.left {
             label {
                 text-align: left;
@@ -62,18 +59,6 @@ fieldset {
             }
         }
 
-        &.ui-accordion-content {
-            border-top-left-radius: 0;
-            border-top-right-radius: 0;
-            margin: 0;
-            padding: 0;
-            width: 100%;
-
-            table {
-                margin: 0;
-            }
-        }
-
         &.unselected {
             background-color: #FFFFFF;
             border: 0;
@@ -86,7 +71,7 @@ fieldset {
 
         div {
             &.hint {
-                font-size: 105%;
+                font-size: 1.25rem;
                 margin: .5rem 0;
                 margin-left: 11rem;
             }
@@ -113,7 +98,8 @@ fieldset {
 
             &.radio {
                 display: inline-block;
-                margin: 0 1rem 0 0;
+                float: none;
+                margin: 0;
                 padding: 0;
                 width: auto;
             }
@@ -163,14 +149,19 @@ fieldset {
             }
 
             fieldset {
-                margin-left: 7.5em;
+                margin: 0;
+                padding: 0;
+
+                input[type="text"] {
+                    max-width: 70%;
+                }
 
                 label {
                     width: 6em;
                 }
 
                 legend {
-                    font-size: 120%;
+                    font-size: 1.55rem;
                     margin: 0 0 0 1em;
                 }
 
@@ -230,13 +221,13 @@ fieldset {
             }
 
             &.hint {
-                font-size: 105%;
+                font-size: 1.25rem;
             }
         }
 
         table {
             clear: both;
-            font-size: 105%;
+            font-size: 1.25rem;
             margin: 1em 0 1em 1em;
 
             &.dataTable {
diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
index baf0ff7b73..e2730484f4 100644
--- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
+++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
@@ -587,8 +587,7 @@ input {
     &[type="checkbox"],
     &[type="radio"] {
         height: unset;
-        margin: 0;
-        vertical-align: middle;
+        margin: 3px 3px 0 5px;
     }
 
     &.submit {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt
index 1490095213..0a49619121 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt
@@ -201,15 +201,15 @@
             <legend>Ordering information</legend>
             <ol><li><label for="activestatus">Vendor is:</label>
                     [% IF ( active ) %]
-                        <label class="radio" for="activestatus">Active</label>
                         <input type="radio" id="activestatus" name="status" value="1" checked="checked" />
-                        <label class="radio" for="inactivestatus">Inactive</label>
+                        <label class="radio" for="activestatus">Active</label>
                         <input type="radio" id="inactivestatus" name="status" value="0" />
+                        <label class="radio" for="inactivestatus">Inactive</label>
                     [% ELSE %]
-                        <label class="radio" for="activestatus">Active</label>
                         <input type="radio" id="activestatus" name="status" value="1" />
-                        <label class="radio" for="inactivestatus">Inactive</label>
+                        <label class="radio" for="activestatus">Active</label>
                         <input type="radio" id="inactivestatus" name="status" value="0" checked="checked" />
+                        <label class="radio" for="inactivestatus">Inactive</label>
                     [% END %]</li>
             <li><label for="list_currency">List prices are: </label>
                 <select name="list_currency" id="list_currency">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt
index a3ef2d38a8..caf4cf1cc3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt
@@ -128,14 +128,14 @@
                                 <div id="panel_modify_[% pm.borrowernumber | html %]" class="panel-collapse collapse" role="tabpanel" aria-labelledby="panel-header-[% pm.borrowernumber | html %]">
                                     <div class="panel-body">
                                         <div class="btn-toolbar">
-                                            <input type="radio" id="approve_modify_[% pm.borrowernumber | html %]" name="modify_[% pm.borrowernumber | html %]" value="approve" />
-                                            <label for="approve_modify_[% pm.borrowernumber | html %]">Approve</label>
 
-                                            <input type="radio" id="deny_modify_[% pm.borrowernumber | html %]" name="modify_[% pm.borrowernumber | html %]" value="deny" />
-                                            <label for="deny_modify_[% pm.borrowernumber | html %]">Deny</label>
+                                            <label for="approve_modify_[% pm.borrowernumber | html %]"><input type="radio" id="approve_modify_[% pm.borrowernumber | html %]" name="modify_[% pm.borrowernumber | html %]" value="approve" /> Approve</label>
 
-                                            <input type="radio" id="ignore_modify_[% pm.borrowernumber | html %]" name="modify_[% pm.borrowernumber | html %]" value="ignore" checked="checked"/>
-                                            <label for="ignore_modify_[% pm.borrowernumber | html %]">Ignore</label>
+
+                                            <label for="deny_modify_[% pm.borrowernumber | html %]"><input type="radio" id="deny_modify_[% pm.borrowernumber | html %]" name="modify_[% pm.borrowernumber | html %]" value="deny" /> Deny</label>
+
+
+                                            <label for="ignore_modify_[% pm.borrowernumber | html %]"><input type="radio" id="ignore_modify_[% pm.borrowernumber | html %]" name="modify_[% pm.borrowernumber | html %]" value="ignore" checked="checked"/> Ignore</label>
                                             | <a target="_blank" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% pm.borrowernumber | html %]" >Patron details</a>
                                         </div>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
index 0d4dd73384..e1247b0420 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
@@ -2352,7 +2352,7 @@
         <label>Report group:</label>
         <input type="radio" name="select_or_create_group"
             id="select_group" checked="checked" />
-        <label for="select_group">Select</label>
+        <label for="select_group" class="radio">Select</label>
         <select name="group" id="group_select">
             <option value="">(None)</option>
             [% FOREACH group IN groups_with_subgroups %]
@@ -2366,7 +2366,7 @@
             [% END %]
         </select>
         <input type="radio" name="select_or_create_group" id="create_group" />
-        <label for="create_group">or create:</label>
+        <label for="create_group" class="radio">or create:</label>
         <input type="text" name="group" id="group_input" title="Group code" placeholder="Code" />
         <input type="text" name="groupdesc" id="groupdesc_input" title="Group name" placeholder="Name" />
     </li>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt
index 138d7cbba7..e6918de53f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt
@@ -14,7 +14,7 @@ fieldset.rows li.radio { width: 100%; } /* override staff-global.css */
 /* Prevents Bootstrap menus from being hidden inside modal */
 #mana_search_result .modal { overflow: visible; }
 #mana_search_result .modal-body { overflow-y: visible; }
-.inputnote { padding-left: 13rem; padding-top: 1rem; }
+
 fieldset.rows table { clear: none; margin: 0; }
 </style>
 </head>
@@ -107,32 +107,32 @@ fieldset.rows table { clear: none; margin: 0; }
                                         [% END %]
                                     </div>
                                 </li>
-                                <li class="radio">
-                                <label for="creating_record">When receiving this serial:</label>
+                                <li>
+                                    <span class="label">When receiving this serial:</span>
                                     [% IF ( serialsadditems ) %]
                                         <input type="radio" id="serialsadditems-yes" name="serialsadditems" value="1" checked="checked" />
-                                        <label class="widelabel" for="serialsadditems-yes"> Create an item record</label>
+                                        <label class="radio" for="serialsadditems-yes"> Create an item record</label>
                                         <input type="radio" id="serialsadditems-no" name="serialsadditems" value="0" />
-                                        <label class="widelabel" for="serialsadditems-no"> Do not create an item record</label>
+                                        <label class="radio" for="serialsadditems-no"> Do not create an item record</label>
                                     [% ELSE %]
                                         <input type="radio" id="serialsadditems-yes" name="serialsadditems" value="1"/>
-                                        <label class="widelabel" for="serialsadditems-yes"> Create an item record</label>
+                                        <label class="radio" for="serialsadditems-yes"> Create an item record</label>
                                         <input type="radio" id="serialsadditems-no" name="serialsadditems" value="0" checked="checked" />
-                                        <label class="widelabel" for="serialsadditems-no"> Do not create an item record</label>
+                                        <label class="radio" for="serialsadditems-no"> Do not create an item record</label>
                                     [% END %]
                                 </li>
-                                <li class="radio">
+                                <li>
                                 <label for="irregular_issue">When there is an irregular issue:</label>
                                   [% IF (skip_serialseq) %]
                                       <input type="radio" id="skip_serialseq_yes" name="skip_serialseq" value="1" checked="checked" />
-                                      <label for="skip_serialseq_yes">Skip issue number</label>
+                                      <label class="radio" for="skip_serialseq_yes">Skip issue number</label>
                                       <input type="radio" id="skip_serialseq_no" name="skip_serialseq" value="0" />
-                                      <label for="skip_serialseq_no">Keep issue number</label>
+                                      <label class="radio" for="skip_serialseq_no">Keep issue number</label>
                                   [% ELSE %]
                                       <input type="radio" id="skip_serialseq_yes" name="skip_serialseq" value="1" />
-                                      <label for="skip_serialseq_yes">Skip issue number</label>
+                                      <label class="radio" for="skip_serialseq_yes">Skip issue number</label>
                                       <input type="radio" id="skip_serialseq_no" name="skip_serialseq" value="0" checked="checked" />
-                                      <label for="skip_serialseq_no">Keep issue number</label>
+                                      <label class="radio" for="skip_serialseq_no">Keep issue number</label>
                                   [% END %]
                                 </li>
                                 <li>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt
index 2beeaaa0ad..f271fc58ff 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt
@@ -309,7 +309,7 @@
             </ol>
         </fieldset>
 
-        <fieldset class="rows">
+        <fieldset class="brief">
             <legend>If matching record is already in the borrowers table:</legend>
 
             <ol>
@@ -338,7 +338,7 @@
         </fieldset>
 
         [% IF ( Koha.Preference('ExtendedPatronAttributes') == 1 ) %]
-            <fieldset class="rows">
+            <fieldset class="brief">
                 <legend>Patron attributes</legend>
 
                 <ol>
-- 
2.39.5