X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=help.pl;h=b2f74826634c2a7f647e5b619427c051b2eaf311;hb=753219b79dc0f0f6556e0e78f703e1c926932913;hp=0a76f6eb17ebed638c592b986a92ddf96c10b903;hpb=8ee881174fbb75e983e9ea09f70b2fcecee396ab;p=koha_gimpoz diff --git a/help.pl b/help.pl index 0a76f6eb17..b2f7482663 100755 --- a/help.pl +++ b/help.pl @@ -1,26 +1,8 @@ #!/usr/bin/perl - -# Copyright 2006 Katipo Communications -# -# This file is part of Koha. -# -# Koha is free software; you can redistribute it and/or modify it under the -# terms of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# Koha is distributed in the hope that it will be useful, but WITHOUT ANY -# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR -# A PARTICULAR PURPOSE. See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along with -# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place, -# Suite 330, Boston, MA 02111-1307 USA - +use HTML::Template::Pro; use strict; require Exporter; use C4::Output; # contains gettemplate -use C4::Output; # use C4::Auth; use C4::Context; @@ -29,7 +11,6 @@ use CGI; my $query = new CGI; # find the script that called the online help using the CGI referer() - my $refer = $query->referer(); # workaround for popup not functioning correctly in IE @@ -39,7 +20,7 @@ if ($referurl) { } $refer =~ /.*koha\/(.*)\.pl.*/; -my $from = "help/$1.tmpl"; +my $from = "modules/help/$1.tmpl"; my $template = gethelptemplate( $from, "intranet" ); @@ -53,7 +34,7 @@ sub gethelptemplate { $htdocs = C4::Context->config('intrahtdocs'); my ( $theme, $lang ) = themelanguage( $htdocs, $tmplbase, "intranet" ); unless ( -e "$htdocs/$theme/$lang/$tmplbase" ) { - $tmplbase = "help/nohelp.tmpl"; + $tmplbase = "modules/help/nohelp.tmpl"; ( $theme, $lang ) = themelanguage( $htdocs, $tmplbase, "intranet" ); } my $template = HTML::Template->new( @@ -68,7 +49,12 @@ sub gethelptemplate { themelang => '/intranet-tmpl' . "/$theme/$lang", interface => '/intranet-tmpl', theme => $theme, - lang => $lang + lang => $lang, + intranetcolorstylesheet => + C4::Context->preference("intranetcolorstylesheet"), + intranetstylesheet => C4::Context->preference("intranetstylesheet"), + IntranetNav => C4::Context->preference("IntranetNav"), + referer => $refer, ); return $template; }