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

(-)a/circ/circulation.pl (+1 lines)
Lines 513-518 sub build_issue_data { Link Here
513
        } else {
513
        } else {
514
            (!$relatives) ? push @previousissues, $it : push @relprevissues, $it;
514
            (!$relatives) ? push @previousissues, $it : push @relprevissues, $it;
515
        }
515
        }
516
        ($it->{'renewcount'},$it->{'renewsallowed'},$it->{'renewsleft'}) = C4::Circulation::GetRenewCount($it->{'borrowernumber'},$it->{'itemnumber'}); #Add renewal count to item data display
516
    }
517
    }
517
}
518
}
518
519
(-)a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css (+6 lines)
Lines 2719-2721 span.browse-button { Link Here
2719
#merge_table tr.active td {
2719
#merge_table tr.active td {
2720
    background-color: #FFFFCC;
2720
    background-color: #FFFFCC;
2721
}
2721
}
2722
2723
.renewals {
2724
    display:block;
2725
    font-size:0.8em;
2726
    padding:0.5em;
2727
}
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (+12 lines)
Lines 766-771 No patron matched <span class="ex">[% message %]</span> Link Here
766
        [% ELSE %]
766
        [% ELSE %]
767
            <input type="checkbox" class="radio" name="items[]" value="[% todayissue.itemnumber %]" />
767
            <input type="checkbox" class="radio" name="items[]" value="[% todayissue.itemnumber %]" />
768
        [% END %]
768
        [% END %]
769
            [% IF ( todayissue.renewsallowed ) %]
770
                <span class="renewals">([% todayissue.renewsleft %] of [% todayissue.renewsallowed %] renewals remaining)</span>
771
            [% END %]
769
        [% ELSE %]
772
        [% ELSE %]
770
            [% IF ( todayissue.can_confirm ) %]<span class="renewals-allowed" style="display: none">
773
            [% IF ( todayissue.can_confirm ) %]<span class="renewals-allowed" style="display: none">
771
                <input type="checkbox" name="all_items[]" value="[% todayissue.itemnumber %]" checked="checked" style="display: none;" />
774
                <input type="checkbox" name="all_items[]" value="[% todayissue.itemnumber %]" checked="checked" style="display: none;" />
Lines 775-780 No patron matched <span class="ex">[% message %]</span> Link Here
775
                    <input type="checkbox" class="radio" name="items[]" value="[% todayissue.itemnumber %]" />
778
                    <input type="checkbox" class="radio" name="items[]" value="[% todayissue.itemnumber %]" />
776
                [% END %]
779
                [% END %]
777
                </span>
780
                </span>
781
                [% IF ( todayissue.renewsallowed ) %]
782
                    <span class="renewals">([% todayissue.renewsleft %] of [% todayissue.renewsallowed %] renewals remaining)</span>
783
                [% END %]
778
                <span class="renewals-disabled">
784
                <span class="renewals-disabled">
779
            [% END %]
785
            [% END %]
780
		[% IF ( todayissue.renew_error_on_reserve ) %]
786
		[% IF ( todayissue.renew_error_on_reserve ) %]
Lines 855-860 No patron matched <span class="ex">[% message %]</span> Link Here
855
        [% ELSE %]
861
        [% ELSE %]
856
            <input type="checkbox" class="radio" name="items[]" value="[% previssue.itemnumber %]" />
862
            <input type="checkbox" class="radio" name="items[]" value="[% previssue.itemnumber %]" />
857
        [% END %]
863
        [% END %]
864
            [% IF ( previssue.renewsallowed ) %]
865
                <span class="renewals">([% previssue.renewsleft %] of [% previssue.renewsallowed %] renewals remaining)</span>
866
            [% END %]
858
        [% ELSE %]
867
        [% ELSE %]
859
            [% IF ( previssue.can_confirm ) %]<span class="renewals-allowed" style="display: none">
868
            [% IF ( previssue.can_confirm ) %]<span class="renewals-allowed" style="display: none">
860
                <input type="checkbox" name="all_items[]" value="[% previssue.itemnumber %]" checked="checked" style="display: none;" />
869
                <input type="checkbox" name="all_items[]" value="[% previssue.itemnumber %]" checked="checked" style="display: none;" />
Lines 864-869 No patron matched <span class="ex">[% message %]</span> Link Here
864
                    <input type="checkbox" class="radio" name="items[]" value="[% previssue.itemnumber %]" />
873
                    <input type="checkbox" class="radio" name="items[]" value="[% previssue.itemnumber %]" />
865
                [% END %]
874
                [% END %]
866
                </span>
875
                </span>
876
                [% IF ( previssue.renewsallowed ) %]
877
                    <span class="renewals">([% previssue.renewsleft %] of [% previssue.renewsallowed %] renewals remaining)</span>
878
                [% END %]
867
                <span class="renewals-disabled">
879
                <span class="renewals-disabled">
868
            [% END %]
880
            [% END %]
869
		[% IF ( previssue.renew_error_on_reserve ) %]
881
		[% IF ( previssue.renew_error_on_reserve ) %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (+6 lines)
Lines 500-505 function validate1(date) { Link Here
500
                        <input type="checkbox" name="items[]" value="[% issueloo.itemnumber %]" />
500
                        <input type="checkbox" name="items[]" value="[% issueloo.itemnumber %]" />
501
                    [% END %]
501
                    [% END %]
502
                    </span>
502
                    </span>
503
                    [% IF ( issueloo.renewsallowed ) %]
504
                        <span class="renewals">([% issueloo.renewsleft %] of [% issueloo.renewsallowed %] renewals remaining)</span>
505
                    [% END %]
503
                    <span class="renewals-disabled">
506
                    <span class="renewals-disabled">
504
                [% END %]
507
                [% END %]
505
                [% IF ( issueloo.norenew_reason_on_reserve ) %]
508
                [% IF ( issueloo.norenew_reason_on_reserve ) %]
Lines 518-523 function validate1(date) { Link Here
518
            [% ELSE %]
521
            [% ELSE %]
519
            <input type="checkbox" name="items[]" value="[% issueloo.itemnumber %]" onclick="uncheck_sibling(this);" />
522
            <input type="checkbox" name="items[]" value="[% issueloo.itemnumber %]" onclick="uncheck_sibling(this);" />
520
            [% END %]
523
            [% END %]
524
                [% IF ( issueloo.renewsallowed ) %]
525
                    <span class="renewals">([% issueloo.renewsleft %] of [% issueloo.renewsallowed %] renewals remaining)</span>
526
                [% END %]
521
            [% END %]
527
            [% END %]
522
            </td>
528
            </td>
523
      [% END %]
529
      [% END %]
(-)a/members/moremember.pl (-1 / +1 lines)
Lines 520-525 sub build_issue_data { Link Here
520
        $row{"norenew_reason_$renewerror"} = 1 if $renewerror;
520
        $row{"norenew_reason_$renewerror"} = 1 if $renewerror;
521
        $row{renew_failed}  = $renew_failed{ $issue->{itemnumber} };
521
        $row{renew_failed}  = $renew_failed{ $issue->{itemnumber} };
522
        $row{return_failed} = $return_failed{ $issue->{barcode} };
522
        $row{return_failed} = $return_failed{ $issue->{barcode} };
523
        ($row{'renewcount'},$row{'renewsallowed'},$row{'renewsleft'}) = C4::Circulation::GetRenewCount($issue->{'borrowernumber'},$issue->{'itemnumber'}); #Add renewal count to item data display
523
        push( @{$localissue}, \%row );
524
        push( @{$localissue}, \%row );
524
    }
525
    }
525
    return $localissue;
526
    return $localissue;
526
- 

Return to bug 11486