From 44ec3c6728ed87ea191fc645e973aee9ba0b1e63 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Wed, 7 Nov 2018 17:18:00 +0000 Subject: [PATCH] Bug 21783: Reindent admin/columns_settings.tt This patch reindents admin/columns_settings.tt to use four spaces instead of two for indentation, following coding guidelines. To test, apply the patch and compare the file to master using the -w flag to ignore whitespace. The only changes should appear where lines were added during indentation. Go to Admin -> Columns settings and confirm that everything works correctly. --- .../prog/en/modules/admin/columns_settings.tt | 370 +++++++++++---------- 1 file changed, 188 insertions(+), 182 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 53b4e9e..6db9123 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,88 +3,94 @@ [% SET footerjs = 1 %] [% SET panel_id = 0 %] [% BLOCK pagelist %] -
-
- - - - [% SET panel_id = panel_id + 1 %] - [% IF module.keys and module.keys.size > 0 %] - [% FOR pagename IN module.keys %] -
[% pagename | html %]
- [% SET tables = module %] - [% IF tables.$pagename.keys and tables.$pagename.keys.size > 0 %] - [% FOR tablename IN tables.$pagename.keys.sort %] - [% IF pagename == 'additem' AND tablename == 'itemst' %] -
Changes made below will only apply to item subfields that are mapped to the 'items' table. Go to Koha to MARC mapping
- [% END %] - - - - - [% FOR column IN tables.$pagename.$tablename %] - [% SET value = pagename _ '#' _ tablename _ '#' _ column.columnname %] - - - - - - [% END %] - -
- [% IF tablename == 'currencies-table' %] - Currency - [% ELSIF pagename == 'additem' AND tablename == 'itemst' %] - Items Editor - [% END %] - (id=[% tablename | html %]) -
Column nameIs hidden by defaultCannot be toggled
- [% column.columnname | html %] - - - [% IF column.is_hidden %] - [% IF column.cannot_be_modified %] - - - [% ELSE %] - - [% END %] - [% ELSE %] - [% IF column.cannot_be_modified %] - - - [% ELSE %] - - [% END %] - [% END %] - - [% IF column.cannot_be_toggled %] - [% IF column.cannot_be_modified %] - - - [% ELSE %] - - [% END %] +
+ + + + + [% SET panel_id = panel_id + 1 %] + [% IF module.keys and module.keys.size > 0 %] + [% FOR pagename IN module.keys %] +
[% pagename | html %]
+ [% SET tables = module %] + [% IF tables.$pagename.keys and tables.$pagename.keys.size > 0 %] + [% FOR tablename IN tables.$pagename.keys.sort %] + [% IF pagename == 'additem' AND tablename == 'itemst' %] +
Changes made below will only apply to item subfields that are mapped to the 'items' table. Go to Koha to MARC mapping
+ [% END %] + + + + + + + + + + + [% FOR column IN tables.$pagename.$tablename %] + [% SET value = pagename _ '#' _ tablename _ '#' _ column.columnname %] + + + + + + [% END %] + +
+ [% IF tablename == 'currencies-table' %] + Currency + [% ELSIF pagename == 'additem' AND tablename == 'itemst' %] + Items Editor + [% END %] + (id=[% tablename | html %]) +
Column nameIs hidden by defaultCannot be toggled
+ [% column.columnname | html %] + + + [% IF column.is_hidden %] + [% IF column.cannot_be_modified %] + + + [% ELSE %] + + [% END %] + [% ELSE %] + [% IF column.cannot_be_modified %] + + + [% ELSE %] + + [% END %] + [% END %] + + [% IF column.cannot_be_toggled %] + [% IF column.cannot_be_modified %] + + + [% ELSE %] + + [% END %] + [% ELSE %] + [% IF column.cannot_be_modified %] + + + [% ELSE %] + + [% END %] + [% END %] +
+ [% END %] + [% ELSE %] - [% IF column.cannot_be_modified %] - - - [% ELSE %] - - [% END %] + There is no table to configure for this module. [% END %] -
- [% END %] - - [% ELSE %] - There is no table to configure for this module. - [% END %] - [% END %] - [% ELSE %] - There is no page using the table configuration in this module. - [% END %] -
-
+ [% END %] + [% ELSE %] + There is no page using the table configuration in this module. + [% END %] + + [% END %] [% INCLUDE 'doc-head-open.inc' %] @@ -93,114 +99,114 @@ -[% INCLUDE 'header.inc' %] -[% INCLUDE 'prefs-admin-search.inc' %] - - -
-
-
-
- -

Columns settings

-
-

Acquisition

-
-

Acquisition tables

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

Administration

-
-

Administration tables

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

Authorities

-
-

Authorities tables

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

Catalog

-
-

Catalogue tables

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

Cataloging

-
-

Cataloguing tables

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

Circulation

-
-

Circulation tables

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

Course reserves

-
-

Course reserves tables

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

Patrons

-
-

Patrons tables

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

Tools

-
-

Tools tables

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

OPAC

-
-

OPAC tables

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

Reports

-
-

Reports tables

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

Serials

-
-

Serials tables

- [% PROCESS pagelist module=modules.serials modulename="serials" %] -
- -
-
-
- -
- -
-
+ [% INCLUDE 'header.inc' %] + [% INCLUDE 'prefs-admin-search.inc' %] + + +
+
+
+
+ +

Columns settings

+
+

Acquisition

+
+

Acquisition tables

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

Administration

+
+

Administration tables

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

Authorities

+
+

Authorities tables

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

Catalog

+
+

Catalogue tables

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

Cataloging

+
+

Cataloguing tables

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

Circulation

+
+

Circulation tables

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

Course reserves

+
+

Course reserves tables

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

Patrons

+
+

Patrons tables

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

Tools

+
+

Tools tables

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

OPAC

+
+

OPAC tables

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

Reports

+
+

Reports tables

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

Serials

+
+

Serials tables

+ [% PROCESS pagelist module=modules.serials modulename="serials" %] +
+ +
+
+
+ +
+ +
+
[% MACRO jsinclude BLOCK %] [% Asset.js("js/admin-menu.js") | $raw %] -- 2.1.4