From 56b2d75e385ab502588a38e4a8e79907a2d52818 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 25 Apr 2017 16:16:49 +0000 Subject: [PATCH] Bug 18419 - Broken patron-blank image in viewlog.tt Because of a variable name collision the blank patron image doesn't display in viewlog.tt. This patch moves the image from the template to the stylesheet to avoid this problem. This patch also replaces the blank patron image PNG file with an SVG file. SVG support is wide enough to begin using whereever possible. This patch also removes some inline CSS from circ-menu.inc and puts it in the global stylesheet. To test, apply the patch and clear your browser cache if necessary. - Enable the patronimages system preference. - View a patron account which lacks a patron image. All views (details, fines, notices, etc) should show the "blank" patron image, including the modification log view. - View a patron account which has a patron image and check that it still displays correctly in all views. Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart Signed-off-by: Mason James --- .../intranet-tmpl/prog/css/staff-global.css | 18 ++++++++++++++++++ .../prog/en/includes/circ-menu.inc | 8 ++++++-- .../prog/img/patron-blank.min.svg | 1 + .../intranet-tmpl/prog/img/patron-blank.png | Bin 1559 -> 0 bytes 4 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/img/patron-blank.min.svg delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/patron-blank.png diff --git a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/css/staff-global.css index be81759199..7c739a8a31 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css +++ b/koha-tmpl/intranet-tmpl/prog/css/staff-global.css @@ -489,6 +489,24 @@ div.patroninfo ul li { list-style-type : none; } +#patronbasics div { + background: transparent url("../img/patron-blank.min.svg") 10px 5px no-repeat; + border: 1px solid #CCCCCC; + height: 125px; + margin: .3em 0 .3em .3em; + padding: 0; + width: 105px; +} + +#patronimage { + border: 1px solid #CCCCCC; + max-width : 140px; + margin: .3em 0 .3em .3em; + padding: .2em; + width:auto !important; + width:130px; +} + div.patronviews { border-right : 1px solid #000; border-top : 1px solid #000; 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 8e83947c8a..f56567e760 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc @@ -8,9 +8,13 @@
    [% IF ( patronimages ) %] [% IF ( picture ) %] -
  • [% firstname | html %] [% surname | html %] ([% cardnumber | html %])
    • +
  • + [% firstname | html %] [% surname | html %] ([% cardnumber | html %]) +
    • [% ELSE %] -
  • [% firstname | html %] [% surname | html %] ([% cardnumber | html %])
    • +
  • +
    +
    • [% END %] [% END %] [% IF Koha.Preference( 'AddressFormat' ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/img/patron-blank.min.svg b/koha-tmpl/intranet-tmpl/prog/img/patron-blank.min.svg new file mode 100644 index 0000000000..795a74fae4 --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/img/patron-blank.min.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/img/patron-blank.png b/koha-tmpl/intranet-tmpl/prog/img/patron-blank.png deleted file mode 100644 index a6ea80f181c12ee351e5d072743ac87ff1d2f45f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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&1s5j6Ff