From 20c2ea7d3a6e24dd13cf3e6dd47108984852607d Mon Sep 17 00:00:00 2001 From: Alex Sassmannshausen Date: Thu, 13 Oct 2016 12:37:50 +0200 Subject: [PATCH] Bug 5670: [Followup] Add 'step 4' edit button. * koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt: Place housebound role form inside the 'step 4' section. * koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt: Add 'step 4' edit button for housebound role. Signed-off-by: Claire Gravely Signed-off-by: Kyle M Hall --- .../prog/en/modules/members/memberentrygen.tt | 101 +++++++++--------- .../prog/en/modules/members/moremember.tt | 52 ++++----- 2 files changed, 78 insertions(+), 75 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt index 8d7e2c76aa..c58185f601 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt @@ -917,55 +917,6 @@ $(document).ready(function() { [% END # hide fieldset %][% END %] - [% IF ( HouseboundModule ) %] -
- Housebound roles -
    -
  1. - - [% IF ( housebound_role.housebound_chooser == 1 ) %] - - - - - [% ELSE %] - - - - - [% END %] -
  2. -
  3. - - [% IF ( housebound_role.housebound_deliverer == 1 ) %] - - - - - [% ELSE %] - - - - - [% END %] -
  4. -
-
- [% END # hide fieldset %] [% UNLESS ( opadd || opduplicate ) %]
@@ -1061,7 +1012,57 @@ $(document).ready(function() { [% END %] -[% IF ( step_4 ) %][% IF ( ExtendedPatronAttributes ) %][% UNLESS ( no_patron_attribute_types ) %] +[% IF ( step_4 ) %] +[% IF ( HouseboundModule ) %] +
+ Housebound roles +
    +
  1. + + [% IF ( housebound_role.housebound_chooser == 1 ) %] + + + + + [% ELSE %] + + + + + [% END %] +
  2. +
  3. + + [% IF ( housebound_role.housebound_deliverer == 1 ) %] + + + + + [% ELSE %] + + + + + [% END %] +
  4. +
+
+[% END # hide fieldset %] +[% IF ( ExtendedPatronAttributes ) %][% UNLESS ( no_patron_attribute_types ) %]
Additional attributes and identifiers diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt index 8e92c564a3..94f9bb9843 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -318,6 +318,33 @@ function validate1(date) { +[% IF ( HouseboundModule ) %] +
+

Housebound roles

+
+
    +
  1. + Chooser: + [% IF ( housebound_role.housebound_chooser == 1 ) %] + Yes + [% ELSE %] + No + [% END %] +
  2. +
  3. + Deliverer: + [% IF ( housebound_role.housebound_deliverer == 1 ) %] + Yes + [% ELSE %] + No + [% END %] +
  4. +
+
+
+ +[% END %] + [% IF ( ExtendedPatronAttributes ) %] [% UNLESS ( no_patron_attribute_types ) %]
@@ -348,31 +375,6 @@ function validate1(date) { [% END %] [% END %] -[% IF ( HouseboundModule ) %] -
-

Housebound roles

-
-
    -
  1. - Chooser: - [% IF ( housebound_role.housebound_chooser == 1 ) %] - Yes - [% ELSE %] - No - [% END %] -
  2. -
  3. - Deliverer: - [% IF ( housebound_role.housebound_deliverer == 1 ) %] - Yes - [% ELSE %] - No - [% END %] -
  4. -
-
-
-[% END %] [% IF ( EnhancedMessagingPreferences ) %]
-- 2.39.5