Attachment 75740 Details for Bug 20857 – Bug 20857: Take the filters block into account to position the toolbar

[patch] Bug 20857: Take the filters block into account to position the toolbar

Bug-20857-Take-the-filters-block-into-account-to-p.patch (text/plain), 3.59 KB, created by Jonathan Druart on 2018-06-01 16:03:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2018-06-01 16:03:24 UTC

Size: 3.59 KB

patch

obsolete

>From 0093a144237523cf804176e7bc6eb7cdcae4d9b8 Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Fri, 1 Jun 2018 13:00:31 -0300
>Subject: [PATCH] Bug 20857: Take the filters block into account to position
> the toolbar
>
>This does not work for 2 reasons:
>- additional_height is always 0, but even when moved inside the onclick
>block the height is not the correct one.
>- This mimicks what is done on members/memberentrygen.tt, but the way
>the block is toggled is different:
>  $('.filteraction').toggle();
>vs
>  class="toggle_element" data-element="#filters,.filteraction"
>Maybe we should adjust that first
>---
> .../prog/en/includes/acquisitions-search.inc              | 10 ++++++----
> koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt   | 15 ++++++++++++++-
> 2 files changed, 20 insertions(+), 5 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc
>index 26ab7f1c70..a771a10cbd 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc
>@@ -17,10 +17,12 @@
>         <span class="filteraction" id="filteraction_off" style="display:none"> <a href="#" class="toggle_element" data-element="#filters,.filteraction">[-]</a></span>
>         <span class="filteraction" id="filteraction_on"> <a href="#" class="toggle_element" data-element="#filters,.filteraction">[+]</a></span>
>     <input value="Submit" class="submit" type="submit" /> <a href="/cgi-bin/koha/acqui/histsearch.pl">Advanced search</a>
>-    <p id="filters" style="display:none">
>-      <label for="basket">Basket: </label><input type="text" name="basket" id="basket" />
>-      <label for="booksellerinvoicenumber">Invoice no.: </label><input type="text" name="booksellerinvoicenumber" id="booksellerinvoicenumber" />
>-    </p>
>+    <div id="filters" style="display:none">
>+        <p>
>+            <label for="basket">Basket: </label><input type="text" name="basket" id="basket" />
>+            <label for="booksellerinvoicenumber">Invoice no.: </label><input type="text" name="booksellerinvoicenumber" id="booksellerinvoicenumber" />
>+        </p>
>+    </div>
> 	</form>
> 	</div>	
> 			<ul id="tabtriggers">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
>index e9a94f8701..d551f2b27f 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
>@@ -703,7 +703,20 @@
>         }
> 
>         $(document).ready(function() {
>-            if ( $('#toolbar').length ) {$('#toolbar').fixFloat();}
>+            var original_offset = $("#toolbar").position().top;
>+            var additional_height = $("#filters").height();
>+            if ( $('#toolbar').length ) {$('#toolbar').fixFloat({ 'originalOffset': original_offset });}
>+            $("#filteraction_on").on("click", function(){
>+                $(window).off('scroll');
>+                $("#toolbar").css({ top: original_offset + additional_height });
>+                $('#toolbar').fixFloat({ 'originalOffset': original_offset + additional_height });
>+            });
>+            $("#filteraction_off").on("click", function(){
>+                $(window).off('scroll');
>+                $("#toolbar").css({ top: original_offset });
>+                $('#toolbar').fixFloat({ 'originalOffset': original_offset });
>+            })
>+
>             $("#show_all_details").click(function(){
>                 updateColumnsVisibility($(this).is(":checked"));
>             });
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 20857: 75740