Attachment #133906 for bug #22490

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




                        }
                    });
                } ).fail( function( data ) {
                    callback( { error: __('Could not fetch frameworkcode for record') } );
                } );
            } );
        },

                }
                callback( record );
            } ).fail( function( data ) {
                callback( { error: __('Could not save record') } );
            } );
        },


                }
                callback( record );
            } ).fail( function( data ) {
                callback( { error: __('Could not save record') } );
            } );
        },


Lines 691-697 define( [ 'marc-record', 'koha-backend', 'preferences', 'text-marc', 'widget' ], Link Here

(-)a/koha-tmpl/intranet-tmpl/lib/koha/cateditor/marc-editor.js (-1 / +1 lines)
691	false,	691	false,
692	function ( error ) {	692	function ( error ) {
693	if ( typeof error !== 'undefined' ) {	693	if ( typeof error !== 'undefined' ) {
694	humanMsg.displayAlert( _(error), { className: 'humanError' } );	694	humanMsg.displayAlert( __(error), { className: 'humanError' } );
695	}	695	}
696	}	696	}
697	);	697	);




            <td>[% ItemTypes.GetDescription( overdueloo.itemtype ) | html %]</td>
          <td>[% overdueloo.replacementprice | $Price %]</td>
          <td>[% overdueloo.itemnotes_nonpublic | html %]</td>
<<<<<<< Updated upstream
=======
          [% IF ( overdueloo.return_claim_id != 0 ) %]
            <td>
                [% IF ( overdueloo.return_claim_created_on ) %]
                    <span class="badge">[% overdueloo.return_claim_created_on %]</span>
                [% ELSIF Koha.Preference('ClaimReturnedLostValue') %]
                    <a class="btn btn-default btn-xs claim-returned-btn" data-itemnumber=[% overdueloo.itemnum | html %]>
                        <i class="fa fa-exclamation-circle"></i> Claim returned
                    </a>
                [% ELSE %]
                    <a class="btn btn-default btn-xs" disabled="disabled" title="ClaimReturnedLostValue is not set, this feature is disabled">
                        <i class="fa fa-exclamation-circle"></i> Claim returned
                    </a>
                [% END %]
            </td>
          [% END %]
>>>>>>> Stashed changes
        </tr>
      [% END %]
      </tbody>




        var filename = $(this).val();
        if ( ! /(?:\.csv|\.ods)$/.test(filename)) {
            $(this).css("background-color","yellow");
            alert(__("Please select a CSV (.csv) or ODS (.ods) spreadsheet file."));
            $(this).val("");
            $(this).css("background-color","white");
        }

        var id = $(this).attr('id');
        var obj = $('#' + id + ' input:file');
        if (/(?:\.csv|\.ods)$/.test(obj.val())) {
            if (confirm(__("Do you really want to import the authority type fields and subfields? This will overwrite the current configuration. For safety reasons please use the export option to make a backup"))) {
                var authtypecode = $('#' + id + ' input:hidden[name=authtypecode]').val();
                $('#importing_' + authtypecode).find("span").html(__("Importing to authority type: %s. Importing from file: %s").format("<strong>" + authtypecode + "</strong>", "<i>" + obj.val().replace(new RegExp("^.+[/\\\\]"),"") + "</i>"));
                if (navigator.userAgent.toLowerCase().indexOf('msie') != -1) {
                    var timestamp = new Date().getTime();
                    $('#importing_' + authtypecode).find("img").attr('src', '[% interface | html %]/[% theme | html %]/img/loading-small.gif' + '?' +timestamp);

            }
        }
        obj.css("background-color","yellow");
        alert(__("Please select a CSV (.csv) or ODS (.ods) spreadsheet file."));
        obj.val("");
        bj.css("background-color","white");
        return false;

Lines 69-75 function submitBackgroundJob(f) { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/js/background-job-progressbar.js (-1 / +1 lines)
69	backgroundJobProgressTimer = setInterval("updateJobProgress()", 500);	69	backgroundJobProgressTimer = setInterval("updateJobProgress()", 500);
70	},	70	},
71	error: function(xml, textStatus) {	71	error: function(xml, textStatus) {
72	humanMsg.displayMsg( '<p>' + _('Import of record(s) failed: ') + textStatus + '</p></br>'+xml.responseText, { className: 'humanError' } );	72	humanMsg.displayMsg( '<p>' + __('Import of record(s) failed: ') + textStatus + '</p></br>'+xml.responseText, { className: 'humanError' } );
73	}	73	}
74		74
75	});	75	});

Lines 114-120 function DateTime_from_syspref(date_time) { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/js/calendar.js (-1 / +1 lines)
114	},	114	},
115	messages: {	115	messages: {
116	input_name_of_later_date_field: {	116	input_name_of_later_date_field: {
117	is_date_after: _("Validation error to be shown, i.e. End date must come after start date")	117	is_date_after: __("Validation error to be shown, i.e. End date must come after start date")
118	}	118	}
119	}	119	}
120	});	120	});

Lines 2-8 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/js/item_search_fields.js (-1 / +1 lines)
2		2
3	jQuery.validator.addMethod("marcfield", function(value, element) {	3	jQuery.validator.addMethod("marcfield", function(value, element) {
4	return this.optional(element) \|\| /^[0-9a-zA-Z]+$/.test(value);	4	return this.optional(element) \|\| /^[0-9a-zA-Z]+$/.test(value);
5	}, _("Please enter letters or numbers") );	5	}, __("Please enter letters or numbers") );
6		6
7	$(document).ready(function(){	7	$(document).ready(function(){
8	$("#add_field_form").hide();	8	$("#add_field_form").hide();

Lines 120-126 $(document).ready(function() { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/js/letter.js (-1 / +1 lines)
120	$(".content_sms").on("keyup", function(){	120	$(".content_sms").on("keyup", function(){
121	var length = $(this).val().length;	121	var length = $(this).val().length;
122	var sms_counter = ("#sms_counter_" + $(this).data('lang'));	122	var sms_counter = ("#sms_counter_" + $(this).data('lang'));
123	$(sms_counter).html(length + "/" + sms_limit + _(" characters"));	123	$(sms_counter).html(length + "/" + sms_limit + __(" characters"));
124	if ( length > sms_limit ) {	124	if ( length > sms_limit ) {
125	$(sms_counter).css("color", "red");	125	$(sms_counter).css("color", "red");
126	} else {	126	} else {

Lines 54-64 function verify_cover_images() { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/js/pages/results.js (-3 / +3 lines)
54	if( div.hasClass("coce-coverimg") ){	54	if( div.hasClass("coce-coverimg") ){
55	/* Identify which service's image is being loaded by IntranetCoce system pref */	55	/* Identify which service's image is being loaded by IntranetCoce system pref */
56	if( $(img).attr("src").indexOf('amazon.com') >= 0 ){	56	if( $(img).attr("src").indexOf('amazon.com') >= 0 ){
57	div.find(".hint").html(_("Coce image from Amazon.com"));	57	div.find(".hint").html(__("Coce image from Amazon.com"));
58	} else if( $(img).attr("src").indexOf('google.com') >= 0 ){	58	} else if( $(img).attr("src").indexOf('google.com') >= 0 ){
59	div.find(".hint").html(_("Coce image from Google Books"));	59	div.find(".hint").html(__("Coce image from Google Books"));
60	} else if( $(img).attr("src").indexOf('openlibrary.org') >= 0 ){	60	} else if( $(img).attr("src").indexOf('openlibrary.org') >= 0 ){
61	div.find(".hint").html(_("Coce image from Open Library"));	61	div.find(".hint").html(__("Coce image from Open Library"));
62	} else {	62	} else {
63	blanks.push( coverId );	63	blanks.push( coverId );
64	div.remove();	64	div.remove();

Lines 55-61 var indeterminate_test = function(tag){ Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/js/pages/tags-review.js (-1 / +1 lines)
55		55
56	var success_test_call = function() {	56	var success_test_call = function() {
57	$('#test_button').prop('disabled', false);	57	$('#test_button').prop('disabled', false);
58	$('#test_button').html("<i class='fa fa-check-square-o' aria-hidden='true'></i>" +_(" Test"));	58	$('#test_button').html("<i class='fa fa-check-square-o' aria-hidden='true'></i>" +__(" Test"));
59	};	59	};
60		60
61	$(document).ready(function() {	61	$(document).ready(function() {

Lines 5-11 $(document).ready(function(){ Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/js/rotating-collections.js (-2 / +1 lines)
5		5
6	$(".confirmdelete").click(function(){	6	$(".confirmdelete").click(function(){
7	$(this).parents('tr').addClass("warn");	7	$(this).parents('tr').addClass("warn");
8	if(confirm(_("Are you sure you want to delete this rotating collection?"))){	8	if(confirm(__("Are you sure you want to delete this rotating collection?"))){
9	return true;	9	return true;
10	} else {	10	} else {
11	$(this).parents('tr').removeClass("warn");	11	$(this).parents('tr').removeClass("warn");
12	-

Return to bug 22490

Lines 121-127 define( [ '/cgi-bin/koha/svc/cataloguing/framework?frameworkcode=&callback=defin Link Here

(-)a/koha-tmpl/intranet-tmpl/lib/koha/cateditor/koha-backend.js (-3 / +3 lines)
121	}	121	}
122	});	122	});
123	} ).fail( function( data ) {	123	} ).fail( function( data ) {
124	callback( { error: _('Could not fetch frameworkcode for record') } );	124	callback( { error: __('Could not fetch frameworkcode for record') } );
125	} );	125	} );
126	} );	126	} );
127	},	127	},
Lines 143-149 define( [ '/cgi-bin/koha/svc/cataloguing/framework?frameworkcode=&callback=defin Link Here
143	}	143	}
144	callback( record );	144	callback( record );
145	} ).fail( function( data ) {	145	} ).fail( function( data ) {
146	callback( { error: _('Could not save record') } );	146	callback( { error: __('Could not save record') } );
147	} );	147	} );
148	},	148	},
149		149
Lines 164-170 define( [ '/cgi-bin/koha/svc/cataloguing/framework?frameworkcode=&callback=defin Link Here
164	}	164	}
165	callback( record );	165	callback( record );
166	} ).fail( function( data ) {	166	} ).fail( function( data ) {
167	callback( { error: _('Could not save record') } );	167	callback( { error: __('Could not save record') } );
168	} );	168	} );
169	},	169	},
170		170

Lines 117-122 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt (+18 lines)
117	<td>[% ItemTypes.GetDescription( overdueloo.itemtype ) \| html %]</td>	117	<td>[% ItemTypes.GetDescription( overdueloo.itemtype ) \| html %]</td>
118	<td>[% overdueloo.replacementprice \| $Price %]</td>	118	<td>[% overdueloo.replacementprice \| $Price %]</td>
119	<td>[% overdueloo.itemnotes_nonpublic \| html %]</td>	119	<td>[% overdueloo.itemnotes_nonpublic \| html %]</td>
		120	<<<<<<< Updated upstream
		121	=======
		122	[% IF ( overdueloo.return_claim_id != 0 ) %]
		123	<td>
		124	[% IF ( overdueloo.return_claim_created_on ) %]
		125	<span class="badge">[% overdueloo.return_claim_created_on %]</span>
		126	[% ELSIF Koha.Preference('ClaimReturnedLostValue') %]
		127	<a class="btn btn-default btn-xs claim-returned-btn" data-itemnumber=[% overdueloo.itemnum \| html %]>
		128	<i class="fa fa-exclamation-circle"></i> Claim returned
		129	</a>
		130	[% ELSE %]
		131	<a class="btn btn-default btn-xs" disabled="disabled" title="ClaimReturnedLostValue is not set, this feature is disabled">
		132	<i class="fa fa-exclamation-circle"></i> Claim returned
		133	</a>
		134	[% END %]
		135	</td>
		136	[% END %]
		137	>>>>>>> Stashed changes
120	</tr>	138	</tr>
121	[% END %]	139	[% END %]
122	</tbody>	140	</tbody>

Lines 41-47 $(document).ready(function() { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/js/authtype.js (-4 / +4 lines)
41	var filename = $(this).val();	41	var filename = $(this).val();
42	if ( ! /(?:\.csv\|\.ods)$/.test(filename)) {	42	if ( ! /(?:\.csv\|\.ods)$/.test(filename)) {
43	$(this).css("background-color","yellow");	43	$(this).css("background-color","yellow");
44	alert(_("Please select a CSV (.csv) or ODS (.ods) spreadsheet file."));	44	alert(__("Please select a CSV (.csv) or ODS (.ods) spreadsheet file."));
45	$(this).val("");	45	$(this).val("");
46	$(this).css("background-color","white");	46	$(this).css("background-color","white");
47	}	47	}
Lines 56-64 $(document).ready(function() { Link Here
56	var id = $(this).attr('id');	56	var id = $(this).attr('id');
57	var obj = $('#' + id + ' input:file');	57	var obj = $('#' + id + ' input:file');
58	if (/(?:\.csv\|\.ods)$/.test(obj.val())) {	58	if (/(?:\.csv\|\.ods)$/.test(obj.val())) {
59	if (confirm(_("Do you really want to import the authority type fields and subfields? This will overwrite the current configuration. For safety reasons please use the export option to make a backup"))) {	59	if (confirm(__("Do you really want to import the authority type fields and subfields? This will overwrite the current configuration. For safety reasons please use the export option to make a backup"))) {
60	var authtypecode = $('#' + id + ' input:hidden[name=authtypecode]').val();	60	var authtypecode = $('#' + id + ' input:hidden[name=authtypecode]').val();
61	$('#importing_' + authtypecode).find("span").html(_("Importing to authority type: %s. Importing from file: %s").format("<strong>" + authtypecode + "</strong>", "<i>" + obj.val().replace(new RegExp("^.+[/\\\\]"),"") + "</i>"));	61	$('#importing_' + authtypecode).find("span").html(__("Importing to authority type: %s. Importing from file: %s").format("<strong>" + authtypecode + "</strong>", "<i>" + obj.val().replace(new RegExp("^.+[/\\\\]"),"") + "</i>"));
62	if (navigator.userAgent.toLowerCase().indexOf('msie') != -1) {	62	if (navigator.userAgent.toLowerCase().indexOf('msie') != -1) {
63	var timestamp = new Date().getTime();	63	var timestamp = new Date().getTime();
64	$('#importing_' + authtypecode).find("img").attr('src', '[% interface \| html %]/[% theme \| html %]/img/loading-small.gif' + '?' +timestamp);	64	$('#importing_' + authtypecode).find("img").attr('src', '[% interface \| html %]/[% theme \| html %]/img/loading-small.gif' + '?' +timestamp);
Lines 73-79 $(document).ready(function() { Link Here
73	}	73	}
74	}	74	}
75	obj.css("background-color","yellow");	75	obj.css("background-color","yellow");
76	alert(_("Please select a CSV (.csv) or ODS (.ods) spreadsheet file."));	76	alert(__("Please select a CSV (.csv) or ODS (.ods) spreadsheet file."));
77	obj.val("");	77	obj.val("");
78	bj.css("background-color","white");	78	bj.css("background-color","white");
79	return false;	79	return false;