gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 42322: Pass the aside to main-container 

Improve main-container.inc so we can pass a specific aside block

Signed-off-by: Clemens Tubach <clemens.tubach@kit.edu>
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
Signed-off-by: Pedro Amorim <pedro.amorim@openfifth.co.uk>
This commit is contained in:
Jonathan Druart 2026-04-09 11:43:22 +02:00 committed by Pedro Amorim
parent ab7602b0f3
commit add690d0f4
No known key found for this signature in database
GPG Key ID: 06B75BA7F3894D55
1 changed files with 46 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
koha-tmpl/intranet-tmpl/prog/en/includes/main-container.inc
View File

@ -5,7 +5,7 @@
[% IF aside && !asides %]
[% SET asides = [aside] %]
[% END %]
[% IF asides %]
[% IF asides || aside_block %]
<div class="col-md-10 order-sm-1 order-md-2">
<main>
[% INCLUDE 'messages.inc' %]
@ -21,47 +21,51 @@
</div>
<div class="col-md-2 order-sm-2 order-md-1" id="sidebar-container" style="position: relative;">
<aside>
[% FOR aside IN asides %]
[% SWITCH aside %]
[% CASE 'acquisitions-menu' %]
[% INCLUDE 'acquisitions-menu.inc' %]
[% CASE 'admin-menu' %]
[% INCLUDE 'admin-menu.inc' %]
[% CASE 'biblio-view-menu' %]
[% INCLUDE 'biblio-view-menu.inc' %]
[% CASE 'cat-menu' %]
[% INCLUDE 'cat-menu.inc' %]
[% CASE 'circ-menu' %]
[% INCLUDE 'circ-menu.inc' %]
[% CASE 'circ-nav' %]
[% INCLUDE 'circ-nav.inc' %]
[% CASE 'facets' %]
[% INCLUDE 'facets.inc' %]
[% CASE 'guided-reports-view' %]
[% INCLUDE 'guided-reports-view.inc' %]
[% CASE 'ill-filter' %]
[% INCLUDE 'ill-filter.inc' %]
[% CASE 'labels-menu' %]
[% INCLUDE 'labels-menu.inc' %]
[% INCLUDE 'cat-menu.inc' %]
[% CASE 'vendor-menu' %]
[% INCLUDE 'vendor-menu.inc' %]
[% CASE 'pos-menu' %]
[% INCLUDE 'pos-menu.inc' %]
[% CASE 'prefs-menu' %]
[% INCLUDE 'prefs-menu.inc' %]
[% CASE 'reports-menu' %]
[% INCLUDE 'reports-menu.inc' %]
[% CASE 'serials-advsearch_brief' %]
[% INCLUDE 'serials-advsearch.inc' brief=1 %]
[% CASE 'serials-menu' %]
[% INCLUDE 'serials-menu.inc' %]
[% CASE 'subscriptions-search' %]
[% INCLUDE 'subscriptions-search.inc' %]
[% CASE 'tags-filter' %]
[% INCLUDE 'tags-filter.inc' %]
[% CASE 'tools-menu' %]
[% INCLUDE 'tools-menu.inc' %]
[% IF aside_block %]
[% aside_block %]
[% ELSE %]
[% FOR aside IN asides %]
[% SWITCH aside %]
[% CASE 'acquisitions-menu' %]
[% INCLUDE 'acquisitions-menu.inc' %]
[% CASE 'admin-menu' %]
[% INCLUDE 'admin-menu.inc' %]
[% CASE 'biblio-view-menu' %]
[% INCLUDE 'biblio-view-menu.inc' %]
[% CASE 'cat-menu' %]
[% INCLUDE 'cat-menu.inc' %]
[% CASE 'circ-menu' %]
[% INCLUDE 'circ-menu.inc' %]
[% CASE 'circ-nav' %]
[% INCLUDE 'circ-nav.inc' %]
[% CASE 'facets' %]
[% INCLUDE 'facets.inc' %]
[% CASE 'guided-reports-view' %]
[% INCLUDE 'guided-reports-view.inc' %]
[% CASE 'ill-filter' %]
[% INCLUDE 'ill-filter.inc' %]
[% CASE 'labels-menu' %]
[% INCLUDE 'labels-menu.inc' %]
[% INCLUDE 'cat-menu.inc' %]
[% CASE 'vendor-menu' %]
[% INCLUDE 'vendor-menu.inc' %]
[% CASE 'pos-menu' %]
[% INCLUDE 'pos-menu.inc' %]
[% CASE 'prefs-menu' %]
[% INCLUDE 'prefs-menu.inc' %]
[% CASE 'reports-menu' %]
[% INCLUDE 'reports-menu.inc' %]
[% CASE 'serials-advsearch_brief' %]
[% INCLUDE 'serials-advsearch.inc' brief=1 %]
[% CASE 'serials-menu' %]
[% INCLUDE 'serials-menu.inc' %]
[% CASE 'subscriptions-search' %]
[% INCLUDE 'subscriptions-search.inc' %]
[% CASE 'tags-filter' %]
[% INCLUDE 'tags-filter.inc' %]
[% CASE 'tools-menu' %]
[% INCLUDE 'tools-menu.inc' %]
[% END %]
[% END %]
[% END %]
</aside>