Bugzilla – Attachment 56341 Details for
Bug 5670
Housebound Readers Module
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 5670: [Followup] Add 'step 4' edit button.
Bug-5670-Followup-Add-step-4-edit-button.patch (text/plain), 8.12 KB, created by
Alex Sassmannshausen
on 2016-10-13 10:39:41 UTC
(
hide
)
Description:
Bug 5670: [Followup] Add 'step 4' edit button.
Filename:
MIME Type:
Creator:
Alex Sassmannshausen
Created:
2016-10-13 10:39:41 UTC
Size:
8.12 KB
patch
obsolete
>From 03c64497c8c10602d388faea8d63f20903410a35 Mon Sep 17 00:00:00 2001 >From: Alex Sassmannshausen <alex.sassmannshausen@ptfs-europe.com> >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. >--- > .../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 d00734a..0aa4c58 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() { > </ol> > </fieldset> > [% END # hide fieldset %][% END %] >- [% IF ( HouseboundModule ) %] >- <fieldset class="rows" id="memberentry_housebound_roles"> >- <legend id="housebound_roles">Housebound roles</legend> >- <ol class="radio"> >- <li> >- <label class="radio" for="housebound_chooser"> >- Chooser: >- </label> >- [% IF ( housebound_role.housebound_chooser == 1 ) %] >- <label for="yes_housebound_chooser">Yes </label> >- <input type="radio" id="yes_housebound_chooser" >- name="housebound_chooser" value="1" >- checked="checked" /> >- <label for="no_housebound_chooser">No </label> >- <input type="radio" id="no_housebound_chooser" >- name="housebound_chooser" value="0" /> >- [% ELSE %] >- <label for="yes_housebound_chooser">Yes </label> >- <input type="radio" id="yes_housebound_chooser" >- name="housebound_chooser" value="1" /> >- <label for="no_housebound_chooser">No </label> >- <input type="radio" id="no_housebound_chooser" >- name="housebound_chooser" value="0" >- checked="checked" /> >- [% END %] >- </li> >- <li> >- <label class="radio" for="housebound_deliverer">Deliverer:</label> >- [% IF ( housebound_role.housebound_deliverer == 1 ) %] >- <label for="yes_housebound_deliverer">Yes </label> >- <input type="radio" id="yes_housebound_deliverer" >- name="housebound_deliverer" value="1" >- checked="checked" /> >- <label for="no_housebound_deliverer">No </label> >- <input type="radio" id="no_housebound_deliverer" >- name="housebound_deliverer" value="0" /> >- [% ELSE %] >- <label for="yes_housebound_deliverer">Yes </label> >- <input type="radio" id="yes_housebound_deliverer" >- name="housebound_deliverer" value="1" /> >- <label for="no_housebound_deliverer">No </label> >- <input type="radio" id="no_housebound_deliverer" >- name="housebound_deliverer" value="0" >- checked="checked" /> >- [% END %] >- </li> >- </ol> >- </fieldset> >- [% END # hide fieldset %] > <!--this zones are not necessary in modif mode --> > [% UNLESS ( opadd || opduplicate ) %] > <fieldset class="rows" id="memberentry_account_flags"> >@@ -1061,7 +1012,57 @@ $(document).ready(function() { > > [% END %] > >-[% IF ( step_4 ) %][% IF ( ExtendedPatronAttributes ) %][% UNLESS ( no_patron_attribute_types ) %] >+[% IF ( step_4 ) %] >+[% IF ( HouseboundModule ) %] >+ <fieldset class="rows" id="memberentry_housebound_roles"> >+ <legend id="housebound_roles">Housebound roles</legend> >+ <ol class="radio"> >+ <li> >+ <label class="radio" for="housebound_chooser"> >+ Chooser: >+ </label> >+ [% IF ( housebound_role.housebound_chooser == 1 ) %] >+ <label for="yes_housebound_chooser">Yes </label> >+ <input type="radio" id="yes_housebound_chooser" >+ name="housebound_chooser" value="1" >+ checked="checked" /> >+ <label for="no_housebound_chooser">No </label> >+ <input type="radio" id="no_housebound_chooser" >+ name="housebound_chooser" value="0" /> >+ [% ELSE %] >+ <label for="yes_housebound_chooser">Yes </label> >+ <input type="radio" id="yes_housebound_chooser" >+ name="housebound_chooser" value="1" /> >+ <label for="no_housebound_chooser">No </label> >+ <input type="radio" id="no_housebound_chooser" >+ name="housebound_chooser" value="0" >+ checked="checked" /> >+ [% END %] >+ </li> >+ <li> >+ <label class="radio" for="housebound_deliverer">Deliverer:</label> >+ [% IF ( housebound_role.housebound_deliverer == 1 ) %] >+ <label for="yes_housebound_deliverer">Yes </label> >+ <input type="radio" id="yes_housebound_deliverer" >+ name="housebound_deliverer" value="1" >+ checked="checked" /> >+ <label for="no_housebound_deliverer">No </label> >+ <input type="radio" id="no_housebound_deliverer" >+ name="housebound_deliverer" value="0" /> >+ [% ELSE %] >+ <label for="yes_housebound_deliverer">Yes </label> >+ <input type="radio" id="yes_housebound_deliverer" >+ name="housebound_deliverer" value="1" /> >+ <label for="no_housebound_deliverer">No </label> >+ <input type="radio" id="no_housebound_deliverer" >+ name="housebound_deliverer" value="0" >+ checked="checked" /> >+ [% END %] >+ </li> >+ </ol> >+ </fieldset> >+[% END # hide fieldset %] >+[% IF ( ExtendedPatronAttributes ) %][% UNLESS ( no_patron_attribute_types ) %] > <fieldset class="rows" id="memberentry_patron_attributes"> > <legend id="patron_attributes_lgd">Additional attributes and identifiers</legend> > <input type="hidden" name="setting_extended_patron_attributes" value="1" /> >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 d4fece2..fdf4f46 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) { > > <!-- End Upload Patron Image Section --> > >+[% IF ( HouseboundModule ) %] >+<div id="houseboundroles"> >+<h3>Housebound roles</h3> >+<div class="rows"> >+ <ol> >+ <li> >+ <span class="label">Chooser:</span> >+ [% IF ( housebound_role.housebound_chooser == 1 ) %] >+ Yes >+ [% ELSE %] >+ No >+ [% END %] >+ </li> >+ <li> >+ <span class="label">Deliverer:</span> >+ [% IF ( housebound_role.housebound_deliverer == 1 ) %] >+ Yes >+ [% ELSE %] >+ No >+ [% END %] >+ </li> >+ </ol> >+</div> >+</div> >+<div class="action"><a href="memberentry.pl?op=modify&borrowernumber=[% borrowernumber %]&step=4">Edit</a></div> >+[% END %] >+ > [% IF ( ExtendedPatronAttributes ) %] > [% UNLESS ( no_patron_attribute_types ) %] > <div id="patron-extended-attributes" style="padding-top: 1em;"> >@@ -348,31 +375,6 @@ function validate1(date) { > [% END %] > [% END %] > >-[% IF ( HouseboundModule ) %] >-<div id="houseboundroles"> >-<h3>Housebound roles</h3> >-<div class="rows"> >- <ol> >- <li> >- <span class="label">Chooser:</span> >- [% IF ( housebound_role.housebound_chooser == 1 ) %] >- Yes >- [% ELSE %] >- No >- [% END %] >- </li> >- <li> >- <span class="label">Deliverer:</span> >- [% IF ( housebound_role.housebound_deliverer == 1 ) %] >- Yes >- [% ELSE %] >- No >- [% END %] >- </li> >- </ol> >-</div> >-</div> >-[% END %] > > [% IF ( EnhancedMessagingPreferences ) %] > <div id="patron-messaging-prefs" style="padding-top: 1em;"> >-- >2.10.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 5670
:
3038
|
22162
|
22163
|
22164
|
22165
|
26816
|
27288
|
50930
|
51377
|
51875
|
54384
|
54385
|
55326
|
55334
|
55335
|
55336
|
55734
|
55735
|
55736
|
55737
|
55738
|
55739
|
55865
|
55866
|
55867
|
55890
|
55891
|
56298
|
56299
|
56300
|
56301
|
56302
|
56308
|
56337
|
56341
|
56346
|
56347
|
56348
|
56349
|
56350
|
56351
|
56352
|
56353
|
56354
|
56355
|
56356
|
56357
|
56358
|
56359
|
56360
|
56361
|
56362
|
56363
|
56364
|
56365
|
56366
|
56367
|
56368
|
56369
|
56580
|
56581
|
56582
|
56583
|
56584
|
56585
|
56586
|
56587
|
56588
|
56589
|
56590
|
56591
|
56592
|
56593
|
56594
|
56595
|
56596
|
56597
|
56598
|
56599
|
56600
|
56601
|
56602
|
56603
|
56604
|
56605
|
56606