Bugzilla – Attachment 161331 Details for
Bug 35883
Use template wrapper for accordions: Table settings administration
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 35883: Use template wrapper for accordions: Table settings administration
Bug-35883-Use-template-wrapper-for-accordions-Tabl.patch (text/plain), 31.62 KB, created by
Owen Leonard
on 2024-01-24 12:54:31 UTC
(
hide
)
Description:
Bug 35883: Use template wrapper for accordions: Table settings administration
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2024-01-24 12:54:31 UTC
Size:
31.62 KB
patch
obsolete
>From a71728199ff0d24e707e69f1b4954be771ec8b92 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Tue, 23 Jan 2024 19:33:33 +0000 >Subject: [PATCH] Bug 35883: Use template wrapper for accordions: Table > settings administration > >This patch updates the table settings administration page so that >Bootstrap accordion markup is generated by WRAPPERs. > >This patch also makes some changes to fix the automatic scroll when a >table configuration button was clicked. > >To test, apply the patch and go to Administration -> Table settings. > >- The list of modules should be displayed as before: Collapsible panels > where clicking the module name heading expands the corresponding > panel of settings. >- Test that direct links to configurable tables still work correctly: > - Go to Administration -> Libraries. > - Click the "Configure" button at the top of the table of libraries. > - You should be taken to the table settings page. > - The "Administration" panel should be expanded by default. > - You should be scrolled down automatically to the "Libraries" > table. >--- > .../prog/en/modules/admin/columns_settings.tt | 387 +++++++----------- > 1 file changed, 148 insertions(+), 239 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt >index 526391b4bd..1bd13164fb 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt >@@ -22,14 +22,14 @@ > [% IF tables.$pagename.keys and tables.$pagename.keys.size > 1 %] > Jump to table: > [% FOR tablename IN tables.$pagename.keys.sort %] >- [% SET table_id = pagename _ '#' _ tablename %] >+ [% SET table_id = pagename _ '_' _ tablename %] > <a href="#[% table_id | uri %]">[% tablename | html %]</a> > [% UNLESS loop.last %]<span class="separator"> | </span>[% END %] > [% END %] > [% END %] > [% IF tables.$pagename.keys and tables.$pagename.keys.size > 0 %] > [% FOR tablename IN tables.$pagename.keys.sort %] >- [% SET table_id = pagename _ '#' _ tablename %] >+ [% SET table_id = pagename _ '_' _ tablename %] > <div class="datatable_config" id="[% table_id | html %]"> > <input type="hidden" name="table_id" value="[% table_id| html %]" /> > [% IF pagename == 'additem' AND tablename == 'itemst' %] >@@ -206,250 +206,159 @@ > <div class="row"> > <div class="col-sm-10 col-sm-push-2"> > <main> >- > <h1>Table settings</h1> >- <div class="panel-group" id="modules" role="tablist" aria-multiselectable="true"> >- <div class="panel panel-default"> >- <div class="panel-heading" role="tab" id="acquiHeading"> >- <h2 class="panel-title"> >- <a id="acquiToggle" class="collapsed" role="button" data-toggle="collapse" data-parent="#modules" href="#acqui" aria-expanded="false" aria-controls="collapseOne"> >- Acquisition >- </a> >- </h2> >- </div> <!-- /.panel-heading --> >- <div id="acqui" class="panel-collapse collapse" role="tabpanel" aria-labelledby="acquiHeading"> >- <div class="panel-body"> >- <h3>Acquisition tables</h3> >- [% PROCESS pagelist module=modules.acqui modulename="acqui" %] >- </div> <!-- /.panel-body --> >- </div> <!-- /.panel-collapse --> >- </div> >+ [% WRAPPER accordion panelgroup_id="modules" %] >+ [% WRAPPER accordion_item %] >+ [% WRAPPER accordion_heading panel_id="acqui" %] >+ <span>Acquisition</span> >+ [% END %] >+ [% WRAPPER accordion_panel panel_id="acqui" %] >+ <h3>Acquisition tables</h3> >+ [% PROCESS pagelist module=modules.acqui modulename="acqui" %] >+ [% END %] >+ [% END %] > >- <div class="panel panel-default"> >- <div class="panel-heading" role="tab" id="adminHeading"> >- <h2 class="panel-title"> >- <a id="adminToggle" class="collapsed" role="button" data-toggle="collapse" data-parent="#modules" href="#admin" aria-expanded="false" aria-controls="collapseOne"> >- Administration >- </a> >- </h2> >- </div> <!-- /.panel-heading --> >- <div id="admin" class="panel-collapse collapse" role="tabpanel" aria-labelledby="adminHeading"> >- <div class="panel-body"> >- <h3>Administration tables</h3> >- [% PROCESS pagelist module=modules.admin modulename="admin" %] >- </div> <!-- /.panel-body --> >- </div> <!-- /.panel-collapse --> >- </div> >+ [% WRAPPER accordion_item %] >+ [% WRAPPER accordion_heading panel_id="admin" %] >+ <span>Administration</span> >+ [% END %] >+ [% WRAPPER accordion_panel panel_id="admin" %] >+ <h3>Administration tables</h3> >+ [% PROCESS pagelist module=modules.admin modulename="admin" %] >+ [% END %] >+ [% END %] > >- <div class="panel panel-default"> >- <div class="panel-heading" role="tab" id="authoritiesHeading"> >- <h2 class="panel-title"> >- <a id="authoritiesToggle" class="collapsed" role="button" data-toggle="collapse" data-parent="#modules" href="#authorities" aria-expanded="false" aria-controls="collapseOne"> >- Authorities >- </a> >- </h2> >- </div> <!-- /.panel-heading --> >- <div id="authorities" class="panel-collapse collapse" role="tabpanel" aria-labelledby="authoritiesHeading"> >- <div class="panel-body"> >- <h3>Authorities tables</h3> >- [% PROCESS pagelist module=modules.authorities modulename="authorities" %] >- </div> <!-- /.panel-body --> >- </div> <!-- /.panel-collapse --> >- </div> >+ [% WRAPPER accordion_item %] >+ [% WRAPPER accordion_heading panel_id="authorities" %] >+ <span>Authorities</span> >+ [% END %] >+ [% WRAPPER accordion_panel panel_id="authorities" %] >+ <h3>Authorities tables</h3> >+ [% PROCESS pagelist module=modules.authorities modulename="authorities" %] >+ [% END %] >+ [% END %] > >- <div class="panel panel-default"> >- <div class="panel-heading" role="tab" id="catalogueHeading"> >- <h2 class="panel-title"> >- <a id="catalogueToggle" class="collapsed" role="button" data-toggle="collapse" data-parent="#modules" href="#catalogue" aria-expanded="false" aria-controls="collapseOne"> >- Catalog >- </a> >- </h2> >- </div> <!-- /.panel-heading --> >- <div id="catalogue" class="panel-collapse collapse" role="tabpanel" aria-labelledby="catalogueHeading"> >- <div class="panel-body"> >- <h3>Catalogue tables</h3> >- [% PROCESS pagelist module=modules.catalogue modulename="catalogue" %] >- </div> <!-- /.panel-body --> >- </div> <!-- /.panel-collapse --> >- </div> >+ [% WRAPPER accordion_item %] >+ [% WRAPPER accordion_heading panel_id="catalogue" %] >+ <span>Catalog</span> >+ [% END %] >+ [% WRAPPER accordion_panel panel_id="catalogue" %] >+ <h3>Catalogue tables</h3> >+ [% PROCESS pagelist module=modules.catalogue modulename="catalogue" %] >+ [% END %] >+ [% END %] > >- <div class="panel panel-default"> >- <div class="panel-heading" role="tab" id="cataloguingHeading"> >- <h2 class="panel-title"> >- <a id="cataloguingToggle" class="collapsed" role="button" data-toggle="collapse" data-parent="#modules" href="#cataloguing" aria-expanded="false" aria-controls="collapseOne"> >- Cataloging >- </a> >- </h2> >- </div> <!-- /.panel-heading --> >- <div id="cataloguing" class="panel-collapse collapse" role="tabpanel" aria-labelledby="cataloguingHeading"> >- <div class="panel-body"> >- <h3>Cataloguing tables</h3> >- [% PROCESS pagelist module=modules.cataloguing modulename="cataloguing" %] >- </div> <!-- /.panel-body --> >- </div> <!-- /.panel-collapse --> >- </div> >+ [% WRAPPER accordion_item %] >+ [% WRAPPER accordion_heading panel_id="cataloguing" %] >+ <span>Cataloging</span> >+ [% END %] >+ [% WRAPPER accordion_panel panel_id="cataloguing" %] >+ <h3>Cataloguing tables</h3> >+ [% PROCESS pagelist module=modules.cataloguing modulename="cataloguing" %] >+ [% END %] >+ [% END %] > >- <div class="panel panel-default"> >- <div class="panel-heading" role="tab" id="circHeading"> >- <h2 class="panel-title"> >- <a id="circToggle" class="collapsed" role="button" data-toggle="collapse" data-parent="#modules" href="#circ" aria-expanded="false" aria-controls="collapseOne"> >- Circulation >- </a> >- </h2> >- </div> <!-- /.panel-heading --> >- <div id="circ" class="panel-collapse collapse" role="tabpanel" aria-labelledby="circHeading"> >- <div class="panel-body"> >- <h3>Circulation tables</h3> >- [% PROCESS pagelist module=modules.circ modulename="circ" %] >- </div> <!-- /.panel-body --> >- </div> <!-- /.panel-collapse --> >- </div> >+ [% WRAPPER accordion_item %] >+ [% WRAPPER accordion_heading panel_id="circ" %] >+ <span>Circulation</span> >+ [% END %] >+ [% WRAPPER accordion_panel panel_id="circ" %] >+ <h3>Circulation tables</h3> >+ [% PROCESS pagelist module=modules.circ modulename="circ" %] >+ [% END %] >+ [% END %] > >- <div class="panel panel-default"> >- <div class="panel-heading" role="tab" id="coursereservesHeading"> >- <h2 class="panel-title"> >- <a id="coursereservesToggle" class="collapsed" role="button" data-toggle="collapse" data-parent="#modules" href="#coursereserves" aria-expanded="false" aria-controls="collapseOne"> >- Course reserves >- </a> >- </h2> >- </div> <!-- /.panel-heading --> >- <div id="coursereserves" class="panel-collapse collapse" role="tabpanel" aria-labelledby="coursereservesHeading"> >- <div class="panel-body"> >- <h3>Course reserves tables</h3> >- [% PROCESS pagelist module=modules.coursereserves modulename="coursereserves" %] >- </div> <!-- /.panel-body --> >- </div> <!-- /.panel-collapse --> >- </div> >+ [% WRAPPER accordion_item %] >+ [% WRAPPER accordion_heading panel_id="coursereserves" %] >+ Course <span>reserves</span> >+ [% END %] >+ [% WRAPPER accordion_panel panel_id="coursereserves" %] >+ <h3>Course reserves tables</h3> >+ [% PROCESS pagelist module=modules.coursereserves modulename="coursereserves" %] >+ [% END %] >+ [% END %] > >- <div class="panel panel-default"> >- <div class="panel-heading" role="tab" id="ermHeading"> >- <h2 class="panel-title"> >- <a class="collapsed" role="button" data-toggle="collapse" data-parent="#modules" href="#erm" aria-expanded="false" aria-controls="collapseOne"> >- E-resource management >- </a> >- </h2> >- </div> <!-- /.panel-heading --> >- <div id="erm" class="panel-collapse collapse" role="tabpanel" aria-labelledby="ermHeading"> >- <div class="panel-body"> >- <h3>E-resource management tables</h3> >- [% PROCESS pagelist module=modules.erm modulename="erm" %] >- </div> <!-- /.panel-body --> >- </div> <!-- /.panel-collapse --> >- </div> >+ [% WRAPPER accordion_item %] >+ [% WRAPPER accordion_heading panel_id="erm" %] >+ E-resource <span>management</span> >+ [% END %] >+ [% WRAPPER accordion_panel panel_id="erm" %] >+ <h3>E-resource management tables</h3> >+ [% PROCESS pagelist module=modules.erm modulename="erm" %] >+ [% END %] >+ [% END %] > >- <div class="panel panel-default"> >- <div class="panel-heading" role="tab" id="illrequestsHeading"> >- <h2 class="panel-title"> >- <a id="illrequestsToggle" class="collapsed" role="button" data-toggle="collapse" data-parent="#modules" href="#illrequests" aria-expanded="false" aria-controls="collapseOne"> >- Interlibrary loans >- </a> >- </h2> >- </div> <!-- /.panel-heading --> >- <div id="illrequests" class="panel-collapse collapse" role="tabpanel" aria-labelledby="illrequestsHeading"> >- <div class="panel-body"> >- <h3>Interlibrary loans tables</h3> >- [% PROCESS pagelist module=modules.illrequests modulename="illrequests" %] >- </div> <!-- /.panel-body --> >- </div> <!-- /.panel-collapse --> >- </div> >+ [% WRAPPER accordion_item %] >+ [% WRAPPER accordion_heading panel_id="illrequests" %] >+ Interlibrary <span>loans</span> >+ [% END %] >+ [% WRAPPER accordion_panel panel_id="illrequests" %] >+ <h3>Interlibrary loans tables</h3> >+ [% PROCESS pagelist module=modules.illrequests modulename="illrequests" %] >+ [% END %] >+ [% END %] > >- <div class="panel panel-default"> >- <div class="panel-heading" role="tab" id="membersHeading"> >- <h2 class="panel-title"> >- <a id="membersToggle" class="collapsed" role="button" data-toggle="collapse" data-parent="#modules" href="#members" aria-expanded="false" aria-controls="collapseOne"> >- Patrons >- </a> >- </h2> >- </div> <!-- /.panel-heading --> >- <div id="members" class="panel-collapse collapse" role="tabpanel" aria-labelledby="membersHeading"> >- <div class="panel-body"> >- <h3>Patrons tables</h3> >- [% PROCESS pagelist module=modules.members modulename="members" %] >- </div> <!-- /.panel-body --> >- </div> <!-- /.panel-collapse --> >- </div> >+ [% WRAPPER accordion_item %] >+ [% WRAPPER accordion_heading panel_id="members" %] >+ <span>Patrons</span> >+ [% END %] >+ [% WRAPPER accordion_panel panel_id="members" %] >+ <h3>Patrons tables</h3> >+ [% PROCESS pagelist module=modules.members modulename="members" %] >+ [% END %] >+ [% END %] > >- <div class="panel panel-default"> >- <div class="panel-heading" role="tab" id="posHeading"> >- <h2 class="panel-title"> >- <a id="posToggle" class="collapsed" role="button" data-toggle="collapse" data-parent="#modules" href="#pos" aria-expanded="false" aria-controls="collapseOne"> >- Point of sale >- </a> >- </h2> >- </div> <!-- /.panel-heading --> >- <div id="pos" class="panel-collapse collapse" role="tabpanel" aria-labelledby="posHeading"> >- <div class="panel-body"> >- <h3>Point of sale tables</h3> >- [% PROCESS pagelist module=modules.pos modulename="pos" %] >- </div> <!-- /.panel-body --> >- </div> <!-- /.panel-collapse --> >- </div> >+ [% WRAPPER accordion_item %] >+ [% WRAPPER accordion_heading panel_id="pos" %] >+ Point of <span>sale</span> >+ [% END %] >+ [% WRAPPER accordion_panel panel_id="pos" %] >+ <h3>Point of sale tables</h3> >+ [% PROCESS pagelist module=modules.pos modulename="pos" %] >+ [% END %] >+ [% END %] > >- <div class="panel panel-default"> >- <div class="panel-heading" role="tab" id="toolsHeading"> >- <h2 class="panel-title"> >- <a id="toolsToggle" class="collapsed" role="button" data-toggle="collapse" data-parent="#modules" href="#tools" aria-expanded="false" aria-controls="collapseOne"> >- Tools >- </a> >- </h2> >- </div> <!-- /.panel-heading --> >- <div id="tools" class="panel-collapse collapse" role="tabpanel" aria-labelledby="toolsHeading"> >- <div class="panel-body"> >- <h3>Tools tables</h3> >- [% PROCESS pagelist module=modules.tools modulename="tools" %] >- </div> <!-- /.panel-body --> >- </div> <!-- /.panel-collapse --> >- </div> >+ [% WRAPPER accordion_item %] >+ [% WRAPPER accordion_heading panel_id="tools" %] >+ <span>Tools</span> >+ [% END %] >+ [% WRAPPER accordion_panel panel_id="tools" %] >+ <h3>Tools tables</h3> >+ [% PROCESS pagelist module=modules.tools modulename="tools" %] >+ [% END %] >+ [% END %] > >- <div class="panel panel-default"> >- <div class="panel-heading" role="tab" id="opacHeading"> >- <h2 class="panel-title"> >- <a id="opacToggle" class="collapsed" role="button" data-toggle="collapse" data-parent="#modules" href="#opac" aria-expanded="false" aria-controls="collapseOne"> >- OPAC >- </a> >- </h2> >- </div> <!-- /.panel-heading --> >- <div id="opac" class="panel-collapse collapse" role="tabpanel" aria-labelledby="opacHeading"> >- <div class="panel-body"> >- <h3>OPAC tables</h3> >- [% PROCESS pagelist module=modules.opac modulename="opac" %] >- </div> <!-- /.panel-body --> >- </div> <!-- /.panel-collapse --> >- </div> >+ [% WRAPPER accordion_item %] >+ [% WRAPPER accordion_heading panel_id="opac" %] >+ <span>OPAC</span> >+ [% END %] >+ [% WRAPPER accordion_panel panel_id="opac" %] >+ <h3>OPAC tables</h3> >+ [% PROCESS pagelist module=modules.opac modulename="opac" %] >+ [% END %] >+ [% END %] > >- <div class="panel panel-default"> >- <div class="panel-heading" role="tab" id="reportsHeading"> >- <h2 class="panel-title"> >- <a id="reportsToggle" class="collapsed" role="button" data-toggle="collapse" data-parent="#modules" href="#reports" aria-expanded="false" aria-controls="collapseOne"> >- Reports >- </a> >- </h2> >- </div> <!-- /.panel-heading --> >- <div id="reports" class="panel-collapse collapse" role="tabpanel" aria-labelledby="reportsHeading"> >- <div class="panel-body"> >- <h3>Reports tables</h3> >- [% PROCESS pagelist module=modules.reports modulename="reports" %] >- </div> <!-- /.panel-body --> >- </div> <!-- /.panel-collapse --> >- </div> >+ [% WRAPPER accordion_item %] >+ [% WRAPPER accordion_heading panel_id="reports" %] >+ <span>Reports</span> >+ [% END %] >+ [% WRAPPER accordion_panel panel_id="reports" %] >+ <h3>Reports tables</h3> >+ [% PROCESS pagelist module=modules.reports modulename="reports" %] >+ [% END %] >+ [% END %] > >- <div class="panel panel-default"> >- <div class="panel-heading" role="tab" id="serialsHeading"> >- <h2 class="panel-title"> >- <a id="serialsToggle" class="collapsed" role="button" data-toggle="collapse" data-parent="#modules" href="#serials" aria-expanded="false" aria-controls="collapseOne"> >- Serials >- </a> >- </h2> >- </div> <!-- /.panel-heading --> >- <div id="serials" class="panel-collapse collapse" role="tabpanel" aria-labelledby="serialsHeading"> >- <div class="panel-body"> >- <h3>Serials tables</h3> >- [% PROCESS pagelist module=modules.serials modulename="serials" %] >- </div> <!-- /.panel-body --> >- </div> <!-- /.panel-collapse --> >- </div> >+ [% WRAPPER accordion_item %] >+ [% WRAPPER accordion_heading panel_id="serials" %] >+ <span>Serials</span> >+ [% END %] >+ [% WRAPPER accordion_panel panel_id="serials" %] >+ <h3>Serials tables</h3> >+ [% PROCESS pagelist module=modules.serials modulename="serials" %] >+ [% END %] >+ [% END %] >+ [% END # /WRAPPER accordion %] > >- </div> > </main> > </div> <!-- /.col-sm-10.col-sm-push-2 --> > >@@ -468,15 +377,15 @@ > $(document).ready( function() { > $("#[% panel | uri %]Toggle").click(); > [%- IF page.defined -%] >- $("#[% panel | uri %]").on('shown.bs.collapse', function () { >- $('html, body').animate({ >- [%- IF table.defined -%] >- scrollTop: ($("#[% page | uri %]\\#[% table | uri %]").offset().top) >- [%- ELSE -%] >- scrollTop: ($("#[% page | uri %]").offset().top) >- [%- END -%] >- }, 500); >- }); >+ $("#[% panel | uri %]_panel").on('shown.bs.collapse', function () { >+ $('html, body').animate({ >+ [%- IF table.defined -%] >+ scrollTop: ($("#[% page | uri %]_[% table | uri %]").offset().top) >+ [%- ELSE -%] >+ scrollTop: ($("#[% page | uri %]").offset().top) >+ [%- END -%] >+ }, 500); >+ }); > [%- END -%] > }); > </script> >-- >2.30.2
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=161331">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 35883
:
161331
|
161763
|
161765
|
163889