[Koha-cvs] CVS: koha/C4 Output.pm,1.39,1.40

[Paul POULAIN]

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1:/tmp/cvs-serv19634

Modified Files:
        Output.pm 
Log Message:
adding "interface" parameter : /intranet-tmpl or /opac-tmpl

Index: Output.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Output.pm,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -r1.39 -r1.40
*** Output.pm   6 Feb 2003 05:04:36 -0000       1.39
--- Output.pm   4 Mar 2003 17:49:50 -0000       1.40
***************
*** 80,104 ****
  # FIXME - POD
  sub gettemplate {
!     my ($tmplbase, $opac) = @_;
  
!     my $htdocs;
!     if ($opac ne "intranet") {
!       $htdocs = C4::Context->config('opachtdocs');
!     } else {
!       $htdocs = C4::Context->config('intrahtdocs');
!     }
  
!     my ($theme, $lang) = themelanguage($htdocs, $tmplbase);
  
!     my $template = HTML::Template->new(filename      => 
"$htdocs/$theme/$lang/$tmplbase",
                                   die_on_bad_params => 0,
                                   global_vars       => 1,
                                   path              => 
["$htdocs/$theme/$lang/includes"]);
  
!     # XXX temporary patch for Bug 182 for themelang
!     $template->param(themelang => ($opac ne 'intranet'? '/opac-tmpl': 
'/intranet-tmpl') . "/$theme/$lang",
!                                                       theme => $theme,
                                                        lang => $lang);
!     return $template;
  }
  
--- 80,105 ----
  # FIXME - POD
  sub gettemplate {
!       my ($tmplbase, $opac) = @_;
  
!       my $htdocs;
!       if ($opac ne "intranet") {
!               $htdocs = C4::Context->config('opachtdocs');
!       } else {
!               $htdocs = C4::Context->config('intrahtdocs');
!       }
  
!       my ($theme, $lang) = themelanguage($htdocs, $tmplbase);
  
!       my $template = HTML::Template->new(filename      => 
"$htdocs/$theme/$lang/$tmplbase",
                                   die_on_bad_params => 0,
                                   global_vars       => 1,
                                   path              => 
["$htdocs/$theme/$lang/includes"]);
  
!       # XXX temporary patch for Bug 182 for themelang
!       $template->param(themelang => ($opac ne 'intranet'? '/opac-tmpl': 
'/intranet-tmpl') . "/$theme/$lang",
!                                                       interface => ($opac ne 
'intranet'? '/opac-tmpl': '/intranet-tmpl'),
!                                                       theme => $theme,
                                                        lang => $lang);
!       return $template;
  }