Bug 28576: Add patron image in patron detail section does not specify image size...
[srvgit] / koha-tmpl / intranet-tmpl / prog / en / modules / members / moremember.tt
index 5d538d1..f3d0822 100644 (file)
@@ -1,43 +1,60 @@
 [% USE raw %]
 [% USE Asset %]
+[% USE Context %]
 [% USE Koha %]
 [% USE Branches %]
+[% USE ItemTypes %]
 [% USE KohaDates %]
 [% USE AuthorisedValues %]
-[% USE ColumnsSettings %]
+[% USE TablesSettings %]
+[% USE Price %]
+[% PROCESS 'member-display-address-style.inc' %]
+[% PROCESS 'member-display-alt-address-style.inc' %]
 [% SET footerjs = 1 %]
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Patrons &rsaquo;
+[% Asset.css("lib/jquery/plugins/rowGroup/stylesheets/rowGroup.dataTables.min.css") | $raw %]
+<title>
     [% UNLESS blocking_error %]
         Patron details for [% INCLUDE 'patron-title.inc' no_html = 1 %]
-    [% END %]
+    [% END %] &rsaquo; Patrons &rsaquo; Koha
 </title>
 [% INCLUDE 'doc-head-close.inc' %]
-[% Asset.css("css/datatables.css") | $raw %]
-<style>
-    input[type="file"] { display: inline-block; }
-    .patroninfo-section { padding: .5em; margin: .5em; }
-    .patroninfo-section .rows { padding: .5em; }
-    .patroninfo-heading { background-color: rgba(237, 244, 246, .4); padding: .5em; margin-bottom: .3em; clear:both;}
-    .patroninfo-heading h3 { display: inline-block; }
-    .patroninfo-heading .btn { float: right; }
-</style>
 </head>
 
 <body id="pat_moremember" class="pat">
     [% INCLUDE 'header.inc' %]
     [% INCLUDE 'patron-search.inc' %]
 
-    <div id="breadcrumbs">
-        <a href="/cgi-bin/koha/mainpage.pl">Home</a>
-        &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>
-        &rsaquo; [% UNLESS blocking_error %]Patron details for [% INCLUDE 'patron-title.inc' %][% END %]
-    </div>
+    <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
+        <ol>
+            <li>
+                <a href="/cgi-bin/koha/mainpage.pl">Home</a>
+            </li>
+
+            [% IF blocking_error %]
+                <li>
+                    <a href="#" aria-current="page">
+                        Patrons
+                    </a>
+                </li>
+            [% ELSE %]
+                <li>
+                    <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>
+                </li>
+                <li>
+                    <a href="#" aria-current="page">
+                        Patron details for [% INCLUDE 'patron-title.inc' %]
+                    </a>
+                </li>
+            [% END %]
+        </ol>
+    </nav>
+
+    <div class="main container-fluid">
+        <div class="row">
+            <div class="col-sm-10 col-sm-push-2">
+                <main>
 
-    <div id="doc3" class="yui-t2">
-        <div id="bd">
-            <div id="yui-main">
-                <div class="yui-b">
 
                     [% INCLUDE 'members-toolbar.inc' %]
 
                                 <h3>Unable to delete patrons from other libraries with current settings</h3>
                                 <p>Insufficient privileges.</p>
                             [% END %]
+                            [% IF ( error == 'CANT_DELETE_ANONYMOUS_PATRON' ) %]
+                                <h3>Unable to delete patron that is set as AnonymousPatron</h3>
+                                <p>This patron cannot be deleted while set as AnonymousPatron in the system preferences.</p>
+                            [% END %]
                             [% IF ( error == 'CANT_DELETE' ) %]
                                 <h3>Unable to delete patron</h3>
                                 <p>Insufficient privileges.</p>
                         </div>
                     [% END %]
 
-                    <div class="yui-g">
+                    <div class="row">
+
+                        <h3>
+                            [% UNLESS ( I ) %]
+                                [% patron.title | html %] [% patron.firstname | html %]
+                            [% END %]
+                            [% patron.surname | html %] ([% patron.cardnumber | html %])
+                        </h3>
 
                         [% IF ( was_renewed ) %]
                             <div class="dialog message">
                             </div>
                         [% END %]
 
-                        [% IF fines %]
-                            <div id="circmessages" class="circmessage attention">
-                                <ul>
-                                    [% INCLUDE 'blocked-fines.inc' %]
-                                </ul>
-                            </div>
-                        [% END %]
-
-                        [% IF ( patron_messages ) %]
-                            <div id="messages" class="circmessage">
-                                <h4>Messages:</h4>
-                                <ul>
-                                    [% FOREACH patron_message IN patron_messages %]
-                                        <li>
-                                            [% IF(patron_message.message_type == "L") %]
-                                                <span class="circ-hlt">
-                                            [% ELSE %]
-                                                <span>
-                                            [% END %]
-                                                [% patron_message.message_date | $KohaDates %]
-                                                [% Branches.GetName( patron_message.branchcode ) | html %]
-                                                [% IF patron_message.manager_id %]
-                                                    ( <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron_message.manager_id | uri %]">[% patron_message.get_column('manager_firstname') | html %] [% patron_message.get_column('manager_surname') | html %]</a> )
-                                                [% END %]
-                                                <i>"[% patron_message.message | html %]"</i>
-                                            </span>
-                                            [% IF patron_message.branchcode == branchcode OR Koha.Preference('AllowAllMessageDeletion') %]
-                                                <a class="btn btn-link btn-sm" href="/cgi-bin/koha/circ/del_message.pl?message_id=[% patron_message.message_id | html %]&amp;borrowernumber=[% patron_message.borrowernumber | html %]&amp;from=moremember" onclick="return confirm(MSG_CONFIRM_DELETE_MESSAGE);"><i class="fa fa-trash"></i> Delete</a>
-                                            [% END %]
-                                        </li>
-                                    [% END %]
-                                </ul>
-                                <a id="addnewmessageLabel" href="#add_message_form" class="btn btn-link btn-sm" data-toggle="modal"><i class="fa fa-plus"></i> Add a new message</a>
-                            </div>
-                        [% END %]
+                        <div id="patron_messages" class="circmessage attention">
+                            [% INCLUDE 'patron_messages.inc' %]
+                        </div>
 
-                        [% IF ( flagged ) %]
-                            <div id="circmessages" class="circmessage attention">
-                                <ul>
-                                    [% IF ( userdebarred ) %]
-                                        <li class="blocker">Patron's account is restricted
-                                            [% IF ( userdebarreddate ) %]
-                                                until [% userdebarreddate | html %]
-                                            [% END %]
-
-                                            [% IF ( debarredcomment ) %]
-                                                with the explanation: <i>
-                                                [% IF debarredcomment.search('OVERDUES_PROCESS') %]
-                                                    Restriction added by overdues process [% debarredcomment.remove('OVERDUES_PROCESS ') | html_line_break %]
-                                                [% ELSE %]
-                                                    [% debarredcomment | html_line_break %]
-                                                [% END %]
-                                                </i>
-                                            [% END %]
-                                            <a href="#reldebarments" id="view_restrictions">View restrictions</a>
-                                        </li>
-                                    [% END %]
-                                    [% IF ( patron.gonenoaddress ) %]
-                                        <li class="blocker">Patron's address is in doubt.</li>
-                                    [% END %]
-                                    [% IF ( lost ) %]
-                                        <li class="blocker">Patron's card has been reported lost.</li>
-                                    [% END %]
-                                </ul>
-                            </div>
-                        [% END %]
-
-                        <h3>
-                            [% UNLESS ( I ) %]
-                                [% patron.title | html %] [% patron.firstname | html %]
-                            [% END %]
-                            [% patron.surname | html %] ([% patron.cardnumber | html %])
-                        </h3>
-                        <div class="yui-u first">
+                        <div class="col-sm-6">
 
                             <div id="patron-information" class="patroninfo-section">
 
 
                                 <div class="address">
                                     <ul>
-                                        [% IF Koha.Preference( 'AddressFormat' ) %]
-                                            [% INCLUDE "member-display-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
-                                        [% ELSE %]
-                                            [% INCLUDE 'member-display-address-style-us.inc' %]
-                                        [% END %]
+                                        [% PROCESS 'display-address-style' %]
                                     </ul>
                                 </div>
 
                                             [% IF ( patron.dateofbirth ) %]
                                                 <li>
                                                     <span class="label">Date of birth:</span>
-                                                    [% patron.dateofbirth | $KohaDates %] ([% age | html %] years)
+                                                    [% INCLUDE 'patron-age.inc' %]
                                                 </li>
                                             [% END %]
                                             [% IF ( patron.sex ) %]
                                                 <li>
                                                     <span class="label">Gender:</span>
-                                                    [% IF ( patron.sex == 'F' ) %]Female[% ELSIF ( patron.sex == 'M' ) %]Male[% ELSE %][% patron.sex | html %][% END %]
+                                                    [% IF ( patron.sex == 'F' ) %]<span class="patronsex-female">Female</span>[% ELSIF ( patron.sex == 'M' ) %]<span class="patronsex-male">Male</span>[% ELSIF (patron.sex == 'O' ) %]<span class="patronsex-other">Other</span>[% ELSE %][% patron.sex | html %][% END %]
                                                 </li>
                                             [% END %]
                                         [% END %]
+                                         <li id="patron-privacyguarantor">
+                                            <span class="label">Show checkouts to guarantor</span>
+                                            [% IF patron.privacy_guarantor_checkouts %]
+                                                Yes
+                                            [% ELSE %]
+                                                No
+                                            [% END %]
+                                        </li>
+
+                                        <li id="patron-privacy_guarantor_fines">
+                                            <span class="label">Show fines to guarantor</span>
+                                            [% IF patron.privacy_guarantor_fines %]
+                                                Yes
+                                            [% ELSE %]
+                                                No
+                                            [% END %]
+                                        </li>
+
                                         [% IF guarantees %]
                                             <li>
                                                 <span class="label">Guarantees:</span>
                                                     [% END %]
                                                 </ul>
                                             </li>
-                                        [% ELSIF guarantor %]
-                                            <li>
-                                                <span class="label">Guarantor:</span>
-                                                [% IF guarantor.borrowernumber AND logged_in_user.can_see_patron_infos( guarantor ) %]
-                                                    <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantor.borrowernumber | uri %]">[% guarantor.firstname | html %] [% guarantor.surname | html %]</a>
+                                        [% ELSIF guarantor_relationships.count > 0 OR ( patron.contactfirstname OR patron.contactname ) %]
+                                                <li>
+                                                [% IF guarantor_relationships.count > 1 OR guarantor_relationships.count == 0 AND ( patron.contactfirstname OR patron.contactname ) %]
+                                                    <span class="label">Guarantors:</span>
                                                 [% ELSE %]
-                                                    [% guarantor.firstname | html %] [% guarantor.surname | html %]
+                                                    <span class="label">Guarantor:</span>
+                                                [% END %]
+                                                    <ul>
+                                                    [% FOREACH gr IN guarantor_relationships %]
+                                                        [% SET guarantor = gr.guarantor %]
+                                                        [% IF logged_in_user.can_see_patron_infos( guarantor ) %]
+                                                            <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantor.id | uri %]">[% guarantor.firstname | html %] [% guarantor.surname | html %][% IF gr.relationship %] ([% gr.relationship | html %])[% END %]</a></li>
+                                                        [% END %]
+                                                    [% END %]
+                                                    [% IF patron.contactfirstname OR patron.contactname %]
+                                                        <li>[% patron.contactfirstname | html %] [% patron.contactname | html %][% IF patron.relationship %] ([% patron.relationship | html %])[% END %]</li>
+                                                    [% END %]
+                                                    </ul>
+                                                </li>
+                                        [% END %]
+
+                                        [% IF ( patron.primary_contact_method ) %]
+                                            <li>
+                                                <span class="label">Main contact method: </span>
+                                                [% SWITCH patron.primary_contact_method %]
+                                                    [% CASE 'phone' %]
+                                                        Primary phone
+                                                    [% CASE 'phonepro' %]
+                                                        Secondary phone
+                                                    [% CASE 'mobile' %]
+                                                        Other phone
+                                                    [% CASE 'email' %]
+                                                        Primary email
+                                                    [% CASE 'emailpro' %]
+                                                        Secondary email
+                                                    [% CASE 'fax' %]
+                                                        Fax
                                                 [% END %]
                                             </li>
                                         [% END %]
                                         [% END %]
                                         <form method="post" id="picture-upload" style="display:none;" action="/cgi-bin/koha/tools/picture-upload.pl" enctype="multipart/form-data">
                                             [% IF ( patron.image ) %]
-                                                <div class="hint">To update the image for [% patron.title | html %] [% patron.surname | html %], select a new image file and click 'Upload.' <br />Click the 'Delete' button to remove the current image.</div>
+                                                <div class="hint">To update the image for [% patron.title | html %] [% patron.firstname | html %] [% patron.surname | html %], select a new image file and click 'Upload.' <br />Click the 'Delete' button to remove the current image.</div>
                                             [% ELSE %]
-                                                <div class="hint">[% patron.title | html %] [% patron.firstname | html %] [% patron.surname | html %] does not currently have an image available. To import an image for [% patron.title | html %] [% patron.surname | html %], enter the name of an image file to upload.</div>
+                                                <div class="hint">[% patron.title | html %] [% patron.firstname | html %] [% patron.surname | html %] does not currently have an image available. To import an image for [% patron.title | html %] [% patron.firstname | html %] [% patron.surname | html %], enter the name of an image file to upload.</div>
                                             [% END %]
-                                            <p>Only PNG, GIF, JPEG, XPM formats are supported.</p>
+                                            <p>Only PNG, GIF, JPEG, XPM formats are supported. Maximum image size is 500KB.</p>
                                             <label for="uploadfile">Select the file to upload: </label>
                                             <input type="file" id="uploadfile" name="uploadfile" required="required" />
                                             <div class="action">
                                 </div> [% #/ div#houseboundroles %]
                             [% END %]
 
-                            [% IF ( ExtendedPatronAttributes ) %]
+                            [% IF Koha.Preference('ExtendedPatronAttributes') %]
                                 [% UNLESS ( no_patron_attribute_types ) %]
                                     <div id="patron-extended-attributes" class="patroninfo-section">
                                         [% IF ( attributes_loop ) %]
                                                     <ol>
                                                         [% FOREACH item IN attribute.items %]
                                                             <li>
-                                                                <span class="label">[% item.description | html %]: </span>
-                                                                [% IF ( item.value_description ) %]
-                                                                    [% item.value_description | html %]
-                                                                [% ELSE %]
-                                                                    [% item.value| html | html_line_break %]
-                                                                [% END %]
+                                                                <span class="label">[% item.type.description | html %]: </span>
+                                                                [% item.description | html_line_break %]
                                                             </li>
                                                         [% END %]
                                                     </ol>
                                         <a class="btn btn-default btn-xs" href="memberentry.pl?op=modify&amp;borrowernumber=[% patron.borrowernumber | html %]&amp;step=5"><i class="fa fa-pencil"></i> Edit</a>
                                     </div>
                                     [% INCLUDE 'messaging-preference-form.inc' %]
-                                    [% IF ( SMSSendDriver ) %]
+                                    [% IF Koha.Preference('SMSSendDriver') %]
                                         <div class="rows">
                                             <ol>
                                                 <li>
                                                     <span class="label">SMS number:</span>
                                                     <a href="sms:[% patron.smsalertnumber | uri %]">[% patron.smsalertnumber | html %]</a>
                                                 </li>
+                                                <li>
+                                                    <span class="label">SMS provider:</span>
+                                                    [% patron.sms_provider.name | html %]
+                                                </li>
                                             </ol>
                                         </div>
                                     [% END %]
                                 </div> [% # /div#patron-messaging-prefs %]
                             [% END %]
 
-                        </div> [% # /div.yui-u.first %]
+                        </div> <!-- /.col-sm-6 -->
 
-                        <div class="yui-u">
+                        <div class="col-sm-6">
                             <div id="patron-library-details" class="patroninfo-section">
                                 <div class="patroninfo-heading">
                                     <h3>Library use</h3>
                                             <span class="label">Expiration date: </span>
                                             [% IF ( was_renewed ) %]
                                                 <strong class="reregistrinfo">[% patron.dateexpiry | $KohaDates %]</strong>
+                                            [% ELSIF ( patron.is_expired ) %]
+                                                <span class="blocker">
+                                                    [% patron.dateexpiry | $KohaDates %]
+                                                    <strong><em>Expired</em></strong>
+                                                    <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% patron.borrowernumber | uri %]&amp;reregistration=y">Renew</a> or <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;borrowernumber=[% patron.borrowernumber | html %]">Edit details</a>
+                                                </span>
+                                            [% ELSIF ( patron.is_going_to_expire ) %]
+                                                [% patron.dateexpiry | $KohaDates %]
+                                                <strong><em>Patron expires soon</em></strong>
+                                                <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% patron.borrowernumber | uri %]&amp;reregistration=y">Renew</a> or <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;borrowernumber=[% patron.borrowernumber | html %]">Edit details</a>
                                             [% ELSE %]
                                                 [% patron.dateexpiry | $KohaDates %]
                                             [% END %]
                                         </li>
                                         <li id="patron-branchname">
                                             <span class="label">Library: </span>
-                                            [% branchname | html %]
+                                            [% Branches.GetName( patron.branchcode ) | html %]
                                         </li>
 
-                                        [% IF ( OPACPrivacy ) %]
+                                        [% IF Koha.Preference( 'OPACPrivacy') %]
                                             <li id="patron-privacypref">
-                                                <span class="label">Privacy Pref:</span>
-                                                    [% IF ( privacy0 ) %]Forever[% END %]
-                                                    [% IF ( privacy1 ) %]Default[% END %]
-                                                    [% IF ( privacy2 ) %]Never[% END %]
+                                                <span class="label">Privacy pref:</span>
+                                                    [% IF ( patron.privacy == 0 ) %]Forever[% END %]
+                                                    [% IF ( patron.privacy == 1 ) %]Default[% END %]
+                                                    [% IF ( patron.privacy == 2 ) %]Never[% END %]
                                             </li>
                                         [% END %]
 
-                                        <li id="patron-privacyguarantor">
-                                            <span class="label">Show checkouts to guarantor</span>
-                                            [% IF privacy_guarantor_checkouts %]
-                                                Yes
-                                            [% ELSE %]
-                                                No
-                                            [% END %]
-                                        </li>
-
                                         [% IF ( patron.sort1 ) %]
                                             <li id="patron-sort1">
                                                 <span class="label">Sort field 1:</span>
                                                 [% AuthorisedValues.GetByCode('Bsort2', patron.sort2) | html %]
                                             </li>
                                         [% END %]
+                                        [% UNLESS ( patron.autorenew_checkouts ) %]
+                                            <li id="patron-autorenew_checkouts">
+                                                <span class="label">Auto-renewal:</span>
+                                                Patron has opted out
+                                            </li>
+                                        [% END %]
                                         <li id="patron-username">
                                             <span class="label">Username: </span>
                                             [% patron.userid | html %]
                                             [% IF ( patron.password ) %]
                                                 *******
                                             [% ELSE %]
-                                                <span class="problem"><a href="/cgi-bin/koha/members/member-password.pl?member=[% patron.borrowernumber | uri %]">Undefined</a></span>
+                                                <i class="fa fa-exclamation-circle problem" aria-hidden="true"></i> <a href="/cgi-bin/koha/members/member-password.pl?member=[% patron.borrowernumber | uri %]">Undefined</a>
                                             [% END %]
                                         </li>
 
                                         [% IF ( patron.borrowernotes ) %]
                                             <li id="patron-borrowernotes">
-                                                <span class="label">Circulation note: </span>
-                                                [% patron.borrowernotes | html %]
+                                                <span class="label">Circulation note: </span><br />
+                                                [% patron.borrowernotes | $raw | html_line_break %]
                                             </li>
                                         [% END %]
 
                                         [% IF ( patron.opacnote ) %]
                                             <li id="patron-opacnote">
-                                                <span class="label">OPAC note:</span>
-                                                [% patron.opacnote | html %]
+                                                <span class="label">OPAC note:</span><br />
+                                                [% patron.opacnote | html | html_line_break %]
                                             </li>
                                         [% END %]
 
                                     </div>
                                     <div class="address">
                                         <ul>
-                                            [% IF Koha.Preference( 'AddressFormat' ) %]
-                                                [% INCLUDE "member-display-alt-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
-                                            [% ELSE %]
-                                                [% INCLUDE 'member-display-alt-address-style-us.inc' %]
-                                            [% END %]
+                                            [% PROCESS 'display-alt-address-style' %]
                                         </ul>
                                     </div>
                                     <div class="rows">
                                             [% IF ( patron.B_email ) %]
                                                 <li id="patron-bemail" class="email">
                                                     <span class="label">Email: </span>
-                                                    <a title="[% patron.B_email | html %]" href="mailto:[% patron.B_email | url %]">[% B_email |html %]</a>
+                                                    <a title="[% patron.B_email | html %]" href="mailto:[% patron.B_email | url %]">[% patron.B_email |html %]</a>
                                                 </li>
                                             [% END %]
 
                                     </div>
                                 [% END %]
                             </div> [% # /div#patron-alternative-contact %]
-                        </div> [% # /div.yui-u %]
-                    </div> [% # /div.yui-g %]
+
+                            [% IF Koha.Preference('EnableBorrowerFiles') %]
+                                <div id="patron-files" class="patroninfo-section">
+                                    <div class="patroninfo-heading">
+                                        <h3>Files</h3>
+                                        <a class="btn btn-default btn-xs" href="/cgi-bin/koha/members/files.pl?borrowernumber=[% patron.borrowernumber | uri %]"><i class="fa fa-list"></i> Manage</a>
+
+                                        [% IF ( files ) %]
+                                            <div class="rows">
+                                                <ol>
+                                                    [% FOREACH f IN files %]
+                                                        <li>
+                                                            <a href="/cgi-bin/koha/members/files.pl?borrowernumber=[% patron.borrowernumber | uri %]&amp;op=download&amp;file_id=[% f.file_id | uri %]">[% f.file_name | html %]</a>
+                                                            [% IF ( f.file_description ) %]
+                                                                - [% f.file_description | html %]
+                                                            [% END %]
+                                                        </li>
+                                                    [% END # /FOREACH f %]
+                                                </ol>
+                                            </div>
+                                        [% END # /IF files %]
+
+                                    </div> <!-- /.patroninfo-heading -->
+                                </div> <!-- /#patron-files -->
+                            [% END # /IF EnableBorrowerFiles %]
+
+                        </div> <!-- /div.col-sm-6 -->
+                    </div> <!-- /div.row -->
 
                     <div id="finesholdsissues" class="toptabs">
                         <ul>
                             </li>
                             [% IF relatives_issues_count %]
                                 <li>
-                                    <a href="#relatives-issues" id="relatives-issues-tab">Relatives' checkouts</a>
+                                    <a href="#relatives-issues" id="relatives-issues-tab">[% relatives_issues_count | html %] Relatives' checkouts</a>
+                                </li>
+                            [% END %]
+                            [% IF ( fines ) %]
+                                <li id="finestab">
+                                    <a href="#finesandcharges">Charges ([% fines | $Price %])</a>
                                 </li>
                             [% END %]
-                            <li>
-                                <a href="#finesandcharges">Fines &amp; Charges</a>
-                            </li>
                             [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
                                 <li>
                                     [% IF ( holds_count ) %]
                                 </li>
                             [% END %]
                             [% IF Koha.Preference('ArticleRequests') %]
+                                [% SET article_requests = Context.Scalar( Context.Scalar( patron, 'article_requests' ), 'filter_by_current') %]
                                 <li>
-                                    <a href="#article-requests" id="article-requests-tab"> [% patron.article_requests_current.count | html %] Article requests</a>
+                                    <a href="#article-requests" id="article-requests-tab"> [% article_requests.count | html %] Article requests</a>
                                 </li>
                             [% END %]
+
+                            [% IF Koha.Preference('ClaimReturnedLostValue') %]
+                                <li>
+                                    [% IF ( patron.return_claims.count ) %]
+                                        <a href="#return-claims" id="return-claims-tab">
+                                            Claim(s)
+                                            [% IF patron.return_claims.resolved.count == 0 %]
+                                                <span title="Resolved claims" class="label label-default" id="return-claims-count-resolved">[% patron.return_claims.resolved.count | html %]</span>
+                                            [% ELSE %]
+                                                <span title="Resolved claims" class="label label-success" id="return-claims-count-resolved">[% patron.return_claims.resolved.count | html %]</span>
+                                            [% END %]
+                                            [% IF patron.return_claims.unresolved.count == 0 %]
+                                                <span title="Unresolved claims" class="label label-default" id="return-claims-count-unresolved">[% patron.return_claims.unresolved.count | html %]</span>
+                                            [% ELSE %]
+                                                <span title="Unresolved claims" class="label label-warning" id="return-claims-count-unresolved">[% patron.return_claims.unresolved.count | html %]</span>
+                                            [% END %]
+
+                                        </a>
+                                    [% ELSE %]
+                                        <a href="#return-claims" id="return-claims-tab">
+                                            Claim(s)
+                                            <span title="Resolved claims" class="label label-default" id="return-claims-count-resolved">0</span>
+                                            <span title="Unresolved claims" class="label label-default" id="return-claims-count-unresolved">0</span>
+                                        </a>
+                                    [% END %]
+                                </li>
+                            [% END %]
+
                             <li>
                                 <a id="debarments-tab-link" href="#reldebarments">[% debarments.size | html %] Restrictions</a>
                             </li>
-                            [% SET enrollments = patron.get_club_enrollments(1) %]
-                            [% SET enrollable  = patron.get_enrollable_clubs(0,1) %]
+                            [% SET enrollments = patron.get_club_enrollments %]
+                            [% SET enrollable  = patron.get_enrollable_clubs(0) %] <!-- 0 => not OPAC -->
                             [% IF CAN_user_clubs && ( enrollable.count || enrollments.count ) %]
                                 <li>
                                     <a id="clubs-tab-link" href="#clubs-tab">
 
                         [% INCLUDE "checkouts-table.inc" %]
 
-                        [% IF ( relatives_issues_count ) %]
-                            <div id="relatives-issues">
-                                <table id="relatives-issues-table" style="width: 100% !Important;">
-                                    <thead>
-                                        <tr>
-                                            <th scope="col">Due date hidden not formatted</th>
-                                            <th scope="col">Due date</th>
-                                            <th scope="col">Title</th>
-                                            <th scope="col">Item type</th>
-                                            <th scope="col">Location</th>
-                                            <th scope="col">Checked out on</th>
-                                            <th scope="col">Checked out from</th>
-                                            <th scope="col">Call no</th>
-                                            <th scope="col">Charge</th>
-                                            <th scope="col">Fine</th>
-                                            <th scope="col">Price</th>
-                                            <th scope="col">Patron</th>
-                                        </tr>
-                                    </thead>
-                                </table>
+                        [% INCLUDE "relatives-issues-table.inc" %]
+
+                        [% IF ( fines ) %]
+                            <div id="finesandcharges">
+                                [% IF ( fines ) %]
+                                    <p>Total due: [% fines | $Price %]</p>
+                                [% ELSE %]
+                                    <p>No outstanding charges</p>
+                                [% END %]
                             </div>
                         [% END %]
 
-                        <div id="finesandcharges">
-                            [% IF ( totaldue_raw ) %]
-                                <p>Total due: [% totaldue | html %]</p>
-                            [% ELSE %]
-                                <p>No outstanding charges</p>
-                            [% END %]
-                        </div>
-
                         [% IF CAN_user_clubs && ( enrollments.count || enrollable.count ) %]
                             <div id="clubs-tab">
                                 Loading...
                                                     <th>Priority</th>
                                                     <th>Delete?</th>
                                                     <th>Suspend?</th>
+                                                    <th>Status</th>
                                                 </tr>
                                             </thead>
                                         </table>
 
                                         <fieldset class="action">
                                             <input type="submit" class="cancel" name="submit" value="Cancel marked holds" />
+
+                                            [% SET hold_cancellation = AuthorisedValues.GetAuthValueDropbox('HOLD_CANCELLATION') %]
+                                            [% IF hold_cancellation %]
+                                                <label for="cancellation-reason">Cancellation reason:</label>
+                                                <select name="cancellation-reason">
+                                                    <option value="">No reason given</option>
+                                                    [% FOREACH reason IN hold_cancellation %]
+                                                        <option value="[% reason.authorised_value | html %]">[% reason.lib | html %]</option>
+                                                    [% END %]
+                                                </select>
+                                            [% END %]
                                         </fieldset>
                                     </form>
 
 
                                                 [% IF Koha.Preference('AutoResumeSuspendedHolds') %]
                                                     <label for="suspend_until">until</label>
-                                                    <input type="text" size="10" id="suspend_until" name="suspend_until" class="datepicker"/>
+                                                    <input type="text" size="10" id="suspend_until" name="suspend_until" class="flatpickr" data-flatpickr-futuredate="true"/>
                                                     <span class="hint">Specify date on which to resume [% INCLUDE 'date-format.inc' %]: </span>
                                                 [% END %]
                                             </fieldset>
                             </div> [% # /div#reserves %]
                         [% END %]
 
+                        [% IF Koha.Preference('ClaimReturnedLostValue') %]
+                            [% INCLUDE 'patron-return-claims.inc' %]
+                        [% END %]
+
                         [% IF Koha.Preference('ArticleRequests') %]
                             [% INCLUDE 'patron-article-requests.inc' %]
                         [% END %]
 
-                    </div> [% # /div#finesholdsissues %]
-                </div> [% # /div.yui-b %]
-            </div> [% # /div#yui-main %]
+                    </div> <!-- /div#finesholdsissues -->
+                </main>
+            </div> <!-- /.col-sm-10.col-sm-push-2 -->
 
-            <div class="yui-b">
-                [% INCLUDE 'circ-menu.inc' %]
-            </div>
-        </div> [% # /div#bd %]
+            <div class="col-sm-2 col-sm-pull-10">
+                <aside>
+                    [% INCLUDE 'circ-menu.inc' %]
+                </aside>
+            </div> <!-- /.col-sm-2.col-sm-pull-10 -->
+        </div> <!-- /.row -->
 
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'datatables.inc' %]
+    [% Asset.js("lib/jquery/plugins/rowGroup/dataTables.rowGroup.min.js") | $raw %]
     [% INCLUDE 'columns_settings.inc' %]
-    [% INCLUDE 'strings.inc' %]
-    [% INCLUDE 'calendar.inc' %]
-    [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") | $raw %]
     [% Asset.js("lib/jquery/plugins/jquery-ui-timepicker-addon.min.js") | $raw %]
     [% INCLUDE 'timepicker.inc' %]
-    [% Asset.js("lib/jquery/plugins/jquery.dataTables.rowGrouping.js") | $raw %]
-    [% Asset.js("js/pages/circulation.js") | $raw %]
-    [% Asset.js("js/checkouts.js") | $raw %]
-    [% Asset.js("js/holds.js") | $raw %]
-    [% INCLUDE 'str/members-menu.inc' %]
-    [% Asset.js("js/members-menu.js") | $raw %]
-    [% Asset.js("js/messaging-preference-form.js") | $raw %]
+    [% INCLUDE 'select2.inc' %]
+    [% INCLUDE 'js-date-format.inc' %]
     <script>
         /* Set some variable needed in circulation.js */
+        var logged_in_user_borrowernumber = "[% logged_in_user.borrowernumber | html %]";
+        var ClaimReturnedLostValue = "[% Koha.Preference('ClaimReturnedLostValue') | html %]";
+        var ClaimReturnedChargeFee = "[% Koha.Preference('ClaimReturnedChargeFee') | html %]";
+        var ClaimReturnedWarningThreshold = "[% Koha.Preference('ClaimReturnedWarningThreshold') | html %]";
+        var UnseenRenewals = "[% Koha.Preference('UnseenRenewals') | html %]";
         var interface = "[% interface | html %]";
         var theme = "[% theme | html %]";
         var borrowernumber = "[% patron.borrowernumber | html %]";
         var exports_enabled = "[% Koha.Preference('ExportCircHistory') | html %]";
         var AllowCirculate = [% (CAN_user_circulate_circulate_remaining_permissions)? 1 : 0 | html %]
         var AllowRenewalLimitOverride = [% (CAN_user_circulate_override_renewals && Koha.Preference('AllowRenewalLimitOverride') )? 1: 0 | html %];
+        var AllowRenewalOnHoldOverride = [% (CAN_user_circulate_override_renewals && Koha.Preference('AllowRenewalOnHoldOverride') )? 1: 0 | html %];
         var script = "moremember";
         var relatives_borrowernumbers = new Array();
         [% FOREACH b IN relatives_borrowernumbers %]
             relatives_borrowernumbers.push("[% b | html %]");
         [% END %]
+        var SuspendHoldsIntranet = [% ( Koha.Preference('SuspendHoldsIntranet') ) ? 1 : 0 | html %];
+    </script>
+    [% Asset.js("js/pages/circulation.js") | $raw %]
+    [% Asset.js("js/checkouts.js") | $raw %]
+    [% Asset.js("js/holds.js") | $raw %]
+    [% INCLUDE 'calendar.inc' %]
+    [% INCLUDE 'str/members-menu.inc' %]
+    [% Asset.js("js/members-menu.js") | $raw %]
+    <script>
 
-        var MSG_EXPORT_SELECT_CHECKOUTS = _("You must select checkout(s) to export");
-        var MSG_CONFIRM_DELETE_MESSAGE = _("Are you sure you want to delete this message? This cannot be undone.");
-
-        columns_settings_issues_table = [% ColumnsSettings.GetColumns( 'members', 'moremember', 'issues-table', 'json' ) | $raw %]
+        columns_settings_issues_table = [% TablesSettings.GetColumns( 'members', 'moremember', 'issues-table', 'json' ) | $raw %]
 
         $(document).ready(function() {
+            $("#info_digests").tooltip();
+
             if ( $('#clubs-tab').length ) {
                 $('#clubs-tab-link').on('click', function() {
                     $('#clubs-tab').text(_("Loading..."));
-                    $('#clubs-tab').load('/cgi-bin/koha/clubs/patron-clubs-tab.pl?borrowernumber=[% borrowernumber | html %]');
+                    $('#clubs-tab').load('/cgi-bin/koha/clubs/patron-clubs-tab.pl?borrowernumber=[% patron.borrowernumber | html %]');
                 });
             }
 
                     $('#'+ui.newTab.context.id).click();
                 }
             } );
-            $("#holdst").dataTable($.extend(true, {}, dataTablesDefaults, {
-                "sDom": 't',
-                "aoColumnDefs": [
-                    { "aTargets": [ -1,-2 ], "bSortable": false, "bSearchable": false }
-                ],
-                "aoColumns": [
-                    { "sType": "title-string" },{ "sType": "anti-the" },null,null,null,null,null,null
-                ],
-                "bPaginate": false
-            }));
-            [% IF ( patron.image ) %]
-                $('#delpicture').click(function(){
-                     return confirm(_("Are you sure you want to delete this patron image? This cannot be undone."));
-                });
-                $('#manage-patron-image').find("input[value*=Upload]").click(function(){
-                    if($("#uploadfile").val() == ""){
-                        alert(_("Please choose a file to upload"));
-                        return false;
-                    }
-                    return confirm(_("Are you sure you want to replace the current patron image? This cannot be undone."));
-                });
-            [% END %]
-
-            $("#suspend_until").datepicker({
-                onClose: function(dateText, inst) {
-                    validate_date(dateText, inst);
-                },
-                minDate: 1, // require that hold suspended until date is after today
-            }).on("change", function(e, value) {
-                if ( ! is_valid_date( $(this).val() ) ) {$(this).val("");}
-            });
 
             $("#view_restrictions").on("click",function(){
                 $('#debarments-tab-link').click();
                }
             }
         }
-
-        function validate1(date) {
-            var today = new Date();
-            if ( date < today ) {
-                return true;
-            } else {
-                return false;
-            }
-        };
     </script>
 [% END %]