Bug 8623: Move YUI out of prog

This patch moves the YUI assets from koha-tmpl/opac-tmpl/prog/en/lib/yui to koha-tmpl/opac-tmpl/lib/yui. NOTE: This was tested on Chrome, FF, and Safari on a Mac, and IE and FF on Windows. To test: 1) View a smattering of pages on the OPAC and intranet. If the move did not work flawlessly, layout will be way off. Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years ago · 5107870359
16 changed files with 7 additions and 7 deletions
--- a/C4/Templates.pm
+++ b/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/lib/yui/button.css
+++ b/koha-tmpl/opac-tmpl/prog/en/lib/yui/button.css
--- a/koha-tmpl/opac-tmpl/prog/en/lib/yui/container.css
+++ b/koha-tmpl/opac-tmpl/prog/en/lib/yui/container.css
--- a/koha-tmpl/opac-tmpl/prog/en/lib/yui/container/container-min.js
+++ b/koha-tmpl/opac-tmpl/prog/en/lib/yui/container/container-min.js
--- a/koha-tmpl/opac-tmpl/prog/en/lib/yui/container/container_core-min.js
+++ b/koha-tmpl/opac-tmpl/prog/en/lib/yui/container/container_core-min.js
--- a/koha-tmpl/opac-tmpl/prog/en/lib/yui/menu.css
+++ b/koha-tmpl/opac-tmpl/prog/en/lib/yui/menu.css
--- a/koha-tmpl/opac-tmpl/prog/en/lib/yui/menu/menu-min.js
+++ b/koha-tmpl/opac-tmpl/prog/en/lib/yui/menu/menu-min.js
--- a/koha-tmpl/opac-tmpl/prog/en/lib/yui/reset-fonts-grids.css
+++ b/koha-tmpl/opac-tmpl/prog/en/lib/yui/reset-fonts-grids.css
--- a/koha-tmpl/opac-tmpl/prog/en/lib/yui/skin.css
+++ b/koha-tmpl/opac-tmpl/prog/en/lib/yui/skin.css
--- a/koha-tmpl/opac-tmpl/prog/en/lib/yui/utilities/utilities.js
+++ b/koha-tmpl/opac-tmpl/prog/en/lib/yui/utilities/utilities.js
--- a/koha-tmpl/opac-tmpl/prog/en/lib/yui/yui-sprite.png
+++ b/koha-tmpl/opac-tmpl/prog/en/lib/yui/yui-sprite.png
--- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css
+++ b/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
+++ b/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
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc
@ -3,6 +3,8 @@
 <meta name="generator" content="Koha [% Version %]" /> <!-- leave this for stats -->
 <link rel="shortcut icon" href="[% IF ( OpacFavicon ) %][% OpacFavicon %][% ELSE %][% themelang %]/includes/favicon.ico[% END %]" type="image/x-icon" />
 <link rel="stylesheet" type="text/css" href="[% themelang %]/lib/jquery/jquery-ui.css" />
+<link rel="stylesheet" type="text/css" href="[% yuipath %]/reset-fonts-grids.css" />
+<link rel="stylesheet" type="text/css" href="[% yuipath %]/skin.css" />
 [% SET opaclayoutstylesheet='opac.css' UNLESS opaclayoutstylesheet %]
 [% IF (opaclayoutstylesheet.match('^https?:|^\/')) %]
    <link rel="stylesheet" type="text/css" href="[% opaclayoutstylesheet %]" />
--- a/koha-tmpl/opac-tmpl/prog/en/modules/sco/help.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/sco/help.tt
@ -3,6 +3,8 @@
 <meta name="generator" content="Koha [% Version %]" /> <!-- leave this for stats -->
 <link rel="shortcut icon" href="[% themelang %]/includes/favicon.ico" type="image/x-icon" />

+<link rel="stylesheet" type="text/css" href="[% yuipath %]/reset-fonts-grids.css" />
+<link rel="stylesheet" type="text/css" href="[% yuipath %]/skin.css" />
 <link rel="stylesheet" type="text/css" href="[% themelang %]/css/sco.css" />
 </head>
 <body>
--- a/koha-tmpl/opac-tmpl/prog/en/modules/sco/sco-main.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/sco/sco-main.tt
@ -97,6 +97,8 @@ $(document).ready(function() {
 [% IF ( opacuserjs ) %]<script type="text/javascript">[% opacuserjs %]</script>[% END %]


+<link rel="stylesheet" type="text/css" href="[% yuipath %]/reset-fonts-grids.css" />
+<link rel="stylesheet" type="text/css" href="[% yuipath %]/skin.css" />
 <link rel="stylesheet" type="text/css" href="[% themelang %]/css/sco.css" />
 [% IF ( OPACUserCSS ) %]<style type="text/css">[% OPACUserCSS %]</style>[% END %]