@@ -, +, @@ did not work flawlessly, layout will be way off. --- C4/Templates.pm | 2 +- .../opac-tmpl/{prog/en => }/lib/yui/button.css | 0 .../opac-tmpl/{prog/en => }/lib/yui/container.css | 0 .../en => }/lib/yui/container/container-min.js | 0 .../lib/yui/container/container_core-min.js | 0 koha-tmpl/opac-tmpl/{prog/en => }/lib/yui/menu.css | 0 .../{prog/en => }/lib/yui/menu/menu-min.js | 0 .../{prog/en => }/lib/yui/reset-fonts-grids.css | 0 koha-tmpl/opac-tmpl/{prog/en => }/lib/yui/skin.css | 0 .../{prog/en => }/lib/yui/utilities/utilities.js | 0 .../opac-tmpl/{prog/en => }/lib/yui/yui-sprite.png | Bin 3123 -> 3123 bytes koha-tmpl/opac-tmpl/prog/en/css/opac.css | 3 --- koha-tmpl/opac-tmpl/prog/en/css/sco.css | 3 --- .../opac-tmpl/prog/en/includes/doc-head-close.inc | 2 ++ koha-tmpl/opac-tmpl/prog/en/modules/sco/help.tt | 2 ++ .../opac-tmpl/prog/en/modules/sco/sco-main.tt | 2 ++ 16 files changed, 7 insertions(+), 7 deletions(-) rename koha-tmpl/opac-tmpl/{prog/en => }/lib/yui/button.css (100%) rename koha-tmpl/opac-tmpl/{prog/en => }/lib/yui/container.css (100%) rename koha-tmpl/opac-tmpl/{prog/en => }/lib/yui/container/container-min.js (100%) rename koha-tmpl/opac-tmpl/{prog/en => }/lib/yui/container/container_core-min.js (100%) rename koha-tmpl/opac-tmpl/{prog/en => }/lib/yui/menu.css (100%) rename koha-tmpl/opac-tmpl/{prog/en => }/lib/yui/menu/menu-min.js (100%) rename koha-tmpl/opac-tmpl/{prog/en => }/lib/yui/reset-fonts-grids.css (100%) rename koha-tmpl/opac-tmpl/{prog/en => }/lib/yui/skin.css (100%) rename koha-tmpl/opac-tmpl/{prog/en => }/lib/yui/utilities/utilities.js (100%) rename koha-tmpl/opac-tmpl/{prog/en => }/lib/yui/yui-sprite.png (100%) --- a/C4/Templates.pm +++ a/C4/Templates.pm @@ -102,7 +102,7 @@ sub output { $vars->{themelang} .= '/' . $self->preferredtheme . '/' . $self->lang; $vars->{yuipath} = ( C4::Context->preference("yuipath") eq "local" - ? $vars->{themelang} . "/lib/yui" + ? ( $self->interface eq 'intranet' ? $vars->{themelang} . "/lib/yui" : "/opac-tmpl/lib/yui" ) : C4::Context->preference("yuipath") ); $vars->{interface} = ( $self->{interface} ne 'intranet' ? '/opac-tmpl' : '/intranet-tmpl' ); --- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css +++ a/koha-tmpl/opac-tmpl/prog/en/css/opac.css @@ -1,6 +1,3 @@ -@import url("../lib/yui/reset-fonts-grids.css"); -@import url("../lib/yui/skin.css"); - a { font-weight : bold; } --- a/koha-tmpl/opac-tmpl/prog/en/css/sco.css +++ a/koha-tmpl/opac-tmpl/prog/en/css/sco.css @@ -1,6 +1,3 @@ -@import url("../../en/lib/yui/reset-fonts-grids.css"); -@import url("../../en/lib/yui/skin.css"); - a { font-weight : bold; } --- a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc +++ a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc @@ -3,6 +3,8 @@ + + [% SET opaclayoutstylesheet='opac.css' UNLESS opaclayoutstylesheet %] [% IF (opaclayoutstylesheet.match('^https?:|^\/')) %] --- a/koha-tmpl/opac-tmpl/prog/en/modules/sco/help.tt +++ a/koha-tmpl/opac-tmpl/prog/en/modules/sco/help.tt @@ -3,6 +3,8 @@ + + --- a/koha-tmpl/opac-tmpl/prog/en/modules/sco/sco-main.tt +++ a/koha-tmpl/opac-tmpl/prog/en/modules/sco/sco-main.tt @@ -97,6 +97,8 @@ $(document).ready(function() { [% IF ( opacuserjs ) %][% END %] + + [% IF ( OPACUserCSS ) %][% END %] --