Bug 38718 - main container wrapper
Summary: main container wrapper
Status: Pushed to main
Alias: None
Product: Koha
Classification: Unclassified
Component: Templates (show other bugs)
Version: unspecified
Hardware: All All
: P5 - low enhancement
Assignee: Jonathan Druart
QA Contact: Testopia
URL:
Keywords:
Depends on: 38714
Blocks: 38664
  Show dependency treegraph
 
Reported: 2024-12-17 07:56 UTC by Jonathan Druart
Modified: 2025-02-11 14:03 UTC (History)
3 users (show)

See Also:
Change sponsored?: ---
Patch complexity: ---
Documentation contact:
Documentation submission:
Text to go in the release notes:
Version(s) released in:
25.05.00
Circulation function:


Attachments
Bug 38718: (follow-up) Wrap both search form and search results in wrapper (2.03 KB, patch)
2025-01-31 19:08 UTC, Owen Leonard
Details | Diff | Splinter Review
Bug 38718: (follow-up) Use main-container.inc on ILL requests page (9.75 KB, patch)
2025-01-31 19:08 UTC, Owen Leonard
Details | Diff | Splinter Review
Bug 38718: (follow-up) Restore sidebar menu to point of sale page (849 bytes, patch)
2025-01-31 19:08 UTC, Owen Leonard
Details | Diff | Splinter Review
Bug 38718: (follow-up) Correct aside parameter (944 bytes, patch)
2025-01-31 19:08 UTC, Owen Leonard
Details | Diff | Splinter Review
Bug 38718: (follow-up) Use container wrapper on tags page (8.08 KB, patch)
2025-01-31 19:08 UTC, Owen Leonard
Details | Diff | Splinter Review

Note You need to log in before you can comment on or make changes to this bug.
Description Jonathan Druart 2024-12-17 07:56:21 UTC
On bug 38664 we are going to tidy the template file and so indent them properly.

Most of our templates have the following structure:

<div class="main container-fluid">
    <div class="row">
        <div class="col-md-10 order-md-2 order-sm-1">
            <main>
                [% INCLUDE 'messages.inc' %]
                <!-- The content -->
            </main>
        </div>
        <div class="col-md-2 order-sm-2 order-md-1">
            <aside>
            </aside>
        </div>
    </div>
</div>

It would be useful to have a WRAPPER to avoid:
* errors (sometimes we see the two divs with the same order: sm-2)
* inconsistencies
* 4 indentation blocks (will be replaced with a single one)
Comment 1 Jonathan Druart 2024-12-17 08:11:42 UTC Comment hidden (obsolete)
Comment 2 Jonathan Druart 2024-12-17 08:37:19 UTC
This is how it would look like: https://gitlab.com/joubu/Koha/-/commit/360a3811f3194b762028c3a927c81f14322d6f38
Comment 3 Jonathan Druart 2025-01-21 08:46:51 UTC
This is ready for testing, use the commits from the branch of bug 38664.
Comment 4 Owen Leonard 2025-01-31 19:08:29 UTC
Created attachment 177403 [details] [review]
Bug 38718: (follow-up) Wrap both search form and search results in wrapper

Also pass "wide_full" parameter to main-container.inc
Comment 5 Owen Leonard 2025-01-31 19:08:32 UTC
Created attachment 177404 [details] [review]
Bug 38718: (follow-up) Use main-container.inc on ILL requests page
Comment 6 Owen Leonard 2025-01-31 19:08:34 UTC
Created attachment 177405 [details] [review]
Bug 38718: (follow-up) Restore sidebar menu to point of sale page
Comment 7 Owen Leonard 2025-01-31 19:08:36 UTC
Created attachment 177406 [details] [review]
Bug 38718: (follow-up) Correct aside parameter
Comment 8 Owen Leonard 2025-01-31 19:08:38 UTC
Created attachment 177407 [details] [review]
Bug 38718: (follow-up) Use container wrapper on tags page
Comment 9 Jonathan Druart 2025-02-03 08:37:52 UTC
Patches cherry-pick on bug_38664
Comment 10 Jonathan Druart 2025-02-10 11:53:44 UTC
Signed-off-by: Owen Leonard <oleonard@myacpl.org>

Added to the bug_38664 remote branch

f5f2eeff9aa Bug 38718: (follow-up) Use container wrapper on tags page
4aaf897e847 Bug 38718: (follow-up) Correct aside parameter
f659d3d995e Bug 38718: (follow-up) Restore sidebar menu to point of sale page
bfc1a61e260 Bug 38718: (follow-up) Use main-container.inc on ILL requests page
9bdcc80dc2c Bug 38718: (follow-up) Wrap both search form and search results in wrapper
34337e73de5 Bug 38718: (follow-up) Fix a few minor errors
dc7e4d057b9 Bug 38718: Preferences pages should use prefs-menu.inc, not admin-menu.inc
0a958696b40 Bug 38718: Main container - Virtual shelves
5a40cd03020 Bug 38718: Main container - Tools
2679ab4f1ae Bug 38718: Main container - Serials
fd208977cd5 Bug 38718: Main container - Rotating collections
8f279d434ba Bug 38718: Main container - Reviews
8f931abffa8 Bug 38718: Main container - Reserves
07ebed37b20 Bug 38718: Main container - Reports
c9c6a436531 Bug 38718: Main container - POS
6c359c8a85e Bug 38718: Main container - Patron lists
eb284a2634e Bug 38718: Main container - Recalls
47ee7dd0d25 Bug 38718: Main container - Patron cards
5e2a6b13fb0 Bug 38718: Main container - Offline circ
01dbe1da2d5 Bug 38718: Main container - Members
09e10442c7e Bug 38718: Main container - Labels
2b8c93a35ef Bug 38718: Main container - Errors
19a31cd554e Bug 38718: Main container - Course reserves
ca751c33770 Bug 38718: Main container - Clubs
f2c04e7e433 Bug 38718: Main container - Circ
1e91cfb0743 Bug 38718: Main container - Cataloguing
1ea2aedc50b Bug 38718: Main container - Catalogue
2c1c7a6184f Bug 38718: Main container - Bookings
1272d7d442a Bug 38718: Main container - Basket
be6ce4b32bf Bug 38718: Main container - Authorities
d6f23ebdf9c Bug 38718: Main container - Administration
d22684b16d0 Bug 38718: Main container - Acquisition
Comment 11 Katrin Fischer 2025-02-11 14:03:12 UTC
Pushed for 25.05!

Well done everyone, thank you!