From e5870e30de55129b5b1037a00283aa9c6aa4095d Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 13 Apr 2020 17:45:22 +0000 Subject: [PATCH] Bug 25135: Improve clarity and navigation of columns settings administration This patch makes some modifications to the columns setting administration template so that the headings are a little clearer. In-page navigation is added for each section. To test, apply the patch and go to Administration -> Columns settings. - Confirm that the collapsing panels work correctly. - Expand a section and confirm that the "jump to" links work correctly. Signed-off-by: Bernardo Gonzalez Kriegel Looks good, works good. Signed-off-by: Katrin Fischer Signed-off-by: Martin Renvoize --- .../prog/en/modules/admin/columns_settings.tt | 80 ++++++++++++------- 1 file changed, 50 insertions(+), 30 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 125c6dc6bd..d88804a263 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 @@ -3,6 +3,13 @@ [% SET footerjs = 1 %] [% SET panel_id = 0 %] [% BLOCK pagelist %] + [% IF module.keys and module.keys.size > 0 %] + Jump to: + [% FOR pagename IN module.keys %] + [% pagename | html %] + [% UNLESS loop.last %] | [% END %] + [% END %] + [% END %]
@@ -11,7 +18,7 @@ [% SET panel_id = panel_id + 1 %] [% IF module.keys and module.keys.size > 0 %] [% FOR pagename IN module.keys %] -
[% pagename | html %]
+

Page: [% pagename | html %]

[% SET tables = module %] [% IF tables.$pagename.keys and tables.$pagename.keys.size > 0 %] [% FOR tablename IN tables.$pagename.keys.sort %] @@ -24,8 +31,9 @@ Currency [% ELSIF pagename == 'additem' AND tablename == 'itemst' %] Items Editor + [% ELSE %] + Table id: [% tablename | html %] [% END %] - (id=[% tablename | html %]) @@ -81,7 +89,9 @@ [% END %] - +
+ +
[% ELSE %] There is no table to configure for this module. [% END %] @@ -96,6 +106,16 @@ [% INCLUDE 'doc-head-open.inc' %] Koha › Administration › Columns settings [% INCLUDE 'doc-head-close.inc' %] + @@ -111,81 +131,81 @@

Columns settings

-

Acquisition

+
Acquisition
-

Acquisition tables

+

Acquisition tables

[% PROCESS pagelist module=modules.acqui modulename="acqui" %]
-

Administration

+
Administration
-

Administration tables

+

Administration tables

[% PROCESS pagelist module=modules.admin modulename="admin" %]
-

Authorities

+
Authorities
-

Authorities tables

+

Authorities tables

[% PROCESS pagelist module=modules.authorities modulename="authorities" %]
-

Catalog

+
Catalog
-

Catalogue tables

+

Catalogue tables

[% PROCESS pagelist module=modules.catalogue modulename="catalogue" %]
-

Cataloging

+
Cataloging
-

Cataloguing tables

+

Cataloguing tables

[% PROCESS pagelist module=modules.cataloguing modulename="cataloguing" %]
-

Circulation

+
Circulation
-

Circulation tables

+

Circulation tables

[% PROCESS pagelist module=modules.circ modulename="circ" %]
-

Course reserves

+
Course reserves
-

Course reserves tables

+

Course reserves tables

[% PROCESS pagelist module=modules.coursereserves modulename="coursereserves" %]
-

Interlibrary loans

+
Interlibrary loans
-

Interlibrary loans tables

+

Interlibrary loans tables

[% PROCESS pagelist module=modules.illrequests modulename="illrequests" %]
-

Patrons

+
Patrons
-

Patrons tables

+

Patrons tables

[% PROCESS pagelist module=modules.members modulename="members" %]
-

Tools

+
Tools
-

Tools tables

+

Tools tables

[% PROCESS pagelist module=modules.tools modulename="tools" %]
-

OPAC

+
OPAC
-

OPAC tables

+

OPAC tables

[% PROCESS pagelist module=modules.opac modulename="opac" %]
-

Reports

+
Reports
-

Reports tables

+

Reports tables

[% PROCESS pagelist module=modules.reports modulename="reports" %]
-

Serials

+
Serials
-

Serials tables

+

Serials tables

[% PROCESS pagelist module=modules.serials modulename="serials" %]
@@ -207,7 +227,7 @@ var accordion = $( "#modules" ).accordion({ collapsible: true, autoHeight: false, - header: "h3", + header: ".panel_header", [%- IF panel -%] [%# we were asked to show a specific panel, usually on update %] active: [%- panel | html -%] -- 2.39.5