Bugzilla – Attachment 62746 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]
Bug 18419 - Broken patron-blank image in viewlog.tt
Bug-18419---Broken-patron-blank-image-in-viewlogtt.patch (text/plain), 7.06 KB, created by
Jonathan Druart
on 2017-04-26 19:36:30 UTC
(
hide
)
Description:
Bug 18419 - Broken patron-blank image in viewlog.tt
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2017-04-26 19:36:30 UTC
Size:
7.06 KB
patch
obsolete
>From 8e6a8972e65758f7a57cb48def15604d7537ed04 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >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 <josef.moravec@gmail.com> > >Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >--- > 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 >KcmV+b0RR6000031 > >literal 1559 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 >JPDHLkV1g4<DK!89 > >-- >2.9.3
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