From bfbae811627086c83b6a0e043eed56376ba51cc2 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Tue, 26 Feb 2008 10:34:28 +1300
Subject: [PATCH] Some changes related to recent commits to patron images:
 Markup and javascript changes for upload form; Enabling passing of cardnumber
 and filetype variable to picture upload form; changes to picture display to
 handle missing image; Adding link to picture upload form from missing image
 display in circ and moremember; Removal of English text from 'no patron
 image' file.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
---
 .../prog/en/includes/circ-menu.inc            |   2 +-
 .../intranet-tmpl/prog/en/js/staff-global.js  |   2 +-
 .../prog/en/modules/circ/circulation.tmpl     |  11 +++--
 .../prog/en/modules/members/moremember.tmpl   |   8 ++++
 .../prog/en/modules/tools/picture-upload.tmpl |  40 ++++++++----------
 .../intranet-tmpl/prog/img/patron-blank.png   | Bin 1988 -> 1559 bytes
 tools/picture-upload.pl                       |   3 ++
 7 files changed, 38 insertions(+), 28 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
index d516fcc79f..e854391aa5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
@@ -1,7 +1,7 @@
 <!-- TMPL_IF NAME="borrowernumber" -->
 <div class="patroninfo"><h5><!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --> (<!-- TMPL_VAR NAME="cardnumber" -->)</h5>
 <ul>
-<li><img src="patronimage.pl?crdnum=<!-- TMPL_VAR NAME="cardnumber" -->" alt="<!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --> (<!-- TMPL_VAR NAME="cardnumber" -->)" border="0" style="margin: .3em 0 .3em .3em; padding: .2em; border: 1px solid #CCCCCC;" width="100" /></li>
+<li><img src="/cgi-bin/koha/members/patronimage.pl?crdnum=<!-- TMPL_VAR NAME="cardnumber" -->" id="patronimage" alt="<!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --> (<!-- TMPL_VAR NAME="cardnumber" -->)" border="0" style="margin: .3em 0 .3em .3em; padding: .2em; border: 1px solid #CCCCCC;" /></li>
     <li><!-- TMPL_IF NAME="address"-->
             <!-- TMPL_VAR NAME="address" -->
     <!-- TMPL_ELSE -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js b/koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js
index ae02212492..371ae2bd21 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js
+++ b/koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js
@@ -19,7 +19,7 @@ function _(s) { return s } // dummy function for gettext
 function verify_patron_images() {
     for (var i = 0; i < document.images.length; i++) {
         img = document.images[i];
-        if ((img.src.indexOf('patronimages') >= 0)) {
+        if ((img.src.indexOf('patronimage') >= 0)) {
 			w = img.width;
             h = img.height;
      if ((w == 0) && (h == 0) || ((img.complete != null) && (!img.complete))) {
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 d7f683ff6a..c29a4f773a 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
@@ -10,9 +10,6 @@
 	 $(document).ready(function() {
  		$('#patronlists').tabs();
 	 });
-<!-- TMPL_IF NAME="patronimages" -->$(window).load(function() {
-		verify_patron_images();
-	 });<!-- /TMPL_IF -->
 //]]>
 </script>
 <!-- TMPL_INCLUDE NAME="calendar.inc" -->
@@ -555,4 +552,12 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
 <!-- TMPL_INCLUDE NAME="circ-menu.inc" -->
 </div><!-- /TMPL_UNLESS -->
 </div>
+<!-- TMPL_IF NAME="patronimages" --><script type="text/JavaScript" language="JavaScript">
+//<![CDATA[
+	verify_patron_images();
+	<!-- TMPL_IF NAME="CAN_user_tools" -->$("#patronimage").after("<a style=\"display: block; font-size:80%; margin:0  0 1em 1em;\" href=\"/cgi-bin/koha/tools/picture-upload.pl?cardnumber=<!-- TMPL_VAR NAME="cardnumber" -->&filetype=image\">+ Click to Add Image</a>").css({cursor: "pointer"}).click(function(){
+		location.href="/cgi-bin/koha/tools/picture-upload.pl?cardnumber=<!-- TMPL_VAR NAME="cardnumber" -->&filetype=image";
+	});<!-- /TMPL_IF -->
+//]]>
+</script><!-- /TMPL_IF -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
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 13ed1f90a2..93eee6700c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
@@ -450,4 +450,12 @@ for (var i=0;i<ItemsNodes.length;i++){
 <!-- TMPL_INCLUDE NAME="circ-menu.inc" -->
 </div>
 </div>
+<!-- TMPL_IF NAME="patronimages" --><script type="text/JavaScript" language="JavaScript">
+//<![CDATA[
+	verify_patron_images();
+	<!-- TMPL_IF NAME="CAN_user_tools" -->$("#patronimage").after("<a style=\"display: block; font-size:80%; margin:0  0 1em 1em;\" href=\"/cgi-bin/koha/tools/picture-upload.pl?cardnumber=<!-- TMPL_VAR NAME="cardnumber" -->&filetype=image\">+ Click to Add Image</a>").css({cursor: "pointer"}).click(function(){
+		location.href="/cgi-bin/koha/tools/picture-upload.pl?cardnumber=<!-- TMPL_VAR NAME="cardnumber" -->&filetype=image";
+	});<!-- /TMPL_IF -->
+//]]>
+</script><!-- /TMPL_IF -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tmpl
index 72db4dc697..2188794709 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tmpl
@@ -2,23 +2,14 @@
 <title>Koha &rsaquo; Tools &rsaquo; Upload Patron Images</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <script type="text/javascript">
-function blah($this){
-    var found=null
-    var els=document.getElementsByName($this.name)
-    for(var i=0;i<els.length;i++){
-        if(els[i]==$this){found=i;break}
-    }
-    if(found==0)return hideCardnumber()
-    if(found==1)return showCardnumber()
-}
-
-function showCardnumber(){
-    document.getElementById("cardnum").style.display="block"
-}
-
-function hideCardnumber(){
-    document.getElementById("cardnum").style.display="none"
-}
+ $(document).ready(function() {
+	$("#zipfile").click(function(){
+		$("#cardnum").hide();
+	});
+	$("#image").click(function(){
+		$("#cardnum").show();
+	});
+});
 </script>
 </head>
 <body>
@@ -92,17 +83,20 @@ function hideCardnumber(){
                 <!-- /TMPL_IF -->
 	        <form method="post" action="/cgi-bin/koha/tools/picture-upload.pl" enctype="multipart/form-data">
 	            <fieldset class="brief">
-                        <ol>
-                            <li>
-                                <input type="radio" id="filetype" name="filetype" onclick="blah(this)" value="zip" checked="checked" /> zip file
-                                <br />
-                                <input type="radio" id="filetype" name="filetype" onclick="blah(this)" value="image" /> image file
+                        <ol class="radio">
+                            <li class="radio">
+                                <label for="zipfile"><input type="radio" id="zipfile" name="filetype" value="zip" checked="checked" /> zip file</label></li>
+                                <li>
+                                <label for="image">
+								<!-- TMPL_IF EXPR="filetype eq 'image'" --><input type="radio" id="image" name="filetype" value="image" checked="checked" /><!-- TMPL_ELSE --><input type="radio" id="image" name="filetype" value="image" /><!-- /TMPL_IF -->
+								 image file</label>
 	                <ol>
                             <li>
                                 <label for="uploadfile">Select the file to upload: </label><input type="file" id="uploadfile" name="uploadfile" />
-                                <span id="cardnum" style="display: none"><label for="cardnumber">Enter patron cardnumber: </label><input type="text" id="cardnumber" name="cardnumber" size="15" /></span>
+                                <!-- TMPL_IF EXPR="filetype eq 'image'" --><span id="cardnum"><!-- TMPL_ELSE --><span id="cardnum" style="display: none"><!-- /TMPL_IF --><label for="cardnumber">Enter patron cardnumber: </label><input type="text" id="cardnumber" name="cardnumber" value="<!-- TMPL_VAR NAME="cardnumber" -->" size="15" /></span>
                             </li>
     	                </ol>
+					</li></ol>
 	            </fieldset>
                     <fieldset class="action"><input type="submit" value="Upload" class="submit" /> <a href="/cgi-bin/koha/tools/picture-upload.pl" class="cancel">Cancel</a>
                     </fieldset>
diff --git a/koha-tmpl/intranet-tmpl/prog/img/patron-blank.png b/koha-tmpl/intranet-tmpl/prog/img/patron-blank.png
index d46d6e927a315cd0819024a4b90cdaaf285baccf..a6ea80f181c12ee351e5d072743ac87ff1d2f45f 100644
GIT binary patch
literal 1559
zcma)6drVVj6u*6-y$G|tH9XvirL;A=f>0395o}9gWw-Ju$XctUg+9>Xt7DEmR47+1
z+9_qEf-;9lh_6YhD9-&ssjcfw4a(98n~t`VD9R#nbAbipzOOFXKa1HP_q*TY{LcCP
zPR=>aB}MN>M=p&-5G1-#Dv^V~7JPeX6tGrLX08T5szJ0~gdlz1tcXKX;2d9<uc#~A
zp|AT`W7Huc?T#uPt8kmfpp)w~+D~@<pvwV9`Vv`r{>zsyeLkPt?FJW<lau4)<0B&@
z^Yio5)6>tMJ@fnh6B859pFi*D=$M<E+qZAu=;)|GAc%^JdiwNfC=}A`_3`oXQ&UsD
zy}djhPbQPyyLZoGu?!6j8I8tu>()6O4y96=j;35hkcg~8iKx8(rz&+f1);GP@D?1W
z@EVZr!(4<UiNz7JImL!h>6`f^8ta;ZOc&PmQ&|m<s!$<v$Ai7jkfU^^_*{`BzH6ET
zfgFWv*kg`TtTA5!9?VyWyaq-BjlLzCDMT1s(8aMynNCk$8;sk@eXG_oMtU>tq=rmm
zb@MeEceKQ8hp>L)1Y=o%R}11ZH0Z*ly~0#?J78(&c3KEzc_L)o#htFDCTo&f(mKK?
zwuK-y)<9Qc+e{ipnVnGqJ_J9=yNS(L!h5pKo{lY?xe*Du*oh`7KEta9X<)0HGpsi0
zua`k+nu0Ct;nvnCgG`WZsRDVT90aBfaXTd{)2h4ar2o!RaF94ygU@XEQwD^6!?9$2
z4bn-%ubKy%7WF}~PK?1$9{#yg9p*t}ZfQ=fgepq*xC+`5$g@wFfQJ@cRBE#a1|bin
ztH|;`ZGZ!1tMg28eP(8j6gUm;jt!Rk-aB(Y0*FfvYEIk7Jx(fJD9I>8In|k_`wO9>
z-r-v!Wm$V83X=JFZJ>Yu`gZe03Xpvl4GsIdSm(}rAZGW&vHn3$zWFf)3cHg~R#f4;
zv0|Aup$zyqb@<lxFFM=5b<dgoUSQo59b;#Fl~n?Z#AMrPv`a5J9NiB;OR1m+V!mJY
z0!SzBV!692*iV?Gn4HRLAT`If(=KR5#&)W%0}t8BLAsj5papIogT~jf+=>DLa^(0)
zK+~>b`)){M)SjhU_~ysnC@_*@GgUDAC%7StrTp@KXa?#_iaJMq(7O!Jj$c7(zrPJg
zcG-!|4Prd?gS7BLLdf5V8^4Vgfs=TUIBGRE{4${jm^%FGSvC6UQ8RFMo3AmPKESPs
zh8XcBqRF}vx%|igtTOPPv(@NU0YqfrGY4%KI=krUbm_{KErLiFkaETrC{}g*XkAiq
zeHzH!IqvL--^I0ZeRB8U@1P)Qer)~)b#F`1)IzV;$8gueGBPj0<2=NysEuHGvBYj>
z8Yo1o7VYD=k*@4NRs-vSg9n5MO6pH>Rsl-v5v<Z=HNiHt8qjRi%h(p)Hs_qm7Qt%u
zIwXzi$Krpst?IU}jiBZqDA*B>JejQ?I*h`d{V5#L{A?@?wjC|q9k$`9*ol%<ohIC~
zD)N!Ky{!ip!A2^_X@)#LoCarY4LNLS$hjN>x1yyC({>oW20f!)lJpVn7)YSkE;*!q
z6-81A8{TVXj_v^zdN#6)H-%miJ6|jv08jr;6ZSY(xnhk{4toqNSsQd=1F&q$#lC!4
z3JVNNwh{wPT<Il%lnzK*_%MnDcm7sZ<w!aNJF4J_Atq^ch(tC&;9OwcEH>r>*fnjz
m>!#KJ9&1s5j6Ff<YNWC7ZN-nD|Fsp&XrwT|NODoEHvJ6~Qz<n7

literal 1988
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

diff --git a/tools/picture-upload.pl b/tools/picture-upload.pl
index d00092c448..75dcbd06dd 100755
--- a/tools/picture-upload.pl
+++ b/tools/picture-upload.pl
@@ -131,6 +131,9 @@ if ( $uploadfile ) {
             );
         }   
     }
+} else {
+	$template->param(cardnumber => $cardnumber );
+	$template->param(filetype => $filetype );
 }
 
 output_html_with_http_headers $input, $cookie, $template->output;
-- 
2.39.5