X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=koha-tmpl%2Fintranet-tmpl%2Fprog%2Fen%2Fmodules%2Fmembers%2Fmembers-update.tt;h=47a5a07889f869fe1e1e79bc9b3ff40404c584a1;hb=1fcdef312be42c673d4ae017e3abe7722aba6048;hp=0e907d715e5dd1d49f69db7526315c5fb13a0e5c;hpb=1e35ea33b0a467aa063e169ab77c70a58e8cbc2a;p=koha.git

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt
index 0e907d715e..47a5a07889 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt
@@ -1,3 +1,6 @@
+[% USE Branches %]
+[% USE Categories %]
+[% USE KohaDates %]
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Koha &rsaquo; Patrons &rsaquo; Update patron records</title>
 [% INCLUDE 'doc-head-close.inc' %]
@@ -13,6 +16,7 @@
 
 [% BLOCK display_names %]
 [% SWITCH field %]
+[% CASE 'branchcode'          %]<span>Home library (branchcode)</span>
 [% CASE 'surname'             %]<span>Surname</span>
 [% CASE 'firstname'           %]<span>First name</span>
 [% CASE 'title'               %]<span>Title</span>
@@ -24,11 +28,11 @@
 [% CASE 'address2'            %]<span>Address 2</span>
 [% CASE 'city'                %]<span>City</span>
 [% CASE 'state'               %]<span>State</span>
-[% CASE 'zipcode'             %]<span>Zip code</span>
+[% CASE 'zipcode'             %]<span>ZIP/Postal code</span>
 [% CASE 'country'             %]<span>Country</span>
 [% CASE 'email'               %]<span>Email</span>
-[% CASE 'phone'               %]<span>Primary Phone</span>
-[% CASE 'mobile'              %]<span>Primary Mobile Phone</span>
+[% CASE 'phone'               %]<span>Primary phone</span>
+[% CASE 'mobile'              %]<span>Other phone</span>
 [% CASE 'fax'                 %]<span>Fax</span>
 [% CASE 'emailpro'            %]<span>Secondary email</span>
 [% CASE 'phonepro'            %]<span>Secondary phone</span>
@@ -38,7 +42,7 @@
 [% CASE 'B_address2'          %]<span>Alternate address: Address 2</span>
 [% CASE 'B_city'              %]<span>Alternate address: City</span>
 [% CASE 'B_state'             %]<span>Alternate address: State</span>
-[% CASE 'B_zipcode'           %]<span>Alternate address: Zip/postal code</span>
+[% CASE 'B_zipcode'           %]<span>Alternate address: ZIP/Postal code</span>
 [% CASE 'B_email'             %]<span>Alternate address: Email</span>
 [% CASE 'B_phone'             %]<span>Alternate address: Phone</span>
 [% CASE 'contactnote'         %]<span>Alternate address: Contact note</span>
@@ -47,8 +51,6 @@
 [% CASE 'contactfirstname'    %]<span>Contact: First name</span>
 [% CASE 'contacttitle'        %]<span>Contact: Title</span>
 [% CASE 'relationship'        %]<span>Contact: Relationship</span>
-[% CASE 'ethnicity'           %]<span>Ethnicity</span>
-[% CASE 'ethnotes'            %]<span>Ethnicity notes</span>
 [% CASE 'sex'                 %]<span>Sex</span>
 [% CASE 'altcontactfirstname' %]<span>Alternate contact: First name</span>
 [% CASE 'altcontactsurname'   %]<span>Alternate contact: Surname</span>
@@ -56,7 +58,7 @@
 [% CASE 'altcontactaddress2'  %]<span>Alternate contact: Address 2</span>
 [% CASE 'altcontactaddress3'  %]<span>Alternate contact: City</span>
 [% CASE 'altcontactstate'     %]<span>Alternate contact: State</span>
-[% CASE 'altcontactzipcode'   %]<span>Alternate contact: Zip code</span>
+[% CASE 'altcontactzipcode'   %]<span>Alternate contact: ZIP/Postal code</span>
 [% CASE 'altcontactcountry'   %]<span>Alternate contact: Country</span>
 [% CASE 'altcontactphone'     %]<span>Alternate contact: Phone</span>
 [% CASE 'smsalertnumber'      %]<span>SMS alert number</span>
@@ -77,7 +79,7 @@
                     <div id="pending_updates">
                             [% FOREACH pm IN PendingModifications %]
                                 [% SET borrowernumber = pm.borrowernumber %]
-                                <h3><a href="#panel_modify_[% pm.borrowernumber %]">[% borrowers.$borrowernumber.surname %], [% borrowers.$borrowernumber.firstname %]</a></h3>
+                                <h3><a href="#panel_modify_[% pm.borrowernumber %]">[% borrowers.$borrowernumber.surname %][% IF ( borrowers.$borrowernumber.firstname ) %], [% borrowers.$borrowernumber.firstname %][% END %] - [% Categories.GetName( borrowers.$borrowernumber.categorycode ) %] ([% Branches.GetName( borrowers.$borrowernumber.branchcode ) %]) ([% borrowers.$borrowernumber.cardnumber %])</a></h3>
                                 <div id="panel_modify_[% pm.borrowernumber %]">
                                     <div style="background-color:#E6F0F2;padding:.5em;margin:.3em 0;">
                                         <input type="radio" id="approve_modify_[% pm.borrowernumber %]" name="modify_[% pm.borrowernumber %]" value="approve" />
@@ -88,12 +90,13 @@
 
                                         <input type="radio" id="ignore_modify_[% pm.borrowernumber %]" name="modify_[% pm.borrowernumber %]" value="ignore" checked="checked"/>
                                         <label for="ignore_modify_[% pm.borrowernumber %]">Ignore</label>
+                                        | <a target="_blank" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% pm.borrowernumber %]" >Patron details</a>
                                     </div>
                                         <table>
                                             <tr>
                                                 <th>Field</th>
-                                                <th>From</th>
-                                                <th>To</th>
+                                                <th>Old value</th>
+                                                <th>New value</th>
                                             </tr>
 
 
@@ -102,8 +105,13 @@
                                                     [% IF ( ( pm.$key OR borrowers.$borrowernumber.$key ) && ( pm.$key != borrowers.$borrowernumber.$key ) ) %]
                                                         <tr>
                                                             <td>[% PROCESS display_names field = key %]</td>
-                                                            <td>[% borrowers.$borrowernumber.$key %]</td>
-                                                            <td>[% pm.$key %]</td>
+                                                            [% IF ( key == "dateofbirth" ) %]
+                                                                <td>[% borrowers.$borrowernumber.$key | $KohaDates %]</td>
+                                                                <td>[% pm.$key | $KohaDates %]</td>
+                                                            [% ELSE %]
+                                                                <td>[% borrowers.$borrowernumber.$key %]</td>
+                                                                <td>[% pm.$key %]</td>
+                                                            [% END %]
                                                         </tr>
                                                     [% END %]
                                                 [% END %]