Attachment #141500 for bug #14783

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





/* Use <a class="closebtn" href="#">&times;</a> */

.modal-header .closebtn {
    margin-top: 2px;
}

.closebtn {
    background: transparent;
    border: 0;
    color: #000000;
    cursor: pointer;
    float: right;
    font-size: 1.5rem;
    font-weight: bold;
    line-height: 1;
    opacity: .5;
    padding: 1rem 1rem;
    margin: -1rem -1rem -1rem auto;
    text-shadow: 0 1px 0 #FFFFFF;

    &:hover {
        color: #000000;
        cursor: pointer;
        opacity: .7;
        text-decoration: none;
    }
}

.ui-widget {
    .closebtn {
        font-size: 1.5rem;
        border: 0;
        cursor: pointer;
        padding: 0;
    }
}

button {
    &.remove {
        &:hover {
            color: #900;




                        [% UNLESS( singleBranchMode) %]
                            <td class="branch">
                                <span class="tdlabel">Pick up location:</span>
                                [% HOLD.branch.branchname | html %]
                                [% IF ( HOLD.can_change_branch_opac ) %]
                                    <button type="button" class="btn btn-sm btn-link" data-toggle="modal" data-target="#changePickup[% HOLD.reserve_id | html %]">
                                        <i class="fa fa-pencil" aria-hidden="true"></i> Change
                                    </button>
                                    <!-- Change pickup location modal -->
                                    <div class="modal" id="changePickup[% HOLD.reserve_id | html %]" tabindex="-1" aria-labelledby="changePickup[% HOLD.reserve_id | html %]Label" aria-hidden="true">
                                        <div class="modal-dialog">
                                            <form id="change_branch_form[% HOLD.reserve_id | html %]" action="/cgi-bin/koha/opac-modrequest.pl" method="post">
                                                <div class="modal-content">
                                                    <div class="modal-header">
                                                        <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>
                                                        <button type="button" class="closebtn" data-dismiss="modal" aria-label="Close">
                                                            <span aria-hidden="true">&times;</span>
                                                        </button>
                                                    </div>
                                                    <div class="modal-body">
                                                        <div class="form-group">
                                                        <label for="new_branch[% HOLD.reserve_id | html %]">New pickup location:</label>
                                                        <select name="new_pickup_location" id="new_branch[% HOLD.reserve_id | html %]" class="form-control">
                                                            [% PROCESS options_for_libraries libraries = Branches.pickup_locations({ search_params => { biblio => HOLD.biblionumber, patron => HOLD.borrower }, selected => HOLD.branchcode }) %]
                                                        </select>
                                                        </div>
                                                        <input type="hidden" name="reserve_id" value="[% HOLD.reserve_id | html %]" />
                                                    </div>
                                                    <div class="modal-footer">
                                                        <button type="submit" name="change_branch" value="1" class="btn btn-primary"><i class="fa fa-check" aria-hidden="true"></i> Save</button>
                                                        <button type="button" class="btn btn-secondary" data-dismiss="modal"><i class="fa fa-remove" aria-hidden="true"></i> Cancel</button>
                                                    </div>
                                                </div> <!-- /.modal-content -->
                                            </form>
                                        </div> <!-- /.modal-dialog -->
                                    </div> <!-- /.modal -->
                                [% END  %]
                            </td>
                        [% END %]

Lines 1245-1250 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt (+6 lines)
1245		1245
1246	[% END %]	1246	[% END %]
1247		1247
		1248	$(".change_pickup").on("click", function(){
		1249	var hold_id = $(this).data("hold-id");
		1250	$(this).hide();
		1251	$("#change-pickup-location" + hold_id ).show();
		1252	});
		1253
1248	if ( $('#opac-user-clubs').length ) {	1254	if ( $('#opac-user-clubs').length ) {
1249	$('#opac-user-clubs-tab-link').on('click', function() {	1255	$('#opac-user-clubs-tab-link').on('click', function() {
1250	$('#opac-user-clubs').text(_("Loading..."));	1256	$('#opac-user-clubs').text(_("Loading..."));

Lines 85-91 function confirmModal(message, title, yes_label, no_label, callback) { Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/js/global.js (-2 / +1 lines)
85	<div class="modal-header" style="min-height:40px;">\	85	<div class="modal-header" style="min-height:40px;">\
86	<h4 class="modal-title"></h4>\	86	<h4 class="modal-title"></h4>\
87	<button type="button" class="closebtn" data-dismiss="modal" aria-label="Close">\	87	<button type="button" class="closebtn" data-dismiss="modal" aria-label="Close">\
88	<span aria-hidden="true">×</span>\	88	<span aria-hidden="true">×</span>\
89	</button>\	89	</button>\
90	</div>\	90	</div>\
91	<div class="modal-body"><p></p></div>\	91	<div class="modal-body"><p></p></div>\
92	-

Return to bug 14783

Lines 965-999 ul { Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/css/src/_common.scss (-14 / +14 lines)
965		965
966	/* Use <a class="closebtn" href="#">×</a> */	966	/* Use <a class="closebtn" href="#">×</a> */
967		967
968	.modal-header .closebtn {
969	margin-top: 2px;
970	}
971
972	.closebtn {	968	.closebtn {
		969	background: transparent;
		970	border: 0;
973	color: #000000;	971	color: #000000;
		972	cursor: pointer;
974	float: right;	973	float: right;
975	font-size: 20px;	974	font-size: 1.5rem;
976	font-weight: bold;	975	font-weight: bold;
977	line-height: 20px;	976	line-height: 1;
978	opacity: .2;	977	opacity: .5;
		978	padding: 1rem 1rem;
		979	margin: -1rem -1rem -1rem auto;
979	text-shadow: 0 1px 0 #FFFFFF;	980	text-shadow: 0 1px 0 #FFFFFF;
980		981
981	&:hover {	982	&:hover {
982	color: #000000;	983	color: #000000;
983	cursor: pointer;	984	cursor: pointer;
984	opacity: .4;	985	opacity: .7;
985	text-decoration: none;	986	text-decoration: none;
986	}	987	}
987	}	988	}
988		989
989	button {	990	.ui-widget {
990	&.closebtn {	991	.closebtn {
991	background: transparent;	992	font-size: 1.5rem;
992	border: 0;
993	cursor: pointer;
994	padding: 0;
995	}	993	}
		994	}
996		995
		996	button {
997	&.remove {	997	&.remove {
998	&:hover {	998	&:hover {
999	color: #900;	999	color: #900;

Lines 82-97 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc (-9 / +32 lines)
82	[% UNLESS( singleBranchMode) %]	82	[% UNLESS( singleBranchMode) %]
83	<td class="branch">	83	<td class="branch">
84	<span class="tdlabel">Pick up location:</span>	84	<span class="tdlabel">Pick up location:</span>
		85	[% HOLD.branch.branchname \| html %]
85	[% IF ( HOLD.can_change_branch_opac ) %]	86	[% IF ( HOLD.can_change_branch_opac ) %]
86	<form class="change_branch" action="/cgi-bin/koha/opac-modrequest.pl" method="post">	87	<button type="button" class="btn btn-sm btn-link" data-toggle="modal" data-target="#changePickup[% HOLD.reserve_id \| html %]">
87	<select name="new_branch" >	88	<i class="fa fa-pencil" aria-hidden="true"></i> Change
88	[% PROCESS options_for_libraries libraries = Branches.pickup_locations({ search_params => { biblio => HOLD.biblionumber, patron => HOLD.borrower }, selected => HOLD.branchcode }) %]	89	</button>
89	</select>	90	<!-- Change pickup location modal -->
90	<input type="hidden" name="new_branch_reserveid" value="[% HOLD.reserve_id \| html %]" />	91	<div class="modal" id="changePickup[% HOLD.reserve_id \| html %]" tabindex="-1" aria-labelledby="changePickup[% HOLD.reserve_id \| html %]Label" aria-hidden="true">
91	<button class="btn btn-primary" type="submit" name="change_branch" value="1">Change</button>	92	<div class="modal-dialog">
92	</form>	93	<form id="change_branch_form[% HOLD.reserve_id \| html %]" action="/cgi-bin/koha/opac-modrequest.pl" method="post">
93	[% ELSE %]	94	<div class="modal-content">
94	[% HOLD.branch.branchname \| html %]	95	<div class="modal-header">
		96	<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>
		97	<button type="button" class="closebtn" data-dismiss="modal" aria-label="Close">
		98	<span aria-hidden="true">×</span>
		99	</button>
		100	</div>
		101	<div class="modal-body">
		102	<div class="form-group">
		103	<label for="new_branch[% HOLD.reserve_id \| html %]">New pickup location:</label>
		104	<select name="new_pickup_location" id="new_branch[% HOLD.reserve_id \| html %]" class="form-control">
		105	[% PROCESS options_for_libraries libraries = Branches.pickup_locations({ search_params => { biblio => HOLD.biblionumber, patron => HOLD.borrower }, selected => HOLD.branchcode }) %]
		106	</select>
		107	</div>
		108	<input type="hidden" name="reserve_id" value="[% HOLD.reserve_id \| html %]" />
		109	</div>
		110	<div class="modal-footer">
		111	<button type="submit" name="change_branch" value="1" class="btn btn-primary"><i class="fa fa-check" aria-hidden="true"></i> Save</button>
		112	<button type="button" class="btn btn-secondary" data-dismiss="modal"><i class="fa fa-remove" aria-hidden="true"></i> Cancel</button>
		113	</div>
		114	</div> <!-- /.modal-content -->
		115	</form>
		116	</div> <!-- /.modal-dialog -->
		117	</div> <!-- /.modal -->
95	[% END %]	118	[% END %]
96	</td>	119	</td>
97	[% END %]	120	[% END %]