X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=help.pl;h=f871e3c094c8b8bdc9724d100058bc93cb9c2a18;hb=dd8fc7cec653bf1c88854aad2b799fbc7560c817;hp=0a76f6eb17ebed638c592b986a92ddf96c10b903;hpb=8ee881174fbb75e983e9ea09f70b2fcecee396ab;p=srvgit

diff --git a/help.pl b/help.pl
index 0a76f6eb17..f871e3c094 100755
--- a/help.pl
+++ b/help.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# Copyright 2006 Katipo Communications
+# Copyright 2010 Koha Development team
 #
 # This file is part of Koha.
 #
@@ -13,15 +13,14 @@
 # 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
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 use strict;
-require Exporter;
+use HTML::Template::Pro;
+use warnings;
 use C4::Output;    # contains gettemplate
-use C4::Output;
-
 # use C4::Auth;
 use C4::Context;
 use CGI;
@@ -29,8 +28,7 @@ use CGI;
 my $query = new CGI;
 
 # find the script that called the online help using the CGI referer()
-
-my $refer = $query->referer();
+our $refer = $query->referer();
 
 # workaround for popup not functioning correctly in IE
 my $referurl = $query->param('url');
@@ -39,7 +37,7 @@ if ($referurl) {
 }
 
 $refer =~ /.*koha\/(.*)\.pl.*/;
-my $from = "help/$1.tmpl";
+my $from = "modules/help/$1.tmpl";
 
 my $template = gethelptemplate( $from, "intranet" );
 
@@ -51,12 +49,12 @@ sub gethelptemplate {
 
     my $htdocs;
     $htdocs = C4::Context->config('intrahtdocs');
-    my ( $theme, $lang ) = themelanguage( $htdocs, $tmplbase, "intranet" );
+    my ( $theme, $lang ) = themelanguage( $htdocs, $tmplbase, "intranet", $query );
     unless ( -e "$htdocs/$theme/$lang/$tmplbase" ) {
-        $tmplbase = "help/nohelp.tmpl";
-        ( $theme, $lang ) = themelanguage( $htdocs, $tmplbase, "intranet" );
+        $tmplbase = "modules/help/nohelp.tmpl";
+        ( $theme, $lang ) = themelanguage( $htdocs, $tmplbase, "intranet", $query );
     }
-    my $template = HTML::Template->new(
+    my $template = HTML::Template::Pro->new(
         filename          => "$htdocs/$theme/$lang/$tmplbase",
         die_on_bad_params => 0,
         global_vars       => 1,
@@ -68,7 +66,13 @@ 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"),
+		yuipath => (C4::Context->preference("yuipath") eq "local"?"/intranet-tmpl/$theme/$lang/lib/yui":C4::Context->preference("yuipath")),
+        referer            => $refer,
     );
     return $template;
 }