[Koha-cvs] CVS: koha imemberentry.pl,1.3,1.4 jmemberentry.pl,1.4,1.5 memberentry.pl,1.15,1.16 member.pl,1.6,1.7 moremember.pl,1.20,1.21

[Paul POULAIN]

Update of /cvsroot/koha/koha
In directory usw-pr-cvs1:/tmp/cvs-serv4843

Modified Files:
	imemberentry.pl jmemberentry.pl memberentry.pl member.pl 
	moremember.pl 
Log Message:
templating stuff : use of gettemplate method

Index: imemberentry.pl
===================================================================
RCS file: /cvsroot/koha/koha/imemberentry.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** imemberentry.pl	17 Sep 2002 15:08:43 -0000	1.3
--- imemberentry.pl	28 Oct 2002 18:00:57 -0000	1.4
***************
*** 30,36 ****
  my $input = new CGI;
  
! my $theme = $input->param('theme'); # only used if allowthemeoverride is set
! my %tmpldata = pathtotemplate ( template => 'imemberentry.tmpl', theme => $theme );
! my $template = HTML::Template->new(filename => $tmpldata{'path'}, die_on_bad_params => 0);
  
  my $member=$input->param('bornum');
--- 30,34 ----
  my $input = new CGI;
  
! my $template = gettemplate("members/imemberentry.tmpl");
  
  my $member=$input->param('bornum');

Index: jmemberentry.pl
===================================================================
RCS file: /cvsroot/koha/koha/jmemberentry.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** jmemberentry.pl	22 Sep 2002 16:49:20 -0000	1.4
--- jmemberentry.pl	28 Oct 2002 18:00:58 -0000	1.5
***************
*** 30,36 ****
  my $input = new CGI;
  
! my $theme = $input->param('theme'); # only used if allowthemeoverride is set
! my %tmpldata = pathtotemplate ( template => 'jmemberentry.tmpl', theme => $theme );
! my $template = HTML::Template->new(filename => $tmpldata{'path'}, die_on_bad_params => 0);
  
  my $member=$input->param('bornum');
--- 30,34 ----
  my $input = new CGI;
  
! my $template = gettemplate("members/jmemberentry.tmpl");
  
  my $member=$input->param('bornum');

Index: memberentry.pl
===================================================================
RCS file: /cvsroot/koha/koha/memberentry.pl,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** memberentry.pl	13 Oct 2002 11:32:24 -0000	1.15
--- memberentry.pl	28 Oct 2002 18:00:58 -0000	1.16
***************
*** 34,40 ****
  my $input = new CGI;
  
! my $theme = $input->param('theme'); # only used if allowthemeoverride is set
! my %tmpldata = pathtotemplate ( template => 'memberentry.tmpl', theme => $theme );
! my $template = HTML::Template->new(filename => $tmpldata{'path'}, die_on_bad_params => 0);
  
  my $member=$input->param('bornum');
--- 34,38 ----
  my $input = new CGI;
  
! my $template = gettemplate("members/memberentry.tmpl");
  
  my $member=$input->param('bornum');
***************
*** 131,135 ****
    my $ethcatpopup;
    if ($ethnicitycategoriescount>=0) {
!   	$ethcatpopup = popup_menu(-name=>'ethnicity',
    			        -values=>$categories,
    			        -default=>$data->{'ethnicity'},
--- 129,133 ----
    my $ethcatpopup;
    if ($ethnicitycategoriescount>=0) {
!   	$ethcatpopup = CGI::popup_menu(-name=>'ethnicity',
    			        -values=>$categories,
    			        -default=>$data->{'ethnicity'},

Index: member.pl
===================================================================
RCS file: /cvsroot/koha/koha/member.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** member.pl	13 Oct 2002 07:32:58 -0000	1.6
--- member.pl	28 Oct 2002 18:00:58 -0000	1.7
***************
*** 34,42 ****
  my $theme = $input->param('theme') || "default";
  			# only used if allowthemeoverride is set
! my %tmpldata = pathtotemplate ( template => 'member.tmpl', theme => $theme, language => 'fi' );
  	# FIXME - Error-checking
! my $template = HTML::Template->new( filename => $tmpldata{'path'},
! 				    die_on_bad_params => 0,
! 				    loop_context_vars => 1 );
  
  my $member=$input->param('member');
--- 34,43 ----
  my $theme = $input->param('theme') || "default";
  			# only used if allowthemeoverride is set
! #my %tmpldata = pathtotemplate ( template => 'member.tmpl', theme => $theme, language => 'fi' );
  	# FIXME - Error-checking
! #my $template = HTML::Template->new( filename => $tmpldata{'path'},
! #				    die_on_bad_params => 0,
! #				    loop_context_vars => 1 );
! my $template = gettemplate("members/member.tmpl");
  
  my $member=$input->param('member');

Index: moremember.pl
===================================================================
RCS file: /cvsroot/koha/koha/moremember.pl,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** moremember.pl	13 Oct 2002 07:33:59 -0000	1.20
--- moremember.pl	28 Oct 2002 18:00:59 -0000	1.21
***************
*** 47,53 ****
  my $input = new CGI;
  
! my $theme = $input->param('theme'); # only used if allowthemeoverride is set
! my %tmpldata = pathtotemplate ( template => 'moremember.tmpl', theme => $theme );
! my $template = HTML::Template->new(filename => $tmpldata{'path'}, die_on_bad_params => 0);
  
  my $bornum=$input->param('bornum');
--- 47,51 ----
  my $input = new CGI;
  
! my $template = gettemplate("members/moremember.tmpl");
  
  my $bornum=$input->param('bornum');