Description
Owen Leonard
2019-05-28 16:51:44 UTC
Created attachment 91112 [details] [review] Bug 22999: Switch two-column templates to Bootstrap grid: Circulation This patch modifies the circulation page template to use the Bootstrap grid instead of YUI. To test, apply the patch and view the checkout page, confirming that it looks correct at various browser widths: - Check out (no patron) - Check out -> Patron search - Results - No results - Check out -> Patron selected - Can check out - Checkout blocked (renewal confirmation, item on hold, etc) - Can't check out (expired, restricted) Created attachment 91113 [details] [review] Bug 22999: (follow-up) Indentation updates The markup changes require indentation updates. This patch contains indentation changes only. Created attachment 91126 [details] [review] Bug 22999: Switch two-column templates to Bootstrap grid: Circulation This patch modifies the circulation page template to use the Bootstrap grid instead of YUI. To test, apply the patch and view the checkout page, confirming that it looks correct at various browser widths: - Check out (no patron) - Check out -> Patron search - Results - No results - Check out -> Patron selected - Can check out - Checkout blocked (renewal confirmation, item on hold, etc) - Can't check out (expired, restricted) Signed-off-by: David Nind <david@davidnind.com> Created attachment 91127 [details] [review] Bug 22999: (follow-up) Indentation updates The markup changes require indentation updates. This patch contains indentation changes only. Signed-off-by: David Nind <david@davidnind.com> Tested using Firefox 67.0.4 on Ubuntu 18.04. Used manual browser resize as well as CTRL + SHIFT + M to test using different device screen sizes. No issues identified. I am sorry, Owen, but this one no longer applies: Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 22999: Switch two-column templates to Bootstrap grid: Circulation Applying: Bug 22999: (follow-up) Indentation updates error: sha1 information is lacking or useless (koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt). error: could not build fake ancestor Patch failed at 0001 Bug 22999: (follow-up) Indentation updates The copy of the patch that failed is found in: .git/rebase-apply/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-22999-follow-up-Indentation-updates-hr86eW.patch Created attachment 91184 [details] [review] Bug 22999: (follow-up) Indentation updates The markup changes require indentation updates. This patch contains indentation changes only. Signed-off-by: David Nind <david@davidnind.com> Created attachment 91239 [details] [review] Bug 22999: Switch two-column templates to Bootstrap grid: Circulation This patch modifies the circulation page template to use the Bootstrap grid instead of YUI. To test, apply the patch and view the checkout page, confirming that it looks correct at various browser widths: - Check out (no patron) - Check out -> Patron search - Results - No results - Check out -> Patron selected - Can check out - Checkout blocked (renewal confirmation, item on hold, etc) - Can't check out (expired, restricted) Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Josef Moravec <josef.moravec@gmail.com> Created attachment 91240 [details] [review] Bug 22999: (follow-up) Indentation updates The markup changes require indentation updates. This patch contains indentation changes only. Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Josef Moravec <josef.moravec@gmail.com> Nice work! Pushed to master for 19.11.00 Enhancement not pushed to 19.05.x |