From f6808f5e554c8608e70865f15bf1cb6b39c1221c Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Wed, 24 Oct 2018 14:01:18 +0000 Subject: [PATCH] Bug 21645: Clean up library groups template This patch modifies the library groups administration page to help compliance with several coding guidelines: - Move JavaScript to the footer - Convert to Bootstrap grid - Other markup corrections To test, apply the patch and go to Administration -> Library groups. - Confirm that the page how has a "Library groups" heading. - Confirm that action buttons in the table of library groups are styled correctly. - Test both adding and editing groups. The "Required" label on required fields should be styled correctly. - Test all JavaScript-driven interactions on the page: - Adding, editing, and deleting groups - Removing libraries from groups - Expanding and collapsing group hierarchies - Validate the page's HTML and confirm that there are no errors found in the main body of the page. Signed-off-by: Mark Tompsett Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens --- .../prog/en/modules/admin/library_groups.tt | 327 +++++++++--------- 1 file changed, 170 insertions(+), 157 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/library_groups.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/library_groups.tt index b69857d1bb..81d4959f3e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/library_groups.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/library_groups.tt @@ -1,113 +1,13 @@ [% USE raw %] [% USE Asset %] [% USE KohaSpan %] +[% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] Koha › Administration › Library groups [% INCLUDE 'doc-head-close.inc' %] [% Asset.css("lib/jquery/plugins/treetable/stylesheets/jquery.treetable.css") | $raw %] -[% Asset.js("lib/jquery/plugins/treetable/jquery.treetable.js") | $raw %] - + [% INCLUDE 'header.inc' %] [% INCLUDE 'cat-search.inc' %] @@ -140,11 +40,11 @@ [% END %] -
-
-
-
-
+
+
+ + +

Library groups

[% FOREACH root_group IN root_groups %] @@ -165,14 +66,18 @@ [% PROCESS tree group=root_group %]
[% END %] -
-
-
- [% INCLUDE 'admin-menu.inc' %] -
+ +
+ +
+ +
+
- - -