From c8a263e1bc9f87ea68bc568a4306982fc5b30dbd Mon Sep 17 00:00:00 2001
From: Julian Maurice <julian.maurice@biblibre.com>
Date: Wed, 14 Sep 2022 14:38:41 +0200
Subject: [PATCH] Bug 30952: Fix style of some buttons

---
 .../intranet-tmpl/prog/css/src/_mixins.scss   |  1 -
 .../prog/css/src/staff-global.scss            | 15 --------
 .../prog/en/modules/catalogue/advsearch.tt    | 36 +++++++++----------
 .../prog/en/modules/cataloguing/addbiblio.tt  | 10 +++---
 .../prog/en/modules/members/memberentrygen.tt |  8 ++---
 5 files changed, 26 insertions(+), 44 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/_mixins.scss b/koha-tmpl/intranet-tmpl/prog/css/src/_mixins.scss
index 85514396b6..d17055405b 100644
--- a/koha-tmpl/intranet-tmpl/prog/css/src/_mixins.scss
+++ b/koha-tmpl/intranet-tmpl/prog/css/src/_mixins.scss
@@ -29,7 +29,6 @@ $nav-menu-bullet: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/s
 @mixin disabled-button {
     background: #EEE none;
     border: 1px solid #C0C0C0;
-    color: #999;
 }
 
 @mixin card {
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 b8dd213015..a7bf792b2b 100644
--- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
+++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
@@ -41,21 +41,6 @@ a {
         padding: 2px 4px;
     }
 
-    &.btn {
-        &.btn-link {
-            &:link,
-            &:visited {
-                color: $green-text-color;
-            }
-
-            &:hover {
-                text-decoration: underline;
-                font-weight: bold;
-            }
-        }
-
-    }
-
     &.edit-patronimage {
         color: #333;
         background-color: #e6e6e6;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt
index 9ed3f069cd..1b2272943b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt
@@ -59,25 +59,23 @@
 
                     <!-- SEARCH BUTTONS -->
                     <div id="toolbar" class="btn-toolbar">
-                        <fieldset class="action" id="submit1">
-                            <div class="btn-group">
-                                <button class="btn btn-default" type="submit" accesskey="s"><i class="fa fa-search"></i> Search</button>
-                            </div>
-                            <div class="btn-group">
-                            [% IF ( expanded_options ) %]
-                                <a href="/cgi-bin/koha/catalogue/search.pl?expanded_options=0" class="btn btn-link"><i class="fa fa-search-minus"></i> Fewer options</a>
-                            </div>
-                            [% ELSE %]
-                                <a href="/cgi-bin/koha/catalogue/search.pl?expanded_options=1" class="btn btn-link"><i class="fa fa-search-plus"></i> More options</a>
-                            </div>
-                            [% END %]
-                            <div class="btn-group">
-                                <a href="/cgi-bin/koha/catalogue/search.pl?do=Clear&expanded_options=[% expanded_options | uri %]" class="btn btn-link"><i class="fa fa-trash"></i> Clear fields</a>
-                            </div>
-                            <div class="btn-group">
-                                <a href="/cgi-bin/koha/catalogue/itemsearch.pl" class="btn btn-default"><i class="fa fa-search"></i> Go to item search</a>
-                            </div>
-                        </fieldset> <!-- /.action -->
+                        <div class="btn-group">
+                            <button class="btn btn-primary" type="submit" accesskey="s"><i class="fa fa-search"></i> Search</button>
+                        </div>
+                        <div class="btn-group">
+                        [% IF ( expanded_options ) %]
+                            <a href="/cgi-bin/koha/catalogue/search.pl?expanded_options=0" class="btn btn-link"><i class="fa fa-search-minus"></i> Fewer options</a>
+                        </div>
+                        [% ELSE %]
+                            <a href="/cgi-bin/koha/catalogue/search.pl?expanded_options=1" class="btn btn-link"><i class="fa fa-search-plus"></i> More options</a>
+                        </div>
+                        [% END %]
+                        <div class="btn-group">
+                            <a href="/cgi-bin/koha/catalogue/search.pl?do=Clear&expanded_options=[% expanded_options | uri %]" class="btn btn-link"><i class="fa fa-trash"></i> Clear fields</a>
+                        </div>
+                        <div class="btn-group">
+                            <a href="/cgi-bin/koha/catalogue/itemsearch.pl" class="btn btn-link"><i class="fa fa-search"></i> Go to item search</a>
+                        </div>
                     </div> <!-- /#toolbar -->
                     <!-- /SEARCH BUTTONS -->
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
index cb6a16f905..18fdac3ff1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
@@ -867,12 +867,12 @@ function PopupMARCFieldDoc(field) {
                     [% IF CAN_user_editcatalogue_edit_items or ( frameworkcode == 'FA' and CAN_user_editcatalogue_fast_cataloging ) %]
                         [% IF (circborrowernumber) %][%# fast cataloging must lead to items %]
                             <!-- Action is under fast cataloging - Save button redirecting to items -->
-                            <div class="btn-group"><a href="#" id="saveanditems" class="btn btn-default"><i class="fa fa-save"></i> Save</a></div>
+                            <div class="btn-group"><a href="#" id="saveanditems" class="btn btn-primary"><i class="fa fa-save"></i> Save</a></div>
                         [% ELSE %]
                             <!-- Not using fast cataloging - Display split menu -->
                             <div class="btn-group">
-                                <button class="btn btn-default" id="saverecord"><i class="fa fa-save"></i> Save</button>
-                                <button class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+                                <button class="btn btn-primary" id="saverecord"><i class="fa fa-save"></i> Save</button>
+                                <button class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
                                 <span class="caret"></span>
                                 </button>
                                 <ul class="dropdown-menu">
@@ -939,11 +939,11 @@ function PopupMARCFieldDoc(field) {
                     [% UNLESS (circborrowernumber) %][%# Hide in fast cataloging %]
                         [% IF (biblionumber) %]
                             <div class="btn-group">
-                                <a href="[% PROCESS biblio_a_href biblionumber => biblionumber %]" class="btn btn-default" id="cancel">Cancel</a>
+                                <a href="[% PROCESS biblio_a_href biblionumber => biblionumber %]" class="btn btn-link" id="cancel">Cancel</a>
                             </div>
                         [% ELSE %]
                             <div class="btn-group">
-                                <a class="btn btn-default" id="cancel" href="/cgi-bin/koha/cataloguing/addbooks.pl">Cancel</a>
+                                <a class="btn btn-link" id="cancel" href="/cgi-bin/koha/cataloguing/addbooks.pl">Cancel</a>
                             </div>
                         [% END %]
                         <div id="show-errors" class="btn-group"></div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
index edf8d13570..820e445189 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
@@ -227,13 +227,13 @@ legend:hover {
                         [% UNLESS ( check_member ) %]
                             <div id="toolbar" class="btn-toolbar">
                                 [% IF quickadd && opadd %]
-                                    <button class="btn btn-default toggler" id="save_quick_add" name="save"><i class="fa fa-save"></i> Save</button>
+                                    <button class="btn btn-primary toggler" id="save_quick_add" name="save"><i class="fa fa-save"></i> Save</button>
                                 [% END %]
-                                <button class="btn btn-default toggler" id="saverecord" name="save" ><i class="fa fa-save"></i> Save</button>
+                                <button class="btn btn-primary toggler" id="saverecord" name="save" ><i class="fa fa-save"></i> Save</button>
                                 [% IF opadd %]
-                                    <a class="btn btn-default" href="/cgi-bin/koha/members/member.pl" class="toggler save_entryform">
+                                    <a class="btn btn-link" href="/cgi-bin/koha/members/member.pl" class="toggler save_entryform">
                                 [% ELSE %]
-                                    <a class="btn btn-default" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber | html %]">
+                                    <a class="btn btn-link" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber | html %]">
                                 [% END %]
                                     <i class="fa fa-times"></i> Cancel
                                 </a>
-- 
2.30.2