Changing <p> to <span> per gmcharlt's suggestion re: Adding <p class="noholdstext...

[koha.git] / help.pl

diff --git a/help.pl b/help.pl
index 3d59165..f871e3c 100755 (executable)
--- a/help.pl
+++ b/help.pl
@@ -1,9 +1,26 @@
 #!/usr/bin/perl
-use HTML::Template;
+
+# Copyright 2010 Koha Development team
+#
+# 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.,
+# 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::Auth;
 use C4::Context;
 use CGI;
@@ -11,7 +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');
@@ -32,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 = "modules/help/nohelp.tmpl";
-        ( $theme, $lang ) = themelanguage( $htdocs, $tmplbase, "intranet" );
+        ( $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,
@@ -54,6 +71,7 @@ sub gethelptemplate {
           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;