The toolbar buttons on the patron cards batch edit page are generated by YUI. They should use Bootstrap instead.
Created attachment 15623 [details] [review] Bug 9697 - Replace YUI buttons on the patron cards batch edit page with Bootstrap The patron card creator's batch edit page uses an include file to display buttons styled by YUI. Bootstrap should be used instead. This patch moves the contents of the include file into the main template, this being the only page which requires it. YUI markup and code has been removed and Bootstrap markup is added. The include file is deleted. To test, edit a batch of patrons in the patron card creator. Each toolbar button should look correct and work correctly: - Add item(s) - Remove item(s) - Delete batch - Remove duplicates (Keeping Bug 9535 in mind) - Export item(s) - Export batch
Sorry. CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt
This patch depends on the one for Bug 9696. Did you apply both?
No, sorry. Now it works.
Created attachment 15657 [details] [review] [SIGNED-OFF] Bug 9697 - Replace YUI buttons on the patron cards batch edit page with Bootstrap The patron card creator's batch edit page uses an include file to display buttons styled by YUI. Bootstrap should be used instead. This patch moves the contents of the include file into the main template, this being the only page which requires it. YUI markup and code has been removed and Bootstrap markup is added. The include file is deleted. To test, edit a batch of patrons in the patron card creator. Each toolbar button should look correct and work correctly: - Add item(s) - Remove item(s) - Delete batch - Remove duplicates (Keeping Bug 9535 in mind) - Export item(s) - Export batch Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> Comment: all buttons works and look well. No errors.
Owen, can you please rebase and switch back to signed-off? -------------------------- Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all y Applying: Bug 9697 - Replace YUI buttons on the patron cards batch edit page with Bootstrap fatal: sha1 information is lacking or useless (koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 Bug 9697 - Replace YUI buttons on the patron cards batch edit page with Bootstrap When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort".
Created attachment 17056 [details] [review] Bug 9535: Follow-up - making QA script and tests happy - 2x single quotes for translated string in edit-batch.tt
Created attachment 17057 [details] [review] [PASSED QA] Bug 9697 - Replace YUI buttons on the patron cards batch edit page with Bootstrap The patron card creator's batch edit page uses an include file to display buttons styled by YUI. Bootstrap should be used instead. This patch moves the contents of the include file into the main template, this being the only page which requires it. YUI markup and code has been removed and Bootstrap markup is added. The include file is deleted. To test, edit a batch of patrons in the patron card creator. Each toolbar button should look correct and work correctly: - Add item(s) - Remove item(s) - Delete batch - Remove duplicates (Keeping Bug 9535 in mind) - Export item(s) - Export batch Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> Comment: all buttons works and look well. No errors. Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Will fix some smaller things in a QA follow up. Works as expected.
Created attachment 17058 [details] [review] Bug 9535: Follow-up - making QA script and tests happy - 2x single quotes for translated string in edit-batch.tt
This patch has been pushed to master.