From a418f73cf57c9b9ecc54feb2a9b42e67084150b2 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 11 Jan 2018 18:16:39 +0000 Subject: [PATCH] Bug 19954: Update popup window templates to use Bootstrap grid: Patrons This patch updates two patron-related templates to use the Bootstrap grid instead of the YUI grid. This patch also corrects an unrelated error in update-child.tt where some JS variable declarations required by members-menu.js were missing. To test you must have more than one adult-type patron category defined. - Locate and view a child-type patron record. - From the "More" menu in the toolbar, choose "Update child to adult patron." - The popup window which appears should look correct and work correctly. - The table of patron categories should be sortable. - Add a new patron and enter the first and last names of an existing patron. - When Koha asks to confirm a possible duplicate record, click the "View existing record" link. The popup which is triggered should look correct. Signed-off-by: Zoe Bennett Signed-off-by: Claire Gravely Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart --- .../en/modules/members/moremember-brief.tt | 47 +++++++++++-------- .../prog/en/modules/members/update-child.tt | 22 +++++---- 2 files changed, 41 insertions(+), 28 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt index 98b006a793..0c2270ad05 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt @@ -4,26 +4,30 @@ [% INCLUDE 'doc-head-open.inc' %] Koha › Check duplicate patron [% INCLUDE 'doc-head-close.inc' %] - - -
-
+ + +
+
+ +

[% UNLESS ( I ) %] [% title %] [% firstname %] [% END %] [% surname %] ([% cardnumber %])

-
-
-
+
+
+
+
+
[% UNLESS ( I ) %][% IF ( othernames ) %]“[% othernames %]”[% END %]
- [% IF Koha.Preference( 'AddressFormat' ) %] - [% INCLUDE "member-display-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %] - [% ELSE %] - [% INCLUDE 'member-display-address-style-us.inc' %] - [% END %] +
    + [% IF Koha.Preference( 'AddressFormat' ) %] + [% INCLUDE "member-display-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %] + [% ELSE %] + [% INCLUDE 'member-display-address-style-us.inc' %] + [% END %] +
    @@ -49,9 +53,10 @@ [% END %]
-
-
-
+
+
+ +

Library use

@@ -74,10 +79,12 @@
-
-
-
+
+
+
+
+
[% INCLUDE 'intranet-bottom.inc' popup_window=1 %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/update-child.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/update-child.tt index 61db2e5d7b..23d80196f5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/update-child.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/update-child.tt @@ -3,15 +3,10 @@ Koha › Choose adult category [% INCLUDE 'doc-head-close.inc' %] - - -
-
+
[% IF ( MULTI ) %] @@ -53,12 +48,22 @@ [% END %] [% END %] -
+ [% MACRO jsinclude BLOCK %] - [% INCLUDE 'datatables.inc' %] [% END %] + [% END %] [% INCLUDE 'intranet-bottom.inc' popup_window=1 %] -- 2.39.5