[Koha-cvs] koha koha-tmpl/intranet-tmpl/default/en/members... [rel_2_2]

[paul poulain]

CVSROOT:        /cvsroot/koha
Module name:    koha
Branch:         rel_2_2
Changes by:     paul poulain <address@hidden>   05/12/14 15:11:41

Modified files:
        koha-tmpl/intranet-tmpl/default/en/members: member.tmpl 
        members        : member.pl 

Log message:
        minor changes in the list : address under name & added sort1 / sort2, 
as it's useful for some libraries.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/member.tmpl.diff?only_with_tag=rel_2_2&tr1=1.14.2.3&tr2=1.14.2.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/members/member.pl.diff?only_with_tag=rel_2_2&tr1=1.2.2.5&tr2=1.2.2.6&r1=text&r2=text

Patches:
Index: koha/koha-tmpl/intranet-tmpl/default/en/members/member.tmpl
diff -u koha/koha-tmpl/intranet-tmpl/default/en/members/member.tmpl:1.14.2.3 
koha/koha-tmpl/intranet-tmpl/default/en/members/member.tmpl:1.14.2.4
--- koha/koha-tmpl/intranet-tmpl/default/en/members/member.tmpl:1.14.2.3        
Fri Sep  9 09:09:25 2005
+++ koha/koha-tmpl/intranet-tmpl/default/en/members/member.tmpl Wed Dec 14 
15:11:41 2005
@@ -26,10 +26,10 @@
                        <th>Name</th>
                        <th>Branch</th>
                        <th>Category</th>
-                       <th>Address</th>
                        <th>OD/Issues</th>
                        <th>Charges</th>
-                       <th>Notes</th>
+                       <th>Sort1</th>
+                       <th>Sort2</th>
                </tr>
                <!-- TMPL_LOOP NAME="resultsloop" -->
                        <!-- TMPL_IF NAME="background" -->
@@ -39,13 +39,17 @@
                        <!-- /TMPL_IF -->
                                <td><!-- TMPL_VAR NAME="count" --></td>
                                <td><!-- TMPL_VAR NAME="cardnumber" --></td>
-                               <td><a 
href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR 
NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR 
NAME="firstname" --></a></td>
+                               <td>
+                                       <p><a 
href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR 
NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="surname" -->, <b><!-- TMPL_VAR 
NAME="firstname" --></b></a></p>
+                                       <p><!-- TMPL_VAR NAME="streetaddress" 
--> <!-- TMPL_VAR NAME="city" --></p>
+                                       <p><i><!-- TMPL_VAR 
NAME="borrowernotes" --></i></p>
+                               </td>
                                <td><!-- TMPL_VAR name="branchcode" --></td>
                                <td><!-- TMPL_VAR NAME="categorycode" --></td>
-                               <td><!-- TMPL_VAR NAME="streetaddress" --> <!-- 
TMPL_VAR NAME="city" --></td>
                                <td><!-- TMPL_VAR NAME="odissue" --></td>
                                <td><!-- TMPL_VAR NAME="fines" --></td>
-                               <td><!-- TMPL_VAR NAME="borrowernotes" --></td>
+                               <td><!-- TMPL_VAR NAME="sort1" --></td>
+                               <td><!-- TMPL_VAR NAME="sort2" --></td>
                        </tr>
                <!-- /TMPL_LOOP -->
        </table>
Index: koha/members/member.pl
diff -u koha/members/member.pl:1.2.2.5 koha/members/member.pl:1.2.2.6
--- koha/members/member.pl:1.2.2.5      Fri Sep  9 09:09:25 2005
+++ koha/members/member.pl      Wed Dec 14 15:11:41 2005
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: member.pl,v 1.2.2.5 2005/09/09 09:09:25 tipaul Exp $
+# $Id: member.pl,v 1.2.2.6 2005/12/14 15:11:41 tipaul Exp $
 
 #script to do a borrower enquiery/brin up borrower details etc
 #written 20/12/99 by address@hidden
@@ -100,7 +100,10 @@
         branchcode => $results->[$i]{'branchcode'},
         odissue => "$od/$issue",
         fines => $fines,
-        borrowernotes => $results->[$i]{'borrowernotes'});
+        borrowernotes => $results->[$i]{'borrowernotes'},
+        sort1 => $results->[$i]{'sort1'},
+        sort2 => $results->[$i]{'sort2'},
+        );
   if ( $background ) { $background = 0; } else {$background = 1; }
   push(@resultsdata, \%row);
 }