From dd06f06f892c11e222039ae195bc7848d7b1565c Mon Sep 17 00:00:00 2001
From: Michael Hafen <mdhafen@tech.washk12.org>
Date: Thu, 14 Aug 2008 13:44:13 -0600
Subject: [PATCH] Implement changes to audio feedback proposed on list

change embed to object
move object tags to included file
consider using wav files for media instead of swf
  in practice this is problematic.  Firefox on windows doesn't have a Media Player plugin
  there may be a later patch with the wav files, just for fun.  I won't use it though.
---
 circ/circulation.pl                                |    5 ++++-
 koha-tmpl/intranet-tmpl/prog/en/includes/sound.inc |    3 +++
 .../prog/en/modules/circ/circulation.tmpl          |    3 +--
 .../prog/en/modules/circ/returns.tmpl              |    3 +--
 .../prog/en/modules/members/moremember.tmpl        |    2 +-
 5 files changed, 10 insertions(+), 6 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/sound.inc

diff --git a/circ/circulation.pl b/circ/circulation.pl
index 5e3d997..20c6285 100755
--- a/circ/circulation.pl
+++ b/circ/circulation.pl
@@ -103,7 +103,7 @@ for (@failedrenews) { $renew_failed[$_] = 1; }
 
 my $sessionID = $query->cookie("CGISESSID") ;
 my $session = get_session($sessionID);
-my $sounderror;
+my ( $sounderror, $soundok );
 my @soundederrors = @{ $session->param( 'soundederrors' ) } if ( $session->param( 'soundederrors' ) );
 my %soundederrors;
 for ( @soundederrors ) { $soundederrors{ $_ } = 1; }
@@ -302,6 +302,7 @@ if ($barcode) {
     # we have no blockers for issuing and any issues needing confirmation have been resolved
         AddIssue( $borrower, $barcode, $datedue, $cancelreserve );
         $inprocess = 1;
+	$soundok = 1;
     }
   elsif ($issueconfirmed){	# FIXME: Do something? Or is this to *intentionally* do nothing?
   }
@@ -328,6 +329,7 @@ if ($barcode) {
 			if ($noquestion) {
 				AddIssue( $borrower, $barcode, $datedue );
 				$inprocess = 1;
+				$soundok = 1;
 			}
    	    }
 		$template->param(
@@ -767,6 +769,7 @@ $template->param( picture => 1 ) if $picture;
 $session->param('soundederrors', [ keys %soundederrors ] );
 $template->param(
     sounderror => $sounderror,
+    soundok => $soundok,
     );
 
 $template->param(
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/sound.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/sound.inc
new file mode 100644
index 0000000..6728933
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/sound.inc
@@ -0,0 +1,3 @@
+<!-- TMPL_IF NAME="sounderror" --><OBJECT data="/intranet-tmpl/prog/img/error.swf" WIDTH="1" HEIGHT="1" TYPE="application/x-shockwave-flash"></OBJECT><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="soundok" --><OBJECT data="/intranet-tmpl/prog/img/ok.swf" WIDTH="1" HEIGHT="1" TYPE="application/x-shockwave-flash"></OBJECT><!-- /TMPL_IF -->
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
index bfb23fd..86ac0d9 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
@@ -60,8 +60,7 @@ $.tablesorter.addParser({
 <!-- /TMPL_IF -->
 
 <!--  INITIAL BLOC : PARAMETERS & BORROWER INFO -->
-<!-- TMPL_IF NAME="sounderror" --><EMBED src="/intranet-tmpl/prog/img/error.swf" quality="high"  WIDTH="1" HEIGHT="1" TYPE="application/x-shockwave-flash" PLUGINSPAGE="http://www.macromedia.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash"></EMBED><!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="inprocess" --><!-- Sound on successful issueing --><EMBED src="/intranet-tmpl/prog/img/ok.swf" quality="high"  WIDTH="1" HEIGHT="1" TYPE="application/x-shockwave-flash" PLUGINSPAGE="http://www.macromedia.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash"></EMBED><!-- /TMPL_IF -->
+<!-- TMPL_INCLUDE NAME="sound.inc" -->
 
 <!-- TMPL_IF NAME="dateexpiry" --><div class="dialog message">Patron's account has been renewed until <!-- TMPL_VAR NAME="dateexpiry" --></div><!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="NEEDSCONFIRMATION" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl
index acba3d0..5ab1de2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl
@@ -317,8 +317,7 @@ function Dopop(link) {
     </form>
 </div>
 
-<!-- TMPL_IF NAME="sounderror" --><EMBED src="/intranet-tmpl/prog/img/error.swf" quality="high"  WIDTH="1" HEIGHT="1" TYPE="application/x-shockwave-flash" PLUGINSPAGE="http://www.macromedia.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash"></EMBED><!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="soundok" --><EMBED src="/intranet-tmpl/prog/img/ok.swf" quality="high"  WIDTH="1" HEIGHT="1" TYPE="application/x-shockwave-flash" PLUGINSPAGE="http://www.macromedia.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash"></EMBED><!-- /TMPL_IF -->
+<!-- TMPL_INCLUDE NAME="sound.inc" -->
 <!-- TMPL_IF Name="returned" -->
 <div class="yui-g">    <table>
         <tr><th>Item Information</th><th>Patron Information</th></tr>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
index 39cb051..f4d4f80 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
@@ -81,7 +81,7 @@ if (nodename =="barcodes[]"){
 	<div id="yui-main">
 	<div class="yui-b">
 <!-- TMPL_INCLUDE NAME="members-toolbar.inc" -->
-<!-- TMPL_IF NAME="sounderror" --><EMBED src="/intranet-tmpl/prog/img/error.swf" quality="high"  WIDTH="1" HEIGHT="1" TYPE="application/x-shockwave-flash" PLUGINSPAGE="http://www.macromedia.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash"></EMBED><!-- <!-- TMPL_VAR NAME="sounderror" --> --><!-- /TMPL_IF -->
+<!-- TMPL_INCLUDE NAME="sound.inc" -->
 <!-- TMPL_IF NAME="error" -->
 <div class="dialog alert">
 <!-- TMPL_IF NAME="AUTH_UPDATE_FAILED" -->
-- 
1.5.4.3