Attachment 141686 Details for Bug 30952 – Bug 30952: Fix style of some buttons

[patch] Bug 30952: Fix style of some buttons

Bug-30952-Fix-style-of-some-buttons.patch (text/plain), 9.70 KB, created by Julian Maurice on 2022-10-12 05:35:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Julian Maurice

Created: 2022-10-12 05:35:14 UTC

Size: 9.70 KB

patch

obsolete

>From d25df15e62097f8efbbaf277c93205e169360884 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 93cf6ff9e0..70a0dd657d 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 @@
> 
>                     
>                     <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> 
>+                        <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> 
>                     
> 
>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 %]
>                             
>-                            <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 %]
>                             
>                             <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 0d8837b50c..12f5eef2e4 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

Actions: View | Diff | Splinter Review

Attachments on bug 30952: 136810 | 136812 | 136813 | 136815 | 136816 | 136818 | 136819 | 136820 | 136822 | 136823 | 136825 | 136827 | 136828 | 136830 | 136831 | 136833 | 136834 | 136836 | 136837 | 136839 | 136840 | 136842 | 136844 | 136845 | 136847 | 136848 | 136878 | 136879 | 136880 | 136881 | 136882 | 136883 | 136884 | 136885 | 136886 | 136887 | 136888 | 136889 | 136890 | 136891 | 136892 | 136893 | 136894 | 136895 | 136896 | 136897 | 136898 | 136899 | 136900 | 136901 | 136902 | 136950 | 136951 | 136952 | 136953 | 136954 | 136955 | 136956 | 136957 | 136958 | 136959 | 136960 | 136961 | 136962 | 136963 | 136964 | 136965 | 136966 | 136967 | 136968 | 136969 | 136970 | 136971 | 136972 | 136973 | 136974 | 137408 | 137409 | 137410 | 137411 | 137414 | 137415 | 137416 | 137417 | 137418 | 137419 | 137420 | 137744 | 137767 | 137768 | 137775 | 137776 | 137994 | 138091 | 138092 | 138093 | 138094 | 138095 | 138096 | 138097 | 138098 | 138099 | 138100 | 138101 | 138102 | 138103 | 138245 | 138246 | 138247 | 138293 | 138299 | 138300 | 138302 | 140117 | 140118 | 140119 | 140120 | 140121 | 140122 | 140123 | 140124 | 140125 | 140126 | 140127 | 140128 | 140129 | 140130 | 140131 | 140132 | 140133 | 140134 | 140135 | 140136 | 140137 | 140138 | 140139 | 140140 | 140141 | 140142 | 140143 | 140371 | 140372 | 140373 | 140374 | 140433 | 140435 | 140459 | 140460 | 140512 | 140513 | 140514 | 140515 | 140516 | 140517 | 140519 | 140520 | 140521 | 140522 | 140523 | 140524 | 140525 | 140526 | 140527 | 140528 | 140529 | 140530 | 140531 | 140532 | 140533 | 140534 | 140535 | 140536 | 140537 | 140538 | 140539 | 140540 | 140541 | 140542 | 140543 | 140544 | 140545 | 140546 | 140547 | 140548 | 140549 | 140550 | 140551 | 140552 | 140553 | 140554 | 140555 | 140556 | 140557 | 140558 | 140559 | 140560 | 140566 | 140567 | 140570 | 140571 | 140575 | 140576 | 140577 | 140588 | 140613 | 140617 | 140618 | 140619 | 140620 | 140628 | 140629 | 140635 | 140649 | 140650 | 140651 | 140652 | 140653 | 140654 | 140658 | 140687 | 140976 | 140977 | 141020 | 141024 | 141026 | 141027 | 141041 | 141043 | 141044 | 141047 | 141052 | 141053 | 141054 | 141055 | 141056 | 141057 | 141064 | 141074 | 141075 | 141631 | 141632 | 141633 | 141634 | 141635 | 141636 | 141637 | 141638 | 141639 | 141640 | 141641 | 141642 | 141643 | 141644 | 141645 | 141646 | 141647 | 141648 | 141649 | 141650 | 141651 | 141652 | 141653 | 141654 | 141655 | 141656 | 141657 | 141658 | 141659 | 141660 | 141661 | 141662 | 141663 | 141664 | 141665 | 141666 | 141667 | 141668 | 141669 | 141670 | 141671 | 141672 | 141673 | 141674 | 141675 | 141676 | 141677 | 141678 | 141679 | 141680 | 141681 | 141682 | 141683 | 141684 | 141685 | 141686 | 141687 | 141688 | 141689 | 141690 | 141691 | 141692 | 141693 | 141694 | 141695 | 141696 | 141697 | 141698 | 141699 | 141700 | 141701 | 141702 | 141703 | 141704 | 141705 | 141706 | 141707 | 141708 | 141709 | 141710 | 141711 | 141712 | 141713 | 142604 | 142605