From a88b2b2670a3f90af1115392a7c63dc3121d9b5d Mon Sep 17 00:00:00 2001 From: Owen Leonard 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. Revision corrects some additional instances in help-top.inc and removes a redundant call to the highlight script in preferences.tt Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart Signed-off-by: Jared Camins-Esakov --- .../jquery/images/ui-bg_flat_0_aaaaaa_40x100.png | Bin .../jquery/images/ui-bg_flat_75_ffffff_40x100.png | Bin .../jquery/images/ui-bg_glass_55_fbf9ee_1x400.png | Bin .../jquery/images/ui-bg_glass_65_ffffff_1x400.png | Bin .../jquery/images/ui-bg_glass_75_dadada_1x400.png | Bin .../jquery/images/ui-bg_glass_75_e6e6e6_1x400.png | Bin .../jquery/images/ui-bg_glass_95_fef1ec_1x400.png | Bin .../images/ui-bg_highlight-soft_75_cccccc_1x100.png | Bin .../lib/jquery/images/ui-icons_222222_256x240.png | Bin .../lib/jquery/images/ui-icons_2e83ff_256x240.png | Bin .../lib/jquery/images/ui-icons_454545_256x240.png | Bin .../lib/jquery/images/ui-icons_888888_256x240.png | Bin .../lib/jquery/images/ui-icons_cd0a0a_256x240.png | Bin .../{prog/en => }/lib/jquery/jquery-ui.css | 0 .../{prog/en => }/lib/jquery/jquery-ui.js | 0 .../{prog/en => }/lib/jquery/jquery.js | 0 .../en => }/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 ++++++------ .../intranet-tmpl/prog/en/includes/help-top.inc | 8 ++++---- .../prog/en/modules/admin/preferences.tt | 1 - 22 files changed, 10 insertions(+), 11 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 f677ed9125..6b26f1c874 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 @@ - + [% IF ( intranetstylesheet ) %] @@ -8,11 +8,11 @@ [% END %] [% IF ( IntranetUserCSS ) %][% END %] - - - - - + + + + + [% IF ( login ) %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/help-top.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/help-top.inc index 0c545a45fe..da8d7817ad 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/help-top.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/help-top.inc @@ -2,16 +2,16 @@ Online Help - + [% IF ( intranetstylesheet ) %] [% ELSE %] [% END %] - - - + + + [% IF ( intranetcolorstylesheet ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt index 139c35ed92..5b20399be3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt @@ -29,7 +29,6 @@ - [% INCLUDE 'header.inc' %] -- 2.39.5