In order for tabs to look correct on certain pages which use the "statictabs" class we need to restructure the tabs to use Bootstrap markup. maininvoice.tt pay.tt paycollect.tt reviewswaiting.tt
Created attachment 143830 [details] [review] Bug 32182: Replace static tabs markup with Bootstrap This patch reimplements certain tabbed interfaces to use Bootstrap markup. Previously these tabs required special CSS because they're static, i.e. not JS-driven tabs for switching in-page. The tabs are links to separate pages. Note: This patch includes whitespace changes, so use diff accordingly. To test, apply the patch and rebuild the staff interface CSS. Test the following pages to confirm that the tabs look correct and still link to the correct locations: - Patron details - Accounting - Pay amount - Transactions - Create manual invoice - Create manual credit - Tools -> Comments
The patch no longer applies 8-(.. git bz apply 32182 Bug 32182 - Replace static tabs markup with Bootstrap 143830 - Bug 32182: Replace static tabs markup with Bootstrap Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 32182: Replace static tabs markup with Bootstrap Using index info to reconstruct a base tree... M koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt M koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt M koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt error: Failed to merge in the changes. Patch failed at 0001 Bug 32182: Replace static tabs markup with Bootstrap
Created attachment 143832 [details] [review] Bug 32103: Remove flex from tab-content list elements Bug 32182: Replace static tabs markup with Bootstrap This patch reimplements certain tabbed interfaces to use Bootstrap markup. Previously these tabs required special CSS because they're static, i.e. not JS-driven tabs for switching in-page. The tabs are links to separate pages. Note: This patch includes whitespace changes, so use diff accordingly. To test, apply the patch and rebuild the staff interface CSS. Test the following pages to confirm that the tabs look correct and still link to the correct locations: - Patron details - Accounting - Pay amount - Transactions - Create manual invoice - Create manual credit - Tools -> Comments
Created attachment 143833 [details] [review] Bug 32182: Replace static tabs markup with Bootstrap This patch reimplements certain tabbed interfaces to use Bootstrap markup. Previously these tabs required special CSS because they're static, i.e. not JS-driven tabs for switching in-page. The tabs are links to separate pages. Note: This patch includes whitespace changes, so use diff accordingly. To test, apply the patch and rebuild the staff interface CSS. Test the following pages to confirm that the tabs look correct and still link to the correct locations: - Patron details - Accounting - Pay amount - Transactions - Create manual invoice - Create manual credit - Tools -> Comments
Created attachment 143836 [details] [review] Bug 32182: Replace static tabs markup with Bootstrap This patch reimplements certain tabbed interfaces to use Bootstrap markup. Previously these tabs required special CSS because they're static, i.e. not JS-driven tabs for switching in-page. The tabs are links to separate pages. Note: This patch includes whitespace changes, so use diff accordingly. To test, apply the patch and rebuild the staff interface CSS. Test the following pages to confirm that the tabs look correct and still link to the correct locations: - Patron details - Accounting - Pay amount - Transactions - Create manual invoice - Create manual credit - Tools -> Comments Signed-off-by: David Nind <david@davidnind.com>
Created attachment 143865 [details] [review] Bug 32182: Replace static tabs markup with Bootstrap This patch reimplements certain tabbed interfaces to use Bootstrap markup. Previously these tabs required special CSS because they're static, i.e. not JS-driven tabs for switching in-page. The tabs are links to separate pages. Note: This patch includes whitespace changes, so use diff accordingly. To test, apply the patch and rebuild the staff interface CSS. Test the following pages to confirm that the tabs look correct and still link to the correct locations: - Patron details - Accounting - Pay amount - Transactions - Create manual invoice - Create manual credit - Tools -> Comments Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Pushed to master for 22.11. Nice work everyone, thanks!