Attachment 53109 Details for Bug 3534 – Bug 3534 (QA Followup)

[patch] Bug 3534 (QA Followup)

Bug-3534-QA-Followup.patch (text/plain), 3.12 KB, created by Nick Clemens (kidclamp) on 2016-07-05 18:37:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nick Clemens (kidclamp)

Created: 2016-07-05 18:37:29 UTC

Size: 3.12 KB

patch

obsolete

>From 46063d6d421fd3d4774bba5fad5fbdd04b5ab53f Mon Sep 17 00:00:00 2001
>From: Nick Clemens <nick@bywatersolutions.com>
>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() {
> 		</div>
> 	[% END %]
> 
>+    
>+
>+    [% IF quickadd && opadd  && !check_member %]
>+        <div id="toolbar" class="btn-toolbar toggler">
>+            <button class="btn btn-small" id="save_quick_add" name="save"><i class="fa fa-save"></i> Save</button>
>+            <a class="btn btn-small" href="/cgi-bin/koha/members/member.pl">
>+                <i class="fa fa-times"></i> Cancel
>+            </a>
>+        </div>
>+[% END %]
> 
> [% UNLESS ( check_member ) %]<form name="form" id="entryform"  action="/cgi-bin/koha/members/memberentry.pl" method="post" autocomplete="off" class="toggler" >
> <input type="hidden" name="nodouble"  value="[% nodouble %]" /> [% END %]
>@@ -1092,12 +1102,6 @@ $(document).ready(function() {
> 
> [% IF quickadd && opadd  && !check_member %]
>     <form id="quick_add_form" class="toggler">
>-        <div id="qa_toolbar" class="btn-toolbar">
>-            <button class="btn btn-small" id="save_quick_add" name="save"><i class="fa fa-save"></i> Save</button>
>-            <a class="btn btn-small" href="/cgi-bin/koha/members/member.pl">
>-                <i class="fa fa-times"></i> Cancel
>-            </a>
>-        </div>
>         <fieldset class="rows quick_add"><legend>Quick add</legend>
>             <ol id="quick_add_list">
>             </ol>
>@@ -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 });
>-            })
>         });
>     </script>
> [% END %]
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 3534: 1396 | 50090 | 50091 | 50092 | 50093 | 50362 | 50410 | 50413 | 50414 | 50665 | 50666 | 50729 | 51382 | 51389 | 51445 | 51446 | 51960 | 51961 | 52192 | 52584 | 52585 | 52586 | 52934 | 52935 | 52936 | 52937 | 53109 | 53152 | 53171 | 53172 | 53173 | 53174 | 53175 | 84851