Bugzilla – Attachment 144668 Details for
Bug 31028
Add 'Report a concern' feature for patrons to report concerns about catalog records
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 31028: Update patron and biblio includes to remove whitespace
Bug-31028-Update-patron-and-biblio-includes-to-rem.patch (text/plain), 8.20 KB, created by
Martin Renvoize (ashimema)
on 2022-12-16 11:33:10 UTC
(
hide
)
Description:
Bug 31028: Update patron and biblio includes to remove whitespace
Filename:
MIME Type:
Creator:
Martin Renvoize (ashimema)
Created:
2022-12-16 11:33:10 UTC
Size:
8.20 KB
patch
obsolete
>From 61de2c92ba1b17f7d3c408fe9a7959d8975f708a Mon Sep 17 00:00:00 2001 >From: Martin Renvoize <martin.renvoize@ptfs-europe.com> >Date: Wed, 14 Dec 2022 17:16:05 +0000 >Subject: [PATCH] Bug 31028: Update patron and biblio includes to remove > whitespace > >These includes used lots of [% %] blocks instead of [%- -%] and as such >the produced markup contains superflous spacing. This is OK in the >browser, but for some reason does affect rendering in HTML email. > >Signed-off-by: David Nind <david@davidnind.com> >Signed-off-by: Helen Oliver <HOliver@tavi-port.ac.uk> >--- > .../prog/en/includes/biblio-title.inc | 54 +++++++++---------- > .../prog/en/includes/patron-title.inc | 44 +++++++-------- > 2 files changed, 49 insertions(+), 49 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-title.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-title.inc >index 2e7ca6426af..6499e591e40 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-title.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-title.inc >@@ -1,31 +1,31 @@ >-[% IF ( link ) %] >- <a href="[% PROCESS biblio_a_href biblionumber => biblio.biblionumber %]" class="title"> >-[% END %] >+[%- IF ( link ) -%] >+ <a href="[%- PROCESS biblio_a_href biblionumber => biblio.biblionumber -%]" class="title"> >+[%- END -%] > >-[% IF ( biblio.title ) %] >- <span class="biblio-title">[% biblio.title | html %]</span> >-[% ELSE %] >+[%- IF ( biblio.title ) -%] >+ <span class="biblio-title">[%- biblio.title | html -%]</span> >+[%- ELSE -%] > <span>No title</span> >-[% END %] >-[% IF ( biblio.medium ) %] >- <span class="biblio-medium">[% biblio.medium | html %]</span> >-[% END %] >-[% FOREACH subtitle IN biblio.subtitle.split(' \\| ') %][% IF Koha.Preference('marcflavour')=='UNIMARC' %],[% END %] >- <span class="subtitle">[% subtitle | html %]</span> >-[% END %] >-[% part_numbers = biblio.part_number.split(' \\| ') %] >-[% part_names = biblio.part_name.split(' \\| ') %] >-[% i = 0 %] >-[% WHILE ( part_numbers.$i.defined || part_names.$i.defined ) %] >- [% IF ( part_numbers.$i.defined ) %] >- <span class="part-number">[% part_numbers.$i | html %]</span> >- [% END %] >- [% IF ( part_names.$i.defined ) %] >- <span class="part-name">[% part_names.$i | html %]</span> >- [% END %] >- [% i = i + 1 %] >-[% END %] >+[%- END -%] >+[%- IF ( biblio.medium ) -%] >+ <span class="biblio-medium">[%- biblio.medium | html -%]</span> >+[%- END -%] >+[%- FOREACH subtitle IN biblio.subtitle.split(' \\| ') -%][%- IF Koha.Preference('marcflavour')=='UNIMARC' -%],[%- END -%] >+ <span class="subtitle">[%- subtitle | html -%]</span> >+[%- END -%] >+[%- part_numbers = biblio.part_number.split(' \\| ') -%] >+[%- part_names = biblio.part_name.split(' \\| ') -%] >+[%- i = 0 -%] >+[%- WHILE ( part_numbers.$i.defined || part_names.$i.defined ) -%] >+ [%- IF ( part_numbers.$i.defined ) -%] >+ <span class="part-number">[%- part_numbers.$i | html -%]</span> >+ [%- END -%] >+ [%- IF ( part_names.$i.defined ) -%] >+ <span class="part-name">[%- part_names.$i | html -%]</span> >+ [%- END -%] >+ [%- i = i + 1 -%] >+[%- END -%] > >-[% IF ( link ) %] >+[%- IF ( link ) -%] > </a> >-[% END %] >+[%- END -%] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc >index d0a3267cf52..772035d5bbe 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc >@@ -30,23 +30,23 @@ > [%- SET data.borrowernumber = borrowernumber -%] > [%- SET data.title = title -%] > [%- END -%] >-[%# Parameter no_html - if 1, the html tags are NOT generated %] >-[%- IF no_title %][% SET data.title = "" %][% END -%] >-[%- IF data.title %] >- [%- IF no_html %] >- [%- span_start = '' %] >- [%- span_end = '' %] >- [%- ELSE %] >- [%- span_start = '<span class="patron-title">' %] >- [%- span_end = '</span>' %] >- [%- END %] >- [% data.title = data.title | html %] >+[%# Parameter no_html - if 1, the html tags are NOT generated -%] >+[%- IF no_title -%][%- SET data.title = "" -%][%- END -%] >+[%- IF data.title -%] >+ [%- IF no_html -%] >+ [%- span_start = '' -%] >+ [%- span_end = '' -%] >+ [%- ELSE -%] >+ [%- span_start = '<span class="patron-title">' -%] >+ [%- span_end = '</span>' -%] >+ [%- END -%] >+ [%- data.title = data.title | html -%] > [%- SET data.title = span_start _ data.title _ span_end _ ' ' -%] > [%- END -%] > [%- SET display_patron_name = 1 -%] > [%- SET display_cardnumber = 1 -%] >-[%- IF no_cardnumber %][% SET display_cardnumber = 0 %][% END -%] >-[%- IF hide_patron_infos_if_needed %] [%# Should only be set if patron is set -%] >+[%- IF no_cardnumber -%][%- SET display_cardnumber = 0 -%][%- END -%] >+[%- IF hide_patron_infos_if_needed -%] [%# Should only be set if patron is set -%] > [%- SET can_see_patron_infos = logged_in_user.can_see_patron_infos( patron ) -%] > [%- UNLESS can_see_patron_infos -%] > [%- SET display_patron_name = 0 -%] >@@ -56,27 +56,27 @@ > [%- END -%] > [%- END -%] > [%- IF hide_patron_infos_if_needed AND ( display_patron_name OR display_cardnumber ) -%] >- [%- IF link_to == 'circulation_reserves' %]<a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% data.borrowernumber | uri %]#reserves"> >- [%- ELSIF link_to == 'circulation_recalls' %]<a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% data.borrowernumber | uri %]#recalls"> >- [%- ELSIF link_to == 'members_pay' %]<a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber | uri %]"> >- [%- ELSE %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% data.borrowernumber | uri %]"> >+ [%- IF link_to == 'circulation_reserves' -%]<a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[%- data.borrowernumber | uri -%]#reserves"> >+ [%- ELSIF link_to == 'circulation_recalls' -%]<a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[%- data.borrowernumber | uri -%]#recalls"> >+ [%- ELSIF link_to == 'members_pay' -%]<a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[%- patron.borrowernumber | uri -%]"> >+ [%- ELSE -%]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[%- data.borrowernumber | uri -%]"> > [%- END -%] > [%- END -%] > [%- IF display_patron_name -%] > [%- IF data.category_type == 'I' -%] >- [%- data.surname | html %] [% IF data.othernames %] ([% data.othernames | html %])[% END -%] >+ [%- data.surname | html -%] [%- IF data.othernames -%] ([%- data.othernames | html -%])[%- END -%] > [%- ELSIF invert_name -%] >- [% data.title | $raw %][%- data.surname | html %][% IF ( data.firstname ) %], [% data.firstname | html %][% END %][% IF data.middle_name %] [% data.middle_name | html %][% END %][% IF data.othernames %] ([% data.othernames | html %]) [% END -%] >+ [%- data.title | $raw -%][%- data.surname | html -%][%- IF ( data.firstname ) -%], [%- data.firstname | html -%][%- END -%][%- IF data.middle_name -%] [%- data.middle_name | html -%][%- END -%][%- IF data.othernames -%] ([%- data.othernames | html -%]) [%- END -%] > [%- ELSE -%] >- [% data.title | $raw %][%- data.firstname | html %][% IF data.middle_name %] [% data.middle_name | html %][% END %][% IF data.othernames %] ([% data.othernames | html %]) [% END %] [% data.surname | html -%] >+ [%- data.title | $raw -%][%- data.firstname | html -%][%- IF data.middle_name -%] [%- data.middle_name | html -%][%- END -%][%- IF data.othernames -%] ([%- data.othernames | html -%]) [%- END -%] [%- data.surname | html -%] > [%- END -%] >- [%- IF display_cardnumber AND data.cardnumber %] ([% data.cardnumber | html %])[% END -%] >+ [%- IF display_cardnumber AND data.cardnumber -%] ([%- data.cardnumber | html -%])[%- END -%] > [%- ELSIF display_cardnumber -%] > [%- IF data.cardnumber -%][%# FIXME Cardnumber should always be defined, right? -%] > [%- data.cardnumber | html -%] > [%- END -%] > [%- ELSE -%] >- <span>A patron from library [% Branches.GetName( patron.branchcode ) | html -%]</span> >+ <span>A patron from library [%- Branches.GetName( patron.branchcode ) | html -%]</span> > [%- END -%] > > [%- IF hide_patron_infos_if_needed AND ( display_patron_name OR display_cardnumber ) -%] >-- >2.39.0
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 31028
:
137412
|
139222
|
139223
|
139224
|
139225
|
139226
|
139227
|
139228
|
139229
|
139230
|
139231
|
139232
|
139233
|
139234
|
139235
|
139236
|
139237
|
139238
|
139572
|
139573
|
139574
|
139575
|
139576
|
139577
|
139578
|
139579
|
139580
|
139581
|
139582
|
139583
|
139584
|
139585
|
139586
|
139587
|
139588
|
139589
|
139590
|
139591
|
140289
|
140290
|
140291
|
140292
|
140293
|
140294
|
140295
|
140296
|
140297
|
140298
|
140299
|
140300
|
140301
|
140302
|
140303
|
140304
|
140305
|
140306
|
140307
|
140308
|
140436
|
140437
|
140438
|
140439
|
140440
|
140441
|
140442
|
140443
|
140444
|
140445
|
140446
|
140447
|
140448
|
140449
|
140450
|
140451
|
140452
|
140453
|
140454
|
140455
|
140764
|
140765
|
140766
|
140767
|
140768
|
140769
|
140770
|
140771
|
140772
|
140773
|
140774
|
140775
|
140776
|
140777
|
140778
|
140779
|
140780
|
140781
|
140782
|
140783
|
140793
|
140929
|
140930
|
140931
|
140932
|
140933
|
140934
|
140935
|
140936
|
140937
|
140938
|
140939
|
140940
|
140941
|
140942
|
140943
|
140944
|
140945
|
140946
|
140947
|
140948
|
140949
|
140950
|
141133
|
141134
|
141135
|
141136
|
141137
|
141138
|
141139
|
141140
|
141141
|
141142
|
141143
|
141144
|
141145
|
141146
|
141147
|
141148
|
141149
|
141150
|
141151
|
141152
|
141153
|
141154
|
141440
|
141441
|
141442
|
141443
|
141444
|
141445
|
141446
|
141447
|
141448
|
141449
|
141450
|
141451
|
141452
|
141453
|
141454
|
141455
|
141456
|
141457
|
141458
|
141459
|
141460
|
142164
|
142165
|
142166
|
142167
|
142168
|
142169
|
142170
|
142171
|
142172
|
142173
|
142174
|
142175
|
142177
|
142179
|
142180
|
142181
|
142182
|
142183
|
142184
|
142185
|
142186
|
142187
|
142188
|
142189
|
142190
|
142191
|
142616
|
142617
|
142618
|
142619
|
142620
|
142621
|
142622
|
142623
|
142624
|
142625
|
142626
|
142627
|
142932
|
142933
|
142934
|
142935
|
142936
|
142937
|
142938
|
142939
|
142940
|
142941
|
142942
|
142943
|
142944
|
142945
|
142946
|
142947
|
142948
|
142949
|
143238
|
143239
|
143240
|
143241
|
143242
|
143243
|
143244
|
143245
|
143246
|
143247
|
143248
|
143249
|
143250
|
143251
|
143252
|
143253
|
143254
|
143255
|
143256
|
143257
|
143302
|
143303
|
143304
|
143305
|
143306
|
143307
|
143308
|
143309
|
143310
|
143311
|
143312
|
143313
|
143314
|
143315
|
143316
|
143317
|
143318
|
143319
|
143320
|
143321
|
143322
|
143323
|
143324
|
143325
|
143326
|
143327
|
143328
|
143329
|
143330
|
143331
|
143332
|
143333
|
143334
|
143335
|
143336
|
143337
|
143338
|
143339
|
143340
|
143341
|
143470
|
143471
|
143472
|
143473
|
143474
|
143475
|
143476
|
143477
|
143478
|
143479
|
143480
|
143481
|
143482
|
143483
|
143484
|
143485
|
143486
|
143487
|
143488
|
143489
|
143490
|
143647
|
143648
|
143649
|
143650
|
143651
|
143652
|
143653
|
143654
|
143655
|
143656
|
143657
|
143658
|
143659
|
143660
|
143661
|
143662
|
143663
|
143664
|
143665
|
143666
|
143667
|
143708
|
143709
|
143710
|
143711
|
143712
|
143713
|
143714
|
143715
|
143716
|
143717
|
143718
|
143719
|
143720
|
143721
|
143722
|
143723
|
143724
|
143725
|
143726
|
143727
|
144647
|
144648
|
144649
|
144650
|
144651
|
144652
|
144653
|
144654
|
144655
|
144656
|
144657
|
144658
|
144659
|
144660
|
144661
|
144662
|
144663
|
144664
|
144665
|
144666
|
144667
|
144668
|
145542
|
146214
|
146215
|
146216
|
146217
|
146218
|
146219
|
146220
|
146221
|
146222
|
146223
|
146224
|
146225
|
146226
|
146227
|
146228
|
146229
|
146230
|
146231
|
146232
|
146233
|
146234
|
146235
|
146236
|
146237
|
146238
|
146239
|
146240
|
146241
|
146242
|
146243
|
146244
|
146245
|
146246
|
146247
|
146248
|
146249
|
146250
|
146251
|
146252
|
146253
|
146254
|
146255
|
146256
|
146257
|
146258
|
146259
|
146260
|
146261
|
146262
|
146697
|
146870
|
146871
|
146872
|
146873
|
146874
|
146875
|
146876
|
146877
|
146878
|
146879
|
146880
|
146881
|
146882
|
146883
|
146884
|
146885
|
146886
|
146887
|
146888
|
146889
|
146890
|
146891
|
146892
|
146893
|
146894
|
146895
|
146896
|
147797
|
147840
|
147841
|
147844
|
147859
|
147860
|
147861
|
147866
|
148673
|
149931