From 95d8ceef98f5c1242a54dd701c49e7a41bd34721 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 24 Apr 2018 13:37:07 +0000 Subject: [PATCH] Bug 20650: Switch single-column templates to Bootstrap grid: Various, part 3 This patch updates various unrelated templates to use the Bootstrap grid. In each case, confirm that the indicated page looks correct. This patch also corrects a couple of capitalization errors and removes an unused template: virtualshelves/merge.tt. - Tools -> Patron card creator -> Manage -> Card batches - Export a batch - The pages inside the modal window should look correct: Both the "X batch(es) to export" screen and the "download exported batch(es)" one. - Tools -> Patron lists -> Edit list - The patron list add/edit form should look correct. - Disable plugins in koha-conf.xml. - Tools -> Plugins - The "Plugins disabled" page should look correct. - Enable plugins in koha-conf.xml - Tools -> Plugins -> Upload plugins. - This page should look correct. - Tools - The tools home page should show three columns: Patrons and Circulation, Catalog, Additional tools. - At viewport width below 768 pixels content should reflow into one column. - virtualshelves/merge.tt has been removed as it is unused. Search the codebase for references to it. There should be none. Signed-off-by: Claire Gravely Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens --- .../en/modules/patron_lists/add-modify.tt | 8 +++++--- .../prog/en/modules/patroncards/print.tt | 17 +++-------------- .../en/modules/plugins/plugins-disabled.tt | 12 ++++-------- .../prog/en/modules/plugins/plugins-upload.tt | 19 ++++++++----------- .../prog/en/modules/tools/tools-home.tt | 16 ++++++++-------- 5 files changed, 28 insertions(+), 44 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/add-modify.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/add-modify.tt index bf89a4db9e..570b309bc5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/add-modify.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/add-modify.tt @@ -23,8 +23,9 @@ -

-

+

+

+

[% IF list.patron_list_id %] Modify patron list @@ -63,7 +64,8 @@ Cancel -

+

+

[% MACRO jsinclude BLOCK %] [% Asset.js("js/tools-menu.js") %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/print.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/print.tt index fcf1d96bb8..5716e972fc 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/print.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/print.tt @@ -1,19 +1,11 @@ [% USE Asset %] [% SET footerjs = 1 %] - -[% IF ( bidi ) %][% ELSE %][% END %] - Koha › Tools › Patron cards › Patron card printing/exporting - - [% INCLUDE intranetstylesheet.inc %] - [% IF ( IntranetUserCSS ) %][% END %] [% INCLUDE 'doc-head-close.inc' popup => 1%] - -

-

+

[% IF ( batches ) %] [% END %] -

-[% IF ( IntranetUserJS ) %] - [% Asset.js("lib/jquery/jquery-2.2.3.min.js") %] - [% Asset.js("lib/jquery/jquery-migrate-1.3.0.min.js") %] +[% MACRO jsinclude BLOCK %] + [% INCLUDE 'greybox.inc' %]