Continuing the work of Bug 32571, serials pages should be updated to use the new WRAPPER for tabs: - Serial collection - Serials search - Subscription details
Created attachment 145576 [details] [review] Bug 32698: Use template wrapper for serials pages tabs This patch updates three serials templates to replace tab markup with the use of WRAPPERs. To test requires more data than will be found in the sample data. You need at least one subscription with issues spanning more than one year. I suggest creating a new subscription which starts in December, then receive one issue from December and one in January. Apply the patch and go to Serials. - Perform a subscription search. - On the search results page there should be two tabs: "Open" and "Closed." These tabs should work correctly. - Open the detail view of one of your subscriptions. - You should see at least four tabs: "Information," "Planning," "Issues," and "Summary." - In some cases an "Acquisition details" tab will also appear. To test this you must go to Acquisitions and add an order to a basket by choosing "From a subscription" option. - Click "Serial collection" in the left-hand sidebar. - There should be tabs for each year of subscription issues in your collection.
The patch no longer applies 8-(.. git bz apply 32698 Bug 32698 Depends on bug 32571 (Signed Off) Follow? [(y)es, (n)o] y Bug 32571 - Use template wrapper to build tabbed components 145529 - Bug 32571: Use template wrapper to build tabbed components 145530 - Bug 32571: (follow-up) Implement abstracted tabs on About page 145533 - Bug 32571: (follow-up) Use more unique variable name to avoid collisions Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 32571: Use template wrapper to build tabbed components Applying: Bug 32571: (follow-up) Implement abstracted tabs on About page Applying: Bug 32571: (follow-up) Use more unique variable name to avoid collisions Bug 32698 - Use template wrapper for serials pages tabs 145576 - Bug 32698: Use template wrapper for serials pages tabs Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 32698: Use template wrapper for serials pages tabs Using index info to reconstruct a base tree... M koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt error: Failed to merge in the changes. Patch failed at 0001 Bug 32698: Use template wrapper for serials pages tabs
Created attachment 145881 [details] [review] Bug 32698: Use template wrapper for serials pages tabs This patch updates three serials templates to replace tab markup with the use of WRAPPERs. To test requires more data than will be found in the sample data. You need at least one subscription with issues spanning more than one year. I suggest creating a new subscription which starts in December, then receive one issue from December and one in January. Apply the patch and go to Serials. - Perform a subscription search. - On the search results page there should be two tabs: "Open" and "Closed." These tabs should work correctly. - Open the detail view of one of your subscriptions. - You should see at least four tabs: "Information," "Planning," "Issues," and "Summary." - In some cases an "Acquisition details" tab will also appear. To test this you must go to Acquisitions and add an order to a basket by choosing "From a subscription" option. - Click "Serial collection" in the left-hand sidebar. - There should be tabs for each year of subscription issues in your collection.
Created attachment 146040 [details] [review] Bug 32698: Use template wrapper for serials pages tabs This patch updates three serials templates to replace tab markup with the use of WRAPPERs. To test requires more data than will be found in the sample data. You need at least one subscription with issues spanning more than one year. I suggest creating a new subscription which starts in December, then receive one issue from December and one in January. Apply the patch and go to Serials. - Perform a subscription search. - On the search results page there should be two tabs: "Open" and "Closed." These tabs should work correctly. - Open the detail view of one of your subscriptions. - You should see at least four tabs: "Information," "Planning," "Issues," and "Summary." - In some cases an "Acquisition details" tab will also appear. To test this you must go to Acquisitions and add an order to a basket by choosing "From a subscription" option. - Click "Serial collection" in the left-hand sidebar. - There should be tabs for each year of subscription issues in your collection. Signed-off-by: David Nind <david@davidnind.com>
Created attachment 146208 [details] [review] Bug 32698: Use template wrapper for serials pages tabs This patch updates three serials templates to replace tab markup with the use of WRAPPERs. To test requires more data than will be found in the sample data. You need at least one subscription with issues spanning more than one year. I suggest creating a new subscription which starts in December, then receive one issue from December and one in January. Apply the patch and go to Serials. - Perform a subscription search. - On the search results page there should be two tabs: "Open" and "Closed." These tabs should work correctly. - Open the detail view of one of your subscriptions. - You should see at least four tabs: "Information," "Planning," "Issues," and "Summary." - In some cases an "Acquisition details" tab will also appear. To test this you must go to Acquisitions and add an order to a basket by choosing "From a subscription" option. - Click "Serial collection" in the left-hand sidebar. - There should be tabs for each year of subscription issues in your collection. Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Pushed to master for 23.05. Nice work everyone, thanks!
Nice work, thanks everyone! Pushed to 22.11.x for the next release.