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

(-)a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css (-14 lines)
Lines 1953-1972 ul.budget_hierarchy li:last-child:after { Link Here
1953
ul.budget_hierarchy li:first-child:after {
1953
ul.budget_hierarchy li:first-child:after {
1954
    content: "";
1954
    content: "";
1955
}
1955
}
1956
#cartmenulink img {
1957
	background-image : none;
1958
	display : inline;
1959
	padding : 3px 6px 0 0;
1960
}
1961
1962
* html #cartmenulink {
1963
	border : 1px solid #336600;
1964
}
1965
1966
* html #listsmenulink {
1967
	border : 1px solid #006699;
1968
}
1969
1970
#collapsedaddress {
1956
#collapsedaddress {
1971
    border: solid 1px #eee;
1957
    border: solid 1px #eee;
1972
    margin-right: 10px;
1958
    margin-right: 10px;
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt (-1 / +1 lines)
Lines 124-130 function CheckAttributeTypeForm(f) { Link Here
124
       </li>
124
       </li>
125
       <li><label for="display_checkout">Display in check-out: </label>
125
       <li><label for="display_checkout">Display in check-out: </label>
126
            <input type="checkbox" id="display_checkout" name="display_checkout" [% display_checkout_checked %] />
126
            <input type="checkbox" id="display_checkout" name="display_checkout" [% display_checkout_checked %] />
127
            <span>Check to show this attribute in member check-out.</span>
127
            <span>Check to show this attribute in patron check-out.</span>
128
       </li>
128
       </li>
129
       
129
       
130
        <li><label for="authorised_value_category">Authorized value category: </label>
130
        <li><label for="authorised_value_category">Authorized value category: </label>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt (-2 / +3 lines)
Lines 80-86 function Dopop(link) { Link Here
80
</div>
80
</div>
81
[% END %]
81
[% END %]
82
<!-- case of a mistake in transfer loop -->
82
<!-- case of a mistake in transfer loop -->
83
[% IF ( WrongTransfer ) %]<div class="dialog message"><!-- WrongTransfer --><h3>Please return <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber %]">[% title |html %]</a> to [% TransferWaitingAt %]</h3>
83
[% IF ( WrongTransfer ) %]<div class="dialog message"><!-- WrongTransfer --><h3>Please return <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber %]">[% title |html %]</a> to [% TransferWaitingAt %] or <a href="/cgi-bin/koha/circ/returns.pl?itemnumber=[% itemnumber %]&amp;canceltransfer=1">Cancel Transfer</a></h3>
84
[% IF ( wborcnum ) %]<h5>Hold for:</h5>
84
[% IF ( wborcnum ) %]<h5>Hold for:</h5>
85
        <ul><li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">
85
        <ul><li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">
86
            [% borsurname %], [% borfirstname %]</a> ([% borcnum %])</li>
86
            [% borsurname %], [% borfirstname %]</a> ([% borcnum %])</li>
Lines 396-402 function Dopop(link) { Link Here
396
[% IF ( riloop ) %]
396
[% IF ( riloop ) %]
397
    <h2>Checked-In items</h2>
397
    <h2>Checked-In items</h2>
398
    <table>
398
    <table>
399
	<tr><th>Due Date</th><th>Title</th>	<th>Author</th>	<th>Barcode</th><th>Call Number</th><th>Type</th>	<th>Patron</th><th>Note</th></tr>
399
	<tr><th>Due Date</th><th>Title</th>	<th>Author</th>	<th>Barcode</th><th>Shelving Location</th><th>Call Number</th><th>Type</th>	<th>Patron</th><th>Note</th></tr>
400
400
401
        [% FOREACH riloo IN riloop %]
401
        [% FOREACH riloo IN riloop %]
402
            <tr>
402
            <tr>
Lines 412-417 function Dopop(link) { Link Here
412
                    [% riloo.itemtitle |html %]</a></td>
412
                    [% riloo.itemtitle |html %]</a></td>
413
			<td>[% riloo.itemauthor %]</td>
413
			<td>[% riloo.itemauthor %]</td>
414
            <td><a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% riloo.itembiblionumber %]&amp;itemnumber=[% riloo.itemnumber %]#item[% riloo.itemnumber %]">[% riloo.barcode %]</a></td>
414
            <td><a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% riloo.itembiblionumber %]&amp;itemnumber=[% riloo.itemnumber %]#item[% riloo.itemnumber %]">[% riloo.barcode %]</a></td>
415
            <td>[% riloo.location %]</td>
415
            <td>[% riloo.itemcallnumber %]</td>
416
            <td>[% riloo.itemcallnumber %]</td>
416
            <td>[% riloo.itemtype %] [% riloo.ccode %]</td>
417
            <td>[% riloo.itemtype %] [% riloo.ccode %]</td>
417
			<td>[% IF ( riloo.duedate ) %]
418
			<td>[% IF ( riloo.duedate ) %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (-27 / +22 lines)
Lines 179-185 function validate1(date) { Link Here
179
179
180
     [% UNLESS ( I ) %][% IF ( othernames ) %]&ldquo;[% othernames %]&rdquo;[% END %]
180
     [% UNLESS ( I ) %][% IF ( othernames ) %]&ldquo;[% othernames %]&rdquo;[% END %]
181
181
182
<p class="address">
182
<p class="address">[% streetnumber %]
183
        [% IF ( roaddetails ) %]
183
        [% IF ( roaddetails ) %]
184
         [% roaddetails %],
184
         [% roaddetails %],
185
        [% END %]
185
        [% END %]
Lines 212-218 function validate1(date) { Link Here
212
    [% END %]
212
    [% END %]
213
    <li><span class="label">Initials: </span>[% initials %]</li>
213
    <li><span class="label">Initials: </span>[% initials %]</li>
214
    <li><span class="label">Date of birth:</span>[% dateofbirth %]</li>
214
    <li><span class="label">Date of birth:</span>[% dateofbirth %]</li>
215
    <li><span class="label">Sex:</span>[% sex %]</li>[% END %]
215
    <li><span class="label">Gender:</span>
216
    [% IF ( sex == 'F' ) %]Female[% ELSIF ( sex == 'M' ) %]Male[% ELSE %][% sex %][% END %]
217
    </li>[% END %]
216
    [% IF ( printethnicityline ) %]
218
    [% IF ( printethnicityline ) %]
217
    <li><span class="label">Ethnicity:</span>[% ethnicity %]</li>
219
    <li><span class="label">Ethnicity:</span>[% ethnicity %]</li>
218
    <li><span class="label">Ethnicity notes: </span>[% ethnotes %]</li>
220
    <li><span class="label">Ethnicity notes: </span>[% ethnotes %]</li>
Lines 339-346 function validate1(date) { Link Here
339
    </li>[% END %]
341
    </li>[% END %]
340
    [% IF ( sort1 ) %]<li><span class="label">Sort field 1:</span>[% lib1 %]</li>[% END %]
342
    [% IF ( sort1 ) %]<li><span class="label">Sort field 1:</span>[% lib1 %]</li>[% END %]
341
    [% IF ( sort2 ) %]<li><span class="label">Sort field 2:</span>[% lib2 %]</li>[% END %]
343
    [% IF ( sort2 ) %]<li><span class="label">Sort field 2:</span>[% lib2 %]</li>[% END %]
342
    <li><span class="label">OPAC login: </span>[% userid %]</li>
344
    <li><span class="label">Username: </span>[% userid %]</li>
343
    <li><span class="label">OPAC password: </span>
345
    <li><span class="label">Password: </span>
344
    [% IF ( password ) %]
346
    [% IF ( password ) %]
345
        *******
347
        *******
346
    [% ELSE %]
348
    [% ELSE %]
Lines 390-396 function validate1(date) { Link Here
390
	<ul>
392
	<ul>
391
		<li><a href="/cgi-bin/koha/members/moremember.pl#checkedout">[% issuecount %] Checkout(s)</a></li>
393
		<li><a href="/cgi-bin/koha/members/moremember.pl#checkedout">[% issuecount %] Checkout(s)</a></li>
392
    [% IF ( relissuecount ) %]
394
    [% IF ( relissuecount ) %]
393
        <li><a href="/cgi-bin/koha/members/moremember.pl#relissues">Relatives issues</a></li>
395
        <li><a href="/cgi-bin/koha/members/moremember.pl#relissues">Relatives' Checkouts</a></li>
394
    [% END %]
396
    [% END %]
395
		<li><a href="/cgi-bin/koha/members/moremember.pl#finesandcharges">Fines &amp; Charges</a></li>
397
		<li><a href="/cgi-bin/koha/members/moremember.pl#finesandcharges">Fines &amp; Charges</a></li>
396
		<li>[% IF ( countreserv ) %]
398
		<li>[% IF ( countreserv ) %]
Lines 486-494 function validate1(date) { Link Here
486
      [% IF ( issueloo.return_failed ) %]
488
      [% IF ( issueloo.return_failed ) %]
487
            <td class="problem">Checkin Failed</td>
489
            <td class="problem">Checkin Failed</td>
488
      [% ELSE %]
490
      [% ELSE %]
491
        [% IF ( issueloo.norenew_reason_on_reserve ) %]
492
            <td><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% issueloo.biblionumber %]">On Hold</a></td>
493
        [% ELSE %]
489
            <td><input type="checkbox" name="barcodes[]"  value="[% issueloo.barcode %]" onclick="uncheck_sibling(this);" />
494
            <td><input type="checkbox" name="barcodes[]"  value="[% issueloo.barcode %]" onclick="uncheck_sibling(this);" />
490
                <input type="checkbox" name="all_barcodes[]" value="[% issueloo.barcode %]" checked="checked" style="display: none;" />
495
                <input type="checkbox" name="all_barcodes[]" value="[% issueloo.barcode %]" checked="checked" style="display: none;" />
491
            </td>
496
            </td>
497
        [% END %]
492
      [% END %]
498
      [% END %]
493
        </tr>
499
        </tr>
494
  [% END %]
500
  [% END %]
Lines 511-531 function validate1(date) { Link Here
511
517
512
[% IF ( relissuecount ) %]
518
[% IF ( relissuecount ) %]
513
<div id="relissues">
519
<div id="relissues">
514
	<h2>Relatives issues</h2>
515
 <table id="relissuest">
520
 <table id="relissuest">
516
    <thead>
521
    <thead>
517
	<tr>
522
	<tr>
518
            <th scope="col">Due date</th>
523
            <th scope="col">Due date</th>
519
            <th scope="col">Title</th>
524
            <th scope="col">Title</th>
520
            <th scope="col">Collection</th>
521
            <th scope="col">Stock number</th>
522
            <th scope="col">Barcode</th>
523
            <th scope="col">Item Type</th>
525
            <th scope="col">Item Type</th>
524
            <th scope="col">Checked out on</th> 
526
            <th scope="col">Checked out on</th> 
525
            <th scope="col">Borrower</th>
527
            <th scope="col">Call no</th>
526
	    <th scope="col">Call no</th>
527
            <th scope="col">Charge</th>
528
            <th scope="col">Charge</th>
528
            <th scope="col">Price</th>
529
            <th scope="col">Price</th>
530
            <th scope="col">Patron</th>
529
        </tr>
531
        </tr>
530
    </thead>
532
    </thead>
531
       <tbody>
533
       <tbody>
Lines 544-559 function validate1(date) { Link Here
544
                                        <span class="dmg">[% relissueloo.itemdamaged %]</span>
546
                                        <span class="dmg">[% relissueloo.itemdamaged %]</span>
545
                [% END %]
547
                [% END %]
546
</td>
548
</td>
547
            <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% relissueloo.biblionumber %]"><strong>[% relissueloo.title |html %]</strong></a>[% IF ( relissueloo.author ) %], by [% relissueloo.author %][% END %] [% IF ( relissueloo.publishercode ) %]; [% relissueloo.publishercode %] [% END %] [% IF ( relissueloo.publicationyear ) %], [% relissueloo.publicationyear %][% END %]</td>
549
            <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% relissueloo.biblionumber %]"><strong>[% relissueloo.title |html %]</strong></a>[% IF relissueloo.author %], by [% relissueloo.author %][% END %] [% IF relissueloo.publishercode %]; [% relissueloo.publishercode %] [% END %] [% IF relissueloo.publicationyear %], [% relissueloo.publicationyear %][% END %] <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% relissueloo.biblionumber %]&amp;itemnumber=[% relissueloo.itemnumber %]#item[% relissueloo.itemnumber %]">[% relissueloo.barcode %]</a></td>
548
            <td>[% relissueloo.collection %]</td>
549
            <td>[% relissueloo.stocknumber %]</td>
550
            <td><a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% relissueloo.biblionumber %]&amp;itemnumber=[% relissueloo.itemnumber %]#item[% relissueloo.itemnumber %]">[% relissueloo.barcode %]</a></td>
551
<td>[% UNLESS ( noItemTypeImages ) %] [% IF ( relissueloo.itemtype_image ) %]<img src="[% relissueloo.itemtype_image %]" alt="" />[% END %][% END %][% relissueloo.itemtype_description %]</td>
550
<td>[% UNLESS ( noItemTypeImages ) %] [% IF ( relissueloo.itemtype_image ) %]<img src="[% relissueloo.itemtype_image %]" alt="" />[% END %][% END %][% relissueloo.itemtype_description %]</td>
552
            <td>[% relissueloo.issuedate %]</td>
551
            <td>[% relissueloo.issuedate %]</td>
553
	    <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% relissueloo.borrowernumber %]">[% relissueloo.borrowername %]</a></td>
552
        <td>[% relissueloo.itemcallnumber %]</td>
554
	    <td>[% relissueloo.itemcallnumber %]</td>
553
        <td>[% relissueloo.charge %]</td>
555
            <td>[% relissueloo.charge %]</td>
554
        <td>[% relissueloo.replacementprice %]</td>
556
            <td>[% relissueloo.replacementprice %]</td>
555
	    <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% relissueloo.borrowernumber %]">[% relissueloo.borrowername %] ([% relissueloo.cardnumber %])</a></td>
557
        </tr>
556
        </tr>
558
  [% END %]
557
  [% END %]
559
        </tbody>
558
        </tbody>
Lines 603-620 function validate1(date) { Link Here
603
                    <option value="del">Yes</option>
602
                    <option value="del">Yes</option>
604
                </select>
603
                </select>
605
                <input type="hidden" name="biblionumber" value="[% reservloo.biblionumber %]" />
604
                <input type="hidden" name="biblionumber" value="[% reservloo.biblionumber %]" />
606
                <input type="hidden" name="borrowernumber" value="[% reservloo.borrowernumber %]" />
605
                <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
607
            </td>
606
            </td>
608
        </tr>
607
        </tr>
609
		[% END %]</tbody>
608
		[% END %]</tbody>
610
    </table>
609
    </table>
611
610
612
        <fieldset class="action">
611
        <fieldset class="action"><input type="submit" class="cancel" name="submit" value="Cancel Marked Requests" /></fieldset>
613
        <input type="submit" name="renew_checked" value="Renew or Return checked items" />
612
    </form>
614
        <input type="submit" id="renew_all" name="renew_all" value="Renew all" />
613
    [% ELSE %]<p>Patron has nothing on hold.</p>[% END %]
615
        </fieldset>
616
    [% ELSE %]<p>Patron has nothing checked out.</p>[% END %]
617
</form>
618
	</div>
614
	</div>
619
615
620
</div>
616
</div>
621
- 

Return to bug 5436