From 8c816fb9768d64da405de0baccb8dee158a03a09 Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Tue, 28 Jun 2016 12:57:00 -0400 Subject: [PATCH] Bug 3534 (QA Followup) Rebase and change floating save Bug 3534 - (QA Followup) Use single toolbar for regular/quickadd forms Signed-off-by: Jonathan Druart --- .../prog/en/modules/members/memberentrygen.tt | 48 +++++++++++----------- 1 file changed, 24 insertions(+), 24 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 39ac47e..6b0e0ee 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt @@ -62,14 +62,19 @@ $(document).ready(function() { $(".toggler").toggle(); }); - $(".save_quick_add").click(function(){ + $("#save_quick_add").click(function(){ $("#quick_add_form").validate(); if( $("#quick_add_form").valid()){ $('.toggle_quick_add').click(); - $('#entryform button[name="save"]').click(); + $('#saverecord').click(); } else {return false;} }); + $("#saverecord").click(function(){ + if( check_form_borrowers() ){ + $("#entryform").submit(); + } + }); }); @@ -201,6 +206,22 @@ $(document).ready(function() { [% END %] +
+[% UNLESS ( check_member ) %] + [% IF quickadd && opadd %] + + [% END %] + + [% IF opadd %] + + [% ELSE %] + + [% END %] + Cancel + +[% END %] +
+ [% UNLESS ( check_member ) %]
[% END %] @@ -224,18 +245,6 @@ $(document).ready(function() { [% END %] [% END %] [% END %] -
-[% UNLESS ( check_member ) %] - - [% IF opadd %] - - [% ELSE %] - - [% END %] - Cancel - -[% END %] -
[% IF ( step_1 ) %] [%UNLESS notitle && nosurname && nofirstname && nodateofbirth && noinitials && noothernames &&nosex %] @@ -1096,19 +1105,10 @@ $(document).ready(function() {
-
-
- - Cancel -
-
-