http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=9697 Owen Leonard <oleonard@myacpl.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |Needs Signoff -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=9697 Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |bgkriegel@gmail.com --- Comment #2 from Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> --- Sorry. CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=9697 Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Patch doesn't apply |Signed Off --- Comment #4 from Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> --- No, sorry. Now it works. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=9697 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Patch doesn't apply CC| |katrin.fischer@bsz-bw.de --- Comment #6 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- 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". -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=9697 Owen Leonard <oleonard@myacpl.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |9779 -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=9697 --- Comment #7 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Created attachment 17056 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=17056&action=edit Bug 9535: Follow-up - making QA script and tests happy - 2x single quotes for translated string in edit-batch.tt -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=9697 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #15657|0 |1 is obsolete| | Attachment #17056|0 |1 is obsolete| | --- Comment #8 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Created attachment 17057 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=17057&action=edit [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. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=9697 Jared Camins-Esakov <jcamins@cpbibliography.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Passed QA |Pushed to Master --- Comment #10 from Jared Camins-Esakov <jcamins@cpbibliography.com> --- This patch has been pushed to master. -- You are receiving this mail because: You are watching all bug changes.