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 737-742 No patron matched <span class="ex">[% message %]</span> Link Here
737
        [% ELSE %]
737
        [% ELSE %]
738
            <input type="checkbox" class="radio" name="items[]" value="[% todayissue.itemnumber %]" />
738
            <input type="checkbox" class="radio" name="items[]" value="[% todayissue.itemnumber %]" />
739
        [% END %]
739
        [% END %]
740
            [% IF ( todayissue.renewsallowed ) %]
741
                <span class="renewals">([% todayissue.renewsleft %] of [% todayissue.renewsallowed %] renewals remaining)</span>
742
            [% END %]
740
        [% ELSE %]
743
        [% ELSE %]
741
            [% IF ( todayissue.can_confirm ) %]<span class="renewals-allowed" style="display: none">
744
            [% IF ( todayissue.can_confirm ) %]<span class="renewals-allowed" style="display: none">
742
                <input type="checkbox" name="all_items[]" value="[% todayissue.itemnumber %]" checked="checked" style="display: none;" />
745
                <input type="checkbox" name="all_items[]" value="[% todayissue.itemnumber %]" checked="checked" style="display: none;" />
Lines 746-751 No patron matched <span class="ex">[% message %]</span> Link Here
746
                    <input type="checkbox" class="radio" name="items[]" value="[% todayissue.itemnumber %]" />
749
                    <input type="checkbox" class="radio" name="items[]" value="[% todayissue.itemnumber %]" />
747
                [% END %]
750
                [% END %]
748
                </span>
751
                </span>
752
                [% IF ( todayissue.renewsallowed ) %]
753
                    <span class="renewals">([% todayissue.renewsleft %] of [% todayissue.renewsallowed %] renewals remaining)</span>
754
                [% END %]
749
                <span class="renewals-disabled">
755
                <span class="renewals-disabled">
750
            [% END %]
756
            [% END %]
751
		[% IF ( todayissue.renew_error_on_reserve ) %]
757
		[% IF ( todayissue.renew_error_on_reserve ) %]
Lines 826-831 No patron matched <span class="ex">[% message %]</span> Link Here
826
        [% ELSE %]
832
        [% ELSE %]
827
            <input type="checkbox" class="radio" name="items[]" value="[% previssue.itemnumber %]" />
833
            <input type="checkbox" class="radio" name="items[]" value="[% previssue.itemnumber %]" />
828
        [% END %]
834
        [% END %]
835
            [% IF ( previssue.renewsallowed ) %]
836
                <span class="renewals">([% previssue.renewsleft %] of [% previssue.renewsallowed %] renewals remaining)</span>
837
            [% END %]
829
        [% ELSE %]
838
        [% ELSE %]
830
            [% IF ( previssue.can_confirm ) %]<span class="renewals-allowed" style="display: none">
839
            [% IF ( previssue.can_confirm ) %]<span class="renewals-allowed" style="display: none">
831
                <input type="checkbox" name="all_items[]" value="[% previssue.itemnumber %]" checked="checked" style="display: none;" />
840
                <input type="checkbox" name="all_items[]" value="[% previssue.itemnumber %]" checked="checked" style="display: none;" />
Lines 835-840 No patron matched <span class="ex">[% message %]</span> Link Here
835
                    <input type="checkbox" class="radio" name="items[]" value="[% previssue.itemnumber %]" />
844
                    <input type="checkbox" class="radio" name="items[]" value="[% previssue.itemnumber %]" />
836
                [% END %]
845
                [% END %]
837
                </span>
846
                </span>
847
                [% IF ( previssue.renewsallowed ) %]
848
                    <span class="renewals">([% previssue.renewsleft %] of [% previssue.renewsallowed %] renewals remaining)</span>
849
                [% END %]
838
                <span class="renewals-disabled">
850
                <span class="renewals-disabled">
839
            [% END %]
851
            [% END %]
840
		[% IF ( previssue.renew_error_on_reserve ) %]
852
		[% 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