View | Details | Raw Unified | Return to bug 16400
Collapse All | Expand All

(-)a/koha-tmpl/intranet-tmpl/lib/jquery/plugins/jquery.fixFloat.js (-3 / +6 lines)
Lines 4-15 Link Here
4
(function ($, window) {
4
(function ($, window) {
5
    "use strict";
5
    "use strict";
6
    $.fn.fixFloat = function (options) {
6
    $.fn.fixFloat = function (options) {
7
        var tbh = $(this);
7
        var defaults = {
8
        var defaults = {
8
            enabled: true
9
            enabled: true,
10
            originalOffset: tbh.position().top
9
        };
11
        };
12
        var originalOffset = typeof options.originalOffset === 'undefined'
13
            ? defaults.originalOffset
14
            : options.originalOffset;
10
        options = $.extend(defaults, options);
15
        options = $.extend(defaults, options);
11
        var tbh = $(this);
12
        var originalOffset = tbh.position().top;
13
16
14
        if (tbh.css('position') !== 'absolute') {
17
        if (tbh.css('position') !== 'absolute') {
15
            var tbhBis = tbh.clone();
18
            var tbhBis = tbh.clone();
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt (-16 / +31 lines)
Lines 3-13 Link Here
3
[% INCLUDE 'doc-head-open.inc' %]
3
[% INCLUDE 'doc-head-open.inc' %]
4
<title>Koha &rsaquo; Patrons &rsaquo; [% IF ( opadd ) %]Add[% ELSIF ( opduplicate ) %]Duplicate[% ELSE %] Modify[% END %] patron [% IF (firstname) %][% firstname %] [% END %][% IF (surname) %][% surname %] [% END %]([%IF ( categoryname ) %][% categoryname %][% ELSE %][% IF ( I ) %]Organization[% END %][% IF ( A ) %]Adult[% END %][% IF ( C ) %]Child[% END %][% IF ( P ) %]Professional[% END %][% IF ( S ) %]Staff[% END %][% END %])</title>
4
<title>Koha &rsaquo; Patrons &rsaquo; [% IF ( opadd ) %]Add[% ELSIF ( opduplicate ) %]Duplicate[% ELSE %] Modify[% END %] patron [% IF (firstname) %][% firstname %] [% END %][% IF (surname) %][% surname %] [% END %]([%IF ( categoryname ) %][% categoryname %][% ELSE %][% IF ( I ) %]Organization[% END %][% IF ( A ) %]Adult[% END %][% IF ( C ) %]Child[% END %][% IF ( P ) %]Professional[% END %][% IF ( S ) %]Staff[% END %][% END %])</title>
5
[% INCLUDE 'doc-head-close.inc' %]
5
[% INCLUDE 'doc-head-close.inc' %]
6
<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.fixFloat.js"></script>
6
[% INCLUDE 'calendar.inc' %]
7
[% INCLUDE 'calendar.inc' %]
7
<script type="text/javascript">
8
<script type="text/javascript">
8
//<![CDATA[
9
//<![CDATA[
9
$(document).ready(function() {
10
$(document).ready(function() {
10
11
12
        var original_offset = $("#toolbar").position().top;
13
        var additional_height = $("#filters").height();
14
        $('#toolbar').fixFloat({ 'originalOffset': original_offset - additional_height });
15
        $("#filteraction_on").on("click", function(){
16
            $(window).off('scroll');
17
            $("#toolbar").css({ top: original_offset });
18
            $('#toolbar').fixFloat({ 'originalOffset': original_offset });
19
        });
20
        $("#filteraction_off").on("click", function(){
21
            $(window).off('scroll');
22
            $("#toolbar").css({ top: original_offset - additional_height});
23
            $('#toolbar').fixFloat({ 'originalOffset': original_offset - additional_height });
24
        })
11
	[% IF categorycode %]
25
	[% IF categorycode %]
12
		update_category_code( "[% categorycode %]" );
26
		update_category_code( "[% categorycode %]" );
13
	[% ELSE %]
27
	[% ELSE %]
Lines 59-65 $(document).ready(function() { Link Here
59
		mrform.hide();
73
		mrform.hide();
60
		e.preventDefault();
74
		e.preventDefault();
61
	});
75
	});
62
    $('#floating-save').css( { bottom: parseInt( $('#floating-save').css('bottom') ) + $('#changelanguage').height() + 'px' } );
63
});
76
});
64
77
65
function clear_entry(node) {
78
function clear_entry(node) {
Lines 299-304 function select_user(borrowernumber, borrower) { Link Here
299
[% END %]
312
[% END %]
300
[% END %]
313
[% END %]
301
[% END %]
314
[% END %]
315
<div id="toolbar" class="btn-toolbar">
316
[% UNLESS ( check_member ) %]
317
    <div class="btn-group">
318
        <button class="btn btn-small" id="saverecord" type="submit" name="save" onclick="return check_form_borrowers();"><i class="fa fa-save"></i> Save</button>
319
    </div>
320
    [% IF opadd %]
321
            <a class="cancel" href="/cgi-bin/koha/members/member.pl">Cancel</a>
322
            <div class="btn-group">
323
                <a class="btn btn-small cancel" id="cancel" href="/cgi-bin/koha/members/member.pl">Cancel</a>
324
            </div>
325
       [% ELSE %]
326
            <div class="btn-group">
327
                <a class="btn btn-small cancel" id="cancel" href="/cgi-bin/koha/members/member.pl?borrowernumber=[% borrowernumber %]">Cancel</a>
328
            </div>
329
        [% END %]
330
[% END %]
331
</div>
302
332
303
[% IF ( step_1 ) %]
333
[% IF ( step_1 ) %]
304
[%UNLESS notitle && nosurname && nofirstname && nodateofbirth && noinitials && noothernames &&nosex %]
334
[%UNLESS notitle && nosurname && nofirstname && nodateofbirth && noinitials && noothernames &&nosex %]
Lines 1147-1166 function select_user(borrowernumber, borrower) { Link Here
1147
  </fieldset>
1177
  </fieldset>
1148
[% END %] [% END %]
1178
[% END %] [% END %]
1149
1179
1150
<fieldset class="rows" id="floating-save">
1151
[% UNLESS ( check_member ) %]
1152
    <fieldset class="action">
1153
        <button type="submit" name="save" onclick="return check_form_borrowers();">
1154
            <i class="fa fa-save"></i> Save
1155
        </button>
1156
      [% IF ( opadd ) %]
1157
       <a class="cancel" href="/cgi-bin/koha/members/member.pl">Cancel</a>
1158
	   [% ELSE %]
1159
	  <a class="cancel" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">Cancel</a>
1160
	   [% END %]
1161
    </fieldset>
1162
[% END %]
1163
</fieldset>
1164
</form>
1180
</form>
1165
  
1181
  
1166
</div>
1182
</div>
1167
- 

Return to bug 16400