Description
Owen Leonard
2023-06-05 13:19:57 UTC
Created attachment 152047 [details] [review] Bug 33895: Use template wrapper for tabs: OPAC user summary This patch updates the OPAC user summary page so that it uses the new WRAPPER syntax to generate tabs markup. To test, apply the patch and log in to the OPAC. Check these tabs on the patron summary page: - Checkouts - Relatives' checkouts - Relatives' charges - Overdues - Charges - Credits - Clubs - Test enrolling and unenrolling - Holds - Recalls - Article requests - Overdrive - Test with OverDriveCirculation enabled - Logging in, logging out I notice that when OverDriveCirculation is off the #opac-user-overdrive tab-pane is still built. Which leads to this error: The aria-labelledby attribute must point to an element in the same document. Created attachment 152051 [details] [review] Bug 33895: (follow-up) Build overdrive tab-pane only if OverDriveCirculation is turned on Owen, if you agree with my follow-up I'll go ahead and add sign off here. If not, happy to obsolete it. Created attachment 152298 [details] [review] Bug 33895: Use template wrapper for tabs: OPAC user summary This patch updates the OPAC user summary page so that it uses the new WRAPPER syntax to generate tabs markup. To test, apply the patch and log in to the OPAC. Check these tabs on the patron summary page: - Checkouts - Relatives' checkouts - Relatives' charges - Overdues - Charges - Credits - Clubs - Test enrolling and unenrolling - Holds - Recalls - Article requests - Overdrive - Test with OverDriveCirculation enabled - Logging in, logging out Created attachment 152299 [details] [review] Bug 33895: (follow-up) Build overdrive tab-pane only if OverDriveCirculation is turned on Applying: Bug 33895: Use template wrapper for tabs: OPAC user summary Using index info to reconstruct a base tree... M koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc M koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc CONFLICT (content): Merge conflict in koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc error: Failed to merge in the changes. Patch failed at 0001 Bug 33895: Use template wrapper for tabs: OPAC user summary hint: Use 'git am --show-current-patch=diff' to see the failed patch When you have resolved this problem run "git bz apply --continue". If you would prefer to skip this patch, instead run "git bz apply --skip". To restore the original branch and stop patching run "git bz apply --abort". Patch left in /tmp/Bug-33895-Use-template-wrapper-for-tabs-OPAC-user--VW0_jB.patch Created attachment 154231 [details] [review] Bug 33895: Use template wrapper for tabs: OPAC user summary This patch updates the OPAC user summary page so that it uses the new WRAPPER syntax to generate tabs markup. To test, apply the patch and log in to the OPAC. Check these tabs on the patron summary page: - Checkouts - Relatives' checkouts - Relatives' charges - Overdues - Charges - Credits - Clubs - Test enrolling and unenrolling - Holds - Recalls - Article requests - Overdrive - Test with OverDriveCirculation enabled - Logging in, logging out Created attachment 154232 [details] [review] Bug 33895: (follow-up) Build overdrive tab-pane only if OverDriveCirculation is turned on Created attachment 154283 [details] [review] Bug 33895: Use template wrapper for tabs: OPAC user summary This patch updates the OPAC user summary page so that it uses the new WRAPPER syntax to generate tabs markup. To test, apply the patch and log in to the OPAC. Check these tabs on the patron summary page: - Checkouts - Relatives' checkouts - Relatives' charges - Overdues - Charges - Credits - Clubs - Test enrolling and unenrolling - Holds - Recalls - Article requests - Overdrive - Test with OverDriveCirculation enabled - Logging in, logging out Signed-off-by: Sam Lau <samalau@gmail.com> Created attachment 154284 [details] [review] Bug 33895: (follow-up) Build overdrive tab-pane only if OverDriveCirculation is turned on Signed-off-by: Sam Lau <samalau@gmail.com> Created attachment 154785 [details] [review] Bug 33895: Use template wrapper for tabs: OPAC user summary This patch updates the OPAC user summary page so that it uses the new WRAPPER syntax to generate tabs markup. To test, apply the patch and log in to the OPAC. Check these tabs on the patron summary page: - Checkouts - Relatives' checkouts - Relatives' charges - Overdues - Charges - Credits - Clubs - Test enrolling and unenrolling - Holds - Recalls - Article requests - Overdrive - Test with OverDriveCirculation enabled - Logging in, logging out Signed-off-by: Sam Lau <samalau@gmail.com> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Created attachment 154786 [details] [review] Bug 33895: (follow-up) Build overdrive tab-pane only if OverDriveCirculation is turned on Signed-off-by: Sam Lau <samalau@gmail.com> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Looks good to me, but harder to verify if changes like this introduce (tiny) regressions somewhere in all template changes. Not talking about rebasing.. Pushed to master for 23.11. Nice work everyone, thanks! Does not apply in 23.05.x Conflict in koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc |