@@ -, +, @@ - Check that the page looks correct and that sections like "Alternate address" and "Alternative contact" are empty when there is no data. - Check that the "Manage patron image" tool works correctly. --- koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 4 + .../prog/en/modules/members/moremember.tt | 442 ++++++++++++--------- 2 files changed, 261 insertions(+), 185 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css +++ a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css @@ -1526,6 +1526,10 @@ li.email { font-size: 110%; } +.address li { + list-style-type: none; +} + .clearfix:after { content: "."; display: block; --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -13,6 +13,14 @@ [% INCLUDE 'doc-head-close.inc' %] [% Asset.css("css/datatables.css") %] + @@ -136,17 +144,29 @@
-
- [% IF ( patron.othernames ) %]“[% patron.othernames | html %]”[% END %] +
-
- [% IF Koha.Preference( 'AddressFormat' ) %] - [% INCLUDE "member-display-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %] +
+

Contact information

+ [% IF ( guarantor.borrowernumber ) %] + Edit [% ELSE %] - [% INCLUDE 'member-display-address-style-us.inc' %] + Edit [% END %]
+ [% IF ( patron.othernames ) %]“[% patron.othernames | html %]”[% END %] + +
+
    + [% IF Koha.Preference( 'AddressFormat' ) %] + [% INCLUDE "member-display-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %] + [% ELSE %] + [% INCLUDE 'member-display-address-style-us.inc' %] + [% END %] +
+
+
    [% IF ( patron.phone ) %] @@ -230,117 +250,131 @@ [% END %]
[% # /div.rows %] -
- [% IF ( guarantor.borrowernumber ) %] - Edit - [% ELSE %] - Edit - [% END %] -
-
[% # /div#patron-information %] [% IF ( patronimages ) %] [% IF ( CAN_user_tools_batch_upload_patron_images ) %] -
-
-
- [% IF ( patron.image ) %] - Manage patron image -
To update the image for [% patron.title | html %] [% patron.surname | html %], select a new image file and click 'Upload.'
Click the 'Delete' button to remove the current image. - [% ELSE %] - Upload patron image -
[% patron.title %] [% patron.firstname | html %] [% patron.surname | html %] does not currently have an image available. To import an image for [% patron.title %] [% patron.surname | html %], enter the name of an image file to upload. - [% END %] -
Only PNG, GIF, JPEG, XPM formats are supported. -
+
+ [% IF ( patron.image ) %] +
+

Manage patron image

+ Edit +
+ [% ELSE %] +
+

Upload patron image

+ Add +
+ [% END %] + + [% IF ( patron.image ) %] +
To update the image for [% patron.title | html %] [% patron.surname | html %], select a new image file and click 'Upload.'
Click the 'Delete' button to remove the current image.
+ [% ELSE %] +
[% patron.title %] [% patron.firstname | html %] [% patron.surname | html %] does not currently have an image available. To import an image for [% patron.title %] [% patron.surname | html %], enter the name of an image file to upload.
+ [% END %] +

Only PNG, GIF, JPEG, XPM formats are supported.

+ + +
+ -
    -
  1. - - -
    2. -
-
- - - - [% IF ( patron.image ) %] - Delete - [% END %] -
-
+ + + [% IF ( patron.image ) %] + Delete + [% END %] + Cancel +
[% # /div#manage-patron-image %] [% END %] [% END %] [% IF Koha.Preference('HouseboundModule') %] -
-

Housebound roles

-
-
    -
  1. - Chooser: - [% IF ( housebound_role.housebound_chooser == 1 ) %] - Yes - [% ELSE %] - No - [% END %] -
    2. -
  2. - Deliverer: - [% IF ( housebound_role.housebound_deliverer == 1 ) %] - Yes - [% ELSE %] - No - [% END %] -
    3. -
-
-
-
- Edit -
+
+ [% IF ( housebound_role.housebound_chooser == 1 OR housebound_role.housebound_deliverer == 1 ) %] +
+

Housebound roles

+ Edit +
+
+
    +
  1. + Chooser: + [% IF ( housebound_role.housebound_chooser == 1 ) %] + Yes + [% ELSE %] + No + [% END %] +
    2. +
  2. + Deliverer: + [% IF ( housebound_role.housebound_deliverer == 1 ) %] + Yes + [% ELSE %] + No + [% END %] +
    3. +
+
+ [% ELSE %] +
+

Housebound roles

+ Add +
+ [% END %] +
[% #/ div#houseboundroles %] [% END %] [% IF ( ExtendedPatronAttributes ) %] [% UNLESS ( no_patron_attribute_types ) %] -
-

Additional attributes and identifiers

- [% FOREACH attribute IN attributes_loop %] - [% IF attribute.class %] -
- [% ELSE %] -
+
+ [% IF ( attributes_loop ) %] +
+

Additional attributes and identifiers

+ Edit +
+ [% FOREACH attribute IN attributes_loop %] + [% IF attribute.class %] +
+ [% ELSE %] +
+ [% END %] +

[% attribute.lib %]

+
    + [% FOREACH item IN attribute.items %] +
  1. + [% item.description %]: + [% IF ( item.value_description ) %] + [% item.value_description %] + [% ELSE %] + [% item.value| html_line_break %] + [% END %] +
    2. + [% END %] +
+
[% END %] -

[% attribute.lib %]

-
    - [% FOREACH item IN attribute.items %] -
  1. - [% item.description %]: - [% IF ( item.value_description ) %] - [% item.value_description %] - [% ELSE %] - [% item.value| html_line_break %] - [% END %] -
    2. - [% END %] -
+
+
+ [% ELSE %] +
+

Additional attributes and identifiers

+ Add
[% END %] -
-
- Edit -
+
[% # /div#patron-extended-attributes %] [% END %] [% END %] [% IF ( EnhancedMessagingPreferences ) %] -
-

Patron messaging preferences

+
+
+

Patron messaging preferences

+ Edit +
[% INCLUDE 'messaging-preference-form.inc' %] [% IF ( SMSSendDriver ) %]
@@ -352,17 +386,17 @@
[% END %] -
-
- Edit -
+
[% # /div#patron-messaging-prefs %] [% END %]
[% # /div.yui-u.first %]
-
-

Library use

+
+
+

Library use

+ Edit +
  1. @@ -507,100 +541,126 @@
[% # /div.rows %]
[% # /div#patron-library-details %] -
- Edit -
-
-

Alternate address

+
+ [% IF ( patron.B_phone || patron.B_email || patron.contactnote || patron.B_address || patron.B_address2 || patron.B_city || patron.B_zipcode || patron.B_country ) %] +
+

Alternate address

+ Edit +
+
+
    + [% IF Koha.Preference( 'AddressFormat' ) %] + [% INCLUDE "member-display-alt-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %] + [% ELSE %] + [% INCLUDE 'member-display-alt-address-style-us.inc' %] + [% END %] +
+
+
+
    + [% IF ( patron.B_phone ) %] +
  1. + Phone: + [% patron.B_phone |html %] +
    2. + [% END %] + + [% IF ( patron.B_email ) %] + + [% END %] - [% IF Koha.Preference( 'AddressFormat' ) %] - [% INCLUDE "member-display-alt-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %] + [% IF ( patron.contactnote ) %] +
  2. + Contact note: + [% patron.contactnote |html %] +
    3. + [% END %] +
+
[% ELSE %] - [% INCLUDE 'member-display-alt-address-style-us.inc' %] +
+

Alternate address

+ Add +
[% END %] - -
-
    - [% IF ( patron.B_phone ) %] -
  1. - Phone: - [% patron.B_phone |html %] -
    2. - [% END %] - [% IF ( patron.B_email ) %] - - [% END %] - [% IF ( patron.contactnote ) %] -
  2. - Contact note: - [% patron.contactnote |html %] -
    3. - [% END %] -
-
[% # /div#patron-alternate-address %] -
- Edit -
-
-

Alternative contact

-
-
    -
  1. - Surname: - [% patron.altcontactsurname | html %] -
    2. -
  2. - First name: - [% patron.altcontactfirstname | html %] -
    3. -
  3. - Address: - [% patron.altcontactaddress1 | html %] -
    4. -
  4. - Address 2: - [% patron.altcontactaddress2 | html %] -
    5. -
  5. - City: - [% patron.altcontactaddress3 | html %] -
    6. - - [% IF ( patron.altcontactstate ) %] -
  6. - State: - [% patron.altcontactstate | html %] -
    7. - [% END %] +
    + [% IF ( patron.altcontactsurname || patron.altcontactfirstname || patron.altcontactaddress1 || patron.altcontactaddress2 || patron.altcontactaddress3 || patron.altcontactstate || patron.altcontactzipcode || patron.altcontactcountry || patron.altcontactphone ) %] +
    +

    Alternative contact

    + Edit +
    +
    +
      + [% IF ( patron.altcontactsurname ) %] +
    1. + Surname: + [% patron.altcontactsurname | html %] +
      2. + [% END %] + [% IF ( patron.altcontactfirstname ) %] +
    2. + First name: + [% patron.altcontactfirstname | html %] +
      3. + [% END %] + [% IF ( patron.altcontactaddress1 ) %] +
    3. + Address: + [% patron.altcontactaddress1 | html %] +
      4. + [% END %] + [% IF ( patron.altcontactaddress2 ) %] +
    4. + Address 2: + [% patron.altcontactaddress2 | html %] +
      5. + [% END %] + [% IF ( patron.altcontactaddress3 ) %] +
    5. + City: + [% patron.altcontactaddress3 | html %] +
      6. + [% END %] -
    6. - ZIP/Postal code: - [% patron.altcontactzipcode | html %] -
      7. - [% IF ( patron.altcontactcountry ) %] -
    7. - Country: - [% patron.altcontactcountry | html %] -
      8. - [% END %] - [% IF ( patron.altcontactphone ) %] -
    8. - Phone: - [% patron.altcontactphone | html %] -
      9. - [% END %] -
    -
    [% # /div.rows %] + [% IF ( patron.altcontactstate ) %] +
  7. + State: + [% patron.altcontactstate | html %] +
    8. + [% END %] + [% IF ( patron.altcontactzipcode ) %] +
  8. + ZIP/Postal code: + [% patron.altcontactzipcode | html %] +
    9. + [% END %] + [% IF ( patron.altcontactcountry ) %] +
  9. + Country: + [% patron.altcontactcountry | html %] +
    10. + [% END %] + [% IF ( patron.altcontactphone ) %] +
  10. + Phone: + [% patron.altcontactphone | html %] +
    11. + [% END %] +
+
[% # /div.rows %] + [% ELSE %] +
+

Alternative contact

+ Add +
+ [% END %]
[% # /div#patron-alternative-contact %] -
- Edit -
[% # /div.yui-u %]
[% # /div.yui-g %] @@ -846,6 +906,18 @@ $("#view_restrictions").on("click",function(){ $('#debarments-tab-link').click(); }); + + $("#show-picture-upload").on("click", function(e){ + e.preventDefault(); + $(this).toggle(); + $("#picture-upload").toggle(); + }); + + $("#cancel-picture-upload").on("click", function(e){ + e.preventDefault(); + $("#picture-upload, #show-picture-upload").toggle(); + }); + }); function uncheck_sibling(me){ nodename=me.getAttribute("name"); --