[Koha-cvs] CVS: koha/C4 Output.pm,1.39,1.40
Paul POULAIN
tipaul at users.sourceforge.net
Tue Mar 4 18:49:52 CET 2003
- Previous message: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters admin-home.tmpl,1.11,1.12 aqbookfund.tmpl,1.8,1.9 aqbudget.tmpl,1.5,1.6 authorised_values.tmpl,1.5,1.6 checkmarc.tmpl,1.2,1.3 itemtypes.tmpl,1.4,1.5 koha2marclinks.tmpl,1.5,1.6 marc_subfields_structure.tmpl,1.15,1.16 systempreferences.tmpl,1.6,1.7 thesaurus.tmpl,1.7,1.8
- Next message: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/images filesave.png,NONE,1.1 mail_get.png,NONE,1.1 mail_send.png,NONE,1.1
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
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;
}
- Previous message: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters admin-home.tmpl,1.11,1.12 aqbookfund.tmpl,1.8,1.9 aqbudget.tmpl,1.5,1.6 authorised_values.tmpl,1.5,1.6 checkmarc.tmpl,1.2,1.3 itemtypes.tmpl,1.4,1.5 koha2marclinks.tmpl,1.5,1.6 marc_subfields_structure.tmpl,1.15,1.16 systempreferences.tmpl,1.6,1.7 thesaurus.tmpl,1.7,1.8
- Next message: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/images filesave.png,NONE,1.1 mail_get.png,NONE,1.1 mail_send.png,NONE,1.1
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Koha-cvs
mailing list