Bugzilla – Attachment 27355 Details for
Bug 12116
Move fixFloat jQuery plugin outside of language-specific directory
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 12116 - Move fixFloat jQuery plugin outside of language-specific directory
Bug-12116---Move-fixFloat-jQuery-plugin-outside-of.patch (text/plain), 5.66 KB, created by
Owen Leonard
on 2014-04-21 16:44:21 UTC
(
hide
)
Description:
Bug 12116 - Move fixFloat jQuery plugin outside of language-specific directory
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2014-04-21 16:44:21 UTC
Size:
5.66 KB
patch
obsolete
>From e5a85725d47db2126a27c103ca2a34f057c4f0a7 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Mon, 21 Apr 2014 12:11:58 -0400 >Subject: [PATCH] Bug 12116 - Move fixFloat jQuery plugin outside of > language-specific directory >Content-Type: text/plain; charset="utf-8" > >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) >--- > .../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 ) %] > <link rel="stylesheet" type="text/css" href="[% themelang %]/css/right-to-left.css" /> > [% END %] >-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.fixFloat.js"></script> >+<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.fixFloat.js"></script> > <script type="text/javascript"> > //<![CDATA[ > [% UNLESS ( searchfield ) %]$(document).ready(function(){ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt >index ae61553..e8afb18 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt >@@ -1,7 +1,7 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Authorities › [% IF ( authid ) %]Modify authority #[% authid %] ([% authtypetext %])[% ELSE %]Adding authority ([% authtypetext %])[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] >-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.fixFloat.js"></script> >+<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.fixFloat.js"></script> > <script type="text/javascript" src="[% themelang %]/js/cataloging.js"></script> > > <script type="text/javascript"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt >index 286e8b7..5ebc0e1 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt >@@ -2,7 +2,7 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Cataloging › [% IF ( biblionumber ) %]Editing [% title |html %] (Record number [% biblionumber %])[% ELSE %]Add MARC record[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] >-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.fixFloat.js"></script> >+<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.fixFloat.js"></script> > <script type="text/javascript" src="[% themelang %]/js/cataloging.js"></script> > [% INCLUDE 'browser-strings.inc' %] > <!--[if lt IE 9]> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt >index 453f108..d9ee3d1 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt >@@ -3,7 +3,7 @@ > [% INCLUDE 'doc-head-close.inc' %] > [% IF ( viewshelf ) %] > <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script> >- <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.fixFloat.js"></script> >+ <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.fixFloat.js"></script> > [% END %] > <script type="text/javascript"> > //<![CDATA[ >-- >1.7.9.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 12116
:
27355
|
27357
|
27616