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.

The popup is displaying some unwanted info which looks like the following:

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

You can see it in the attached screenshot circled in green.

Created attachment 159458 [details]
unwanted info in popup

(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?

I tested it on a new sandbox and it worked great.

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>

All working well, cleaner code++

Passing QA

Pushed for 24.05!

Well done everyone, thank you!

Pushed to 23.11.x for 23.11.03