From 2958aba3800dd99321e0f09f62631c4cd4ef65e3 Mon Sep 17 00:00:00 2001 From: Jared Camins-Esakov Date: Sun, 12 Aug 2012 21:17:21 -0400 Subject: [PATCH] Bug 8623: Move YUI out of prog Content-Type: text/plain; charset="UTF-8" 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. --- 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%) diff --git a/C4/Templates.pm b/C4/Templates.pm index 46e0c09..507e077 100644 --- 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' ); diff --git a/koha-tmpl/opac-tmpl/prog/en/lib/yui/button.css b/koha-tmpl/opac-tmpl/lib/yui/button.css similarity index 100% rename from koha-tmpl/opac-tmpl/prog/en/lib/yui/button.css rename to koha-tmpl/opac-tmpl/lib/yui/button.css diff --git a/koha-tmpl/opac-tmpl/prog/en/lib/yui/container.css b/koha-tmpl/opac-tmpl/lib/yui/container.css similarity index 100% rename from koha-tmpl/opac-tmpl/prog/en/lib/yui/container.css rename to koha-tmpl/opac-tmpl/lib/yui/container.css diff --git a/koha-tmpl/opac-tmpl/prog/en/lib/yui/container/container-min.js b/koha-tmpl/opac-tmpl/lib/yui/container/container-min.js similarity index 100% rename from koha-tmpl/opac-tmpl/prog/en/lib/yui/container/container-min.js rename to koha-tmpl/opac-tmpl/lib/yui/container/container-min.js diff --git a/koha-tmpl/opac-tmpl/prog/en/lib/yui/container/container_core-min.js b/koha-tmpl/opac-tmpl/lib/yui/container/container_core-min.js similarity index 100% rename from koha-tmpl/opac-tmpl/prog/en/lib/yui/container/container_core-min.js rename to koha-tmpl/opac-tmpl/lib/yui/container/container_core-min.js diff --git a/koha-tmpl/opac-tmpl/prog/en/lib/yui/menu.css b/koha-tmpl/opac-tmpl/lib/yui/menu.css similarity index 100% rename from koha-tmpl/opac-tmpl/prog/en/lib/yui/menu.css rename to koha-tmpl/opac-tmpl/lib/yui/menu.css diff --git a/koha-tmpl/opac-tmpl/prog/en/lib/yui/menu/menu-min.js b/koha-tmpl/opac-tmpl/lib/yui/menu/menu-min.js similarity index 100% rename from koha-tmpl/opac-tmpl/prog/en/lib/yui/menu/menu-min.js rename to koha-tmpl/opac-tmpl/lib/yui/menu/menu-min.js diff --git a/koha-tmpl/opac-tmpl/prog/en/lib/yui/reset-fonts-grids.css b/koha-tmpl/opac-tmpl/lib/yui/reset-fonts-grids.css similarity index 100% rename from koha-tmpl/opac-tmpl/prog/en/lib/yui/reset-fonts-grids.css rename to koha-tmpl/opac-tmpl/lib/yui/reset-fonts-grids.css diff --git a/koha-tmpl/opac-tmpl/prog/en/lib/yui/skin.css b/koha-tmpl/opac-tmpl/lib/yui/skin.css similarity index 100% rename from koha-tmpl/opac-tmpl/prog/en/lib/yui/skin.css rename to koha-tmpl/opac-tmpl/lib/yui/skin.css diff --git a/koha-tmpl/opac-tmpl/prog/en/lib/yui/utilities/utilities.js b/koha-tmpl/opac-tmpl/lib/yui/utilities/utilities.js similarity index 100% rename from koha-tmpl/opac-tmpl/prog/en/lib/yui/utilities/utilities.js rename to koha-tmpl/opac-tmpl/lib/yui/utilities/utilities.js diff --git a/koha-tmpl/opac-tmpl/prog/en/lib/yui/yui-sprite.png b/koha-tmpl/opac-tmpl/lib/yui/yui-sprite.png similarity index 100% rename from koha-tmpl/opac-tmpl/prog/en/lib/yui/yui-sprite.png rename to koha-tmpl/opac-tmpl/lib/yui/yui-sprite.png diff --git a/koha-tmpl/opac-tmpl/prog/en/css/opac.css b/koha-tmpl/opac-tmpl/prog/en/css/opac.css index aeb209c..3f59c4a 100644 --- 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; } diff --git a/koha-tmpl/opac-tmpl/prog/en/css/sco.css b/koha-tmpl/opac-tmpl/prog/en/css/sco.css index c38caea..4d8e25a 100644 --- 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; } diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc b/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc index 3ce49ce..1ea41be 100644 --- 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 @@ + + [% SET opaclayoutstylesheet='opac.css' UNLESS opaclayoutstylesheet %] [% IF (opaclayoutstylesheet.match('^https?:|^\/')) %] diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/sco/help.tt b/koha-tmpl/opac-tmpl/prog/en/modules/sco/help.tt index df4f0d3..32b4f56 100644 --- 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 @@ + + diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/sco/sco-main.tt b/koha-tmpl/opac-tmpl/prog/en/modules/sco/sco-main.tt index 8eb9f08..66cace5 100644 --- 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 ) %][% END %] + + [% IF ( OPACUserCSS ) %][% END %] -- 1.7.2.5