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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (-32 / +32 lines)
Lines 288-294 function validate1(date) { Link Here
288
[% FOREACH attribute IN attributes_loop %]
288
[% FOREACH attribute IN attributes_loop %]
289
    [% IF attribute.class %]
289
    [% IF attribute.class %]
290
        <h4>[% attribute.lib %]</h4>
290
        <h4>[% attribute.lib %]</h4>
291
        <table id=aai_[% attribute.class %]>
291
        <table id="aai_[% attribute.class %]">
292
    [% ELSE %]
292
    [% ELSE %]
293
        <table id="aai">
293
        <table id="aai">
294
    [% END %]
294
    [% END %]
Lines 407-442 function validate1(date) { Link Here
407
</div>
407
</div>
408
</div>
408
</div>
409
409
410
<div id="finesholdsissues" class="toptabs">
411
	<ul>
412
		<li><a href="/cgi-bin/koha/members/moremember.pl#checkedout">[% issueloop.size %] Checkout(s)</a></li>
413
    [% IF relissueloop.size %]
414
        <li><a href="/cgi-bin/koha/members/moremember.pl#relissues">Relatives' Checkouts</a></li>
415
    [% END %]
416
		<li><a href="/cgi-bin/koha/members/moremember.pl#finesandcharges">Fines &amp; Charges</a></li>
417
		<li>[% IF ( countreserv ) %]
418
            <a href="/cgi-bin/koha/members/moremember.pl#onhold">[% countreserv %] Hold(s)</a>
419
    [% ELSE %]
420
            <a href="/cgi-bin/koha/members/moremember.pl#onhold">0 Holds</a>
421
    [% END %]</li>
422
	</ul>
423
	
424
<div id="finesandcharges">
425
    [% IF ( totaldue_raw ) %]
426
        <p>Total due: [% totaldue %]</p>
427
    [% ELSE %]
428
        <p>No outstanding charges</p>
429
    [% END %]
430
</div>
431
432
    <form action="/cgi-bin/koha/reserve/renewscript.pl" method="post" class="checkboxed">
410
    <form action="/cgi-bin/koha/reserve/renewscript.pl" method="post" class="checkboxed">
433
    <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
411
    <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
434
	<input type="hidden" name="branch" value="[% branch %]" />
412
    <input type="hidden" name="branch" value="[% branch %]" />
435
<div id="checkedout">
413
<div id="checkedout">
436
    [% IF ( issueloop ) %]
414
    [% IF ( issueloop ) %]
437
    <table id="issuest">
415
    <table id="issuest">
438
    <thead>
416
    <thead>
439
		<tr>
417
        <tr>
440
            <th scope="col">Due date</th>
418
            <th scope="col">Due date</th>
441
            <th scope="col">Title</th>
419
            <th scope="col">Title</th>
442
            <th scope="col">Item type</th>
420
            <th scope="col">Item type</th>
Lines 458-464 function validate1(date) { Link Here
458
          <tr>
436
          <tr>
459
          [% END %]
437
          [% END %]
460
          [% IF ( issueloo.red ) %]
438
          [% IF ( issueloo.red ) %]
461
		      <td class="od">
439
              <td class="od">
462
          [% ELSE %]
440
          [% ELSE %]
463
            <td>
441
            <td>
464
          [% END %]
442
          [% END %]
Lines 474-480 function validate1(date) { Link Here
474
<td>[% UNLESS ( noItemTypeImages ) %] [% IF ( issueloo.itemtype_image ) %]<img src="[% issueloo.itemtype_image %]" alt="" />[% END %][% END %][% issueloo.itemtype_description %]</td>
452
<td>[% UNLESS ( noItemTypeImages ) %] [% IF ( issueloo.itemtype_image ) %]<img src="[% issueloo.itemtype_image %]" alt="" />[% END %][% END %][% issueloo.itemtype_description %]</td>
475
            <td>[% issueloo.issuedate %]</td>
453
            <td>[% issueloo.issuedate %]</td>
476
            <td>[% issueloo.issuingbranchname %]</td>
454
            <td>[% issueloo.issuingbranchname %]</td>
477
	        <td>[% issueloo.itemcallnumber %]</td>
455
            <td>[% issueloo.itemcallnumber %]</td>
478
            <td>[% issueloo.charge %]</td>
456
            <td>[% issueloo.charge %]</td>
479
            <td>[% issueloo.replacementprice %]</td>
457
            <td>[% issueloo.replacementprice %]</td>
480
      [% IF ( issueloo.renew_failed ) %]
458
      [% IF ( issueloo.renew_failed ) %]
Lines 495-503 function validate1(date) { Link Here
495
                [% IF ( issueloo.norenew_reason_on_reserve ) %]
473
                [% IF ( issueloo.norenew_reason_on_reserve ) %]
496
                <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% issueloo.biblionumber %]">On Hold</a>
474
                <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% issueloo.biblionumber %]">On Hold</a>
497
                [% END %]
475
                [% END %]
498
				    [% IF ( issueloo.norenew_reason_too_many ) %]
476
                    [% IF ( issueloo.norenew_reason_too_many ) %]
499
                        Not renewable
477
                        Not renewable
500
				    [% END %]
478
                    [% END %]
501
                [% IF ( issueloo.can_confirm ) %]
479
                [% IF ( issueloo.can_confirm ) %]
502
                    </span>
480
                    </span>
503
                [% END %]
481
                [% END %]
Lines 545-551 function validate1(date) { Link Here
545
<div id="relissues">
523
<div id="relissues">
546
 <table id="relissuest">
524
 <table id="relissuest">
547
    <thead>
525
    <thead>
548
	<tr>
526
    <tr>
549
            <th scope="col">Due date</th>
527
            <th scope="col">Due date</th>
550
            <th scope="col">Title</th>
528
            <th scope="col">Title</th>
551
            <th scope="col">Item type</th>
529
            <th scope="col">Item type</th>
Lines 585-599 function validate1(date) { Link Here
585
        <td>[% relissueloo.itemcallnumber %]</td>
563
        <td>[% relissueloo.itemcallnumber %]</td>
586
        <td>[% relissueloo.charge %]</td>
564
        <td>[% relissueloo.charge %]</td>
587
        <td>[% relissueloo.replacementprice %]</td>
565
        <td>[% relissueloo.replacementprice %]</td>
588
	    <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% relissueloo.borrowernumber %]">[% relissueloo.firstname %] [% relissueloo.surname %] ([% relissueloo.cardnumber %])</a></td>
566
        <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% relissueloo.borrowernumber %]">[% relissueloo.firstname %] [% relissueloo.surname %] ([% relissueloo.cardnumber %])</a></td>
589
        </tr>
567
        </tr>
590
  [% END %]
568
  [% END %]
591
        </tbody>
569
        </tbody>
592
       </table>
570
       </table>
593
	</div>
571
    </div>
594
[% END %]
572
[% END %]
595
    </form>
573
    </form>
574
575
<div id="finesholdsissues" class="toptabs">
576
	<ul>
577
		<li><a href="/cgi-bin/koha/members/moremember.pl#checkedout">[% issueloop.size %] Checkout(s)</a></li>
578
    [% IF relissueloop.size %]
579
        <li><a href="/cgi-bin/koha/members/moremember.pl#relissues">Relatives' Checkouts</a></li>
580
    [% END %]
581
		<li><a href="/cgi-bin/koha/members/moremember.pl#finesandcharges">Fines &amp; Charges</a></li>
582
		<li>[% IF ( countreserv ) %]
583
            <a href="/cgi-bin/koha/members/moremember.pl#onhold">[% countreserv %] Hold(s)</a>
584
    [% ELSE %]
585
            <a href="/cgi-bin/koha/members/moremember.pl#onhold">0 Holds</a>
586
    [% END %]</li>
587
	</ul>
596
	
588
	
589
<div id="finesandcharges">
590
    [% IF ( totaldue_raw ) %]
591
        <p>Total due: [% totaldue %]</p>
592
    [% ELSE %]
593
        <p>No outstanding charges</p>
594
    [% END %]
595
</div>
596
597
<div id="onhold">
597
<div id="onhold">
598
[% IF ( reservloop ) %]
598
[% IF ( reservloop ) %]
599
<form action="/cgi-bin/koha/reserve/modrequest.pl" method="post">
599
<form action="/cgi-bin/koha/reserve/modrequest.pl" method="post">
(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt (-84 / +82 lines)
Lines 120-196 $.tablesorter.addParser({ Link Here
120
            [% IF ( waiting_count ) %][% IF ( BORROWER_INF.atdestination ) %]<li><a href="/cgi-bin/koha/opac-user.pl#opac-user-waiting">Waiting</a></li>[% END %][% END %]
120
            [% IF ( waiting_count ) %][% IF ( BORROWER_INF.atdestination ) %]<li><a href="/cgi-bin/koha/opac-user.pl#opac-user-waiting">Waiting</a></li>[% END %][% END %]
121
            [% IF ( reserves_count ) %]<li><a href="/cgi-bin/koha/opac-user.pl#opac-user-holds">Holds</a></li>[% END %]
121
            [% IF ( reserves_count ) %]<li><a href="/cgi-bin/koha/opac-user.pl#opac-user-holds">Holds</a></li>[% END %]
122
        </ul>
122
        </ul>
123
        
124
[% IF ( OPACFinesTab ) %]
125
        <!-- FINES BOX -->
126
        [% IF ( BORROWER_INF.amountoverfive ) %]
127
            <div id="opac-user-fines"> <h3>Fines and charges</h3>
128
            <table>
129
                <tr><th colspan="2">Amount</th></tr>
130
                <tr>
131
                    <td>You currently owe fines and charges amounting to:</td>
132
                    <td><a href="/cgi-bin/koha/opac-account.pl">[% BORROWER_INF.amountoutstanding %]</a></td>
133
                </tr>
134
            </table></div>
135
        [% END %]
136
137
        [% IF ( BORROWER_INF.amountoverzero ) %]
138
           <div id="opac-user-fines"> <h3>Fines and charges</h3>
139
            <table>
140
                <tr><th colspan="2">Amount</th></tr>
141
                <tr><td>You currently owe fines and charges amounting to:</td>
142
                <td><a href="/cgi-bin/koha/opac-account.pl">[% BORROWER_INF.amountoutstanding %]</a></td></tr>
143
            </table></div>
144
        [% END %]
145
146
        [% IF ( BORROWER_INF.amountlessthanzero ) %]
147
          <div id="opac-user-fines">  <h3>Credits</h3>
148
            <table>
149
            <tr><th colspan="2">Amount</th></tr>
150
            <tr><td>You have a credit of:</td><td><a href="/cgi-bin/koha/opac-account.pl">[% BORROWER_INF.amountoutstanding %]</a></td></tr>
151
            </table></div>
152
        [% END %]
153
[% END %]
154
    
155
    [% END %]
156
157
    [% IF ( waiting_count ) %]
158
    [% IF ( atdestination ) %]
159
    <div id="opac-user-waiting">
160
        <table id="waitingt">
161
            <caption>Holds waiting</caption>
162
           <thead> <tr>
163
                <th colspan="2" class="{sorter:'articles'}">Title</th>
164
                <th>Hold date</th>
165
                <th>Pick up library</th>
166
            </tr></thead>
167
            <tbody>[% FOREACH WAITIN IN WAITING %]
168
                <tr>
169
                    <td><img src="[% themelang %]/images/[% WAITIN.itemtype %].gif" alt="[% WAITIN.itemtype %]" title="[% WAITIN.itemtype %]" /></td>
170
                    <td><a href="opac-detail.pl?biblionumber=[% WAITIN.biblionumber %]">
171
                            [% WAITIN.waiting_title %]
172
                        </a><span class="item-details">
173
                            [% WAITIN.author %]
174
                        </span></td>
175
                    <td>[% WAITIN.reservedate | $KohaDates %]</td>
176
                    <td>[% IF ( WAITIN.atdestination ) %]<strong>Waiting</strong> at [% WAITIN.branch %]
177
                        [% ELSE %]
178
                        In transit from [% WAITIN.holdingbranch %] to [% WAITIN.branch %]
179
                        [% END %]</td>
180
                </tr>
181
            [% END %]</tbody>
182
        </table></div>
183
        [% END %]
184
    [% END %]
185
123
186
    <div id="opac-user-checkouts">[% IF ( issues_count ) %]
124
    <div id="opac-user-checkouts">[% IF ( issues_count ) %]
187
        <form id="renewselected" action="/cgi-bin/koha/opac-renew.pl" method="post">
125
        <form id="renewselected" action="/cgi-bin/koha/opac-renew.pl" method="post">
188
	<input type="hidden" name="borrowernumber" value="[% borrowernumber %]">
126
    <input type="hidden" name="borrowernumber" value="[% borrowernumber %]">
189
	<input type="hidden" name="from" value="opac_user" />
127
    <input type="hidden" name="from" value="opac_user" />
190
        <table id="checkoutst">
128
        <table id="checkoutst">
191
        <caption>[% issues_count %] Item(s) checked out</caption>
129
        <caption>[% issues_count %] Item(s) checked out</caption>
192
       <thead><tr>
130
       <thead><tr>
193
		[% IF ( JacketImages ) %]<th class="{sorter: false}">&nbsp;</th>[% END %]
131
        [% IF ( JacketImages ) %]<th class="{sorter: false}">&nbsp;</th>[% END %]
194
        <th class="{sorter:'articles'}">Title</th>
132
        <th class="{sorter:'articles'}">Title</th>
195
        <th>Due</th>
133
        <th>Due</th>
196
        [% UNLESS ( item_level_itypes ) %]<th>Item type</th> [% END %]
134
        [% UNLESS ( item_level_itypes ) %]<th>Item type</th> [% END %]
Lines 207-221 $.tablesorter.addParser({ Link Here
207
        [% END %]
145
        [% END %]
208
        </tr></thead>
146
        </tr></thead>
209
        <tbody>
147
        <tbody>
210
		<!-- FIXME: the styling for highlight overrides the overdue red background,
148
        <!-- FIXME: the styling for highlight overrides the overdue red background,
211
				so currently we don't use this conditional as the first thing inside the LOOP:
149
                so currently we don't use this conditional as the first thing inside the LOOP:
212
        [% UNLESS ( __odd__ ) %]
150
        [% UNLESS ( __odd__ ) %]
213
           <tr[% IF ( overdue ) %] class="overdue"[% END %]>
151
           <tr[% IF ( overdue ) %] class="overdue"[% END %]>
214
        [% ELSE %]
152
        [% ELSE %]
215
           <tr class="[% IF ( overdue ) %]overdue [% END %]highlight">
153
           <tr class="[% IF ( overdue ) %]overdue [% END %]highlight">
216
        [% END %]
154
        [% END %]
217
		-->
155
        -->
218
		[% FOREACH ISSUE IN ISSUES %]
156
        [% FOREACH ISSUE IN ISSUES %]
219
        [% IF ( ISSUE.overdue ) %]<tr class="overdue">[% ELSE %]<tr>[% END %]
157
        [% IF ( ISSUE.overdue ) %]<tr class="overdue">[% ELSE %]<tr>[% END %]
220
158
221
[% IF ( JacketImages ) %]<td class="jacketcell">
159
[% IF ( JacketImages ) %]<td class="jacketcell">
Lines 259-285 $.tablesorter.addParser({ Link Here
259
            </tr>
197
            </tr>
260
        [% END %]</tbody>
198
        [% END %]</tbody>
261
        </table>
199
        </table>
262
	   [% IF ( canrenew && !userdebarred && OpacRenewalAllowed ) %]
200
       [% IF ( canrenew && !userdebarred && OpacRenewalAllowed ) %]
263
		<input type="submit" value="Renew Selected" />
201
        <input type="submit" value="Renew Selected" />
264
		[% END %]
202
        [% END %]
265
		</form>
203
        </form>
266
        [% IF ( canrenew && !userdebarred && OpacRenewalAllowed ) %]
204
        [% IF ( canrenew && !userdebarred && OpacRenewalAllowed ) %]
267
		<form id="renewall" action="/cgi-bin/koha/opac-renew.pl" method="post">
205
        <form id="renewall" action="/cgi-bin/koha/opac-renew.pl" method="post">
268
			<input type="hidden" name="from" value="opac_user" />
206
            <input type="hidden" name="from" value="opac_user" />
269
			<input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
207
            <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
270
			[% FOREACH ISSUE IN ISSUES %]
208
            [% FOREACH ISSUE IN ISSUES %]
271
			<input type="hidden" name="item" value="[% ISSUE.itemnumber %]" />
209
            <input type="hidden" name="item" value="[% ISSUE.itemnumber %]" />
272
			[% END %]
210
            [% END %]
273
			<input type="submit" value="Renew All" />
211
            <input type="submit" value="Renew All" />
274
		</form>
212
        </form>
275
		[% END %]
213
        [% END %]
276
    [% ELSE %]
214
    [% ELSE %]
277
        <table>
215
        <table>
278
            <tr><td>You have nothing checked out</td></tr>
216
            <tr><td>You have nothing checked out</td></tr>
279
        </table>
217
        </table>
280
    [% END %]</div>
218
    [% END %]</div>
219
220
[% IF ( OPACFinesTab ) %]
221
        <!-- FINES BOX -->
222
        [% IF ( BORROWER_INF.amountoverfive ) %]
223
            <div id="opac-user-fines"> <h3>Fines and charges</h3>
224
            <table>
225
                <tr><th colspan="2">Amount</th></tr>
226
                <tr>
227
                    <td>You currently owe fines and charges amounting to:</td>
228
                    <td><a href="/cgi-bin/koha/opac-account.pl">[% BORROWER_INF.amountoutstanding %]</a></td>
229
                </tr>
230
            </table></div>
231
        [% END %]
232
233
        [% IF ( BORROWER_INF.amountoverzero ) %]
234
           <div id="opac-user-fines"> <h3>Fines and charges</h3>
235
            <table>
236
                <tr><th colspan="2">Amount</th></tr>
237
                <tr><td>You currently owe fines and charges amounting to:</td>
238
                <td><a href="/cgi-bin/koha/opac-account.pl">[% BORROWER_INF.amountoutstanding %]</a></td></tr>
239
            </table></div>
240
        [% END %]
241
242
        [% IF ( BORROWER_INF.amountlessthanzero ) %]
243
          <div id="opac-user-fines">  <h3>Credits</h3>
244
            <table>
245
            <tr><th colspan="2">Amount</th></tr>
246
            <tr><td>You have a credit of:</td><td><a href="/cgi-bin/koha/opac-account.pl">[% BORROWER_INF.amountoutstanding %]</a></td></tr>
247
            </table></div>
248
        [% END %]
249
[% END %]
281
    
250
    
282
    
251
    [% END %]
252
253
    [% IF ( waiting_count ) %]
254
    [% IF ( atdestination ) %]
255
    <div id="opac-user-waiting">
256
        <table id="waitingt">
257
            <caption>Holds waiting</caption>
258
           <thead> <tr>
259
                <th colspan="2" class="{sorter:'articles'}">Title</th>
260
                <th>Hold date</th>
261
                <th>Pick up library</th>
262
            </tr></thead>
263
            <tbody>[% FOREACH WAITIN IN WAITING %]
264
                <tr>
265
                    <td><img src="[% themelang %]/images/[% WAITIN.itemtype %].gif" alt="[% WAITIN.itemtype %]" title="[% WAITIN.itemtype %]" /></td>
266
                    <td><a href="opac-detail.pl?biblionumber=[% WAITIN.biblionumber %]">
267
                            [% WAITIN.waiting_title %]
268
                        </a><span class="item-details">
269
                            [% WAITIN.author %]
270
                        </span></td>
271
                    <td>[% WAITIN.reservedate | $KohaDates %]</td>
272
                    <td>[% IF ( WAITIN.atdestination ) %]<strong>Waiting</strong> at [% WAITIN.branch %]
273
                        [% ELSE %]
274
                        In transit from [% WAITIN.holdingbranch %] to [% WAITIN.branch %]
275
                        [% END %]</td>
276
                </tr>
277
            [% END %]</tbody>
278
        </table></div>
279
        [% END %]
280
    [% END %]
281
283
[% IF ( overdues_count ) %]
282
[% IF ( overdues_count ) %]
284
<div id="opac-user-overdues"><table id="overduest">
283
<div id="opac-user-overdues"><table id="overduest">
285
<caption>Overdues <span class="count">([% overdues_count %] total)</span></caption>
284
<caption>Overdues <span class="count">([% overdues_count %] total)</span></caption>
286
- 

Return to bug 8078