Bugzilla – Attachment 158510 Details for
Bug 35187
Fix line breaks in some HTML notices, including WELCOME
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 35187: (follow-up) Use <br> consistently over <br />
-Bug-35187-follow-up-Use-br-consistently-over-br-.patch (text/plain), 8.58 KB, created by
Martin Renvoize (ashimema)
on 2023-11-06 11:44:52 UTC
(
hide
)
Description:
Bug 35187: (follow-up) Use <br> consistently over <br />
Filename:
MIME Type:
Creator:
Martin Renvoize (ashimema)
Created:
2023-11-06 11:44:52 UTC
Size:
8.58 KB
patch
obsolete
>From 6ee3e6ae745fa8787408ac5c711b1b6e7337064a Mon Sep 17 00:00:00 2001 >From: Martin Renvoize <martin.renvoize@ptfs-europe.com> >Date: Mon, 6 Nov 2023 11:42:02 +0000 >Subject: [PATCH] Bug 35187: (follow-up) Use <br> consistently over <br /> > >The first patch highlighted a minor inconsistency to me and this patch >just brings us closer to html5 consistency throughout the notices by >replacing any existing occurences of `<br />` and `<br/>` with the >recommended `<br>`. > >Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> >--- > .../mysql/en/mandatory/sample_notices.yml | 66 +++++++++---------- > 1 file changed, 33 insertions(+), 33 deletions(-) > >diff --git a/installer/data/mysql/en/mandatory/sample_notices.yml b/installer/data/mysql/en/mandatory/sample_notices.yml >index 5fed36a67e0..e4a52dda8ba 100644 >--- a/installer/data/mysql/en/mandatory/sample_notices.yml >+++ b/installer/data/mysql/en/mandatory/sample_notices.yml >@@ -173,22 +173,22 @@ tables: > - " [% IF ( credit.credit_type_code == 'PAYMENT' ) %]" > - " <tr>" > - " <th colspan=\"2\">" >- - " Received with thanks from [% credit.patron.firstname | html %] [% credit.patron.surname | html %] <br />" >- - " Card number: [% credit.patron.cardnumber | html %]<br />" >+ - " Received with thanks from [% credit.patron.firstname | html %] [% credit.patron.surname | html %] <br>" >+ - " Card number: [% credit.patron.cardnumber | html %]<br>" > - " </th>" > - " </tr>" > - " [% ELSIF ( credit.credit_type_code == 'CREDIT' ) %]" > - " <tr>" > - " <th colspan=\"2\">" >- - " Credit added to account for [% credit.patron.firstname | html %] [% credit.patron.surname | html %] <br />" >- - " Card number: [% credit.patron.cardnumber | html %]<br />" >+ - " Credit added to account for [% credit.patron.firstname | html %] [% credit.patron.surname | html %] <br>" >+ - " Card number: [% credit.patron.cardnumber | html %]<br>" > - " </th>" > - " </tr>" > - " [% ELSIF ( credit.credit_type_code == 'WRITEOFF' ) %]" > - " <tr>" > - " <th colspan=\"2\">" >- - " Writeoff added to account for [% credit.patron.firstname | html %] [% credit.patron.surname | html %] <br />" >- - " Card number: [% credit.patron.cardnumber | html %]<br />" >+ - " Writeoff added to account for [% credit.patron.firstname | html %] [% credit.patron.surname | html %] <br>" >+ - " Card number: [% credit.patron.cardnumber | html %]<br>" > - " </th>" > - " </tr>" > - " [% END %]" >@@ -283,8 +283,8 @@ tables: > - " </tr>" > - " <tr>" > - " <th colspan=\"3\" >" >- - " Bill to: [% debit.patron.firstname | html %] [% debit.patron.surname | html %] <br />" >- - " Card number: [% debit.patron.cardnumber | html %]<br />" >+ - " Bill to: [% debit.patron.firstname | html %] [% debit.patron.surname | html %] <br>" >+ - " Card number: [% debit.patron.cardnumber | html %]<br>" > - " </th>" > - " </tr>" > - " [% IF debit.amountoutstanding != 0 %]" >@@ -688,13 +688,13 @@ tables: > - "<ul>" > - " <li><<borrowers.cardnumber>></li>" > - " <li><<borrowers.phone>></li>" >- - " <li> <<borrowers.address>><br />" >- - " <<borrowers.address2>><br />" >+ - " <li> <<borrowers.address>><br>" >+ - " <<borrowers.address2>><br>" > - " <<borrowers.city>> <<borrowers.zipcode>>" > - " </li>" > - " <li><<borrowers.email>></li>" > - "</ul>" >- - "<br />" >+ - "<br>" > - "<h3>ITEM ON HOLD</h3>" > - "<h4><<biblio.title>></h4>" > - "<h5><<biblio.author>></h5>" >@@ -718,17 +718,17 @@ tables: > content: > - "[%~ USE KohaDates ~%]" > - "<h3><<branches.branchname>></h3>" >- - "Checked out to <<borrowers.title>> <<borrowers.firstname>> <<borrowers.initials>> <<borrowers.surname>> <br />" >- - "(<<borrowers.cardnumber>>) <br />" >+ - "Checked out to <<borrowers.title>> <<borrowers.firstname>> <<borrowers.initials>> <<borrowers.surname>> <br>" >+ - "(<<borrowers.cardnumber>>) <br>" > - "<br>" >- - "<<today>><br />" >+ - "<<today>><br>" > - "<br>" > - "<h4>Checked out today</h4>" > - "<checkedout>" > - "<p>" >- - "<<biblio.title>> <br />" >- - "Barcode: <<items.barcode>><br />" >- - "Date due: <<issues.date_due>><br />" >+ - "<<biblio.title>> <br>" >+ - "Barcode: <<items.barcode>><br>" >+ - "Date due: <<issues.date_due>><br>" > - "</p>" > - "</checkedout>" > >@@ -742,26 +742,26 @@ tables: > lang: default > content: > - "<h3><<branches.branchname>></h3>" >- - "Checked out to <<borrowers.title>> <<borrowers.firstname>> <<borrowers.initials>> <<borrowers.surname>> <br />" >- - "(<<borrowers.cardnumber>>) <br />" >+ - "Checked out to <<borrowers.title>> <<borrowers.firstname>> <<borrowers.initials>> <<borrowers.surname>> <br>" >+ - "(<<borrowers.cardnumber>>) <br>" > - "<br>" >- - "<<today>><br />" >+ - "<<today>><br>" > - "<br>" > - "<h4>Checked out</h4>" > - "<checkedout>" > - "<p>" >- - "<<biblio.title>> <br />" >- - "Barcode: <<items.barcode>><br />" >- - "Date due: <<issues.date_due>><br />" >+ - "<<biblio.title>> <br>" >+ - "Barcode: <<items.barcode>><br>" >+ - "Date due: <<issues.date_due>><br>" > - "</p>" > - "</checkedout>" > - "<br>" > - "<h4>Overdues</h4>" > - "<overdue>" > - "<p>" >- - "<<biblio.title>> <br />" >- - "Barcode: <<items.barcode>><br />" >- - "Date due: <<issues.date_due>><br />" >+ - "<<biblio.title>> <br>" >+ - "Barcode: <<items.barcode>><br>" >+ - "Date due: <<issues.date_due>><br>" > - "</p>" > - "</overdue>" > - "<br>" >@@ -1366,7 +1366,7 @@ tables: > - "</p>" > - "<p>" > - "You can now create your new password using the following link:" >- - "<br/><a href=\"<<passwordreseturl>>\"><<passwordreseturl>></a>" >+ - "<br><a href=\"<<passwordreseturl>>\"><<passwordreseturl>></a>" > - "</p>" > - "<p>This link will be valid for 2 days from this email's reception, then you must reapply if you do not change your password.</p>" > - "<p>Thank you.</p>" >@@ -1384,7 +1384,7 @@ tables: > - "</p>" > - "<p>" > - "Please create your new password using the following link:" >- - "<br/><a href=\"<<passwordreseturl>>\"><<passwordreseturl>></a>" >+ - "<br><a href=\"<<passwordreseturl>>\"><<passwordreseturl>></a>" > - "</p>" > - "<p>This link will be valid for 5 days from this email's reception, then you must reapply if you do not change your password.</p>" > - "<p>Thank you.</p>" >@@ -2176,17 +2176,17 @@ tables: > lang: default > content: > - "<h3>[% branch.branchname %]</h3>" >- - "Checked in items for [% borrower.title %] [% borrower.firstname %] [% borrower.initials %] [% borrower.surname %] <br />" >- - "([% borrower.cardnumber %]) <br />" >+ - "Checked in items for [% borrower.title %] [% borrower.firstname %] [% borrower.initials %] [% borrower.surname %] <br>" >+ - "([% borrower.cardnumber %]) <br>" > - "<br>" >- - "[% today | $KohaDates %]<br />" >+ - "[% today | $KohaDates %]<br>" > - "<br>" > - "<h4>Checked in today</h4>" > - "[% FOREACH checkin IN old_checkouts %]" > - "[% SET item = checkin.item %]" > - "<p>" >- - "[% item.biblio.title %] <br />" >- - "Barcode: [% item.barcode %] <br />" >+ - "[% item.biblio.title %] <br>" >+ - "Barcode: [% item.barcode %] <br>" > - "</p>" > - "[% END %]" > >-- >2.41.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 35187
:
158049
|
158050
|
158055
|
158509
| 158510 |
158813
|
158833