Bug 35349

Summary: Reindent label item search template
Product: Koha Reporter: Owen Leonard <oleonard>
Component: TemplatesAssignee: Owen Leonard <oleonard>
Status: Pushed to stable --- QA Contact: Martin Renvoize <martin.renvoize>
Severity: trivial    
Priority: P5 - low CC: barbara.johnson, fridolin.somers, martin.renvoize
Version: Main   
Hardware: All   
OS: All   
Change sponsored?: --- Patch complexity: Small patch
Documentation contact: Documentation submission:
Text to go in the release notes:
Version(s) released in:
24.05.00,23.11.03
Bug Depends on:    
Bug Blocks: 35350    
Attachments: Bug 35349: Reindent label item search template
unwanted info in popup
Bug 35349: Reindent label item search template

Description Owen Leonard 2023-11-16 12:12:44 UTC
I would like to reformat the label item search template (labels/search.tt) so that it has consistent spacing and indentation.
Comment 1 Owen Leonard 2023-11-16 12:26:29 UTC
Created attachment 159041 [details] [review]
Bug 35349: Reindent label item search template

This patch reindents the label item search template so that it has
consistent indentation. These changes should have no visible effect on
the page.

To test, apply the patch and go to Cataloging -> Label creator.

- Click New -> Label batch.
- Click the "Add items" button under the form.
- A "Search for items" window should pop up.
- The form should look correct, and work as it did before the patch.

Viewing the diff while ignoring whitespace changes should show only
places where a line break was added.
Comment 2 Barbara Johnson 2023-12-01 15:56:22 UTC
The popup is displaying some unwanted info which looks like the following:

<<<<<<< HEAD =======

You can see it in the attached screenshot circled in green.
Comment 3 Barbara Johnson 2023-12-01 15:56:43 UTC
Created attachment 159458 [details]
unwanted info in popup
Comment 4 Owen Leonard 2023-12-01 16:05:34 UTC
(In reply to Barbara Johnson from comment #2)
> <<<<<<< HEAD =======

That's the kind of thing you'll see when a patch doesn't apply, but I tested it just now and it applies fine for me in master. Could you try again?
Comment 5 Barbara Johnson 2023-12-01 17:04:27 UTC
I tested it on a new sandbox and it worked great.
Comment 6 Martin Renvoize 2024-01-26 10:22:14 UTC
Created attachment 161499 [details] [review]
Bug 35349: Reindent label item search template

This patch reindents the label item search template so that it has
consistent indentation. These changes should have no visible effect on
the page.

To test, apply the patch and go to Cataloging -> Label creator.

- Click New -> Label batch.
- Click the "Add items" button under the form.
- A "Search for items" window should pop up.
- The form should look correct, and work as it did before the patch.

Viewing the diff while ignoring whitespace changes should show only
places where a line break was added.

Signed-off-by: Barbara Johnson <barbara.johnson@bedfordtx.gov>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Comment 7 Martin Renvoize 2024-01-26 10:22:49 UTC
All working well, cleaner code++

Passing QA
Comment 8 Katrin Fischer 2024-01-29 11:28:34 UTC
Pushed for 24.05!

Well done everyone, thank you!
Comment 9 Fridolin Somers 2024-02-01 13:51:04 UTC
Pushed to 23.11.x for 23.11.03