fix for bug 2447: yuipath variable not getting passed to help pages
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: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
This commit is contained in:
parent
14c55e06aa
commit
e6dc1ba7f8
2 changed files with 4 additions and 2 deletions
2
help.pl
2
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;
|
||||
|
|
4
koha-tmpl/intranet-tmpl/prog/en/includes/help-top.inc
Normal file → Executable file
4
koha-tmpl/intranet-tmpl/prog/en/includes/help-top.inc
Normal file → Executable file
|
@ -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">
|
||||
<body id="help">
|
||||
|
|
Loading…
Reference in a new issue