projects / koha-equinox.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch (parent: 5d72025)
fix for bug 2447: yuipath variable not getting passed to help pages
authorJesse Weaver <jesse.weaver@liblime.com>
Wed, 19 Nov 2008 13:58:31 +0000 (14:58 +0100)
committerGalen Charlton <galen.charlton@liblime.com>
Wed, 19 Nov 2008 21:45:51 +0000 (15:45 -0600)
This updates help.pl to pass the yuipath variable correctly. It also adds some script references to help-top.inc to avoid other js errors.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>

help.pl patch | blob | history
koha-tmpl/intranet-tmpl/prog/en/includes/help-top.inc [changed mode: 0644->0755] patch | blob | history

diff --git a/help.pl b/help.pl
index 402e7d5..ff02bd9 100755 (executable)
--- a/help.pl
+++ b/help.pl
@@ -54,7 +54,7 @@ sub gethelptemplate {
           C4::Context->preference("intranetcolorstylesheet"),
         intranetstylesheet => C4::Context->preference("intranetstylesheet"),
         IntranetNav        => C4::Context->preference("IntranetNav"),
-        yuipath        => C4::Context->preference("yuipath"),
+               yuipath => (C4::Context->preference("yuipath") eq "local"?"/intranet-tmpl/$theme/$lang/lib/yui":C4::Context->preference("yuipath")),
         referer            => $refer,
     );
     return $template;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/help-top.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/help-top.inc
old mode 100644 (file)
new mode 100755 (executable)
index 34a9113..174d4be
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/help-top.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/help-top.inc
@@ -9,6 +9,8 @@
 <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/css/staff-global.css" />
 <!-- /TMPL_IF -->
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/jquery/jquery.js"></script>
+<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/jquery/plugins/ui.tabs.js"></script>
+<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/jquery/plugins/jquery.hotkeys.js"></script>
 <!-- local colors -->
 <!-- TMPL_IF name="intranetcolorstylesheet" -->
 <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/css/<!-- TMPL_VAR NAME="intranetcolorstylesheet" -->" />
@@ -24,4 +26,4 @@
 
 <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/css/help.css" />
 </head>
-<body id="help">
\ No newline at end of file
+<body id="help">
Koha with Equinox developments in process and local tweaks