Bugzilla – Attachment 15005 Details for
Bug 9521
Move common jQuery assets to koha-tmpl/intranet-tmpl/lib
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[SIGNED-OFF] Bug 9521 - Move common jQuery assets to koha-tmpl/intranet-tmpl/lib
Bug-9521---Move-common-jQuery-assets-to-koha-tmpli.patch (text/plain), 12.60 KB, created by
Kyle M Hall (khall)
on 2013-02-01 13:41:46 UTC
(
hide
)
Description:
[SIGNED-OFF] Bug 9521 - Move common jQuery assets to koha-tmpl/intranet-tmpl/lib
Filename:
MIME Type:
Creator:
Kyle M Hall (khall)
Created:
2013-02-01 13:41:46 UTC
Size:
12.60 KB
patch
obsolete
>From 26c2e60245b78352ee1eb6ca61d5de0e352a6519 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Thu, 31 Jan 2013 14:55:25 -0500 >Subject: [PATCH] Bug 9521 - Move common jQuery assets to koha-tmpl/intranet-tmpl/lib > >Assets which are not theme-specific can now be placed in >koha-tmpl/intranet-tmpl/lib. This patch moves jQuery assets referenced >by doc-head-close.inc to this location and corrects the path in the >include. > >To test, load any page in the staff client which uses jQuery and confirm >that there are no JavaScript errors. Test keyboard shortcuts (Alt-r, >Alt-u, Alt-q), Search to hold functionality, and search term >highlighting to confirm that jQuery plugins are working correctly. > >Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> >--- > .../jquery/images/ui-bg_flat_0_aaaaaa_40x100.png | Bin 180 -> 180 bytes > .../jquery/images/ui-bg_flat_75_ffffff_40x100.png | Bin 178 -> 178 bytes > .../jquery/images/ui-bg_glass_55_fbf9ee_1x400.png | Bin 120 -> 120 bytes > .../jquery/images/ui-bg_glass_65_ffffff_1x400.png | Bin 105 -> 105 bytes > .../jquery/images/ui-bg_glass_75_dadada_1x400.png | Bin 111 -> 111 bytes > .../jquery/images/ui-bg_glass_75_e6e6e6_1x400.png | Bin 110 -> 110 bytes > .../jquery/images/ui-bg_glass_95_fef1ec_1x400.png | Bin 119 -> 119 bytes > .../ui-bg_highlight-soft_75_cccccc_1x100.png | Bin 101 -> 101 bytes > .../lib/jquery/images/ui-icons_222222_256x240.png | Bin 4369 -> 4369 bytes > .../lib/jquery/images/ui-icons_2e83ff_256x240.png | Bin 4369 -> 4369 bytes > .../lib/jquery/images/ui-icons_454545_256x240.png | Bin 4369 -> 4369 bytes > .../lib/jquery/images/ui-icons_888888_256x240.png | Bin 4369 -> 4369 bytes > .../lib/jquery/images/ui-icons_cd0a0a_256x240.png | Bin 4369 -> 4369 bytes > .../{prog/en => }/lib/jquery/jquery-ui.css | 0 > .../{prog/en => }/lib/jquery/jquery-ui.js | 0 > .../{prog/en => }/lib/jquery/jquery.js | 0 > .../lib/jquery/plugins/jquery.cookie.min.js | 0 > .../lib/jquery/plugins/jquery.highlight-3.js | 0 > .../lib/jquery/plugins/jquery.hotkeys.min.js | 0 > .../prog/en/includes/doc-head-close.inc | 12 ++++++------ > 20 files changed, 6 insertions(+), 6 deletions(-) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/jquery/images/ui-bg_flat_0_aaaaaa_40x100.png (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/jquery/images/ui-bg_flat_75_ffffff_40x100.png (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/jquery/images/ui-bg_glass_55_fbf9ee_1x400.png (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/jquery/images/ui-bg_glass_65_ffffff_1x400.png (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/jquery/images/ui-bg_glass_75_dadada_1x400.png (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/jquery/images/ui-bg_glass_75_e6e6e6_1x400.png (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/jquery/images/ui-bg_glass_95_fef1ec_1x400.png (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/jquery/images/ui-bg_highlight-soft_75_cccccc_1x100.png (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/jquery/images/ui-icons_222222_256x240.png (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/jquery/images/ui-icons_2e83ff_256x240.png (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/jquery/images/ui-icons_454545_256x240.png (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/jquery/images/ui-icons_888888_256x240.png (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/jquery/images/ui-icons_cd0a0a_256x240.png (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/jquery/jquery-ui.css (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/jquery/jquery-ui.js (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/jquery/jquery.js (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/jquery/plugins/jquery.cookie.min.js (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/jquery/plugins/jquery.highlight-3.js (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/jquery/plugins/jquery.hotkeys.min.js (100%) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/jquery/images/ui-bg_flat_0_aaaaaa_40x100.png b/koha-tmpl/intranet-tmpl/lib/jquery/images/ui-bg_flat_0_aaaaaa_40x100.png >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/jquery/images/ui-bg_flat_0_aaaaaa_40x100.png >rename to koha-tmpl/intranet-tmpl/lib/jquery/images/ui-bg_flat_0_aaaaaa_40x100.png >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/jquery/images/ui-bg_flat_75_ffffff_40x100.png b/koha-tmpl/intranet-tmpl/lib/jquery/images/ui-bg_flat_75_ffffff_40x100.png >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/jquery/images/ui-bg_flat_75_ffffff_40x100.png >rename to koha-tmpl/intranet-tmpl/lib/jquery/images/ui-bg_flat_75_ffffff_40x100.png >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/jquery/images/ui-bg_glass_55_fbf9ee_1x400.png b/koha-tmpl/intranet-tmpl/lib/jquery/images/ui-bg_glass_55_fbf9ee_1x400.png >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/jquery/images/ui-bg_glass_55_fbf9ee_1x400.png >rename to koha-tmpl/intranet-tmpl/lib/jquery/images/ui-bg_glass_55_fbf9ee_1x400.png >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/jquery/images/ui-bg_glass_65_ffffff_1x400.png b/koha-tmpl/intranet-tmpl/lib/jquery/images/ui-bg_glass_65_ffffff_1x400.png >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/jquery/images/ui-bg_glass_65_ffffff_1x400.png >rename to koha-tmpl/intranet-tmpl/lib/jquery/images/ui-bg_glass_65_ffffff_1x400.png >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/jquery/images/ui-bg_glass_75_dadada_1x400.png b/koha-tmpl/intranet-tmpl/lib/jquery/images/ui-bg_glass_75_dadada_1x400.png >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/jquery/images/ui-bg_glass_75_dadada_1x400.png >rename to koha-tmpl/intranet-tmpl/lib/jquery/images/ui-bg_glass_75_dadada_1x400.png >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/jquery/images/ui-bg_glass_75_e6e6e6_1x400.png b/koha-tmpl/intranet-tmpl/lib/jquery/images/ui-bg_glass_75_e6e6e6_1x400.png >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/jquery/images/ui-bg_glass_75_e6e6e6_1x400.png >rename to koha-tmpl/intranet-tmpl/lib/jquery/images/ui-bg_glass_75_e6e6e6_1x400.png >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/jquery/images/ui-bg_glass_95_fef1ec_1x400.png b/koha-tmpl/intranet-tmpl/lib/jquery/images/ui-bg_glass_95_fef1ec_1x400.png >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/jquery/images/ui-bg_glass_95_fef1ec_1x400.png >rename to koha-tmpl/intranet-tmpl/lib/jquery/images/ui-bg_glass_95_fef1ec_1x400.png >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/jquery/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/koha-tmpl/intranet-tmpl/lib/jquery/images/ui-bg_highlight-soft_75_cccccc_1x100.png >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/jquery/images/ui-bg_highlight-soft_75_cccccc_1x100.png >rename to koha-tmpl/intranet-tmpl/lib/jquery/images/ui-bg_highlight-soft_75_cccccc_1x100.png >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/jquery/images/ui-icons_222222_256x240.png b/koha-tmpl/intranet-tmpl/lib/jquery/images/ui-icons_222222_256x240.png >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/jquery/images/ui-icons_222222_256x240.png >rename to koha-tmpl/intranet-tmpl/lib/jquery/images/ui-icons_222222_256x240.png >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/jquery/images/ui-icons_2e83ff_256x240.png b/koha-tmpl/intranet-tmpl/lib/jquery/images/ui-icons_2e83ff_256x240.png >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/jquery/images/ui-icons_2e83ff_256x240.png >rename to koha-tmpl/intranet-tmpl/lib/jquery/images/ui-icons_2e83ff_256x240.png >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/jquery/images/ui-icons_454545_256x240.png b/koha-tmpl/intranet-tmpl/lib/jquery/images/ui-icons_454545_256x240.png >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/jquery/images/ui-icons_454545_256x240.png >rename to koha-tmpl/intranet-tmpl/lib/jquery/images/ui-icons_454545_256x240.png >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/jquery/images/ui-icons_888888_256x240.png b/koha-tmpl/intranet-tmpl/lib/jquery/images/ui-icons_888888_256x240.png >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/jquery/images/ui-icons_888888_256x240.png >rename to koha-tmpl/intranet-tmpl/lib/jquery/images/ui-icons_888888_256x240.png >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/jquery/images/ui-icons_cd0a0a_256x240.png b/koha-tmpl/intranet-tmpl/lib/jquery/images/ui-icons_cd0a0a_256x240.png >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/jquery/images/ui-icons_cd0a0a_256x240.png >rename to koha-tmpl/intranet-tmpl/lib/jquery/images/ui-icons_cd0a0a_256x240.png >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/jquery/jquery-ui.css b/koha-tmpl/intranet-tmpl/lib/jquery/jquery-ui.css >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/jquery/jquery-ui.css >rename to koha-tmpl/intranet-tmpl/lib/jquery/jquery-ui.css >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/jquery/jquery-ui.js b/koha-tmpl/intranet-tmpl/lib/jquery/jquery-ui.js >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/jquery/jquery-ui.js >rename to koha-tmpl/intranet-tmpl/lib/jquery/jquery-ui.js >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/jquery/jquery.js b/koha-tmpl/intranet-tmpl/lib/jquery/jquery.js >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/jquery/jquery.js >rename to koha-tmpl/intranet-tmpl/lib/jquery/jquery.js >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/jquery/plugins/jquery.cookie.min.js b/koha-tmpl/intranet-tmpl/lib/jquery/plugins/jquery.cookie.min.js >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/jquery/plugins/jquery.cookie.min.js >rename to koha-tmpl/intranet-tmpl/lib/jquery/plugins/jquery.cookie.min.js >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/jquery/plugins/jquery.highlight-3.js b/koha-tmpl/intranet-tmpl/lib/jquery/plugins/jquery.highlight-3.js >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/jquery/plugins/jquery.highlight-3.js >rename to koha-tmpl/intranet-tmpl/lib/jquery/plugins/jquery.highlight-3.js >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/jquery/plugins/jquery.hotkeys.min.js b/koha-tmpl/intranet-tmpl/lib/jquery/plugins/jquery.hotkeys.min.js >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/jquery/plugins/jquery.hotkeys.min.js >rename to koha-tmpl/intranet-tmpl/lib/jquery/plugins/jquery.hotkeys.min.js >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc >index f677ed9..6b26f1c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc >@@ -1,6 +1,6 @@ > <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> > <link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon %][% 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="[% interface %]/lib/jquery/jquery-ui.css" /> > <link rel="stylesheet" type="text/css" media="print" href="[% themelang %]/css/print.css" /> > [% IF ( intranetstylesheet ) %] > <link rel="stylesheet" type="text/css" href="[% intranetstylesheet %]" /> >@@ -8,11 +8,11 @@ > <link rel="stylesheet" type="text/css" href="[% themelang %]/css/staff-global.css" /> > [% END %] > [% IF ( IntranetUserCSS ) %]<style type="text/css">[% IntranetUserCSS %]</style>[% END %] >-<script type="text/javascript" src="[% themelang %]/lib/jquery/jquery.js"></script> >-<script type="text/javascript" src="[% themelang %]/lib/jquery/jquery-ui.js"></script> >-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.hotkeys.min.js"></script> >-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.cookie.min.js"></script> >-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.highlight-3.js"></script> >+<script type="text/javascript" src="[% interface %]/lib/jquery/jquery.js"></script> >+<script type="text/javascript" src="[% interface %]/lib/jquery/jquery-ui.js"></script> >+<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.hotkeys.min.js"></script> >+<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.cookie.min.js"></script> >+<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.highlight-3.js"></script> > [% IF ( login ) %] > <link rel="stylesheet" type="text/css" href="[% themelang %]/css/login.css" /> > [% 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 9521
:
14984
|
15005
|
15072
|
15091
|
15092