Bug 6303: Display Organisation and Parent Organisation names when viewing a borrower...

[koha_gimpoz] / koha-tmpl / intranet-tmpl / prog / en / modules / members / moremember.tt

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 db9ae4d..cce4cd9 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
@@ -1,5 +1,11 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Patrons &rsaquo; [% IF ( unknowuser ) %]Patron does not exist[% ELSE %]Patron Details for [% firstname %] [% surname %] ([% cardnumber %])[% END %]</title>
+<title>Koha &rsaquo; Patrons &rsaquo;
+[% IF ( unknowuser ) %]
+    Patron does not exist
+[% ELSE %]
+    Patron Details for [% INCLUDE 'patron-title.inc' %]
+[% END %]
+</title>
 [% INCLUDE 'doc-head-close.inc' %]
 [% INCLUDE 'calendar.inc' %]
 <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
@@ -17,16 +23,16 @@ $(document).ready(function() {
        $.tablesorter.defaults.widgets = ['zebra'];
        $("#issuest").tablesorter({[% IF ( dateformat_metric ) %]
                dateFormat: 'uk',[% END %]
-        headers: { 1: { sorter: 'articles' }}
+        headers: { 1: { sorter: 'articles'},8:{sorter:false},9:{sorter:false }}
        }); 
        $("#relissuest").tablesorter({[% IF ( dateformat_metric ) %]
                dateFormat: 'uk',[% END %]
-               headers: { 1: { sorter: 'articles' }}
+               headers: { 1: { sorter: 'articles'},8:{sorter:false},9:{sorter:false }}
        }); 
        $("#holdst").tablesorter({[% IF ( dateformat_metric ) %]
                dateFormat: 'uk',[% END %]
                sortList: [[0,0]],
-               headers: { 1: { sorter: 'articles' },6: { sorter: false }}
+               headers: { 1: { sorter: 'articles' },5: { sorter: false }}
        }); 
     [% IF ( picture ) %]
     // new YAHOO.widget.Button("delpicture");   // FIXME: formatting mismatch between YUI and normal button
@@ -119,7 +125,7 @@ function validate1(date) {
 <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; [% IF ( unknowuser ) %]Patron does not exist[% ELSE %]Patron Details for [% firstname %] [% surname %] ([% cardnumber %])[% END %]
+&rsaquo; [% IF ( unknowuser ) %]Patron does not exist[% ELSE %]Patron Details for [% INCLUDE 'patron-title.inc' %][% END %]
 </div>
 
 <div id="doc3" class="yui-t1">
@@ -285,12 +291,12 @@ function validate1(date) {
         <th>Type</th>
         <th>Value</th>
     </tr>
-    [% FOREACH patron_attribute IN patron_attributes %]
+    [% FOREACH extendedattribute IN extendedattributes %]
     <tr>
-        <td>[% patron_attribute.code %] ([% patron_attribute.description %])</td>
-        <td>[% patron_attribute.value %]
-            [% IF ( patron_attribute.value_description ) %]
-                ([% patron_attribute.value_description %])
+        <td>[% extendedattribute.code %] ([% extendedattribute.description %])</td>
+        <td>[% extendedattribute.value %]
+            [% IF ( extendedattribute.value_description ) %]
+                ([% extendedattribute.value_description %])
             [% END %]
         </td>
     </tr>
@@ -422,6 +428,7 @@ function validate1(date) {
             <th scope="col">Title</th>
             <th scope="col">Item Type</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">Price</th>
@@ -453,6 +460,7 @@ function validate1(date) {
             <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% issueloo.biblionumber %]"><strong>[% issueloo.title |html %]</strong></a>[% IF ( issueloo.author ) %], by [% issueloo.author %][% END %] [% IF ( issueloo.publishercode ) %]; [% issueloo.publishercode %] [% END %] [% IF ( issueloo.publicationyear ) %], [% issueloo.publicationyear %][% END %] <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% issueloo.biblionumber %]&amp;itemnumber=[% issueloo.itemnumber %]#item[% issueloo.itemnumber %]">[% issueloo.barcode %]</a></td>
 <td>[% UNLESS ( noItemTypeImages ) %] [% IF ( issueloo.itemtype_image ) %]<img src="[% issueloo.itemtype_image %]" alt="" />[% END %][% END %][% issueloo.itemtype_description %]</td>
             <td>[% issueloo.issuedate %]</td>
+            <td>[% issueloo.issuingbranchname %]</td>
                <td>[% issueloo.itemcallnumber %]</td>
             <td>[% issueloo.charge %]</td>
             <td>[% issueloo.replacementprice %]</td>
@@ -529,6 +537,7 @@ function validate1(date) {
             <th scope="col">Title</th>
             <th scope="col">Item Type</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">Price</th>
@@ -559,10 +568,11 @@ function validate1(date) {
             <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% relissueloo.biblionumber %]"><strong>[% relissueloo.title |html %]</strong></a>[% IF relissueloo.author %], by [% relissueloo.author %][% END %] [% IF relissueloo.publishercode %]; [% relissueloo.publishercode %] [% END %] [% IF relissueloo.publicationyear %], [% relissueloo.publicationyear %][% END %] <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% relissueloo.biblionumber %]&amp;itemnumber=[% relissueloo.itemnumber %]#item[% relissueloo.itemnumber %]">[% relissueloo.barcode %]</a></td>
 <td>[% UNLESS ( noItemTypeImages ) %] [% IF ( relissueloo.itemtype_image ) %]<img src="[% relissueloo.itemtype_image %]" alt="" />[% END %][% END %][% relissueloo.itemtype_description %]</td>
             <td>[% relissueloo.issuedate %]</td>
+            <td>[% relissueloo.issuingbranchname %]</td>
         <td>[% relissueloo.itemcallnumber %]</td>
         <td>[% relissueloo.charge %]</td>
         <td>[% relissueloo.replacementprice %]</td>
-           <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% relissueloo.borrowernumber %]">[% relissueloo.borrowername %] ([% relissueloo.cardnumber %])</a></td>
+           <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% relissueloo.borrowernumber %]">[% relissueloo.firstname %] [% relissueloo.surname %] ([% relissueloo.cardnumber %])</a></td>
         </tr>
   [% END %]
         </tbody>