From 46063d6d421fd3d4774bba5fad5fbdd04b5ab53f Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Tue, 5 Jul 2016 14:36:29 -0400 Subject: [PATCH] Bug 3534 (QA Followup) Move QA save toolbar and use same class as full form --- .../prog/en/modules/members/memberentrygen.tt | 30 ++++++++-------------- 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt index 27d4b84..3c2aa6d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt @@ -200,6 +200,16 @@ $(document).ready(function() { [% END %] + + + [% IF quickadd && opadd && !check_member %] +
+ + + Cancel + +
+[% END %] [% UNLESS ( check_member ) %]
[% END %] @@ -1092,12 +1102,6 @@ $(document).ready(function() { [% IF quickadd && opadd && !check_member %] -
- - - Cancel - -
Quick add
@@ -1126,20 +1130,6 @@ $(document).ready(function() { if( $("#memberentry_guarantor").length ) { $("#memberentry_guarantor").clone().appendTo("#quick_add_list").css("margin",0); } - $("#quick_add_form").show(); - var qa_original_offset = $("#qa_toolbar").position().top; - var qa_additional_height = $("#qa_filters").height(); - $('#qa_toolbar').fixFloat({ 'originalOffset': qa_original_offset - qa_additional_height }); - $("#filteraction_on").on("click", function(){ - $(window).off('scroll'); - $("#qa_toolbar").css({ top: qa_original_offset }); - $('#qa_toolbar').fixFloat({ 'originalOffset': qa_original_offset }); - }); - $("#filteraction_off").on("click", function(){ - $(window).off('scroll'); - $("#qa_toolbar").css({ top: qa_original_offset - qa_additional_height}); - $('#qa_toolbar').fixFloat({ 'originalOffset': qa_original_offset - qa_additional_height }); - }) }); [% END %] -- 2.1.4