From bfbae811627086c83b6a0e043eed56376ba51cc2 Mon Sep 17 00:00:00 2001 From: Owen Leonard 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 Signed-off-by: Joshua Ferraro --- .../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 @@
()
    -
  • " alt=" ()" border="0" style="margin: .3em 0 .3em .3em; padding: .2em; border: 1px solid #CCCCCC;" width="100" />
  • +
  • " id="patronimage" alt=" ()" border="0" style="margin: .3em 0 .3em .3em; padding: .2em; border: 1px solid #CCCCCC;" />
  • 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(); }); -$(window).load(function() { - verify_patron_images(); - }); //]]> @@ -555,4 +552,12 @@ No patron matched
+ 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 + 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 @@ Koha › Tools › Upload Patron Images @@ -92,17 +83,20 @@ function hideCardnumber(){
-
    -
  1. - zip file -
    - image file +
      +
    1. +
    2. +
    3. +
      1. - +
      +
Cancel
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;2d9zsyeLkPt?FJWtMJ@fnh6B859pFi*D=$M()6O4y96=j;35hkcg~8iKx8(rz&+f1);GP@D?1W z@EVZr!(46`f^8ta;ZOc&PmQ&|mtq=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@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-v5vJejQ?I*h`d{V5#L{A?@?wjC|q9k$`9*ol%x1yyC({>oW20f!)lJpVn7)YSkE;*!q z6-81A8{TVXj_v^zdN#6)H-%miJ6|jv08jr;6ZSY(xnhk{4toqNSsQd=1F&q$#lC!4 z3JVNNwh{wPTr>*fnjz m>!#KJ9&1s5j6FfPrTh z5Gr78WBrD?%?u6NaEPJiX(8B}LO}@UO@e_6uIONnvfhOV%n$TzB{X#v`#*rf8yFca zlk_YJz655%&oQ#;P&Sgs!T&-p?_#7ZA-h13=}6xT0z2>*gx$T$-1p>k1{$rO?}8Hw z2k9h&guT=gW@V>=EQOQUTm#1t8KZ=_rJahz-AZ}7l!0)#RL%UwBd=+C`)L*yT)37@ z76>Xp&fH6uckLX(rV=`eA4_PbG~5wD2rUv$YWN)Quj&2USeTHoCza6n3l?-2+QFkE zj98BFwR|=$f`#DXlNfuQmL@^#w~ipc5*p#>D5S+$s34QlV5P@U2F<7BI4{ACWx%wx zN?T@iT9l@C_R}PCYAaGDfI;A&>aKpg(n2$KQyR|q=s@mo0mM4=twC(#KI7${J}FA> zp*imTL<<+Ezx1m5+h_nftO~laih5Bx*w`h>z5`a*kv7`8az?8^!HWxCi3T?HN!AT_ zq(XJW!(M<}`)i*w>U{dN`X5X5^5pShr&w|O+^k6Rpch6ssT69e@$PB<>~F%tt_>`8 z2KwHoXx=pb(+Py5Y$WU_OGOOtd~`afm%EC6 znv}z>+e~~)3 z>N5UdGYy$?W8bTNPXXTPiT@122lLPCfaeaAoCpLF%t45or^ZBdW623J@Q2@nidwE? zv5cW%*avH<8k0#XHML86ZbaFG24ifDdFZ~U8gyr1#B%BwuW|>EC*8$Mn!}8{8;raA z`8=Mc>rBU%3fT$4&myIXNtyW3e|y|-Oxf2z47Vt&T70P1eAMQuNvj)mrq#7u8snPG zXpA!wm$RwQW=E6%^8Y5Gy5 zw{Ofp`?ziEBDusY@@_omcO3xgHQF{;bBqhu-e1-=#bq?9I=k&L_r+tmbQ0E;5!;y) zr%u_9#S|Y8M+K9~f!MP0@*mnj+y%A3ou|6?V7)Rqj;1l@e>k^%MFCU5|6bDK&jpyN3uYk&8=#tIvvk zx+8w*gZDe)b*Ra`L$!Yh7wrB-E*ev2iH0!NdF1QUemeX?3QAvrS8G$HE0JjcXTf1# zFvQV%bQ6@7sg)R8V?%V-DcUupu&}9D^^RiW%ZU!GtRtK!kql5ykYf1ExX<@g_!lUv z%Q-q~Vtm6=v5?D>3I#w1gDF zi66KdBgKoe*#Tb#param(cardnumber => $cardnumber ); + $template->param(filetype => $filetype ); } output_html_with_http_headers $input, $cookie, $template->output; -- 2.39.5