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

(-)a/koha-tmpl/opac-tmpl/bootstrap/css/src/_common.scss (-14 / +14 lines)
Lines 941-975 ul { Link Here
941
/* Redefine a new style for Bootstrap's class "close" since we use that already */
941
/* Redefine a new style for Bootstrap's class "close" since we use that already */
942
/* Use <a class="closebtn" href="#">&times;</a> */
942
/* Use <a class="closebtn" href="#">&times;</a> */
943
943
944
.modal-header .closebtn {
945
    margin-top: 2px;
946
}
947
948
.closebtn {
944
.closebtn {
945
    background: transparent;
946
    border: 0;
949
    color: #000000;
947
    color: #000000;
948
    cursor: pointer;
950
    float: right;
949
    float: right;
951
    font-size: 20px;
950
    font-size: 1.5rem;
952
    font-weight: bold;
951
    font-weight: bold;
953
    line-height: 20px;
952
    line-height: 1;
954
    opacity: .2;
953
    opacity: .5;
954
    padding: 1rem 1rem;
955
    margin: -1rem -1rem -1rem auto;
955
    text-shadow: 0 1px 0 #FFFFFF;
956
    text-shadow: 0 1px 0 #FFFFFF;
956
957
957
    &:hover {
958
    &:hover {
958
        color: #000000;
959
        color: #000000;
959
        cursor: pointer;
960
        cursor: pointer;
960
        opacity: .4;
961
        opacity: .7;
961
        text-decoration: none;
962
        text-decoration: none;
962
    }
963
    }
963
}
964
}
964
965
965
button {
966
.ui-widget {
966
    &.closebtn {
967
    .closebtn {
967
        background: transparent;
968
        font-size: 1.5rem;
968
        border: 0;
969
        cursor: pointer;
970
        padding: 0;
971
    }
969
    }
970
}
972
971
972
button {
973
    &.remove {
973
    &.remove {
974
        &:hover {
974
        &:hover {
975
            color: #900;
975
            color: #900;
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc (-10 / +33 lines)
Lines 84-99 Link Here
84
                        [% UNLESS( singleBranchMode) %]
84
                        [% UNLESS( singleBranchMode) %]
85
                            <td class="branch">
85
                            <td class="branch">
86
                                <span class="tdlabel">Pick up location:</span>
86
                                <span class="tdlabel">Pick up location:</span>
87
                                [% HOLD.branch.branchname | html %]
87
                                [% IF ( HOLD.can_change_branch_opac ) %]
88
                                [% IF ( HOLD.can_change_branch_opac ) %]
88
                                    <form class="change_branch" action="/cgi-bin/koha/opac-modrequest.pl" method="post">
89
                                    <button type="button" class="btn btn-sm btn-link" data-toggle="modal" data-target="#changePickup[% HOLD.reserve_id | html %]">
89
                                        <select name="new_branch" >
90
                                        <i class="fa fa-pencil" aria-hidden="true"></i> Change
90
                                            [% PROCESS options_for_libraries libraries = Branches.pickup_locations({    search_params => { biblio => HOLD.biblionumber, patron => HOLD.borrower }, selected => HOLD.branchcode }) %]
91
                                    </button>
91
                                       </select>
92
                                    <!-- Change pickup location modal -->
92
                                       <input type="hidden" name="new_branch_reserveid" value="[% HOLD.reserve_id | html %]" />
93
                                    <div class="modal" id="changePickup[% HOLD.reserve_id | html %]" tabindex="-1" aria-labelledby="changePickup[% HOLD.reserve_id | html %]Label" aria-hidden="true">
93
                                       <button class="btn btn-primary" type="submit" name="change_branch" value="1">Change</button>
94
                                        <div class="modal-dialog">
94
                                    </form>
95
                                            <form id="change_branch_form[% HOLD.reserve_id | html %]" action="/cgi-bin/koha/opac-modrequest.pl" method="post">
95
                                [% ELSE %]
96
                                                <div class="modal-content">
96
                                    [% HOLD.branch.branchname | html %]
97
                                                    <div class="modal-header">
98
                                                        <h5 class="modal-title" id="changePickup[% HOLD.reserve_id | html %]Label">Change pickup location for <em>[% INCLUDE 'biblio-title.inc' biblio=HOLD.biblio %]</em></h5>
99
                                                        <button type="button" class="closebtn" data-dismiss="modal" aria-label="Close">
100
                                                            <span aria-hidden="true">&times;</span>
101
                                                        </button>
102
                                                    </div>
103
                                                    <div class="modal-body">
104
                                                        <div class="form-group">
105
                                                        <label for="new_branch[% HOLD.reserve_id | html %]">New pickup location:</label>
106
                                                        <select name="new_branch" id="new_branch[% HOLD.reserve_id | html %]" class="form-control">
107
                                                            [% PROCESS options_for_libraries libraries = Branches.pickup_locations({ search_params => { biblio => HOLD.biblionumber, patron => HOLD.borrower }, selected => HOLD.branchcode }) %]
108
                                                        </select>
109
                                                        </div>
110
                                                        <input type="hidden" name="new_branch_reserveid" value="[% HOLD.reserve_id | html %]" />
111
                                                    </div>
112
                                                    <div class="modal-footer">
113
                                                        <button type="submit" name="change_branch" value="1" class="btn btn-primary"><i class="fa fa-check" aria-hidden="true"></i> Save</button>
114
                                                        <button type="button" class="btn btn-secondary" data-dismiss="modal"><i class="fa fa-remove" aria-hidden="true"></i> Cancel</button>
115
                                                    </div>
116
                                                </div> <!-- /.modal-content -->
117
                                            </form>
118
                                        </div> <!-- /.modal-dialog -->
119
                                    </div> <!-- /.modal -->
97
                                [% END  %]
120
                                [% END  %]
98
                            </td>
121
                            </td>
99
                        [% END %]
122
                        [% END %]
Lines 161-167 Link Here
161
                                                                    <h3 class="modal-title" id="suspendModal[% HOLD.reserve_id | html %]Label">Suspend your hold on <em>[% HOLD.biblio.title | html %]</em></h3>
184
                                                                    <h3 class="modal-title" id="suspendModal[% HOLD.reserve_id | html %]Label">Suspend your hold on <em>[% HOLD.biblio.title | html %]</em></h3>
162
                                                                [% END %]
185
                                                                [% END %]
163
                                                                <button type="button" class="closebtn" data-dismiss="modal" aria-label="Close">
186
                                                                <button type="button" class="closebtn" data-dismiss="modal" aria-label="Close">
164
                                                                    <span aria-hidden="true">x</span>
187
                                                                    <span aria-hidden="true">&times;</span>
165
                                                                </button>
188
                                                                </button>
166
                                                            </div>
189
                                                            </div>
167
                                                            <div class="modal-body">
190
                                                            <div class="modal-body">
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/overdrive-checkout.inc (-1 / +1 lines)
Lines 1-6 Link Here
1
<div id="overdrive-checkout" class="modal" tabindex="-1" role="dialog" aria-labelledby="overdrive-checkout-label" aria-hidden="true">
1
<div id="overdrive-checkout" class="modal" tabindex="-1" role="dialog" aria-labelledby="overdrive-checkout-label" aria-hidden="true">
2
    <div class="modal-header">
2
    <div class="modal-header">
3
        <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">×</button>
3
        <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">&times;</button>
4
        <h3 id="overdrive-checkout-label">Checkout</h3>
4
        <h3 id="overdrive-checkout-label">Checkout</h3>
5
    </div>
5
    </div>
6
    <form action="#" method="post" id="overdrive-checkout-form">
6
    <form action="#" method="post" id="overdrive-checkout-form">
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt (+6 lines)
Lines 1051-1056 Link Here
1051
                minDate: 1
1051
                minDate: 1
1052
            });
1052
            });
1053
1053
1054
            $(".change_pickup").on("click", function(){
1055
                var hold_id = $(this).data("hold-id");
1056
                $(this).hide();
1057
                $("#change-pickup-location" + hold_id ).show();
1058
            });
1059
1054
            if ( $('#opac-user-clubs').length ) {
1060
            if ( $('#opac-user-clubs').length ) {
1055
                $('#opac-user-clubs-tab-link').on('click', function() {
1061
                $('#opac-user-clubs-tab-link').on('click', function() {
1056
                    $('#opac-user-clubs').text(_("Loading..."));
1062
                    $('#opac-user-clubs').text(_("Loading..."));
(-)a/koha-tmpl/opac-tmpl/bootstrap/js/global.js (-2 / +1 lines)
Lines 84-90 function confirmModal(message, title, yes_label, no_label, callback) { Link Here
84
                    <div class="modal-header" style="min-height:40px;">\
84
                    <div class="modal-header" style="min-height:40px;">\
85
                        <h4 class="modal-title"></h4>\
85
                        <h4 class="modal-title"></h4>\
86
                        <button type="button" class="closebtn" data-dismiss="modal" aria-label="Close">\
86
                        <button type="button" class="closebtn" data-dismiss="modal" aria-label="Close">\
87
                        <span aria-hidden="true">×</span>\
87
                        <span aria-hidden="true">&times;</span>\
88
                    </button>\
88
                    </button>\
89
                    </div>\
89
                    </div>\
90
                    <div class="modal-body"><p></p></div>\
90
                    <div class="modal-body"><p></p></div>\
91
- 

Return to bug 14783