From 0b3ab62ea097467df77180cec85c704be6dae1ba Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 21 Apr 2014 12:11:58 -0400 Subject: [PATCH] [PASSED QA] Bug 12116 - Move fixFloat jQuery plugin outside of language-specific directory This patch moves the fixFloat jQuery plugin to intranet-tmpl/prog/lib/jquery/plugins so that it will not be duplicated for each set of translated templates. This patch also includes a change to staff-global.css to override some style the floating toolbar inherited when we added Bootstrap widgets. To test, apply the patch and confirm that the toolbar "sticks" to the top of the screen when scrolling down on the following pages: - System preferences - Authorities editor (Authorities -> New authority) - Cataloging editor (Cataloging -> New record) - List contents view (Lists -> View a list's contents) Followed test plan. Patch behaves as expected. Signed-off-by: Marc Veron Signed-off-by: Kyle M Hall --- .../en => }/lib/jquery/plugins/jquery.fixFloat.js | 0 .../intranet-tmpl/prog/en/css/staff-global.css | 7 +++++++ .../prog/en/modules/admin/preferences.tt | 2 +- .../prog/en/modules/authorities/authorities.tt | 2 +- .../prog/en/modules/cataloguing/addbiblio.tt | 2 +- .../prog/en/modules/virtualshelves/shelves.tt | 2 +- 6 files changed, 11 insertions(+), 4 deletions(-) rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/jquery/plugins/jquery.fixFloat.js (100%) diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/jquery/plugins/jquery.fixFloat.js b/koha-tmpl/intranet-tmpl/lib/jquery/plugins/jquery.fixFloat.js similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/lib/jquery/plugins/jquery.fixFloat.js rename to koha-tmpl/intranet-tmpl/lib/jquery/plugins/jquery.fixFloat.js diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css index 8abe90d..1db0427 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css +++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css @@ -2611,11 +2611,18 @@ fieldset.rows table.mceListBox { } /* Class to be added to toolbar when it starts being fixed at the top of the screen*/ + .floating { -webkit-box-shadow: 0px 3px 2px 0px rgba(0, 0, 0, .5); box-shadow: 0px 3px 2px 0px rgba(0, 0, 0, .5); } +div#toolbar.floating, +#searchheader.floating { + border-radius: 0; + margin-top: 0; +} + .inline { display : inline; } 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 f81f1a9..63ecaaf 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt @@ -7,7 +7,7 @@ [% IF ( bidi ) %] [% END %] - + + + [% INCLUDE 'browser-strings.inc' %]