Bugzilla – Attachment 11570 Details for
Bug 8623
Javascript libraries should be outside theme directories
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 8623: Move YUI out of prog
Bug-8623-Move-YUI-out-of-prog.patch (text/plain), 8.51 KB, created by
Jared Camins-Esakov
on 2012-08-13 01:22:11 UTC
(
hide
)
Description:
Bug 8623: Move YUI out of prog
Filename:
MIME Type:
Creator:
Jared Camins-Esakov
Created:
2012-08-13 01:22:11 UTC
Size:
8.51 KB
patch
obsolete
>From 2958aba3800dd99321e0f09f62631c4cd4ef65e3 Mon Sep 17 00:00:00 2001 >From: Jared Camins-Esakov <jcamins@cpbibliography.com> >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 @@ > <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 %]" /> >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 @@ > <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> >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 ) %]<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 %] > >-- >1.7.2.5
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 8623
:
11564
|
11570
|
11581
|
11582
|
12289
|
12554
|
12555
|
12574
|
12575