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 886-920 ul { Link Here
886
/* Redefine a new style for Bootstrap's class "close" since we use that already */
886
/* Redefine a new style for Bootstrap's class "close" since we use that already */
887
/* Use <a class="closebtn" href="#">&times;</a> */
887
/* Use <a class="closebtn" href="#">&times;</a> */
888
888
889
.modal-header .closebtn {
890
    margin-top: 2px;
891
}
892
893
.closebtn {
889
.closebtn {
890
    background: transparent;
891
    border: 0;
894
    color: #000000;
892
    color: #000000;
893
    cursor: pointer;
895
    float: right;
894
    float: right;
896
    font-size: 20px;
895
    font-size: 1.5rem;
897
    font-weight: bold;
896
    font-weight: bold;
898
    line-height: 20px;
897
    line-height: 1;
899
    opacity: .2;
898
    opacity: .5;
899
    padding: 1rem 1rem;
900
    margin: -1rem -1rem -1rem auto;
900
    text-shadow: 0 1px 0 #FFFFFF;
901
    text-shadow: 0 1px 0 #FFFFFF;
901
902
902
    &:hover {
903
    &:hover {
903
        color: #000000;
904
        color: #000000;
904
        cursor: pointer;
905
        cursor: pointer;
905
        opacity: .4;
906
        opacity: .7;
906
        text-decoration: none;
907
        text-decoration: none;
907
    }
908
    }
908
}
909
}
909
910
910
button {
911
.ui-widget {
911
    &.closebtn {
912
    .closebtn {
912
        background: transparent;
913
        font-size: 1.5rem;
913
        border: 0;
914
        cursor: pointer;
915
        padding: 0;
916
    }
914
    }
915
}
917
916
917
button {
918
    &.remove {
918
    &.remove {
919
        &:hover {
919
        &:hover {
920
            color: #900;
920
            color: #900;
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc (-9 / +32 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 %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt (+6 lines)
Lines 1117-1122 Link Here
1117
1117
1118
            [% END %]
1118
            [% END %]
1119
1119
1120
            $(".change_pickup").on("click", function(){
1121
                var hold_id = $(this).data("hold-id");
1122
                $(this).hide();
1123
                $("#change-pickup-location" + hold_id ).show();
1124
            });
1125
1120
            if ( $('#opac-user-clubs').length ) {
1126
            if ( $('#opac-user-clubs').length ) {
1121
                $('#opac-user-clubs-tab-link').on('click', function() {
1127
                $('#opac-user-clubs-tab-link').on('click', function() {
1122
                    $('#opac-user-clubs').text(_("Loading..."));
1128
                    $('#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