I would like to reindent tools/manage-marc-import.tt: Correct indentation, add some comments to clarify the structure.
Created attachment 91023 [details] [review] Bug 23221: Reindent tools/manage-marc-import.tt This patch reformats the template for the Manage staged MARC records page. It makes only whitespace changes. It should have no effect on the behavior of the page. In addition to re-indentation, some lines have been broken up. These should be the only changes highlighted when using diff while ignoring whitespace. To test, apply the patch and view the Manage staged MARC records page. The page should look correct and work correctly: - Paging through results - Viewing batches - Cleaning batches - Deleting batches
Created attachment 91024 [details] [review] Bug 23221: (follow-up) Add comments on markup structure This patch adds a few comments to the markup in order to highlight the structure of the page.
Created attachment 91030 [details] [review] Bug 23221: Reindent tools/manage-marc-import.tt This patch reformats the template for the Manage staged MARC records page. It makes only whitespace changes. It should have no effect on the behavior of the page. In addition to re-indentation, some lines have been broken up. These should be the only changes highlighted when using diff while ignoring whitespace. To test, apply the patch and view the Manage staged MARC records page. The page should look correct and work correctly: - Paging through results - Viewing batches - Cleaning batches - Deleting batches
Created attachment 91031 [details] [review] Bug 23221: (follow-up) Add comments on markup structure This patch adds a few comments to the markup in order to highlight the structure of the page.
Created attachment 91032 [details] [review] Bug 23221: Reindent tools/manage-marc-import.tt This patch reformats the template for the Manage staged MARC records page. It makes only whitespace changes. It should have no effect on the behavior of the page. In addition to re-indentation, some lines have been broken up. These should be the only changes highlighted when using diff while ignoring whitespace. To test, apply the patch and view the Manage staged MARC records page. The page should look correct and work correctly: - Paging through results - Viewing batches - Cleaning batches - Deleting batches
Created attachment 91033 [details] [review] Bug 23221: (follow-up) Add comments on markup structure This patch adds a few comments to the markup in order to highlight the structure of the page.
Comment on attachment 91033 [details] [review] Bug 23221: (follow-up) Add comments on markup structure Review of attachment 91033 [details] [review]: ----------------------------------------------------------------- I don't understand the insertion of /'s in the comments. ::: koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt @@ +276,4 @@ > </tr> > [% END %] > </table> > + [% END #/ IF did_commit %] I would expect "# /" for consistency, but as a comment it doesn't really matter.
# really force master to be latest before. git checkout master git pull git reset --hard origin/master cat koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt | tr -d [:space:] > before.txt git checkout -b bug_23221 origin/master git bz apply 23221 # interactive and apply just the first patch cat koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt | tr -d [:space:] > after.txt diff before.txt after.txt # should be no differences # didn't use git diff -w origin/master, because too much scroll. rm before.txt after.txt
Created attachment 91297 [details] [review] Bug 23221: Reindent tools/manage-marc-import.tt This patch reformats the template for the Manage staged MARC records page. It makes only whitespace changes. It should have no effect on the behavior of the page. In addition to re-indentation, some lines have been broken up. These should be the only changes highlighted when using diff while ignoring whitespace. To test, apply the patch and view the Manage staged MARC records page. The page should look correct and work correctly: - Paging through results - Viewing batches - Cleaning batches - Deleting batches Signed-off-by: Mark Tompsett <mtompset@hotmail.com>
Created attachment 91298 [details] [review] Bug 23221: (follow-up) Add comments on markup structure This patch adds a few comments to the markup in order to highlight the structure of the page. Signed-off-by: Mark Tompsett <mtompset@hotmail.com>
Created attachment 91383 [details] [review] Bug 23221: Reindent tools/manage-marc-import.tt This patch reformats the template for the Manage staged MARC records page. It makes only whitespace changes. It should have no effect on the behavior of the page. In addition to re-indentation, some lines have been broken up. These should be the only changes highlighted when using diff while ignoring whitespace. To test, apply the patch and view the Manage staged MARC records page. The page should look correct and work correctly: - Paging through results - Viewing batches - Cleaning batches - Deleting batches Signed-off-by: Mark Tompsett <mtompset@hotmail.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Created attachment 91384 [details] [review] Bug 23221: (follow-up) Add comments on markup structure This patch adds a few comments to the markup in order to highlight the structure of the page. Signed-off-by: Mark Tompsett <mtompset@hotmail.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Nice work! Pushed to master for 19.11.00
Pushed to 19.05.x for 19.05.03
backported to 18.11.x for 18.11.09