Attachment #140629 for bug #30952

View | Details | Raw Unified | Return to bug 30952
Collapse All | Expand All

Lines 29-35 $nav-menu-bullet: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/s Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/css/src/_mixins.scss (-1 lines)
29	@mixin disabled-button {	29	@mixin disabled-button {
30	background: #EEE none;	30	background: #EEE none;
31	border: 1px solid #C0C0C0;	31	border: 1px solid #C0C0C0;
32	color: #999;
33	}	32	}
34		33
35	@mixin card {	34	@mixin card {




        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;





                    <!-- SEARCH BUTTONS -->
                    <div id="toolbar" class="btn-toolbar">
                        <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>
                        </fieldset> <!-- /.action -->
                    </div> <!-- /#toolbar -->
                    <!-- /SEARCH BUTTONS -->





                    [% 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-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-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">

                    [% UNLESS (circborrowernumber) %][%# Hide in fast cataloging %]
                        [% IF (biblionumber) %]
                            <div class="btn-group">
                                <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-link" id="cancel" href="/cgi-bin/koha/cataloguing/addbooks.pl">Cancel</a>
                            </div>
                        [% END %]
                        <div id="show-errors" class="btn-group"></div>




                        [% UNLESS ( check_member ) %]
                            <div id="toolbar" class="btn-toolbar">
                                [% IF quickadd && opadd %]
                                    <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-primary toggler" id="saverecord" name="save" ><i class="fa fa-save"></i> Save</button>
                                [% IF opadd %]
                                    <a class="btn btn-link" href="/cgi-bin/koha/members/member.pl" class="toggler save_entryform">
                                [% ELSE %]
                                    <a class="btn btn-link" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber | html %]">
                                [% END %]
                                    <i class="fa fa-times"></i> Cancel
                                </a>
- 

Return to bug 30952

Lines 41-61 a { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss (-15 lines)
41	padding: 2px 4px;	41	padding: 2px 4px;
42	}	42	}
43		43
44	&.btn {
45	&.btn-link {
46	&:link,
47	&:visited {
48	color: $green-text-color;
49	}
50
51	&:hover {
52	text-decoration: underline;
53	font-weight: bold;
54	}
55	}
56
57	}
58
59	&.edit-patronimage {	44	&.edit-patronimage {
60	color: #333;	45	color: #333;
61	background-color: #e6e6e6;	46	background-color: #e6e6e6;

Lines 59-83 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt (-19 / +17 lines)
59		59
60	<!-- SEARCH BUTTONS -->	60	<!-- SEARCH BUTTONS -->
61	<div id="toolbar" class="btn-toolbar">	61	<div id="toolbar" class="btn-toolbar">
62	<fieldset class="action" id="submit1">	62	<div class="btn-group">
63	<div class="btn-group">	63	<button class="btn btn-primary" type="submit" accesskey="s"><i class="fa fa-search"></i> Search</button>
64	<button class="btn btn-default" type="submit" accesskey="s"><i class="fa fa-search"></i> Search</button>	64	</div>
65	</div>	65	<div class="btn-group">
66	<div class="btn-group">	66	[% IF ( expanded_options ) %]
67	[% IF ( expanded_options ) %]	67	<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>
68	<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>	68	</div>
69	</div>	69	[% ELSE %]
70	[% ELSE %]	70	<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>
71	<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>	71	</div>
72	</div>	72	[% END %]
73	[% END %]	73	<div class="btn-group">
74	<div class="btn-group">	74	<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>
75	<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>	75	</div>
76	</div>	76	<div class="btn-group">
77	<div class="btn-group">	77	<a href="/cgi-bin/koha/catalogue/itemsearch.pl" class="btn btn-link"><i class="fa fa-search"></i> Go to item search</a>
78	<a href="/cgi-bin/koha/catalogue/itemsearch.pl" class="btn btn-default"><i class="fa fa-search"></i> Go to item search</a>	78	</div>
79	</div>
80	</fieldset> <!-- /.action -->
81	</div> <!-- /#toolbar -->	79	</div> <!-- /#toolbar -->
82	<!-- /SEARCH BUTTONS -->	80	<!-- /SEARCH BUTTONS -->
83		81

Lines 867-878 function PopupMARCFieldDoc(field) { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt (-5 / +5 lines)
867	[% IF CAN_user_editcatalogue_edit_items or ( frameworkcode == 'FA' and CAN_user_editcatalogue_fast_cataloging ) %]	867	[% IF CAN_user_editcatalogue_edit_items or ( frameworkcode == 'FA' and CAN_user_editcatalogue_fast_cataloging ) %]
868	[% IF (circborrowernumber) %][%# fast cataloging must lead to items %]	868	[% IF (circborrowernumber) %][%# fast cataloging must lead to items %]
869	<!-- Action is under fast cataloging - Save button redirecting to items -->	869	<!-- Action is under fast cataloging - Save button redirecting to items -->
870	<div class="btn-group"><a href="#" id="saveanditems" class="btn btn-default"><i class="fa fa-save"></i> Save</a></div>	870	<div class="btn-group"><a href="#" id="saveanditems" class="btn btn-primary"><i class="fa fa-save"></i> Save</a></div>
871	[% ELSE %]	871	[% ELSE %]
872	<!-- Not using fast cataloging - Display split menu -->	872	<!-- Not using fast cataloging - Display split menu -->
873	<div class="btn-group">	873	<div class="btn-group">
874	<button class="btn btn-default" id="saverecord"><i class="fa fa-save"></i> Save</button>	874	<button class="btn btn-primary" id="saverecord"><i class="fa fa-save"></i> Save</button>
875	<button class="btn btn-default dropdown-toggle" data-toggle="dropdown">	875	<button class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
876	<span class="caret"></span>	876	<span class="caret"></span>
877	</button>	877	</button>
878	<ul class="dropdown-menu">	878	<ul class="dropdown-menu">
Lines 939-949 function PopupMARCFieldDoc(field) { Link Here
939	[% UNLESS (circborrowernumber) %][%# Hide in fast cataloging %]	939	[% UNLESS (circborrowernumber) %][%# Hide in fast cataloging %]
940	[% IF (biblionumber) %]	940	[% IF (biblionumber) %]
941	<div class="btn-group">	941	<div class="btn-group">
942	<a href="[% PROCESS biblio_a_href biblionumber => biblionumber %]" class="btn btn-default" id="cancel">Cancel</a>	942	<a href="[% PROCESS biblio_a_href biblionumber => biblionumber %]" class="btn btn-link" id="cancel">Cancel</a>
943	</div>	943	</div>
944	[% ELSE %]	944	[% ELSE %]
945	<div class="btn-group">	945	<div class="btn-group">
946	<a class="btn btn-default" id="cancel" href="/cgi-bin/koha/cataloguing/addbooks.pl">Cancel</a>	946	<a class="btn btn-link" id="cancel" href="/cgi-bin/koha/cataloguing/addbooks.pl">Cancel</a>
947	</div>	947	</div>
948	[% END %]	948	[% END %]
949	<div id="show-errors" class="btn-group"></div>	949	<div id="show-errors" class="btn-group"></div>

Lines 227-239 legend:hover { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt (-5 / +4 lines)
227	[% UNLESS ( check_member ) %]	227	[% UNLESS ( check_member ) %]
228	<div id="toolbar" class="btn-toolbar">	228	<div id="toolbar" class="btn-toolbar">
229	[% IF quickadd && opadd %]	229	[% IF quickadd && opadd %]
230	<button class="btn btn-default toggler" id="save_quick_add" name="save"><i class="fa fa-save"></i> Save</button>	230	<button class="btn btn-primary toggler" id="save_quick_add" name="save"><i class="fa fa-save"></i> Save</button>
231	[% END %]	231	[% END %]
232	<button class="btn btn-default toggler" id="saverecord" name="save" ><i class="fa fa-save"></i> Save</button>	232	<button class="btn btn-primary toggler" id="saverecord" name="save" ><i class="fa fa-save"></i> Save</button>
233	[% IF opadd %]	233	[% IF opadd %]
234	<a class="btn btn-default" href="/cgi-bin/koha/members/member.pl" class="toggler save_entryform">	234	<a class="btn btn-link" href="/cgi-bin/koha/members/member.pl" class="toggler save_entryform">
235	[% ELSE %]	235	[% ELSE %]
236	<a class="btn btn-default" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber \| html %]">	236	<a class="btn btn-link" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber \| html %]">
237	[% END %]	237	[% END %]
238	<i class="fa fa-times"></i> Cancel	238	<i class="fa fa-times"></i> Cancel
239	</a>	239	</a>
240	-