From 5fdbf16959757ce67a954b1e85adbb1b6786d6fd Mon Sep 17 00:00:00 2001 From: Aleisha Amohia Date: Mon, 12 Dec 2016 00:00:30 +0000 Subject: [PATCH] Bug 16072: Changing all instances of 'loading-small.gif' to 'spinner-small.gif' and removing loading-small.gif file. Confirm that I have not missed any places where there is 'loading-small.gif' Have amended patch to not include OPAC changes from previous patch. Sponsored-by: Catalyst IT Signed-off-by: Owen Leonard Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall --- .../intranet-tmpl/prog/css/staff-global.css | 2 +- .../prog/en/modules/acqui/addorderiso2709.tt | 4 ++-- .../prog/en/modules/acqui/edifactmsgs.tt | 4 ++-- .../prog/en/modules/acqui/neworderbiblio.tt | 4 ++-- .../prog/en/modules/acqui/parcel.tt | 4 ++-- .../prog/en/modules/acqui/z3950_search.tt | 2 +- .../prog/en/modules/admin/biblio_framework.tt | 4 ++-- .../prog/en/modules/catalogue/detail.tt | 4 ++-- .../prog/en/modules/cataloguing/addbooks.tt | 4 ++-- .../prog/en/modules/cataloguing/merge.tt | 4 ++-- .../en/modules/cataloguing/z3950_auth_search.tt | 2 +- .../prog/en/modules/cataloguing/z3950_search.tt | 2 +- .../prog/en/modules/circ/article-requests.tt | 6 +++--- .../prog/en/modules/patron_lists/lists.tt | 6 +++--- .../modules/tools/batch_record_modification.tt | 4 ++-- .../prog/en/modules/tools/manage-marc-import.tt | 4 ++-- .../intranet-tmpl/prog/img/loading-small.gif | Bin 1849 -> 0 bytes .../intranet-tmpl/prog/js/biblio_framework.js | 2 +- koha-tmpl/intranet-tmpl/prog/js/checkouts.js | 4 ++-- koha-tmpl/intranet-tmpl/prog/js/holds.js | 2 +- koha-tmpl/intranet-tmpl/prog/js/z3950_search.js | 4 ++-- 21 files changed, 36 insertions(+), 36 deletions(-) delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/loading-small.gif diff --git a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/css/staff-global.css index ff8e6b660d..f423dbaff8 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css +++ b/koha-tmpl/intranet-tmpl/prog/css/staff-global.css @@ -1956,7 +1956,7 @@ div#acqui_order_supplierlist > div.supplier > div.baskets { color: #212121; } .ui-autocomplete-loading { - background: #FFF url("../img/loading-small.gif") right center no-repeat; + background: #FFF url("../img/spinner-small.gif") right center no-repeat; } /* jQuery UI standard tabs */ diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt index acf84e1f50..490b92abfd 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt @@ -149,7 +149,7 @@ }); $("#dataPreview").on("hidden", function(){ $("#dataPreviewLabel").html(""); - $("#dataPreview .modal-body").html("
\"\" "+_("Loading")+"
"); + $("#dataPreview .modal-body").html("
\"\" "+_("Loading")+"
"); }); }); @@ -307,7 +307,7 @@

MARC preview

-
Loading
+
Loading
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt index 93a1c03568..462d15fbb3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt @@ -29,7 +29,7 @@ $(document).ready(function() { EDIModal.modal("hide"); }); EDIModal.on("hidden", function(){ - EDIModalBody.html("
\"\" "+_("Loading")+"
"); + EDIModalBody.html("
\"\" "+_("Loading")+"
"); }); $(".delete_msg").on("click",function(){ return confirm(_("Are you sure you want to delete this message?")); @@ -116,7 +116,7 @@ $(document).ready(function() {

EDIFACT message

-
Loading
+
Loading
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt index 21b428cfac..269d6e630c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt @@ -23,7 +23,7 @@ }); $("#marcPreview").on("hidden", function(){ $("#marcPreviewLabel").html(""); - $("#marcPreview .modal-body").html("
\"\" "+_("Loading")+"
"); + $("#marcPreview .modal-body").html("
\"\" "+_("Loading")+"
"); }); }); //]]> @@ -107,7 +107,7 @@

MARC preview

-
Loading
+
Loading
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt index 401ab11b5f..979ba82585 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt @@ -114,7 +114,7 @@ }); $("#dataPreview").on("hidden", function(){ $("#dataPreviewLabel").html(""); - $("#dataPreview .modal-body").html("
\"\" "+_("Loading")+"
"); + $("#dataPreview .modal-body").html("
\"\" "+_("Loading")+"
"); }); }); @@ -469,7 +469,7 @@

MARC preview

-
Loading
+
Loading
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt index e7e8fff22e..8e4f7acaf5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt @@ -157,7 +157,7 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :

MARC preview

-
Loading
+
Loading
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt index 50cd4b2133..1bec38d43e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt @@ -186,7 +186,7 @@

- +
@@ -249,7 +249,7 @@

- +
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt index c0151e9c95..300e62aff3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt @@ -203,7 +203,7 @@ function verify_images() { $('#marcPreview').modal({show:true}); }); $("#marcPreview").on("hidden", function(){ - $("#marcPreview .modal-body").html("
\"\" "+_("Loading")+"
"); + $("#marcPreview .modal-body").html("
\"\" "+_("Loading")+"
"); }); [% IF ( Koha.Preference('NovelistSelectStaffEnabled') && Koha.Preference('NovelistSelectProfile') && ( normalized_isbn || normalized_upc ) ) %] novSelect.loadContentForQuery( @@ -1129,7 +1129,7 @@ function verify_images() {

MARC preview

-
Loading
+
Loading
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt index a3baba2bc0..c9f856e1bf 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt @@ -38,7 +38,7 @@ }); $("#dataPreview").on("hidden", function(){ $("#dataPreviewLabel").html(""); - $("#dataPreview .modal-body").html("
\"\" "+_("Loading")+"
"); + $("#dataPreview .modal-body").html("
\"\" "+_("Loading")+"
"); }); }); @@ -273,7 +273,7 @@

Preview

-
Loading
+
Loading
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt index d23c34b58f..8527314c8c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt @@ -29,7 +29,7 @@ div#result { margin-top: 1em; } }); $("#dataPreview").on("hidden", function(){ $("#dataPreviewLabel").html(""); - $("#dataPreview .modal-body").html("
\"\" "+_("Loading")+"
"); + $("#dataPreview .modal-body").html("
\"\" "+_("Loading")+"
"); }); }); [% ELSE %] @@ -245,7 +245,7 @@ $(document).ready(function(){

Preview

-
Loading
+
Loading
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt index 07e69df82c..38225cf5d0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt @@ -137,7 +137,7 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :

MARC preview

-
Loading
+
Loading
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt index c7bc15af06..1c26d76c2c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt @@ -172,7 +172,7 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :

Preview

-
Loading
+
Loading
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt index dfb7894f6b..132b7a6111 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt @@ -36,7 +36,7 @@ return; } - a.closest('td').prepend(''); + a.closest('td').prepend(''); a.closest('div').hide(); $.ajax({ type: "POST", @@ -58,7 +58,7 @@ var table_row = a.closest('tr').clone(); table_row.find('.ar-process-request').remove(); - a.closest('td').prepend(''); + a.closest('td').prepend(''); a.closest('div').hide(); $.ajax({ type: "POST", @@ -78,7 +78,7 @@ } function Complete( id, a ) { - a.closest('td').prepend(''); + a.closest('td').prepend(''); a.closest('div').hide(); $.ajax({ type: "POST", diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt index a3d886658b..f584f61771 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt @@ -32,13 +32,13 @@ }); patronExportModal.on("hidden", function(){ - patronExportModalBody.html("
\"\" "+_("Loading")+"
"); + patronExportModalBody.html("
\"\" "+_("Loading")+"
"); }); patronExportModal.on("submit", "#exportingf", function(e){ e.preventDefault(); modal_body = patronExportModalBody; - modal_body.html("
\"\" "+_("Loading")+"
"); + modal_body.html("
\"\" "+_("Loading")+"
"); target_url = $(this).attr("action"); params = $( this ).serialize(); modal_body.load( target_url + "?" + params + " #custom-doc"); @@ -133,7 +133,7 @@

Print patron cards

-
Loading
+
Loading
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt index e5dad6c91c..2a60b9db36 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt @@ -69,7 +69,7 @@ $(document).ready(function() { }); $("#marcPreview").on("hidden", function(){ $("#marcPreviewLabel").html(""); - $("#marcPreview .modal-body").html("
\"\" "+_("Loading")+"
"); + $("#marcPreview .modal-body").html("
\"\" "+_("Loading")+"
"); }); }); @@ -191,7 +191,7 @@ $(document).ready(function() {

MARC preview

-
Loading
+
Loading
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt index 32796f01c9..b9c5bd5b9d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt @@ -147,7 +147,7 @@ $(document).ready(function(){ }); $("#marcPreview").on("hidden", function(){ $("#marcPreviewLabel").html(""); - $("#marcPreview .modal-body").html("
\"\" "+_("Loading")+"
"); + $("#marcPreview .modal-body").html("
\"\" "+_("Loading")+"
"); }); $(".batch_form").on("submit",function(){ if( $(this).hasClass("batch_delete") ){ @@ -514,7 +514,7 @@ Page

MARC preview

-
Loading
+
Loading
diff --git a/koha-tmpl/intranet-tmpl/prog/img/loading-small.gif b/koha-tmpl/intranet-tmpl/prog/img/loading-small.gif deleted file mode 100644 index d42f72c723644bbf8cf8d6e1b7ff0bea7ddd305a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1849 zcma*odr%wI9tZGc_iT2vk7P+x3@LU(2yGIQCcHvgYTblq0THkTesI znR7n#{hi;OjP2?A&1ME-pkE;9;lqaz1T8KudOV)_`T6wp^p=(uf2Fv%SSFK=kB@u3 zUZGGpJUk2l(CKv5)z$vpzrP~?FHUK&nD<(COPZ{Et0m?db93z;^X^U7=d1QWkq-bw z_z#PGNam*Pcq+w^mln54i-h<~s=yrqB!o6eBrwd4{B{&hHR9I{{bQLC?)mG!al!d3 z<_YADRELlGj+H!fNocrRe7`?$gk5?^y3^@6pC85jwesu>G6*{Wrto)mL5D?z)j-L++&!SNH!MDuhyZ1*)jGIdEgHH>qdP6}DTp>kJ!bZd!oke!Q0J5vRHHSl&=?=ft+HzcfBB?ZKg#rgtngf(C zDL)0I;%QR6Z_49x&crpS#vVCUpEoP)gxevZsOEytw5Vq|*bf39%i#K5VVMGzL^=13 zR-}G|UaU(m68*HWc{(R=BrQG$CK$N`HcDv@S=IAWm(o~Np>ZF8X|_V%3_!1*u`vm}?t+-#K2Qs= zlXouK&f(YJG|lD7kLqye?NcYji#s*HOSm|xQ~{R)Ao3VZxwQ7l4$VQO;kkhWM?7Tq zV7I5-(5BO!(yinIf+@AjEfNKCk>b~u*83@)>qu(a3nA*y_1a7za7?y8mYaN9Z=br4iilUPLeBE8>z7SjUY!R@qdmA$~nkLiZ z9qy{OsKf4~y1^q+D*!YY&=vr^tMUUJQrx*Do>dYDlPO!l`DoZR5vApf95=i4Lz;yXc(}m~6Zh#oS@fHF;-MHT+t;8_YoNLuk zSUE;16g_GThjJ{n2e=qnXWb70jIOhk#;lMy!K4=hr0tBKfB(rz4e z+1U)aJZHl#TYU{%(($JI!F!<+%Jp+Jdk!#Y(|CzO!nka;h@9x_wBI_{i{tgbHY(SI zVOYV2N)E%tOc-CGkW(0fy>Or+s~>c2t0?1P8+jRZNqDzxRf7dRy(%%W_#a<6{e3caEW8DdD|KsdZBw z(K6nRmw&K{D1uvtp&1a;%;nPiAvOlI0*Zq9*kdsS7JEd^O*1FLwTe{>9&A}oMlrlF z`pQPbaQ2zQZ_j_#qk8qy|9IetJFQG!>l{9_AvsafGtVRnQr)xR?bImN4qo-#?gP`}S)0UYaWY9t`6HQwY4B_($TWNu`l?!*nIBy_|7=pQc9cnFU zs%%oO^oje|8ddh7^1-E9_|T~KBxydL{KcW06CqFQ?Ym3~cb^|wPx?lUyCBD|_nRZU zsA}@ctKd0_^(q#G?{G;+$w=8-md|N>W6e5@3AT19SLRCCSyG z=oV%uMus5!Ry9PhrZMnpmb0lXJuACSOl2|krLXzwsrVsNe(8N);u`z?E#W-RKNi9E z;z;dGgCSKfqEhya^?xWt|DBmvWexQ%SfTtu(C0Mdv9@(g3WttPh3GsE1Niv~Ituk; zXltbvX7Jn^Z4>QMtd0~JELrW+CaT^$N~khm@~tceYLLGjk=3uK@XnOQ1!btG^Pus9 zYDnDM@%;wTR-(h+ec@l>g6c`Cs7=j$FkqTfajDLuzmAAh_qHK0!$~G+eL?P46^V2( gTVr?dnQ{(H{Ie1a9NS3OKPMyDfF?Qc5iPGj047fkWdHyG diff --git a/koha-tmpl/intranet-tmpl/prog/js/biblio_framework.js b/koha-tmpl/intranet-tmpl/prog/js/biblio_framework.js index 171cb8381a..15dd1f77d2 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/biblio_framework.js +++ b/koha-tmpl/intranet-tmpl/prog/js/biblio_framework.js @@ -57,7 +57,7 @@ $('#importing_' + frameworkcode).find("span").html(MSG_IMPORTING_TO_FRAMEWORK.format("" + frameworkcode + "", "" + obj.val().replace(new RegExp("^.+[/\\\\]"),"") + "")); if (navigator.userAgent.toLowerCase().indexOf('msie') != -1) { var timestamp = new Date().getTime(); - $('#importing_' + frameworkcode).find("img").attr('src', template_path + '/img/loading-small.gif' + '?' +timestamp); + $('#importing_' + frameworkcode).find("img").attr('src', template_path + '/img/spinner-small.gif' + '?' +timestamp); } $('#importing_' + frameworkcode).css('display', 'block'); if (navigator.userAgent.toLowerCase().indexOf('firefox') == -1) $("body").css("cursor", "progress"); diff --git a/koha-tmpl/intranet-tmpl/prog/js/checkouts.js b/koha-tmpl/intranet-tmpl/prog/js/checkouts.js index de0a0a509f..f12743ff48 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/checkouts.js +++ b/koha-tmpl/intranet-tmpl/prog/js/checkouts.js @@ -50,7 +50,7 @@ $(document).ready(function() { $(".checkin:checked:visible").each(function() { itemnumber = $(this).val(); - $(this).replaceWith(""); + $(this).replaceWith(""); params = { itemnumber: itemnumber, @@ -81,7 +81,7 @@ $(document).ready(function() { var itemnumber = $(this).val(); - $(this).parent().parent().replaceWith(""); + $(this).parent().parent().replaceWith(""); var params = { itemnumber: itemnumber, diff --git a/koha-tmpl/intranet-tmpl/prog/js/holds.js b/koha-tmpl/intranet-tmpl/prog/js/holds.js index 8d51474884..3372992564 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/holds.js +++ b/koha-tmpl/intranet-tmpl/prog/js/holds.js @@ -200,7 +200,7 @@ $(document).ready(function() { $(this).prop("disabled",true); var cur_select = $(this); var res_id = $(this).attr('reserve_id'); - $(this).after('
'); + $(this).after('
'); var api_url = '/api/v1/holds/'+res_id; var update_info = JSON.stringify({ branchcode: $(this).val(), priority: parseInt($(this).attr("priority"),10) }); $.ajax({ diff --git a/koha-tmpl/intranet-tmpl/prog/js/z3950_search.js b/koha-tmpl/intranet-tmpl/prog/js/z3950_search.js index 7f79c3c787..95ef673dfe 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/z3950_search.js +++ b/koha-tmpl/intranet-tmpl/prog/js/z3950_search.js @@ -66,7 +66,7 @@ $( document ).ready( function() { }); $( "#marcPreview" ).on( "hidden", function() { $( "#marcPreviewLabel" ).html( "" ); - $( "#marcPreview .modal-body" ).html( "
" + MSG_LOADING + "
" ); + $( "#marcPreview .modal-body" ).html( "
" + MSG_LOADING + "
" ); }); $( ".previewData" ).on( "click", function(e) { e.preventDefault(); @@ -78,7 +78,7 @@ $( document ).ready( function() { }); $( "#dataPreview" ).on( "hidden", function() { $( "#dataPreviewLabel" ).html( "" ); - $( "#dataPreview .modal-body" ).html( "
" + MSG_LOADING + "
" ); + $( "#dataPreview .modal-body" ).html( "
" + MSG_LOADING + "
" ); }); $( ".import_record" ).on( "click", function(e) { e.preventDefault(); -- 2.39.5