[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Koha-cvs] koha C4/Members.pm koha-tmpl/intranet-tmpl/prog... [rel_3_0]
|
From: |
Bruno Toumi |
|
Subject: |
[Koha-cvs] koha C4/Members.pm koha-tmpl/intranet-tmpl/prog... [rel_3_0] |
|
Date: |
Wed, 06 Dec 2006 14:05:35 +0000 |
CVSROOT: /sources/koha
Module name: koha
Branch: rel_3_0
Changes by: Bruno Toumi <btoumi> 06/12/06 14:05:35
Modified files:
C4 : Members.pm
koha-tmpl/intranet-tmpl/prog/en/members: memberentryA.tmpl
memberentryC.tmpl
memberentryP.tmpl
members : memberentry.pl
Log message:
remove template scrolling list for borrowertitle
create cgi::popup menu title in template
add systempreferences 'BorrowersTitles"
add function to return all title in BorrowersTitles systempreferences
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Members.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.32.2.25&r2=1.32.2.26
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.11.2.9&r2=1.11.2.10
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.9.2.13&r2=1.9.2.14
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.7.2.11&r2=1.7.2.12
http://cvs.savannah.gnu.org/viewcvs/koha/members/memberentry.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.38.2.16&r2=1.38.2.17
Patches:
Index: C4/Members.pm
===================================================================
RCS file: /sources/koha/koha/C4/Members.pm,v
retrieving revision 1.32.2.25
retrieving revision 1.32.2.26
diff -u -b -r1.32.2.25 -r1.32.2.26
--- C4/Members.pm 1 Dec 2006 16:54:47 -0000 1.32.2.25
+++ C4/Members.pm 6 Dec 2006 14:05:34 -0000 1.32.2.26
@@ -17,7 +17,7 @@
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA 02111-1307 USA
-# $Id: Members.pm,v 1.32.2.25 2006/12/01 16:54:47 btoumi Exp $
+# $Id: Members.pm,v 1.32.2.26 2006/12/06 14:05:34 btoumi Exp $
use strict;
require Exporter;
@@ -29,7 +29,7 @@
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK);
-$VERSION = do { my @v = '$Revision: 1.32.2.25 $' =~ /\d+/g; shift(@v) . "." .
join( "_", map { sprintf "%03d", $_ } @v ); };
+$VERSION = do { my @v = '$Revision: 1.32.2.26 $' =~ /\d+/g; shift(@v) . "." .
join( "_", map { sprintf "%03d", $_ } @v ); };
=head1 NAME
@@ -68,6 +68,7 @@
&GetCities &GetRoadTypes &GetRoadTypeDetails &GetBorNotifyAcctRecord
&GetMembeReregistration
&GetSortDetails
+ &GetBorrowersTitles
&GetBorrowersWhoHaveNotBorrowedSince
&GetBorrowersWhoHaveNeverBorrowed
&GetBorrowersWithIssuesHistoryOlderThan
@@ -1594,9 +1595,9 @@
return $dateexpiry;
}
-=head2 roadtypecaracteristic (OUEST-PROVENCE)
+=head2 GetRoadTypes (OUEST-PROVENCE)
- ($idroadtypearrayref, $roadttype_hashref) = &roadtypecaracteristic();
+ ($idroadtypearrayref, $roadttype_hashref) = &GetRoadTypes();
Looks up the different road type . Returns two
elements: a reference-to-array, which lists the id_roadtype
@@ -1635,6 +1636,24 @@
}
}
+
+
+=head2 GetBorrowersTitles (OUEST-PROVENCE)
+
+ ($borrowertitle)= &GetBorrowersTitles();
+
+Looks up the different title . Returns array with all borrowers title
+
+=cut
+
+sub GetBorrowersTitles {
+ my @borrowerTitle = split
/,|\|/,C4::Context->preference('BorrowersTitles');
+ unshift( @borrowerTitle, "" );
+ return ( address@hidden);
+ }
+
+
+
=head2 GetRoadTypeDetails (OUEST-PROVENCE)
($roadtype) = &GetRoadTypeDetails($roadtypeid);
Index: koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl,v
retrieving revision 1.11.2.9
retrieving revision 1.11.2.10
diff -u -b -r1.11.2.9 -r1.11.2.10
--- koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl 15 Nov 2006
14:29:10 -0000 1.11.2.9
+++ koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl 6 Dec 2006
14:05:35 -0000 1.11.2.10
@@ -124,13 +124,9 @@
<label>
<!-- /TMPL_IF-->
Title</label>
- <select name="title" >
- <option <!-- TMPL_VAR NAME="title_selected_ " -->
value="" >Select a value</option>
- <option value="Mlle" <!-- TMPL_VAR NAME="title_Mlle"
-->>Mlle</option>
- <option value="Mme" <!-- TMPL_VAR NAME="title_Mme"
-->>Mme</option>
- <option value="Mr" <!-- TMPL_VAR NAME="title_Mr" -->
>M.</option>
- </select>
+ <!-- TMPL_VAR NAME="borrotitlepopup" -->
</p>
+
<p>
<!-- TMPL_IF NAME="mandatorysurname" -->
<label style="font-weight:bold">
Index: koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl,v
retrieving revision 1.9.2.13
retrieving revision 1.9.2.14
diff -u -b -r1.9.2.13 -r1.9.2.14
--- koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl 6 Dec 2006
10:23:11 -0000 1.9.2.13
+++ koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl 6 Dec 2006
14:05:35 -0000 1.9.2.14
@@ -125,12 +125,7 @@
<label>
<!-- /TMPL_IF-->
Title</label>
- <select name="title" >
- <option <!-- TMPL_VAR NAME="title_selected_ " -->
value="" >Select a value</option>
- <option value="Mlle" <!-- TMPL_VAR NAME="title_Mlle"
-->>Mlle</option>
- <option value="Mme" <!-- TMPL_VAR NAME="title_Mme"
-->>Mme</option>
- <option value="Mr" <!-- TMPL_VAR NAME="title_Mr" -->
>M.</option>
- </select>
+ <!-- TMPL_VAR NAME="borrotitlepopup" -->
</p>
<p>
<!-- TMPL_IF NAME="mandatorysurname" -->
Index: koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl,v
retrieving revision 1.7.2.11
retrieving revision 1.7.2.12
diff -u -b -r1.7.2.11 -r1.7.2.12
--- koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl 15 Nov 2006
14:29:10 -0000 1.7.2.11
+++ koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl 6 Dec 2006
14:05:35 -0000 1.7.2.12
@@ -124,12 +124,7 @@
<label>
<!-- /TMPL_IF-->
Title</label>
- <select name="title" >
- <option <!-- TMPL_VAR NAME="title_selected_ " -->
value="" >Select a value</option>
- <option value="Mlle" <!-- TMPL_VAR NAME="title_Mlle"
-->>Mlle</option>
- <option value="Mme" <!-- TMPL_VAR NAME="title_Mme"
-->>Mme</option>
- <option value="Mr" <!-- TMPL_VAR NAME="title_Mr" -->
>M.</option>
- </select>
+ <!-- TMPL_VAR NAME="borrotitlepopup" -->
</p>
<p>
<!-- TMPL_IF NAME="mandatorysurname" -->
Index: members/memberentry.pl
===================================================================
RCS file: /sources/koha/koha/members/memberentry.pl,v
retrieving revision 1.38.2.16
retrieving revision 1.38.2.17
diff -u -b -r1.38.2.16 -r1.38.2.17
--- members/memberentry.pl 30 Nov 2006 18:23:51 -0000 1.38.2.16
+++ members/memberentry.pl 6 Dec 2006 14:05:35 -0000 1.38.2.17
@@ -1,5 +1,5 @@
#!/usr/bin/perl
-# $Id: memberentry.pl,v 1.38.2.16 2006/11/30 18:23:51 toins Exp $
+# $Id: memberentry.pl,v 1.38.2.17 2006/12/06 14:05:35 btoumi Exp $
# Copyright 2006 SAN OUEST PROVENCE et Paul POULAIN
#
@@ -323,6 +323,16 @@
-default=>$default_roadtype
);
+ my $default_borrowertitle;
+ $default_borrowertitle=$data{'title'} ;
+ my($borrowertitle)=GetBorrowersTitles();
+ my $borrotitlepopup = CGI::popup_menu(-name=>'title',
+ -id => 'title',
+ -values=>$borrowertitle,
+ -override => 1,
+ -default=>$default_borrowertitle
+ );
+
my @relationships = split
/,|\|/,C4::Context->preference('BorrowerRelationship');
my @relshipdata;
@@ -467,7 +477,6 @@
cardnumber => $data{'cardnumber'},
surname => uc($data{'surname'}),
firstname => ucfirst($data{'firstname'}),
- "title_".$data{'title'} => " SELECTED ",
title => $data{'title'},
othernames => $data{'othernames'},
initials => $data{'initials'},
@@ -512,6 +521,7 @@
relationship => $data{'relationship'},
citypopup => $citypopup,
roadpopup => $roadpopup,
+ borrotitlepopup => $borrotitlepopup,
contacttype => $data{'contacttype'},
organisations => $data{'organisations'},
guarantorinfo => $guarantorinfo,