Bugzilla – Attachment 62729 Details for
Bug 18419
Broken patron-blank image in viewlog.tt
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[SIGNED-OFF] Bug 18419 - Broken patron-blank image in viewlog.tt
SIGNED-OFF-Bug-18419---Broken-patron-blank-image-i.patch (text/plain), 6.70 KB, created by
Josef Moravec
on 2017-04-26 13:17:38 UTC
(
hide
)
Description:
[SIGNED-OFF] Bug 18419 - Broken patron-blank image in viewlog.tt
Filename:
MIME Type:
Creator:
Josef Moravec
Created:
2017-04-26 13:17:38 UTC
Size:
6.70 KB
patch
obsolete
>From e611c2a1425733e542342f8ac70c3656deb4e81d Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Tue, 25 Apr 2017 16:16:49 +0000 >Subject: [PATCH] [SIGNED-OFF] 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 <josef.moravec@gmail.com> >--- > koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 18 ++++++++++++++++++ > .../intranet-tmpl/prog/en/includes/circ-menu.inc | 8 ++++++-- > koha-tmpl/intranet-tmpl/prog/img/patron-blank.min.svg | 1 + > koha-tmpl/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 35479c8..175fce8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css >+++ b/koha-tmpl/intranet-tmpl/prog/css/staff-global.css >@@ -535,6 +535,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 083a88c..8d90fa9 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 @@ > <ul class="patronbriefinfo"> > [% IF ( patronimages ) %] > [% IF ( picture ) %] >- <li><img src="/cgi-bin/koha/members/patronimage.pl?borrowernumber=[% borrowernumber | uri %]" id="patronimage" alt="[% firstname | html %] [% surname | html %] ([% cardnumber | html %])" style="max-width : 140px; margin: .3em 0 .3em .3em; padding: .2em; border: 1px solid #CCCCCC; width:auto !important; width:130px;" /></li> >+ <li> >+ <img src="/cgi-bin/koha/members/patronimage.pl?borrowernumber=[% borrowernumber | uri %]" id="patronimage" alt="[% firstname | html %] [% surname | html %] ([% cardnumber | html %])" /> >+ </li> > [% ELSE %] >- <li id="patronbasics"><img src="[% interface %]/[% theme %]/img/patron-blank.png" alt="[% firstname | html %] [% surname | html %] ([% cardnumber | html %])" style="margin: .3em 0 .3em .3em; padding: .2em; border: 1px solid #CCCCCC;" /></li> >+ <li id="patronbasics"> >+ <div></div> >+ </li> > [% 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 0000000..795a74f >--- /dev/null >+++ b/koha-tmpl/intranet-tmpl/prog/img/patron-blank.min.svg >@@ -0,0 +1 @@ >+<svg xmlns="http://www.w3.org/2000/svg" width="85.187" height="125" display="block"><circle cx="42.593" cy="22.925" r="22.925" fill="#ccc" style="vector-effect:none"/><path fill="#ccc" d="M27.3 47.78C12.3 47.78.2 59.28 0 73.6V125h85.2V73.6h-.02c-.2-14.33-12.3-25.82-27.3-25.82z" style="vector-effect:none"/><path d="M36.76 105.66c-.12-2.64 2.94-4.65 5.32-3.53 2.6.96 3.18 4.83.96 6.5-1.97 1.73-5.44.7-6.12-1.84-.1-.36-.18-.8-.16-1.14zM40.9 65c3.56-.03 7.7 1.07 9.52 4.44 1.72 3.12 1.04 7.1-1.12 9.83-2.03 2.8-4.97 5.18-5.57 8.77-.57 2.7-.54 5.5-.57 8.24-1.75 0-3.5 0-5.26 0 .06-5.14.24-10.78 3.5-15.06 1.6-2.18 3.74-4.25 4.2-7.03.3-2.45-2.2-4.05-4.37-4.16-3.02-.35-6.1.97-8.12 3.2-.42-1.7-.84-3.4-1.27-5.1 2.42-2.2 5.98-3.04 9.07-3.14z"/></svg> >\ 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;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 > >-- >2.1.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 18419
:
62062
|
62691
|
62729
|
62746