[Bug 23159] New: Reindent addbiblio.tt
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23159 Bug ID: 23159 Summary: Reindent addbiblio.tt Change sponsored?: --- Product: Koha Version: master Hardware: All OS: All Status: ASSIGNED Severity: enhancement Priority: P5 - low Component: Templates Assignee: oleonard@myacpl.org Reporter: oleonard@myacpl.org QA Contact: testopia@bugs.koha-community.org Blocks: 22399 Target Milestone: --- I would like to reindent cataloging/addbiblio.tt: Remove tabs, correct indentation, add some comments to clarify the structure. Referenced Bugs: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=22399 [Bug 22399] Improve responsive behavior of the basic marc editor -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23159 Owen Leonard <oleonard@myacpl.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |Needs Signoff Patch complexity|--- |Small patch -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23159 --- Comment #1 from Owen Leonard <oleonard@myacpl.org> --- Created attachment 90786 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=90786&action=edit Bug 23159: Reindent addbiblio.tt This patch corrects whitespace in the basic MARC editor template, addbiblio.tt: Tabs converted to spaces, indentation corrected. Some comments have been added in the markup to clarify the page structure. To test, apply the patch and open the basic MARC editor. Confirm that everything works correctly, including: - Showing/hiding subfields - Re-ordering subfields - Removing tags and subfields - Cloning tags and subfields - Plugin links Use the "-w" flag when using diff to examine the patch. The only changes should be places where single lines were broken up and where comments were added. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23159 --- Comment #2 from M. Tompsett <mtompset@hotmail.com> --- Comment on attachment 90786 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=90786 Bug 23159: Reindent addbiblio.tt Review of attachment 90786: --> (https://bugs.koha-community.org/bugzilla3/page.cgi?id=splinter.html&bug=23159&attachment=90786) ----------------------------------------------------------------- ::: koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt @@ +488,5 @@
+ [% ELSE %] + <button type="submit" class="new" onclick="confirmnotdup('view'); return false;"><i class="fa fa-fw fa-save"></i> No, save as new record</button> + [% END %] + </form> + </div> <!-- /.dialog.alert -->
HTML comments and Template comments added make this harder to check. @@ +489,5 @@
+ <button type="submit" class="new" onclick="confirmnotdup('view'); return false;"><i class="fa fa-fw fa-save"></i> No, save as new record</button> + [% END %] + </form> + </div> <!-- /.dialog.alert --> + [% END # /IF duplicatebiblionumber %]
Your insertion of comments while clarifying, would have been better in a separate commit, so it would be easier to check. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23159 --- Comment #3 from M. Tompsett <mtompset@hotmail.com> --- Created attachment 90789 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=90789&action=edit Bug 23159: (followup) re-add comments" This reverts the previous followup, so that all patches can be pushed without only pushing the first one. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23159 M. Tompsett <mtompset@hotmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |mtompset@hotmail.com Attachment #90789|0 |1 is obsolete| | -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23159 --- Comment #4 from M. Tompsett <mtompset@hotmail.com> --- Created attachment 90790 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=90790&action=edit Bug 23159: (followup) remove added comments -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23159 --- Comment #5 from M. Tompsett <mtompset@hotmail.com> --- Created attachment 90791 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=90791&action=edit Bug 23159: (followup) re-add comments" This reverts the previous followup, so that all patches can be pushed without only pushing the first one. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23159 M. Tompsett <mtompset@hotmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Signed Off -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23159 M. Tompsett <mtompset@hotmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #90786|0 |1 is obsolete| | Attachment #90790|0 |1 is obsolete| | Attachment #90791|0 |1 is obsolete| | --- Comment #6 from M. Tompsett <mtompset@hotmail.com> --- Created attachment 90792 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=90792&action=edit Bug 23159: Reindent addbiblio.tt This patch corrects whitespace in the basic MARC editor template, addbiblio.tt: Tabs converted to spaces, indentation corrected. Some comments have been added in the markup to clarify the page structure. To test, apply the patch and open the basic MARC editor. Confirm that everything works correctly, including: - Showing/hiding subfields - Re-ordering subfields - Removing tags and subfields - Cloning tags and subfields - Plugin links Use the "-w" flag when using diff to examine the patch. The only changes should be places where single lines were broken up and where comments were added. Signed-off-by: Mark Tompsett <mtompset@hotmail.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23159 --- Comment #7 from M. Tompsett <mtompset@hotmail.com> --- Created attachment 90793 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=90793&action=edit Bug 23159: (follow-up) remove added comments Signed-off-by: Mark Tompsett <mtompset@hotmail.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23159 --- Comment #8 from M. Tompsett <mtompset@hotmail.com> --- Created attachment 90794 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=90794&action=edit Bug 23159: (follow-up) re-add comments" This reverts the previous followup, so that all patches can be pushed without only pushing the first one. Signed-off-by: Mark Tompsett <mtompset@hotmail.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23159 --- Comment #9 from M. Tompsett <mtompset@hotmail.com> --- TEST PLAN (on a kohadevbox) --------- $ git checkout master $ git pull $ git checkout -b bug_23159 origin/master $ git bz apply 23159 -- do this interactively, and only apply the first 2 patches $ tr -d '[:space:]' < koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt > after.txt $ git checkout master $ tr -d '[:space:]' < koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt > before.txt $ diff before.txt after.txt -- no differences, which means the only differences are whitespace $ git checkout bug_23159 $ git bz apply 23159 -- apply the last patch $ restart_all Do the recommended testing in comment #1, though the "-w" won't help much, hence the provision of the remove and re-add comments patches. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23159 Marcel de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Passed QA -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23159 Marcel de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #90792|0 |1 is obsolete| | --- Comment #10 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- Created attachment 90873 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=90873&action=edit Bug 23159: Reindent addbiblio.tt This patch corrects whitespace in the basic MARC editor template, addbiblio.tt: Tabs converted to spaces, indentation corrected. Some comments have been added in the markup to clarify the page structure. To test, apply the patch and open the basic MARC editor. Confirm that everything works correctly, including: - Showing/hiding subfields - Re-ordering subfields - Removing tags and subfields - Cloning tags and subfields - Plugin links Use the "-w" flag when using diff to examine the patch. The only changes should be places where single lines were broken up and where comments were added. Signed-off-by: Mark Tompsett <mtompset@hotmail.com> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23159 Marcel de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #90793|0 |1 is obsolete| | --- Comment #11 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- Created attachment 90874 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=90874&action=edit Bug 23159: (follow-up) remove added comments Signed-off-by: Mark Tompsett <mtompset@hotmail.com> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23159 Marcel de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #90794|0 |1 is obsolete| | --- Comment #12 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- Created attachment 90875 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=90875&action=edit Bug 23159: (follow-up) re-add comments" This reverts the previous followup, so that all patches can be pushed without only pushing the first one. Signed-off-by: Mark Tompsett <mtompset@hotmail.com> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23159 Marcel de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |m.de.rooy@rijksmuseum.nl QA Contact|testopia@bugs.koha-communit |m.de.rooy@rijksmuseum.nl |y.org | -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23159 --- Comment #13 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- (In reply to M. Tompsett from comment #2)
Your insertion of comments while clarifying, would have been better in a separate commit, so it would be easier to check.
Agree completely. Without the two patches of Mark, this patch would probably be sitting in the queue for much longer! @RM: Patch 2 and 3 do not need to be pushed (although they can), but prove that patch 1 can be pushed. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23159 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Version(s)| |19.11.00 released in| | Status|Passed QA |Pushed to Master -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23159 --- Comment #14 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Nice work! Pushed to master for 19.11.00 -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23159 Fridolin SOMERS <fridolin.somers@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Resolution|--- |FIXED CC| |fridolin.somers@biblibre.co | |m Status|Pushed to master |RESOLVED --- Comment #15 from Fridolin SOMERS <fridolin.somers@biblibre.com> --- Enhancement not pushed to 19.05.x -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23159 Fridolin SOMERS <fridolin.somers@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|RESOLVED |REOPENED Resolution|FIXED |--- -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23159 Fridolin SOMERS <fridolin.somers@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|REOPENED |ASSIGNED -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23159 Fridolin SOMERS <fridolin.somers@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |Needs Signoff -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23159 Fridolin SOMERS <fridolin.somers@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Signed Off -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23159 Fridolin SOMERS <fridolin.somers@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Passed QA -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23159 Fridolin SOMERS <fridolin.somers@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Passed QA |Pushed to stable Version(s)|19.11.00 |19.11.00,19.05.03 released in| | --- Comment #16 from Fridolin SOMERS <fridolin.somers@biblibre.com> --- I choose to push to stable branch in order to ease next patches Pushed to 19.05.x for 19.05.03 -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23159 Lucas Gass <lucas@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |lucas@bywatersolutions.com --- Comment #17 from Lucas Gass <lucas@bywatersolutions.com> --- i also wanted to have this in 18.11.x but I was unable to apply cleanly or rebase. no backport -- You are receiving this mail because: You are watching all bug changes.
participants (1)
-
bugzilla-daemon＠bugs.koha-community.org