Created attachment 155263 [details] Spacing before Print notices that are html templates are wrapped in a <pre> tag which causes inconsistencies in formatting. Extra spaces are introduced that shouldn't be, this is solved by making the <pre> tag conditional on the content type of the message.
Created attachment 155264 [details] Spacing after
Created attachment 155265 [details] [review] Bug 34728: Make pre tag conditional This patch makes the pre-formatting of notice templates conditional on the content type. Test plan: 1) Navigate to tools > Notices and slips 2) Edit the notice with the code of HOLD 3) Under print, paste the following <p>Please collect within 10 days from the date of this letter and don't forget to bring your library card with you.</p> <p>Be aware that opening hours vary at different library branches so if in doubt double check the times before you visit.</p> <p>Should you no longer require this item please contact us so we can make it available for another customer.</p> <p>Thank you</p> 4) Check the box that says HTML message and save the notice 5) In Patrons, select a patron and in Patron messaging preferences, check the box in the Email column for Hold filled 6) Find a record in the catalogue 7) Copy the barcode for one of the items 8) Place a hold on the item for the patron you selected 9) Navigate to Circulation > Check-in 10) Paste the barcode in the Check-in box and click Check-in 11) In the pop-up box, click Confirm hold 12) In the command line, run perl misc/cronjobs/gather_print_notices.pl --letter_code=HOLD --html /tmp 13) cd /tmp 14) There should be a file in there called 'notices_HOLD-date.html 15) cat this file 16) The html you pasted in the template will be wrapped in a <pre> tag 17) Apply patch and restart_all 18) rm the notices file that was created 19) cd /kohadevbox/koha 20) Select a new record from the catalogue and repeat steps 7-15 for this record, using the same patron 21) This time, the html file should not contain the <pre> tag 22) Sign off!
Created attachment 155599 [details] [review] Bug 34728: Make pre tag conditional This patch makes the pre-formatting of notice templates conditional on the content type. Test plan: 1) Navigate to tools > Notices and slips 2) Edit the notice with the code of HOLD 3) Under print, paste the following <p>Please collect within 10 days from the date of this letter and don't forget to bring your library card with you.</p> <p>Be aware that opening hours vary at different library branches so if in doubt double check the times before you visit.</p> <p>Should you no longer require this item please contact us so we can make it available for another customer.</p> <p>Thank you</p> 4) Check the box that says HTML message and save the notice 5) In Patrons, select a patron and in Patron messaging preferences, check the box in the Email column for Hold filled 6) Find a record in the catalogue 7) Copy the barcode for one of the items 8) Place a hold on the item for the patron you selected 9) Navigate to Circulation > Check-in 10) Paste the barcode in the Check-in box and click Check-in 11) In the pop-up box, click Confirm hold 12) In the command line, run perl misc/cronjobs/gather_print_notices.pl --letter_code=HOLD --html /tmp 13) cd /tmp 14) There should be a file in there called 'notices_HOLD-date.html 15) cat this file 16) The html you pasted in the template will be wrapped in a <pre> tag 17) Apply patch and restart_all 18) rm the notices file that was created 19) cd /kohadevbox/koha 20) Select a new record from the catalogue and repeat steps 7-15 for this record, using the same patron 21) This time, the html file should not contain the <pre> tag 22) Sign off! Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
Created attachment 155639 [details] [review] Bug 34728: Make pre tag conditional This patch makes the pre-formatting of notice templates conditional on the content type. Test plan: 1) Navigate to tools > Notices and slips 2) Edit the notice with the code of HOLD 3) Under print, paste the following <p>Please collect within 10 days from the date of this letter and don't forget to bring your library card with you.</p> <p>Be aware that opening hours vary at different library branches so if in doubt double check the times before you visit.</p> <p>Should you no longer require this item please contact us so we can make it available for another customer.</p> <p>Thank you</p> 4) Check the box that says HTML message and save the notice 5) In Patrons, select a patron and in Patron messaging preferences, check the box in the Email column for Hold filled 6) Find a record in the catalogue 7) Copy the barcode for one of the items 8) Place a hold on the item for the patron you selected 9) Navigate to Circulation > Check-in 10) Paste the barcode in the Check-in box and click Check-in 11) In the pop-up box, click Confirm hold 12) In the command line, run perl misc/cronjobs/gather_print_notices.pl --letter_code=HOLD --html /tmp 13) cd /tmp 14) There should be a file in there called 'notices_HOLD-date.html 15) cat this file 16) The html you pasted in the template will be wrapped in a <pre> tag 17) Apply patch and restart_all 18) rm the notices file that was created 19) cd /kohadevbox/koha 20) Select a new record from the catalogue and repeat steps 7-15 for this record, using the same patron 21) This time, the html file should not contain the <pre> tag 22) Sign off! Signed-off-by: Lucas Gass <lucas@bywatersolutions.com> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Created attachment 155640 [details] [review] Bug 34728: (QA follow-up) Remove o modifier, bit more compact Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Pushed to master for 23.11. Nice work everyone, thanks!
Pushed to 23.05.x for 23.05.04
Nice work everyone! Pushed to oldstable for 22.11.x
WARN misc/cronjobs/gather_print_notices.pl WARN tidiness The file is less tidy than before (bad/messy lines before: 92, now: 93) Fixed in amended last patch.