Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 8623: Move YUI out of prog

Browse source 
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>
This commit is contained in:
Jared Camins-Esakov 2012-08-12 21:17:21 -04:00 committed by Paul Poulain
parent 765bbe1dad
commit 4e8bd6b9a6
16 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
C4/Templates.pm
View file

@ -102,7 +102,7 @@ sub output {
$vars->{themelang} .= '/' . $self->preferredtheme . '/' . $self->lang; $vars->{themelang} .= '/' . $self->preferredtheme . '/' . $self->lang;
$vars->{yuipath} = $vars->{yuipath} =
( C4::Context->preference("yuipath") eq "local" ( 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") ); : C4::Context->preference("yuipath") );
$vars->{interface} = $vars->{interface} =
( $self->{interface} ne 'intranet' ? '/opac-tmpl' : '/intranet-tmpl' ); ( $self->{interface} ne 'intranet' ? '/opac-tmpl' : '/intranet-tmpl' );

0
koha-tmpl/opac-tmpl/prog/en/lib/yui/button.css → koha-tmpl/opac-tmpl/lib/yui/button.css
View file

0
koha-tmpl/opac-tmpl/prog/en/lib/yui/container.css → koha-tmpl/opac-tmpl/lib/yui/container.css
View file

0
koha-tmpl/opac-tmpl/prog/en/lib/yui/container/container-min.js → koha-tmpl/opac-tmpl/lib/yui/container/container-min.js vendored
View file

0
koha-tmpl/opac-tmpl/prog/en/lib/yui/container/container_core-min.js → koha-tmpl/opac-tmpl/lib/yui/container/container_core-min.js vendored
View file

0
koha-tmpl/opac-tmpl/prog/en/lib/yui/menu.css → koha-tmpl/opac-tmpl/lib/yui/menu.css
View file

0
koha-tmpl/opac-tmpl/prog/en/lib/yui/menu/menu-min.js → koha-tmpl/opac-tmpl/lib/yui/menu/menu-min.js vendored
View file

0
koha-tmpl/opac-tmpl/prog/en/lib/yui/reset-fonts-grids.css → koha-tmpl/opac-tmpl/lib/yui/reset-fonts-grids.css
View file

0
koha-tmpl/opac-tmpl/prog/en/lib/yui/skin.css → koha-tmpl/opac-tmpl/lib/yui/skin.css
View file

0
koha-tmpl/opac-tmpl/prog/en/lib/yui/utilities/utilities.js → koha-tmpl/opac-tmpl/lib/yui/utilities/utilities.js vendored
View file

0
koha-tmpl/opac-tmpl/prog/en/lib/yui/yui-sprite.png → koha-tmpl/opac-tmpl/lib/yui/yui-sprite.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3 KiB

After

Width:  |  Height:  |  Size: 3 KiB

3
koha-tmpl/opac-tmpl/prog/en/css/opac.css
View file

@ -1,6 +1,3 @@
@import url("../lib/yui/reset-fonts-grids.css");
@import url("../lib/yui/skin.css");
a { a {
font-weight : bold; font-weight : bold;
} }

3
koha-tmpl/opac-tmpl/prog/en/css/sco.css
View file

@ -1,6 +1,3 @@
@import url("../../en/lib/yui/reset-fonts-grids.css");
@import url("../../en/lib/yui/skin.css");
a { a {
font-weight : bold; font-weight : bold;
} }

2
koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc
View file

@ -3,6 +3,8 @@
<meta name="generator" content="Koha [% Version %]" /> <!-- leave this for stats --> <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="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="[% 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 %] [% SET opaclayoutstylesheet='opac.css' UNLESS opaclayoutstylesheet %]
[% IF (opaclayoutstylesheet.match('^https?:|^\/')) %] [% IF (opaclayoutstylesheet.match('^https?:|^\/')) %]
<link rel="stylesheet" type="text/css" href="[% opaclayoutstylesheet %]" /> <link rel="stylesheet" type="text/css" href="[% opaclayoutstylesheet %]" />

2
koha-tmpl/opac-tmpl/prog/en/modules/sco/help.tt
View file

@ -3,6 +3,8 @@
<meta name="generator" content="Koha [% Version %]" /> <!-- leave this for stats --> <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="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" /> <link rel="stylesheet" type="text/css" href="[% themelang %]/css/sco.css" />
</head> </head>
<body> <body>

2
koha-tmpl/opac-tmpl/prog/en/modules/sco/sco-main.tt
View file

@ -97,6 +97,8 @@ $(document).ready(function() {
[% IF ( opacuserjs ) %]<script type="text/javascript">[% opacuserjs %]</script>[% END %] [% 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" /> <link rel="stylesheet" type="text/css" href="[% themelang %]/css/sco.css" />
[% IF ( OPACUserCSS ) %]<style type="text/css">[% OPACUserCSS %]</style>[% END %] [% IF ( OPACUserCSS ) %]<style type="text/css">[% OPACUserCSS %]</style>[% END %]