Browse Source

change in yuipath management 1/2 Noupdatedatabase.pl

now yuipath is added in C4::Output and uses themelang
In my opinion, all the general variables that are used in output should get in C4::Output (since there is theme lang computed.)
rather than in C4::Auth

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
3.0.x
Henri-Damien LAURENT 16 years ago
committed by Joshua Ferraro
parent
commit
f59c9706a4
  1. 2
      C4/Auth.pm
  2. 7
      C4/Output.pm

2
C4/Auth.pm

@ -250,7 +250,6 @@ sub get_template_and_user {
IntranetmainUserblock => C4::Context->preference("IntranetmainUserblock"),
IndependantBranches => C4::Context->preference("IndependantBranches"),
CircAutocompl => C4::Context->preference("CircAutocompl"),
yuipath => C4::Context->preference("yuipath"),
FRBRizeEditions => C4::Context->preference("FRBRizeEditions"),
AmazonSimilarItems => C4::Context->preference("AmazonSimilarItems"),
'item-level_itypes' => C4::Context->preference('item-level_itypes'),
@ -315,7 +314,6 @@ sub get_template_and_user {
OPACFRBRizeEditions => C4::Context->preference("OPACFRBRizeEditions"),
'item-level_itypes' => C4::Context->preference('item-level_itypes'),
'Version' => C4::Context->preference('Version'),
yuipath => C4::Context->preference("yuipath"),
singleBranchMode => C4::Context->preference("singleBranchMode"),
XSLTResultsDisplay => C4::Context->preference("XSLTResultsDisplay"),
XSLTDetailsDisplay => C4::Context->preference("XSLTDetailsDisplay"),

7
C4/Output.pm

@ -90,10 +90,11 @@ sub gettemplate {
case_sensitive => 1,
path => ["$htdocs/$theme/$lang/$path"]
);
my $themelang=( $interface ne 'intranet' ? '/opac-tmpl' : '/intranet-tmpl' )
. "/$theme/$lang";
$template->param(
themelang => ( $interface ne 'intranet' ? '/opac-tmpl' : '/intranet-tmpl' )
. "/$theme/$lang",
themelang => $themelang,
yuipath => (C4::Context->preference("yuipath") eq "local"?"$themelang/lib/yui":C4::Context->preference("yuipath")),
interface => ( $interface ne 'intranet' ? '/opac-tmpl' : '/intranet-tmpl' ),
theme => $theme,
opacstylesheet => $opacstylesheet,

Loading…
Cancel
Save