Attachment #170428 for bug #37177

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

Lines 4-10 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc (-1 / +1 lines)
4	[% IF ( can_add_biblios ) %]	4	[% IF ( can_add_biblios ) %]
5	<div class="btn-group">	5	<div class="btn-group">
6	<button type="button" class="btn btn-default" data-toggle="modal" data-target="#addToList">	6	<button type="button" class="btn btn-default" data-toggle="modal" data-target="#addToList">
7	<i class="fa fa-plus"></i> Add items	7	<i class="fa fa-plus"></i> Add records
8	</button>	8	</button>
9	</div>	9	</div>
10	[% END %]	10	[% END %]

Lines 7-13 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt (-1 / +1 lines)
7	[% BLOCK controls %]	7	[% BLOCK controls %]
8	<p class="cart-controls">	8	<p class="cart-controls">
9	<a id="CheckAll" href="#"><i class="fa fa-check"></i> Select all</a> <a id="CheckNone" href="#"><i class="fa fa-times"></i> Clear all</a>	9	<a id="CheckAll" href="#"><i class="fa fa-check"></i> Select all</a> <a id="CheckNone" href="#"><i class="fa fa-times"></i> Clear all</a>
10	\| <strong>Selected items:</strong>	10	\| <strong>Selected records:</strong>
11	<a href="#" id="remove_from_cart">Remove</a>	11	<a href="#" id="remove_from_cart">Remove</a>
12		12
13	[% IF ( loggedinusername ) %]	13	[% IF ( loggedinusername ) %]




                        <span>An error occurred when deleting this list.</span>
                    [% CASE 'error_on_add_biblio' %]
                        [% IF m.item_barcode %]
                            <span>The record for this item ([% m.item_barcode | html %]) has not been added to the list. Please verify it is not already in the list.</span>
                        [% ELSE %]
                            <span>The record ([% m.bibnum | html %]) has not been added to the list. Please verify it is not already in the list.</span>
                        [% END %]

                        <span>List deleted.</span>
                    [% CASE 'success_on_add_biblio' %]
                        [% IF m.item_barcode %]
                            <span>The record for this item ([% m.item_barcode | html %]) has been added to the list.</span>
                        [% ELSE %]
                            <span>The record ([% m.bibnum | html %]) has been added to the list.</span>
                        [% END %]
                    [% CASE 'success_on_remove_biblios' %]
                        <span>The record has been removed from the list.</span>
                    [% CASE 'does_not_exist' %]
                        <span>This list does not exist.</span>
                    [% CASE 'item_does_not_exist' %]

                <div class="modal-content">
                    <div class="modal-header">
                        <button type="button" class="closebtn" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
                        <h4 class="modal-title" id="addToListLabel">Add records</h4>
                    </div>
                    <div class="modal-body">
                        <fieldset class="brief">

    [% END %]
    <script>
        var MSG_NO_ITEM_SELECTED = _("Nothing is selected.");
        var MSG_REMOVE_FROM_LIST = _("Are you sure you want to remove these records from the list?");
        var MSG_CONFIRM_DELETE_LIST = _("Are you sure you want to remove this list?");

        [% IF op == 'list' %]




                return 0;
            }
            if (! NoMsgAlert ) {
                showCartUpdate( __("This record is already in your cart") );
            }
        }
        else {

            return 1;
        }
        if (! NoMsgAlert ) {
            showCartUpdate( __("This record has been added to your cart") );
            updateLink(val,"add");
        }
    }

    var msg = "";
    if (nbAdd) {
        if (i > nbAdd) {
            msg = __("%s record(s) added to your cart").format(nbAdd);
            msg += "<br/>";
            msg += __("%s already in your cart").format((i-nbAdd));
        }
        else {
            msg = __("%s record(s) added to your cart").format(nbAdd);
        }
    }
    else {
        if (i < 1) {
            msg = __("No record was selected");
        }
        else {
            msg = __("No record was added to your cart (already in your cart)!");
        }
    }
    showCartUpdate(msg);

    writeCookie( nameCookie, valCookie );
    updateBasket( arrayRecords.length-1 );
    updateLink(biblionumber,"del");
    showCartUpdate(__("The record has been removed from your cart"));
}

function delSelRecords() {

        document.location = CGIBIN + "basket/basket.pl?" + strCookie;
    }
    else {
        alert(__("No record was selected"));
    }
}


function quit() {
    if (document.myform.records.value) {
        var rep = false;
        rep = confirm(__("Are you sure you want to remove the selected records?"));
        if (rep) {
            delSelRecords();
        }

function updateBasket(updated_value,target) {
    if(target){
        target.$('#basketcount').html(" <span>("+updated_value+")</span>");
        target.$('#cartDetails').html(__("Records in your cart: %s").format(updated_value));
    } else {
        $('#basketcount').html(" <span>("+updated_value+")</span>");
        $('#cartDetails').html(__("Records in your cart: %s").format(updated_value));
    }
}


    if(items){
        document.location = "/cgi-bin/koha/virtualshelves/addbybiblionumber.pl?biblionumber="+items;
    } else {
        alert(__("No record was selected"));
    }
}


                bibs.push("biblionumber=" +  biblist[i].value);
            }
        }
        if (bibs.length === 0) { showListsUpdate(__("No record was selected")); }
        return bibs.join("&");
    } else {
        var bibnums = getContextBiblioNumbers();

            }
            return bibs.join("&");
        } else {
            showListsUpdate(__("No record was selected"));
        }
    }
}
- 

Return to bug 37177

Lines 151-157 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt (-5 / +5 lines)
151	<span>An error occurred when deleting this list.</span>	151	<span>An error occurred when deleting this list.</span>
152	[% CASE 'error_on_add_biblio' %]	152	[% CASE 'error_on_add_biblio' %]
153	[% IF m.item_barcode %]	153	[% IF m.item_barcode %]
154	<span>The item ([% m.item_barcode \| html %]) has not been added to the list. Please verify it is not already in the list.</span>	154	<span>The record for this item ([% m.item_barcode \| html %]) has not been added to the list. Please verify it is not already in the list.</span>
155	[% ELSE %]	155	[% ELSE %]
156	<span>The record ([% m.bibnum \| html %]) has not been added to the list. Please verify it is not already in the list.</span>	156	<span>The record ([% m.bibnum \| html %]) has not been added to the list. Please verify it is not already in the list.</span>
157	[% END %]	157	[% END %]
Lines 163-174 Link Here
163	<span>List deleted.</span>	163	<span>List deleted.</span>
164	[% CASE 'success_on_add_biblio' %]	164	[% CASE 'success_on_add_biblio' %]
165	[% IF m.item_barcode %]	165	[% IF m.item_barcode %]
166	<span>The item ([% m.item_barcode \| html %]) has been added to the list.</span>	166	<span>The record for this item ([% m.item_barcode \| html %]) has been added to the list.</span>
167	[% ELSE %]	167	[% ELSE %]
168	<span>The record ([% m.bibnum \| html %]) has been added to the list.</span>	168	<span>The record ([% m.bibnum \| html %]) has been added to the list.</span>
169	[% END %]	169	[% END %]
170	[% CASE 'success_on_remove_biblios' %]	170	[% CASE 'success_on_remove_biblios' %]
171	<span>The item has been removed from the list.</span>	171	<span>The record has been removed from the list.</span>
172	[% CASE 'does_not_exist' %]	172	[% CASE 'does_not_exist' %]
173	<span>This list does not exist.</span>	173	<span>This list does not exist.</span>
174	[% CASE 'item_does_not_exist' %]	174	[% CASE 'item_does_not_exist' %]
Lines 572-578 Link Here
572	<div class="modal-content">	572	<div class="modal-content">
573	<div class="modal-header">	573	<div class="modal-header">
574	<button type="button" class="closebtn" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>	574	<button type="button" class="closebtn" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
575	<h4 class="modal-title" id="addToListLabel">Add items</h4>	575	<h4 class="modal-title" id="addToListLabel">Add records</h4>
576	</div>	576	</div>
577	<div class="modal-body">	577	<div class="modal-body">
578	<fieldset class="brief">	578	<fieldset class="brief">
Lines 624-630 Link Here
624	[% END %]	624	[% END %]
625	<script>	625	<script>
626	var MSG_NO_ITEM_SELECTED = _("Nothing is selected.");	626	var MSG_NO_ITEM_SELECTED = _("Nothing is selected.");
627	var MSG_REMOVE_FROM_LIST = _("Are you sure you want to remove these items from the list?");	627	var MSG_REMOVE_FROM_LIST = _("Are you sure you want to remove these records from the list?");
628	var MSG_CONFIRM_DELETE_LIST = _("Are you sure you want to remove this list?");	628	var MSG_CONFIRM_DELETE_LIST = _("Are you sure you want to remove this list?");
629		629
630	[% IF op == 'list' %]	630	[% IF op == 'list' %]

Lines 116-122 function addRecord(val, selection,NoMsgAlert) { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/js/basket.js (-15 / +14 lines)
116	return 0;	116	return 0;
117	}	117	}
118	if (! NoMsgAlert ) {	118	if (! NoMsgAlert ) {
119	showCartUpdate( __("This item is already in your cart") );	119	showCartUpdate( __("This record is already in your cart") );
120	}	120	}
121	}	121	}
122	else {	122	else {
Lines 133-139 function addRecord(val, selection,NoMsgAlert) { Link Here
133	return 1;	133	return 1;
134	}	134	}
135	if (! NoMsgAlert ) {	135	if (! NoMsgAlert ) {
136	showCartUpdate( __("This item has been added to your cart") );	136	showCartUpdate( __("This record has been added to your cart") );
137	updateLink(val,"add");	137	updateLink(val,"add");
138	}	138	}
139	}	139	}
Lines 205-224 function addSelRecords(valSel) { Link Here
205	var msg = "";	205	var msg = "";
206	if (nbAdd) {	206	if (nbAdd) {
207	if (i > nbAdd) {	207	if (i > nbAdd) {
208	msg = __("%s item(s) added to your cart").format(nbAdd);	208	msg = __("%s record(s) added to your cart").format(nbAdd);
209	msg += "<br/>";	209	msg += "<br/>";
210	msg += __("%s already in your cart").format((i-nbAdd));	210	msg += __("%s already in your cart").format((i-nbAdd));
211	}	211	}
212	else {	212	else {
213	msg = __("%s item(s) added to your cart").format(nbAdd);	213	msg = __("%s record(s) added to your cart").format(nbAdd);
214	}	214	}
215	}	215	}
216	else {	216	else {
217	if (i < 1) {	217	if (i < 1) {
218	msg = __("No item was selected");	218	msg = __("No record was selected");
219	}	219	}
220	else {	220	else {
221	msg = __("No item was added to your cart (already in your cart)!");	221	msg = __("No record was added to your cart (already in your cart)!");
222	}	222	}
223	}	223	}
224	showCartUpdate(msg);	224	showCartUpdate(msg);
Lines 257-263 function delSingleRecord(biblionumber){ Link Here
257	writeCookie( nameCookie, valCookie );	257	writeCookie( nameCookie, valCookie );
258	updateBasket( arrayRecords.length-1 );	258	updateBasket( arrayRecords.length-1 );
259	updateLink(biblionumber,"del");	259	updateLink(biblionumber,"del");
260	showCartUpdate(__("The item has been removed from your cart"));	260	showCartUpdate(__("The record has been removed from your cart"));
261	}	261	}
262		262
263	function delSelRecords() {	263	function delSelRecords() {
Lines 308-314 function delSelRecords() { Link Here
308	document.location = CGIBIN + "basket/basket.pl?" + strCookie;	308	document.location = CGIBIN + "basket/basket.pl?" + strCookie;
309	}	309	}
310	else {	310	else {
311	alert(__("No item was selected"));	311	alert(__("No record was selected"));
312	}	312	}
313	}	313	}
314		314
Lines 355-361 function delBasket(context,rep) { Link Here
355	function quit() {	355	function quit() {
356	if (document.myform.records.value) {	356	if (document.myform.records.value) {
357	var rep = false;	357	var rep = false;
358	rep = confirm(__("Are you sure you want to remove the selected items?"));	358	rep = confirm(__("Are you sure you want to remove the selected records?"));
359	if (rep) {	359	if (rep) {
360	delSelRecords();	360	delSelRecords();
361	}	361	}
Lines 409-418 function showLess() { Link Here
409	function updateBasket(updated_value,target) {	409	function updateBasket(updated_value,target) {
410	if(target){	410	if(target){
411	target.$('#basketcount').html(" <span>("+updated_value+")</span>");	411	target.$('#basketcount').html(" <span>("+updated_value+")</span>");
412	target.$('#cartDetails').html(__("Items in your cart: %s").format(updated_value));	412	target.$('#cartDetails').html(__("Records in your cart: %s").format(updated_value));
413	} else {	413	} else {
414	$('#basketcount').html(" <span>("+updated_value+")</span>");	414	$('#basketcount').html(" <span>("+updated_value+")</span>");
415	$('#cartDetails').html(__("Items in your cart: %s").format(updated_value));	415	$('#cartDetails').html(__("Records in your cart: %s").format(updated_value));
416	}	416	}
417	}	417	}
418		418
Lines 426-432 function addSelToShelf() { Link Here
426	if(items){	426	if(items){
427	document.location = "/cgi-bin/koha/virtualshelves/addbybiblionumber.pl?biblionumber="+items;	427	document.location = "/cgi-bin/koha/virtualshelves/addbybiblionumber.pl?biblionumber="+items;
428	} else {	428	} else {
429	alert(__("No item was selected"));	429	alert(__("No record was selected"));
430	}	430	}
431	}	431	}
432		432
Lines 441-447 function vShelfAdd(biblist) { Link Here
441	bibs.push("biblionumber=" + biblist[i].value);	441	bibs.push("biblionumber=" + biblist[i].value);
442	}	442	}
443	}	443	}
444	if (bibs.length === 0) { showListsUpdate(__("No item was selected")); }	444	if (bibs.length === 0) { showListsUpdate(__("No record was selected")); }
445	return bibs.join("&");	445	return bibs.join("&");
446	} else {	446	} else {
447	var bibnums = getContextBiblioNumbers();	447	var bibnums = getContextBiblioNumbers();
Lines 451-457 function vShelfAdd(biblist) { Link Here
451	}	451	}
452	return bibs.join("&");	452	return bibs.join("&");
453	} else {	453	} else {
454	showListsUpdate(__("No item was selected"));	454	showListsUpdate(__("No record was selected"));
455	}	455	}
456	}	456	}
457	}	457	}
458	-