From feadb910fcbfbab78ec5ddd0cfd3280c7379ef98 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Wed, 2 May 2018 18:33:04 +0000 Subject: [PATCH] Bug 21438: Update two-column templates with Bootstrap grid: Patron card creator This patch modifies the patron card creator templates to use the Bootstrap grid instead of YUI. To test, apply the patch and view the following pages, confirming that they look correct at various browser widths: - Tools -> patron card creator - Manage -> Card batches - Edit card batch - Manage -> Layouts - Edit layout - Manage -> Images - Manage -> Card templates - Edit template - Manage -> Printer profiles - Edit profile Signed-off-by: Claire Gravely --- .../prog/en/modules/patroncards/edit-batch.tt | 30 ++++++------ .../prog/en/modules/patroncards/edit-layout.tt | 37 +++++++------- .../prog/en/modules/patroncards/edit-profile.tt | 34 +++++++------ .../prog/en/modules/patroncards/edit-template.tt | 56 +++++++++++----------- .../prog/en/modules/patroncards/home.tt | 36 +++++++------- .../prog/en/modules/patroncards/image-manage.tt | 37 +++++++------- .../prog/en/modules/patroncards/manage.tt | 30 +++++++----- 7 files changed, 134 insertions(+), 126 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt index ff26bef..c3310f4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt @@ -23,16 +23,13 @@ New [% END %] -
-
-
-
-
- [% INCLUDE 'patroncards-toolbar.inc' %] -
-
-
+
+
+
+
+ + [% INCLUDE 'patroncards-toolbar.inc' %] [% IF ( duplicate_message ) %]
@@ -124,13 +121,16 @@ [% END %]
-
-
-
- [% INCLUDE 'tools-menu.inc' %] -
-
+ +
+ +
+ +
+
[% MACRO jsinclude BLOCK %] [% INCLUDE 'greybox.inc' %] [% INCLUDE 'datatables.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt index b93385b..8a5c487 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt @@ -14,21 +14,18 @@ Layouts › [% IF ( layout_id ) %]Edit ([% layout_id | html %])[% ELSE %]New[% END %]
-
-
-
-
-
- [% INCLUDE 'patroncards-toolbar.inc' %] -
-
-
+
+
+
+
+ + [% INCLUDE 'patroncards-toolbar.inc' %]
-
-
+
+
[% IF ( layout_id ) %]Edit[% ELSE %]Create[% END %] patron card text layout
    @@ -259,7 +256,7 @@
-
+
[% IF ( layout_id ) %]Edit[% ELSE %]Create[% END %] patron card graphic layout
    @@ -460,12 +457,16 @@
-
-
-
- [% INCLUDE 'tools-menu.inc' %] -
-
+ +
+
+ +
+ +
+
[% MACRO jsinclude BLOCK %]