X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=koha-tmpl%2Fintranet-tmpl%2Fprog%2Fen%2Fmodules%2Fcirc%2Freturns.tt;h=1ee9efe53da9308d8f2f76d71595167b080f95d3;hb=9dca7096c89bef81c3a4cfb46df788e65818e86b;hp=7fd8d1d55d286f1ba6c1fa720a38aa962195a87f;hpb=ca11d0ba2998996bbef39a9a9e2483bba21572d6;p=koha_fer

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
index 7fd8d1d55d..1ee9efe53d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
@@ -120,7 +120,7 @@ $(document).ready(function () {
 	<!-- waiting -->
 
 [% IF ( soundon ) %]
-<audio src="/intranet-tmpl/prog/sound/ending.ogg" autoplay="autoplay" autobuffer="autobuffer"></audio>
+<audio src="[% interface %]/[% theme %]/sound/ending.ogg" autoplay="autoplay" autobuffer="autobuffer"></audio>
 [% END %]
 
 <div id="hold-found1" class="dialog message">
@@ -163,7 +163,7 @@ $(document).ready(function () {
     [% IF ( diffbranch ) %]
 		<!-- diffbranch -->
         [% IF ( soundon ) %]
-        <audio src="/intranet-tmpl/prog/sound/opening.ogg" autoplay="autoplay" autobuffer="autobuffer"></audio>
+        <audio src="[% interface %]/[% theme %]/sound/opening.ogg" autoplay="autoplay" autobuffer="autobuffer"></audio>
         [% END %]
         <div id="transfer-needed" class="dialog message">
 		<h3>Hold needing transfer found: <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% itembiblionumber %]">[% title |html %]</a></h3>
@@ -206,14 +206,14 @@ $(document).ready(function () {
             <h3>Please return <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber %]">[% title or "item" |html %]</a> to [% homebranchname %]<br/>( <a href="#" onclick="Dopop('transfer-slip.pl?transferitem=[% itemnumber %]&amp;branchcode=[% homebranch %]&amp;op=slip'); return true;">Print slip</a> )</h3>
         </div>
         [% IF ( soundon ) %]
-        <audio src="/intranet-tmpl/prog/sound/opening.ogg" autoplay="autoplay" autobuffer="autobuffer"></audio>
+        <audio src="[% interface %]/[% theme %]/sound/opening.ogg" autoplay="autoplay" autobuffer="autobuffer"></audio>
         [% END %]
     [% END %]
 
     [% IF ( needstransfer ) %]
 	<!-- needstransfer -->
         [% IF ( soundon ) %]
-        <audio src="/intranet-tmpl/prog/sound/opening.ogg" autoplay="autoplay" autobuffer="autobuffer"></audio>
+        <audio src="[% interface %]/[% theme %]/sound/opening.ogg" autoplay="autoplay" autobuffer="autobuffer"></audio>
         [% END %]
 	<div id="item-transfer" class="dialog message"><h3> This item needs to be transferred to [% homebranchname %]</h3>
     Transfer now?<br />
@@ -239,7 +239,7 @@ $(document).ready(function () {
     [% IF ( diffbranch ) %]
 	<!-- diffbranch -->
         [% IF ( soundon ) %]
-        <audio src="/intranet-tmpl/prog/sound/opening.ogg" autoplay="autoplay" autobuffer="autobuffer"></audio>
+        <audio src="[% interface %]/[% theme %]/sound/opening.ogg" autoplay="autoplay" autobuffer="autobuffer"></audio>
         [% END %]
         <h3>Item consigned:</h3>
         <table>
@@ -267,7 +267,7 @@ $(document).ready(function () {
 	<!--  reserved  -->
 
         [% IF ( soundon ) %]
-        <audio src="/intranet-tmpl/prog/sound/opening.ogg" autoplay="autoplay" autobuffer="autobuffer"></audio>
+        <audio src="[% interface %]/[% theme %]/sound/opening.ogg" autoplay="autoplay" autobuffer="autobuffer"></audio>
         [% END %]
 
 	<div id="hold-found2" class="dialog message">
@@ -313,10 +313,11 @@ $(document).ready(function () {
         </form>
 	</div>
     [% END %]
-[% ELSE %]
+[% END %]
 
 [% IF ( errmsgloop ) %]
     <div class="dialog alert">
+        <h3>Check in message</h3>
         [% FOREACH errmsgloo IN errmsgloop %]
                     [% IF ( errmsgloo.badbarcode ) %]
                         <p class="problem">No item with barcode: [% errmsgloo.msg %]</p>
@@ -340,7 +341,7 @@ $(document).ready(function () {
                     [% END %]
                     [% IF ( errmsgloo.withdrawn ) %]
                         [% IF BlockReturnOfWithdrawnItems %]
-                           <h3>Cannot Check In</h3>
+                           <h5>Cannot check in</h5>
                            <p class="problem">Item is withdrawn. <strong>NOT CHECKED IN</strong></p>
                         [% ELSE %]
                            <p class="problem">Item is withdrawn.</p>
@@ -351,15 +352,24 @@ $(document).ready(function () {
                     [% END %]
             [% END %]
 [% IF ( soundon ) %]
-<audio src="/intranet-tmpl/prog/sound/critical.ogg" autoplay="autoplay" autobuffer="autobuffer"></audio>
+<audio src="[% interface %]/[% theme %]/sound/critical.ogg" autoplay="autoplay" autobuffer="autobuffer"></audio>
 [% END %]
         [% ELSE %]
 [% IF ( soundon ) %]
-<audio src="/intranet-tmpl/prog/sound/beep.ogg" autoplay="autoplay" autobuffer="autobuffer"></audio>
+<audio src="[% interface %]/[% theme %]/sound/beep.ogg" autoplay="autoplay" autobuffer="autobuffer"></audio>
 [% END %]
         [% END %]
     </div>
-[% END %]
+
+[% IF ( checkinmsg ) %]
+    [% IF ( checkinmsgtype == 'alert' ) %]
+        <div class="dialog alert">
+    [% ELSE %]
+        <div class="dialog message">
+    [% END %]
+            <p class="problem">[% checkinmsg %]</p>
+        </div>
+[% END%]
 
     <div id="exemptfines" class="dialog message" style="display:none;">
         <p>Fines for returned items are forgiven.</p>