Some changes related to recent commits to patron images: Markup and javascript change...

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>

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 d516fcc..e854391 100644 (file)
--- 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 ae02212..371ae2b 100644 (file)
--- 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 d7f683f..c29a4f7 100755 (executable)
--- 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 13ed1f9..93eee67 100644 (file)
--- 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 72db4dc..2188794 100644 (file)
--- 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 d46d6e9..a6ea80f 100644 (file)
Binary files a/koha-tmpl/intranet-tmpl/prog/img/patron-blank.png and b/koha-tmpl/intranet-tmpl/prog/img/patron-blank.png differ

diff --git a/tools/picture-upload.pl b/tools/picture-upload.pl
index d00092c..75dcbd0 100755 (executable)
--- 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;