[Bug 42330] New: Use main-container.inc from all the templates
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42330 Bug ID: 42330 Summary: Use main-container.inc from all the templates Initiative type: --- Sponsorship --- status: Product: Koha Version: unspecified Hardware: All OS: All Status: NEW Severity: enhancement Priority: P5 - low Component: Staff interface Assignee: jonathan.druart@gmail.com Reporter: jonathan.druart@gmail.com QA Contact: testopia@bugs.koha-community.org CC: gmcharlt@gmail.com We can now use main-container.inc with a custom aside (see bug 42322). Now we need to use it for all our templates. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42330 Jonathan Druart <jonathan.druart@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Depends on| |42322 Referenced Bugs: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42322 [Bug 42322] Collapse sidebar -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42330 Jonathan Druart <jonathan.druart@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED CC| |oleonard@myacpl.org Depends on| |42094 --- Comment #1 from Jonathan Druart <jonathan.druart@gmail.com> --- I am ready to work on this as soon as the depend bug reports are ready to be pushed. Referenced Bugs: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42094 [Bug 42094] Tidy all script tags (except value_builder) -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42330 --- Comment #2 from Jonathan Druart <jonathan.druart@gmail.com> --- Created attachment 197164 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=197164&action=edit Bug 42330: Use main-container from all our templates This goal here is to uniformize the structure of our templates. Using main-container.inc will also introduce the sidebar collapse (from bug 42322) where it was missing -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42330 --- Comment #3 from Jonathan Druart <jonathan.druart@gmail.com> --- Created attachment 197165 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=197165&action=edit Bug 42330: Tidy Patch from commit cfefca4 -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42330 Jonathan Druart <jonathan.druart@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |michaela.sieber@kit.edu -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42330 Jonathan Druart <jonathan.druart@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #197164|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=42330 Jonathan Druart <jonathan.druart@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #197165|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=42330 --- Comment #4 from Jonathan Druart <jonathan.druart@gmail.com> --- Created attachment 197166 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=197166&action=edit Bug 42330: Use main-container from all our templates This goal here is to uniformize the structure of our templates. Using main-container.inc will also introduce the sidebar collapse (from bug 42322) where it was missing -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42330 --- Comment #5 from Jonathan Druart <jonathan.druart@gmail.com> --- Created attachment 197167 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=197167&action=edit Bug 42330: Tidy Patch from commit 2b316ca -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42330 Jonathan Druart <jonathan.druart@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |42344 Referenced Bugs: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42344 [Bug 42344] Remove CircSidebar -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42330 Jonathan Druart <jonathan.druart@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |Needs Signoff --- Comment #6 from Jonathan Druart <jonathan.druart@gmail.com> --- Test plan: Check the views of the following templates and confirm that the sidebar can now be collapsed includes/facets.inc (the facets of the search) acqui/histsearch.tt acqui/invoices.tt acqui/lateorders.tt acqui/parcels.tt admin/aqbudgets.tt admin/aqplan.tt admin/float_limits.tt admin/sru_modmapping.tt sru_modmapping_auth.tt cataloguing/editor.tt circ/overdue.tt circ/pendingbookings.tt circ/pendingreserves.tt circ/reserveratios.tt circ/view_holdsqueue.tt members/member.tt members/memberentrygen.tt plugins/plugins-home.tt serials/serials-edit.tt tags/list.tt tools/additional-contents.tt tools/showdiffmarc.tt tools/stockrotation.tt tools/upload.tt -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42330 --- Comment #7 from Owen Leonard <oleonard@myacpl.org> --- [FAIL] koha-tmpl/intranet-tmpl/prog/en/includes/main-container.inc FAIL filters missing_filter at line 12 ([% messages_block %]) missing_filter at line 26 ([% aside_block %]) missing_filter at line 78 ([% messages_block %]) missing_filter at line 88 ([% messages_block %]) missing_filter at line 98 ([% messages_block %]) Do these all need "| $raw" ? -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42330 Jonathan Druart <jonathan.druart@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #197166|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=42330 Jonathan Druart <jonathan.druart@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #197167|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=42330 --- Comment #8 from Jonathan Druart <jonathan.druart@gmail.com> --- Created attachment 197365 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=197365&action=edit Bug 42330: Use main-container from all our templates This goal here is to uniformize the structure of our templates. Using main-container.inc will also introduce the sidebar collapse (from bug 42322) where it was missing -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42330 --- Comment #9 from Jonathan Druart <jonathan.druart@gmail.com> --- Created attachment 197366 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=197366&action=edit Bug 42330: Tidy Patch from commit 1189aa3 -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42330 --- Comment #10 from Jonathan Druart <jonathan.druart@gmail.com> --- (In reply to Owen Leonard from comment #7)
[FAIL] koha-tmpl/intranet-tmpl/prog/en/includes/main-container.inc FAIL filters missing_filter at line 12 ([% messages_block %]) missing_filter at line 26 ([% aside_block %]) missing_filter at line 78 ([% messages_block %]) missing_filter at line 88 ([% messages_block %]) missing_filter at line 98 ([% messages_block %])
Do these all need "| $raw" ?
Yes, fixed! -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42330 Owen Leonard <oleonard@myacpl.org> changed: What |Removed |Added ---------------------------------------------------------------------------- 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=42330 Owen Leonard <oleonard@myacpl.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #197365|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=42330 Owen Leonard <oleonard@myacpl.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #197366|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=42330 --- Comment #11 from Owen Leonard <oleonard@myacpl.org> --- Created attachment 197381 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=197381&action=edit Bug 42330: Use main-container from all our templates This goal here is to uniformize the structure of our templates. Using main-container.inc will also introduce the sidebar collapse (from bug 42322) where it was missing Signed-off-by: Owen Leonard <oleonard@myacpl.org> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42330 --- Comment #12 from Owen Leonard <oleonard@myacpl.org> --- Created attachment 197382 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=197382&action=edit Bug 42330: Tidy Signed-off-by: Owen Leonard <oleonard@myacpl.org> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42330 --- Comment #13 from Owen Leonard <oleonard@myacpl.org> --- Created attachment 197383 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=197383&action=edit Bug 42330: (follow-up) Some corrections to sidebars - The structure of the search facets, advanced MARC editor, and HTML customiztions sidebars need to be corrected in order for the collapse button to work correctly. - The "toggle_sidebar" click handler should be inside a "$(document).ready()" in order to work correctly on pages where the JS is in the header. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42330 Jonathan Druart <jonathan.druart@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #197383|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=42330 --- Comment #14 from Jonathan Druart <jonathan.druart@gmail.com> --- Created attachment 197388 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=197388&action=edit Bug 42330: (follow-up) Some corrections to sidebars - The structure of the search facets, advanced MARC editor, and HTML customiztions sidebars need to be corrected in order for the collapse button to work correctly. - The "toggle_sidebar" click handler should be inside a "$(document).ready()" in order to work correctly on pages where the JS is in the header. Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42330 Owen Leonard <oleonard@myacpl.org> 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=42330 Jonathan Druart <jonathan.druart@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #197381|0 |1 is obsolete| | Attachment #197382|0 |1 is obsolete| | Attachment #197388|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=42330 --- Comment #15 from Jonathan Druart <jonathan.druart@gmail.com> --- Created attachment 200057 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=200057&action=edit Bug 42330: Use main-container from all our templates This goal here is to uniformize the structure of our templates. Using main-container.inc will also introduce the sidebar collapse (from bug 42322) where it was missing Signed-off-by: Owen Leonard <oleonard@myacpl.org> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42330 --- Comment #16 from Jonathan Druart <jonathan.druart@gmail.com> --- Created attachment 200058 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=200058&action=edit Bug 42330: Tidy Signed-off-by: Owen Leonard <oleonard@myacpl.org> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42330 --- Comment #17 from Jonathan Druart <jonathan.druart@gmail.com> --- Created attachment 200059 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=200059&action=edit Bug 42330: (follow-up) Some corrections to sidebars - The structure of the search facets, advanced MARC editor, and HTML customiztions sidebars need to be corrected in order for the collapse button to work correctly. - The "toggle_sidebar" click handler should be inside a "$(document).ready()" in order to work correctly on pages where the JS is in the header. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42330 Jonathan Druart <jonathan.druart@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Depends on|42094 | --- Comment #18 from Jonathan Druart <jonathan.druart@gmail.com> --- Patches rebased and removed the dependency on bug 42094 to ease adoption. Referenced Bugs: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42094 [Bug 42094] Tidy all script tags (except value_builder) -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42330 David Nind <david@davidnind.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |david@davidnind.com --- Comment #19 from David Nind <david@davidnind.com> --- Patches from dependent bug 42322 don't apply cleanly 8-(... -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42330 Jonathan Druart <jonathan.druart@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #200057|0 |1 is obsolete| | Attachment #200058|0 |1 is obsolete| | Attachment #200059|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=42330 --- Comment #20 from Jonathan Druart <jonathan.druart@gmail.com> --- Created attachment 200513 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=200513&action=edit Bug 42330: Use main-container from all our templates This goal here is to uniformize the structure of our templates. Using main-container.inc will also introduce the sidebar collapse (from bug 42322) where it was missing Signed-off-by: Owen Leonard <oleonard@myacpl.org> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42330 --- Comment #21 from Jonathan Druart <jonathan.druart@gmail.com> --- Created attachment 200514 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=200514&action=edit Bug 42330: Tidy Signed-off-by: Owen Leonard <oleonard@myacpl.org> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42330 --- Comment #22 from Jonathan Druart <jonathan.druart@gmail.com> --- Created attachment 200515 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=200515&action=edit Bug 42330: (follow-up) Some corrections to sidebars - The structure of the search facets, advanced MARC editor, and HTML customiztions sidebars need to be corrected in order for the collapse button to work correctly. - The "toggle_sidebar" click handler should be inside a "$(document).ready()" in order to work correctly on pages where the JS is in the header. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42330 --- Comment #23 from Jonathan Druart <jonathan.druart@gmail.com> --- Patches rebased. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42330 --- Comment #24 from Jonathan Druart <jonathan.druart@gmail.com> --- Created attachment 200516 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=200516&action=edit Bug 42330: Add an xt test to prevent new occurrences of <main> in staff templates Patch from commit 1789636 -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42330 Lucas Gass (lukeg) <lucas@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |lucas@bywatersolutions.com -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42330 --- Comment #25 from Jonathan Druart <jonathan.druart@gmail.com> --- Created attachment 200517 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=200517&action=edit Bug 42330: Add new template tools/restore-records.tt Patch from commit baad327 -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42330 --- Comment #26 from Jonathan Druart <jonathan.druart@gmail.com> --- Created attachment 200518 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=200518&action=edit Bug 42330: Auto-tidy Patch from commit 3ccaa12 -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42330 Lucas Gass (lukeg) <lucas@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Patch doesn't apply --- Comment #27 from Lucas Gass (lukeg) <lucas@bywatersolutions.com> --- Currently doesn't apply clean to main -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42330 Jonathan Druart <jonathan.druart@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Patch doesn't apply |Signed Off -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42330 Jonathan Druart <jonathan.druart@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #200514|0 |1 is obsolete| | Attachment #200515|0 |1 is obsolete| | Attachment #200516|0 |1 is obsolete| | Attachment #200517|0 |1 is obsolete| | Attachment #200518|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=42330 --- Comment #28 from Jonathan Druart <jonathan.druart@gmail.com> --- Created attachment 201039 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=201039&action=edit Bug 42330: Tidy Signed-off-by: Owen Leonard <oleonard@myacpl.org> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42330 --- Comment #29 from Jonathan Druart <jonathan.druart@gmail.com> --- Created attachment 201040 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=201040&action=edit Bug 42330: (follow-up) Some corrections to sidebars - The structure of the search facets, advanced MARC editor, and HTML customiztions sidebars need to be corrected in order for the collapse button to work correctly. - The "toggle_sidebar" click handler should be inside a "$(document).ready()" in order to work correctly on pages where the JS is in the header. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42330 --- Comment #30 from Jonathan Druart <jonathan.druart@gmail.com> --- Created attachment 201041 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=201041&action=edit Bug 42330: Add an xt test to prevent new occurrences of <main> in staff templates Patch from commit 2a75719 -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42330 --- Comment #31 from Jonathan Druart <jonathan.druart@gmail.com> --- Created attachment 201042 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=201042&action=edit Bug 42330: Add new template tools/restore-records.tt Patch from commit 0e0ae59 -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42330 --- Comment #32 from Jonathan Druart <jonathan.druart@gmail.com> --- Created attachment 201043 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=201043&action=edit Bug 42330: Auto-tidy Patch from commit ba3f1c1 -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42330 David Cook <dcook@prosentient.com.au> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |dcook@prosentient.com.au -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42330 Lisette Scheer <lisette@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |lisette@bywatersolutions.co | |m QA Contact|testopia@bugs.koha-communit |lisette@bywatersolutions.co |y.org |m -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42330 Lisette Scheer <lisette@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |BLOCKED --- Comment #33 from Lisette Scheer <lisette@bywatersolutions.com> --- I can't apply the dependancy, so blocked for now. Details on $2322 -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42330 Tomás Cohen Arazi (tcohen) <tomascohen@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |tomascohen@gmail.com -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42330 Jonathan Druart <jonathan.druart@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|BLOCKED |Signed Off --- Comment #34 from Jonathan Druart <jonathan.druart@gmail.com> --- Dependency rebased. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42330 Jonathan Druart <jonathan.druart@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #200513|0 |1 is obsolete| | Attachment #201039|0 |1 is obsolete| | Attachment #201040|0 |1 is obsolete| | Attachment #201041|0 |1 is obsolete| | Attachment #201042|0 |1 is obsolete| | Attachment #201043|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=42330 --- Comment #35 from Jonathan Druart <jonathan.druart@gmail.com> --- Created attachment 202099 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=202099&action=edit Bug 42330: Use main-container from all our templates This goal here is to uniformize the structure of our templates. Using main-container.inc will also introduce the sidebar collapse (from bug 42322) where it was missing Signed-off-by: Owen Leonard <oleonard@myacpl.org> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42330 --- Comment #36 from Jonathan Druart <jonathan.druart@gmail.com> --- Created attachment 202100 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=202100&action=edit Bug 42330: Tidy Signed-off-by: Owen Leonard <oleonard@myacpl.org> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42330 --- Comment #37 from Jonathan Druart <jonathan.druart@gmail.com> --- Created attachment 202101 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=202101&action=edit Bug 42330: (follow-up) Some corrections to sidebars - The structure of the search facets, advanced MARC editor, and HTML customiztions sidebars need to be corrected in order for the collapse button to work correctly. - The "toggle_sidebar" click handler should be inside a "$(document).ready()" in order to work correctly on pages where the JS is in the header. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42330 --- Comment #38 from Jonathan Druart <jonathan.druart@gmail.com> --- Created attachment 202102 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=202102&action=edit Bug 42330: Add an xt test to prevent new occurrences of <main> in staff templates Patch from commit 91e6af2 -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42330 --- Comment #39 from Jonathan Druart <jonathan.druart@gmail.com> --- Created attachment 202103 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=202103&action=edit Bug 42330: Add new template tools/restore-records.tt Patch from commit 1f6dee7 -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42330 --- Comment #40 from Jonathan Druart <jonathan.druart@gmail.com> --- Created attachment 202104 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=202104&action=edit Bug 42330: Auto-tidy Patch from commit 3f0e6f8 -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42330 Lisette Scheer <lisette@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Passed QA --- Comment #41 from Lisette Scheer <lisette@bywatersolutions.com> --- Looks great Jonathan! the consistancy here will be really helpful. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42330 Lisette Scheer <lisette@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #202099|0 |1 is obsolete| | Attachment #202100|0 |1 is obsolete| | Attachment #202101|0 |1 is obsolete| | Attachment #202102|0 |1 is obsolete| | Attachment #202103|0 |1 is obsolete| | Attachment #202104|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=42330 --- Comment #42 from Lisette Scheer <lisette@bywatersolutions.com> --- Created attachment 202263 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=202263&action=edit Bug 42330: Use main-container from all our templates This goal here is to uniformize the structure of our templates. Using main-container.inc will also introduce the sidebar collapse (from bug 42322) where it was missing Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Lisette Scheer <lisette@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42330 --- Comment #43 from Lisette Scheer <lisette@bywatersolutions.com> --- Created attachment 202264 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=202264&action=edit Bug 42330: Tidy Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Lisette Scheer <lisette@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42330 --- Comment #44 from Lisette Scheer <lisette@bywatersolutions.com> --- Created attachment 202265 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=202265&action=edit Bug 42330: (follow-up) Some corrections to sidebars - The structure of the search facets, advanced MARC editor, and HTML customiztions sidebars need to be corrected in order for the collapse button to work correctly. - The "toggle_sidebar" click handler should be inside a "$(document).ready()" in order to work correctly on pages where the JS is in the header. Signed-off-by: Lisette Scheer <lisette@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42330 --- Comment #45 from Lisette Scheer <lisette@bywatersolutions.com> --- Created attachment 202266 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=202266&action=edit Bug 42330: Add an xt test to prevent new occurrences of <main> in staff templates Signed-off-by: Lisette Scheer <lisette@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42330 --- Comment #46 from Lisette Scheer <lisette@bywatersolutions.com> --- Created attachment 202267 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=202267&action=edit Bug 42330: Add new template tools/restore-records.tt Signed-off-by: Lisette Scheer <lisette@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42330 --- Comment #47 from Lisette Scheer <lisette@bywatersolutions.com> --- Created attachment 202268 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=202268&action=edit Bug 42330: Auto-tidy Signed-off-by: Lisette Scheer <lisette@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42330 --- Comment #48 from Lisette Scheer <lisette@bywatersolutions.com> --- Created attachment 202269 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=202269&action=edit Bug 42330: (QA follow-up) Fix file permissions on new test and tidy This patch - Fixes the file permissions on the new test - Removes a variable declaration from the new test that's unused - Removes a new line from the end of staff-global.scss Signed-off-by: Lisette Scheer <lisette@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42330 Pedro Amorim (ammopt) <pedro.amorim@openfifth.co.uk> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |pedro.amorim@openfifth.co.u | |k Status|Passed QA |Patch doesn't apply -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42330 Jonathan Druart <jonathan.druart@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Patch doesn't apply |Passed QA -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42330 Jonathan Druart <jonathan.druart@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #202263|0 |1 is obsolete| | Attachment #202264|0 |1 is obsolete| | Attachment #202265|0 |1 is obsolete| | Attachment #202266|0 |1 is obsolete| | Attachment #202267|0 |1 is obsolete| | Attachment #202268|0 |1 is obsolete| | Attachment #202269|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=42330 --- Comment #49 from Jonathan Druart <jonathan.druart@gmail.com> --- Created attachment 204847 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=204847&action=edit Bug 42330: Use main-container from all our templates This goal here is to uniformize the structure of our templates. Using main-container.inc will also introduce the sidebar collapse (from bug 42322) where it was missing Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Lisette Scheer <lisette@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42330 --- Comment #50 from Jonathan Druart <jonathan.druart@gmail.com> --- Created attachment 204848 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=204848&action=edit Bug 42330: Tidy Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Lisette Scheer <lisette@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42330 --- Comment #51 from Jonathan Druart <jonathan.druart@gmail.com> --- Created attachment 204849 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=204849&action=edit Bug 42330: (follow-up) Some corrections to sidebars - The structure of the search facets, advanced MARC editor, and HTML customiztions sidebars need to be corrected in order for the collapse button to work correctly. - The "toggle_sidebar" click handler should be inside a "$(document).ready()" in order to work correctly on pages where the JS is in the header. Signed-off-by: Lisette Scheer <lisette@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42330 --- Comment #52 from Jonathan Druart <jonathan.druart@gmail.com> --- Created attachment 204850 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=204850&action=edit Bug 42330: Add an xt test to prevent new occurrences of <main> in staff templates Signed-off-by: Lisette Scheer <lisette@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42330 --- Comment #53 from Jonathan Druart <jonathan.druart@gmail.com> --- Created attachment 204851 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=204851&action=edit Bug 42330: Add new template tools/restore-records.tt Signed-off-by: Lisette Scheer <lisette@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42330 --- Comment #54 from Jonathan Druart <jonathan.druart@gmail.com> --- Created attachment 204852 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=204852&action=edit Bug 42330: Auto-tidy Signed-off-by: Lisette Scheer <lisette@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42330 --- Comment #55 from Jonathan Druart <jonathan.druart@gmail.com> --- Created attachment 204853 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=204853&action=edit Bug 42330: (QA follow-up) Fix file permissions on new test and tidy This patch - Fixes the file permissions on the new test - Removes a variable declaration from the new test that's unused - Removes a new line from the end of staff-global.scss Signed-off-by: Lisette Scheer <lisette@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42330 Pedro Amorim (ammopt) <pedro.amorim@openfifth.co.uk> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Passed QA |Pushed to main Version(s)| |26.11.00 released in| | -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42330 --- Comment #56 from Pedro Amorim (ammopt) <pedro.amorim@openfifth.co.uk> --- Thanks everyone! Pushed to main for 26.11! -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42330 Jonathan Druart <jonathan.druart@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Keywords| |additional_work_needed --- Comment #57 from Jonathan Druart <jonathan.druart@gmail.com> --- (In reply to Jonathan Druart from comment #50)
Created attachment 204848 [details] [review] Bug 42330: Tidy
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Lisette Scheer <lisette@bywatersolutions.com>
I totally messed up this last rebased. Code have been removed. I am working on it right now. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42330 --- Comment #58 from Jonathan Druart <jonathan.druart@gmail.com> --- Created attachment 206244 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=206244&action=edit Bug 42330: (follow-up) Tidy Something very messy happened during the last rebase before push. Sorry! I've restored the original version: git rebase -i HEAD~258 Edit commit b02ca1270d6eeb3 and remove the next one (Tidy) perl misc/devel/tidy.pl $(git diff --name-only HEAD~1) git commit -a git rebase --continue Luckily there was no conflict! I then picked the version of those files and here is the commit. Use this to confirm: `git show -w ad694a3411e677fcea96f315758793fd1fe0f203` You should see changes that are not related to tidiness -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42330 Owen Leonard <oleonard@myacpl.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #206244|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=42330 --- Comment #59 from Owen Leonard <oleonard@myacpl.org> --- Created attachment 206246 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=206246&action=edit Bug 42330: (follow-up) Tidy Something very messy happened during the last rebase before push. Sorry! I've restored the original version: git rebase -i HEAD~258 Edit commit b02ca1270d6eeb3 and remove the next one (Tidy) perl misc/devel/tidy.pl $(git diff --name-only HEAD~1) git commit -a git rebase --continue Luckily there was no conflict! I then picked the version of those files and here is the commit. Use this to confirm: `git show -w ad694a3411e677fcea96f315758793fd1fe0f203` You should see changes that are not related to tidiness Signed-off-by: Owen Leonard <oleonard@myacpl.org> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42330 Pedro Amorim (ammopt) <pedro.amorim@openfifth.co.uk> changed: What |Removed |Added ---------------------------------------------------------------------------- Keywords|additional_work_needed | --- Comment #60 from Pedro Amorim (ammopt) <pedro.amorim@openfifth.co.uk> --- Follow-up pushed. Thanks! -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42330 Lucas Gass (lukeg) <lucas@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Pushed to main |RESOLVED Resolution|--- |FIXED --- Comment #61 from Lucas Gass (lukeg) <lucas@bywatersolutions.com> --- Enhancement, no 26.05.x backport. -- You are receiving this mail because: You are watching all bug changes.
participants (1)
-
bugzilla-daemon＠bugs.koha-community.org