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

(-)a/C4/Auth.pm (+1 lines)
Lines 374-379 sub get_template_and_user { Link Here
374
            IntranetUserCSS             => C4::Context->preference("IntranetUserCSS"),
374
            IntranetUserCSS             => C4::Context->preference("IntranetUserCSS"),
375
            intranetuserjs              => C4::Context->preference("intranetuserjs"),
375
            intranetuserjs              => C4::Context->preference("intranetuserjs"),
376
            intranetbookbag             => C4::Context->preference("intranetbookbag"),
376
            intranetbookbag             => C4::Context->preference("intranetbookbag"),
377
            PatronDefaultView           => C4::Context->preference("PatronDefaultView"),
377
            suggestion                  => C4::Context->preference("suggestion"),
378
            suggestion                  => C4::Context->preference("suggestion"),
378
            virtualshelves              => C4::Context->preference("virtualshelves"),
379
            virtualshelves              => C4::Context->preference("virtualshelves"),
379
            StaffSerialIssueDisplayCount => C4::Context->preference("StaffSerialIssueDisplayCount"),
380
            StaffSerialIssueDisplayCount => C4::Context->preference("StaffSerialIssueDisplayCount"),
(-)a/installer/data/mysql/sysprefs.sql (+1 lines)
Lines 69-74 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES Link Here
69
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('memberofinstitution',0,'If ON, patrons can be linked to institutions',NULL,'YesNo');
69
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('memberofinstitution',0,'If ON, patrons can be linked to institutions',NULL,'YesNo');
70
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('noissuescharge',5,'Define maximum amount withstanding before check outs are blocked','','Integer');
70
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('noissuescharge',5,'Define maximum amount withstanding before check outs are blocked','','Integer');
71
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('NotifyBorrowerDeparture',30,'Define number of days before expiry where circulation is warned about patron account expiry',NULL,'Integer');
71
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('NotifyBorrowerDeparture',30,'Define number of days before expiry where circulation is warned about patron account expiry',NULL,'Integer');
72
INSERT INTO `systempreferences` (variable, value, options, explanation, type) VALUES ( 'PatronDefaultView', 'normal', 'circ|detail', 'Choose the default destination for links to patron records: checkout or patron details', 'Choice');
72
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacAuthorities',1,'If ON, enables the search authorities link on OPAC',NULL,'YesNo');
73
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacAuthorities',1,'If ON, enables the search authorities link on OPAC',NULL,'YesNo');
73
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('opacbookbag',1,'If ON, enables display of Cart feature','','YesNo');
74
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('opacbookbag',1,'If ON, enables display of Cart feature','','YesNo');
74
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('intranetbookbag','1','If ON, enables display of Cart feature in the intranet','','YesNo');
75
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('intranetbookbag','1','If ON, enables display of Cart feature in the intranet','','YesNo');
(-)a/installer/data/mysql/updatedatabase.pl (+9 lines)
Lines 4765-4770 if (C4::Context->preference("Version") < TransformToNum($DBversion)) { Link Here
4765
    SetVersion($DBversion);
4765
    SetVersion($DBversion);
4766
}
4766
}
4767
4767
4768
$DBversion = "3.07.00.XXX";
4769
if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
4770
    $dbh->do("INSERT INTO koha.systempreferences (variable, value, options, explanation, type) VALUES (
4771
'PatronDefaultView', 'normal', 'circ|detail', 'Choose the default destination for links to patron records: checkout or patron details', 'Choice');");
4772
    print "Upgrade to $DBversion done (Bug 7680 - Create a PatronDefaultView preference for the staff client)\n";
4773
    SetVersion($DBversion);
4774
}
4775
4776
4768
=head1 FUNCTIONS
4777
=head1 FUNCTIONS
4769
4778
4770
=head2 DropAllForeignKeys($table)
4779
=head2 DropAllForeignKeys($table)
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-default-view.inc (+5 lines)
Line 0 Link Here
1
[% IF ( PatronDefaultView == 'circ' ) %]
2
<a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% borrowernumber %]">
3
[% ELSE %]
4
<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">
5
[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt (-2 / +2 lines)
Lines 211-217 Link Here
211
    [% END %]
211
    [% END %]
212
            [% budge.budget_remaining %] </td>
212
            [% budge.budget_remaining %] </td>
213
213
214
    <td class="tooltipcontent">[% IF ( budge.budget_owner_id ) %]<strong>Owner: </strong><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% budge.budget_owner_id %]">[% budge.budget_owner_name %]</a>[% END %]
214
    <td class="tooltipcontent">[% IF ( budge.budget_owner_id ) %]<strong>Owner: </strong>[% INCLUDE 'patron-default-view.inc' borrowernumber = budge.budget_owner_id %][% budge.budget_owner_name %]</a>[% END %]
215
        [% IF ( budge.budget_branchcode ) %]<br /><strong>Library: </strong>[% budge.budget_branchcode %][% END %]
215
        [% IF ( budge.budget_branchcode ) %]<br /><strong>Library: </strong>[% budge.budget_branchcode %][% END %]
216
        [% IF ( budge.budget_notes ) %]<br /><strong>Notes: </strong>[% budge.budget_notes %][% END %]
216
        [% IF ( budge.budget_notes ) %]<br /><strong>Notes: </strong>[% budge.budget_notes %][% END %]
217
        [% IF ( budge.budget_hierarchy ) %]
217
        [% IF ( budge.budget_hierarchy ) %]
Lines 294-300 Link Here
294
    <li>
294
    <li>
295
    <span class="label">Owner: </span>
295
    <span class="label">Owner: </span>
296
    <span  id="budget_owner_name">
296
    <span  id="budget_owner_name">
297
    <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% budget_owner_id %]">[% budget_owner_name %]</a>
297
    [% INCLUDE 'patron-default-view.inc' borrowernumber = budget_owner_id %][% budget_owner_name %]</a>
298
    </span>
298
    </span>
299
299
300
    <!-- FIXME: hardcoded button positions :/ -->
300
    <!-- FIXME: hardcoded button positions :/ -->
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref (+6 lines)
Lines 94-99 Patrons: Link Here
94
           class: integer
94
           class: integer
95
         - days beforehand.
95
         - days beforehand.
96
     -
96
     -
97
         - Links to patron records point to
98
         - pref: PatronDefaultView
99
           choices:
100
               circ: checkout
101
               detail: "patron details"
102
     -
97
         - pref: patronimages
103
         - pref: patronimages
98
           choices:
104
           choices:
99
               yes: Allow
105
               yes: Allow
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt (-2 / +2 lines)
Lines 308-314 function verify_images() { Link Here
308
                [% IF ( itemloo.datedue ) %]
308
                [% IF ( itemloo.datedue ) %]
309
						<span class="datedue">Checked out
309
						<span class="datedue">Checked out
310
                    [% UNLESS ( itemloo.NOTSAMEBRANCH ) %]
310
                    [% UNLESS ( itemloo.NOTSAMEBRANCH ) %]
311
                          to <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% itemloo.borrowernumber %]">
311
                          to [% INCLUDE 'patron-default-view.inc' borrowernumber = itemloo.borrowernumber %]
312
			  [% IF ( itemloo.hidepatronname ) %]
312
			  [% IF ( itemloo.hidepatronname ) %]
313
			      [% itemloo.cardnumber %]
313
			      [% itemloo.cardnumber %]
314
			  [% ELSE %]
314
			  [% ELSE %]
Lines 366-372 function verify_images() { Link Here
366
                    [% ELSE %]
366
                    [% ELSE %]
367
                        Item-level hold
367
                        Item-level hold
368
                    [% END %]
368
                    [% END %]
369
                    [% IF ( canreservefromotherbranches ) %]for <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% itemloo.ReservedForBorrowernumber %]">
369
                    [% IF ( canreservefromotherbranches ) %]for [% INCLUDE 'patron-default-view.inc' borrowernumber = itemloo.ReservedForBorrowernumber %]
370
		        [% IF ( itemloo.hidepatronname ) %]
370
		        [% IF ( itemloo.hidepatronname ) %]
371
		            [% itemloo.Reservedcardnumber %]
371
		            [% itemloo.Reservedcardnumber %]
372
		        [% ELSE %]
372
		        [% ELSE %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt (-1 / +1 lines)
Lines 34-40 Link Here
34
            <tbody>
34
            <tbody>
35
        [% FOREACH issue IN issues %]
35
        [% FOREACH issue IN issues %]
36
        [% UNLESS ( loop.odd ) %]<tr class="highlight">[% ELSE %]<tr>[% END %]
36
        [% UNLESS ( loop.odd ) %]<tr class="highlight">[% ELSE %]<tr>[% END %]
37
                <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% issue.borrowernumber %]">[% IF HidePatronName %][% issue.cardnumber %][% ELSE %][% issue.surname %][% IF ( issue.firstname ) %], [% issue.firstname %][% END %][% END %]</a></td>
37
                <td>[% INCLUDE 'patron-default-view.inc' borrowernumber = issue.borrowernumber %][% IF HidePatronName %][% issue.cardnumber %][% ELSE %][% issue.surname %][% IF ( issue.firstname ) %], [% issue.firstname %][% END %][% END %]</a></td>
38
                <td>[% IF ( issue.barcode ) %]
38
                <td>[% IF ( issue.barcode ) %]
39
                        <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% issue.biblionumber %]&amp;itemnumber=[% issue.itemnumber %]">[% issue.barcode %]</a>
39
                        <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% issue.biblionumber %]&amp;itemnumber=[% issue.itemnumber %]">[% issue.barcode %]</a>
40
                    [% ELSE %]
40
                    [% ELSE %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt (-4 / +4 lines)
Lines 69-75 Link Here
69
69
70
            <ol class="bibliodetails">
70
            <ol class="bibliodetails">
71
            <li><span class="label">Current Location:</span> [% ITEM_DAT.holdingbranchname %]&nbsp;</li>
71
            <li><span class="label">Current Location:</span> [% ITEM_DAT.holdingbranchname %]&nbsp;</li>
72
            <li><span class="label">Checkout Status:</span> [% IF ( ITEM_DAT.issue ) %]Checked out to <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% ITEM_DAT.borrowernumber %]">[% ITEM_DAT.cardnumber %]</a>[% IF ( ITEM_DAT.lastreneweddate ) %], Last renewed [% ITEM_DAT.lastreneweddate %][% END %], Due back on [% ITEM_DAT.datedue %][% ELSE %]Not Checked out [% END %]</li>
72
            <li><span class="label">Checkout Status:</span> [% IF ( ITEM_DAT.issue ) %]Checked out to [% INCLUDE 'patron-default-view.inc' borrowernumber = ITEM_DAT.borrowernumber %][% ITEM_DAT.cardnumber %]</a>[% IF ( ITEM_DAT.lastreneweddate ) %], Last renewed [% ITEM_DAT.lastreneweddate %][% END %], Due back on [% ITEM_DAT.datedue %][% ELSE %]Not Checked out [% END %]</li>
73
            <li><span class="label">Current Renewals:</span> [% ITEM_DAT.renewals %]&nbsp;</li>
73
            <li><span class="label">Current Renewals:</span> [% ITEM_DAT.renewals %]&nbsp;</li>
74
            [% IF ( ITEM_DAT.itemlostloop ) %]
74
            [% IF ( ITEM_DAT.itemlostloop ) %]
75
                <li><span class="label">Lost Status:</span>
75
                <li><span class="label">Lost Status:</span>
Lines 171-179 Link Here
171
171
172
                <li><span class="label">Last seen:</span> [% ITEM_DAT.datelastseen %]&nbsp;</li>
172
                <li><span class="label">Last seen:</span> [% ITEM_DAT.datelastseen %]&nbsp;</li>
173
                <li><span class="label">Last borrowed:</span> [% ITEM_DAT.datelastborrowed %]&nbsp;</li>
173
                <li><span class="label">Last borrowed:</span> [% ITEM_DAT.datelastborrowed %]&nbsp;</li>
174
                [% IF ( ITEM_DAT.card0 ) %]<li><span class="label">Last Borrower:</span> <a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% ITEM_DAT.borrower0 %]">[% ITEM_DAT.card0 %]</a>&nbsp;</li>[% END %]
174
                [% IF ( ITEM_DAT.card0 ) %]<li><span class="label">Last Borrower:</span> [% INCLUDE 'patron-default-view.inc' borrowernumber = ITEM_DAT.borrower0 %][% ITEM_DAT.card0 %]</a>&nbsp;</li>[% END %]
175
                [% IF ( ITEM_DAT.card1 ) %]<li><span class="label">Previous Borrower:</span> <a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% ITEM_DAT.borrower1 %]">[% ITEM_DAT.card1 %]</a>&nbsp;</li>[% END %]
175
                [% IF ( ITEM_DAT.card1 ) %]<li><span class="label">Previous Borrower:</span> [% INCLUDE 'patron-default-view.inc' borrowernumber = ITEM_DAT.borrower1 %][% ITEM_DAT.card1 %]</a>&nbsp;</li>[% END %]
176
		[% IF ( ITEM_DAT.card2 ) %]<li><span class="label">Previous Borrower:</span> <a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% ITEM_DAT.borrower2 %]">[% ITEM_DAT.card2 %]</a>&nbsp;</li>[% END %]
176
		[% IF ( ITEM_DAT.card2 ) %]<li><span class="label">Previous Borrower:</span> [% INCLUDE 'patron-default-view.inc' borrowernumber = ITEM_DAT.borrower2 %][% ITEM_DAT.card2 %]</a>&nbsp;</li>[% END %]
177
                <li><span class="label">Paid for?:</span> [% ITEM_DAT.paidfor %]&nbsp;</li>
177
                <li><span class="label">Paid for?:</span> [% ITEM_DAT.paidfor %]&nbsp;</li>
178
            <li><span class="label">Serial enumeration:</span> [% ITEM_DAT.enumchron %]&nbsp;</li>
178
            <li><span class="label">Serial enumeration:</span> [% ITEM_DAT.enumchron %]&nbsp;</li>
179
            <li><span class="label">Public Note:</span>
179
            <li><span class="label">Public Note:</span>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt (-2 / +2 lines)
Lines 48-54 Link Here
48
                            <br />Barcode : [% overduesloo.barcode %]
48
                            <br />Barcode : [% overduesloo.barcode %]
49
                    </td>
49
                    </td>
50
                    <td>
50
                    <td>
51
                        <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% overduesloo.borrowernumber %]">[% overduesloo.borrowersurname %], [% overduesloo.borrowerfirstname %]</a><br />[% overduesloo.borrowerphone %]<br />
51
                        [% INCLUDE 'patron-default-view.inc' borrowernumber = overduesloo.borrowernumber %][% overduesloo.borrowersurname %], [% overduesloo.borrowerfirstname %]</a><br />[% overduesloo.borrowerphone %]<br />
52
                    [% IF ( overduesloo.borroweremail ) %]<a href="mailto:[% overduesloo.borroweremail %]?subject=Overdue: [% overduesloo.title |html %]">
52
                    [% IF ( overduesloo.borroweremail ) %]<a href="mailto:[% overduesloo.borroweremail %]?subject=Overdue: [% overduesloo.title |html %]">
53
                    [% overduesloo.borroweremail %]</a>[% END %]
53
                    [% overduesloo.borroweremail %]</a>[% END %]
54
                    </td>
54
                    </td>
Lines 126-132 Link Here
126
                            </p>
126
                            </p>
127
                        </td>
127
                        </td>
128
                        <td>
128
                        <td>
129
                            <p><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% todayoverduesloo.borrowernumber %]">[% todayoverduesloo.borrowersurname %] &nbsp; [% todayoverduesloo.borrowerfirstname %]</a><br />[% todayoverduesloo.borrowerphone %]<br />
129
                            <p>[% INCLUDE 'patron-default-view.inc' borrowernumber = todayoverduesloo.borrowernumber %][% todayoverduesloo.borrowersurname %] &nbsp; [% todayoverduesloo.borrowerfirstname %]</a><br />[% todayoverduesloo.borrowerphone %]<br />
130
                        [% IF ( todayoverduesloo.borroweremail ) %]<a href="mailto:[% todayoverduesloo.borroweremail %]?subject=Overdue: [% todayoverduesloo.title |html %]">
130
                        [% IF ( todayoverduesloo.borroweremail ) %]<a href="mailto:[% todayoverduesloo.borroweremail %]?subject=Overdue: [% todayoverduesloo.title |html %]">
131
                        [% todayoverduesloo.borroweremail %]</a>[% END %]
131
                        [% todayoverduesloo.borroweremail %]</a>[% END %]
132
                            </p>
132
                            </p>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt (-3 / +3 lines)
Lines 16-25 Link Here
16
    <table>
16
    <table>
17
        <caption>
17
        <caption>
18
            [% IF ( reserved ) %]
18
            [% IF ( reserved ) %]
19
                Reserve found for [% name %] (<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% borrowernumber %]</a>).
19
                Reserve found for [% name %] ([% INCLUDE 'patron-default-view.inc' %][% borrowernumber %]</a>).
20
            [% END %]
20
            [% END %]
21
            [% IF ( waiting ) %]
21
            [% IF ( waiting ) %]
22
                Item is marked waiting at [% branchname %] for [% name %] (<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% borrowernumber %]</a>).
22
                Item is marked waiting at [% branchname %] for [% name %] ([% INCLUDE 'patron-default-view.inc' %][% borrowernumber %]</a>).
23
            [% END %]
23
            [% END %]
24
        </caption>
24
        </caption>
25
        <tr>
25
        <tr>
Lines 116-122 Link Here
116
                                  <li>Item is already at destination library.</li>
116
                                  <li>Item is already at destination library.</li>
117
                              [% END %]
117
                              [% END %]
118
                              [% IF ( errmsgloo.errwasreturned ) %]
118
                              [% IF ( errmsgloo.errwasreturned ) %]
119
                                  <li>Item was on loan to <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% errmsgloo.borrowernumber %]">
119
                                  <li>Item was on loan to [% INCLUDE 'patron-default-view.inc' borrowernumber = errmsgloo.borrowernumber %]
120
                                  [% errmsgloo.firstname %] [% errmsgloo.surname %]
120
                                  [% errmsgloo.firstname %] [% errmsgloo.surname %]
121
                                  ([% errmsgloo.cardnumber %])</a> and has been returned.</li>
121
                                  ([% errmsgloo.cardnumber %])</a> and has been returned.</li>
122
                              [% END %]
122
                              [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-5 / +5 lines)
Lines 249-263 function refocus(calendar) { Link Here
249
[% END %]
249
[% END %]
250
250
251
[% IF ( RESERVE_WAITING ) %]
251
[% IF ( RESERVE_WAITING ) %]
252
    <li>Item <i>[% getTitleMessageIteminfo %]</i> ([% getBarcodeMessageIteminfo %]) has been waiting for <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% resborrowernumber %]">[% resfirstname %] [% ressurname %]</a> ([% rescardnumber %]) at [% resbranchname %] since [% reswaitingdate %]</li>
252
    <li>Item <i>[% getTitleMessageIteminfo %]</i> ([% getBarcodeMessageIteminfo %]) has been waiting for [% INCLUDE 'patron-default-view.inc' borrowernumber = resborrowernumber %][% resfirstname %] [% ressurname %]</a> ([% rescardnumber %]) at [% resbranchname %] since [% reswaitingdate %]</li>
253
[% END %]
253
[% END %]
254
254
255
[% IF ( RESERVED ) %]
255
[% IF ( RESERVED ) %]
256
    <li>Item <i>[% getTitleMessageIteminfo %]</i> ([% getBarcodeMessageIteminfo %]) has been on hold for <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% resborrowernumber %]">[% resfirstname %] [% ressurname %]</a> ([% rescardnumber %]) at [% resbranchname %] since [% resreservedate %]</li>
256
    <li>Item <i>[% getTitleMessageIteminfo %]</i> ([% getBarcodeMessageIteminfo %]) has been on hold for [% INCLUDE 'patron-default-view.inc' borrowernumber = resborrowernumber %][% resfirstname %] [% ressurname %]</a> ([% rescardnumber %]) at [% resbranchname %] since [% resreservedate %]</li>
257
[% END %]
257
[% END %]
258
258
259
[% IF ( ISSUED_TO_ANOTHER ) %]
259
[% IF ( ISSUED_TO_ANOTHER ) %]
260
    <li>Item <i>[% getTitleMessageIteminfo %]</i> ([% getBarcodeMessageIteminfo %]) is checked out to <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% issued_borrowernumber %]">[% issued_firstname %] [% issued_surname %]</a> ([% issued_cardnumber %]). Check in and check out?</li>
260
    <li>Item <i>[% getTitleMessageIteminfo %]</i> ([% getBarcodeMessageIteminfo %]) is checked out to [% INCLUDE 'patron-default-view.inc' borrowernumber = issued_borrowernumber %][% issued_firstname %] [% issued_surname %]</a> ([% issued_cardnumber %]). Check in and check out?</li>
261
[% END %]
261
[% END %]
262
262
263
[% IF ( TOO_MANY ) %]
263
[% IF ( TOO_MANY ) %]
Lines 903-909 No patron matched <span class="ex">[% message %]</span> Link Here
903
        <td>[% relissue.issuingbranchname %]</td>
903
        <td>[% relissue.issuingbranchname %]</td>
904
        <td>[% relissue.itemcallnumber %]</td>
904
        <td>[% relissue.itemcallnumber %]</td>
905
        <td>[% relissue.charge %]</td>
905
        <td>[% relissue.charge %]</td>
906
        <td>[% relissue.replacementprice %]</td><td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% relissue.borrowernumber %]">[% relissue.firstname %] [% relissue.surname %] ([% relissue.cardnumber %])</a></td>
906
        <td>[% relissue.replacementprice %]</td><td>[% INCLUDE 'patron-default-view.inc' borrowernumber = relissue.borrowernumber %][% relissue.firstname %] [% relissue.surname %] ([% relissue.cardnumber %])</a></td>
907
     </tr>
907
     </tr>
908
    [% END %] <!-- /loop relissues -->
908
    [% END %] <!-- /loop relissues -->
909
    <!-- /if relissues -->[% END %]
909
    <!-- /if relissues -->[% END %]
Lines 926-932 No patron matched <span class="ex">[% message %]</span> Link Here
926
	[% IF ( relprevissue.multiple_borrowers ) %]<td>[% relprevissue.firstname %] [% relprevissue.surname %]</td>[% END %]
926
	[% IF ( relprevissue.multiple_borrowers ) %]<td>[% relprevissue.firstname %] [% relprevissue.surname %]</td>[% END %]
927
        <td>[% relprevissue.charge %]</td>
927
        <td>[% relprevissue.charge %]</td>
928
        <td>[% relprevissue.replacementprice %]</td>
928
        <td>[% relprevissue.replacementprice %]</td>
929
        <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% relprevissue.borrowernumber %]">[% relprevissue.firstname %] [% relprevissue.surname %] ([% relprevissue.cardnumber %])</a></td>
929
        <td>[% INCLUDE 'patron-default-view.inc' borrowernumber = relprevissue.borrowernumber %][% relprevissue.firstname %] [% relprevissue.surname %] ([% relprevissue.cardnumber %])</a></td>
930
930
931
    </tr>
931
    </tr>
932
    <!-- /loop relprevissue -->[% END %]
932
    <!-- /loop relprevissue -->[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt (-1 / +1 lines)
Lines 116-122 Link Here
116
<tbody>[% FOREACH overdueloo IN overdueloop %]
116
<tbody>[% FOREACH overdueloo IN overdueloop %]
117
    <tr>
117
    <tr>
118
        <td>[% overdueloo.duedate %]</td>
118
        <td>[% overdueloo.duedate %]</td>
119
        <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% overdueloo.borrowernumber %]">[% overdueloo.surname %] [% overdueloo.firstname %]</a>
119
        <td>[% INCLUDE 'patron-default-view.inc' borrowernumber = overdueloo.borrowernumber %][% overdueloo.surname %] [% overdueloo.firstname %]</a>
120
        [% IF ( overdueloo.email ) %][<a href="mailto:[% overdueloo.email %]?subject=Overdue: [% overdueloo.title |html %]">email</a>][% END %]
120
        [% IF ( overdueloo.email ) %][<a href="mailto:[% overdueloo.email %]?subject=Overdue: [% overdueloo.title |html %]">email</a>][% END %]
121
        [% IF ( overdueloo.phone ) %]([% overdueloo.phone %])[% ELSIF ( overdueloo.mobile ) %]([% overdueloo.mobile %])[% ELSIF ( overdueloo.phonepro ) %]([% overdueloo.phonepro %])[% END %]</td>
121
        [% IF ( overdueloo.phone ) %]([% overdueloo.phone %])[% ELSIF ( overdueloo.mobile ) %]([% overdueloo.mobile %])[% ELSIF ( overdueloo.phonepro ) %]([% overdueloo.phonepro %])[% END %]</td>
122
        <td>[% overdueloo.branchcode %]</td>
122
        <td>[% overdueloo.branchcode %]</td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt (-7 / +7 lines)
Lines 88-94 function Dopop(link) { Link Here
88
<!-- case of a mistake in transfer loop -->
88
<!-- case of a mistake in transfer loop -->
89
[% IF ( WrongTransfer ) %]<div id="return2" 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><h3><a href="#" onclick="Dopop('transfer-slip.pl?transferitem=[% itemnumber %]&amp;&amp;branchcode=[% homebranch %]&amp;op=slip'); return true;">Print Slip</a> or <a href="/cgi-bin/koha/circ/returns.pl?itemnumber=[% itemnumber %]&amp;canceltransfer=1">Cancel Transfer</a></h3>
89
[% IF ( WrongTransfer ) %]<div id="return2" 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><h3><a href="#" onclick="Dopop('transfer-slip.pl?transferitem=[% itemnumber %]&amp;&amp;branchcode=[% homebranch %]&amp;op=slip'); return true;">Print Slip</a> or <a href="/cgi-bin/koha/circ/returns.pl?itemnumber=[% itemnumber %]&amp;canceltransfer=1">Cancel Transfer</a></h3>
90
[% IF ( wborcnum ) %]<h5>Hold for:</h5>
90
[% IF ( wborcnum ) %]<h5>Hold for:</h5>
91
        <ul><li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">
91
        <ul><li>[% INCLUDE 'patron-default-view.inc' %]
92
            [% borsurname %], [% borfirstname %]</a> ([% borcnum %])</li>
92
            [% borsurname %], [% borfirstname %]</a> ([% borcnum %])</li>
93
        <li>[% wboraddress %][% IF ( wboraddress2 ) %]<br />
93
        <li>[% wboraddress %][% IF ( wboraddress2 ) %]<br />
94
		[% wboraddress2 %]<br />[% END %]
94
		[% wboraddress2 %]<br />[% END %]
Lines 122-128 function Dopop(link) { Link Here
122
        [% IF ( reservenotes ) %]<h4>Notes: [% reservenotes %]</h4>[% END %]
122
        [% IF ( reservenotes ) %]<h4>Notes: [% reservenotes %]</h4>[% END %]
123
        <h4>Hold for:</h4>
123
        <h4>Hold for:</h4>
124
			<ul>
124
			<ul>
125
            <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% borsurname %], [% borfirstname %]</a> ([% borcnum %])</li>
125
            <li>[% INCLUDE 'patron-default-view.inc' %][% borsurname %], [% borfirstname %]</a> ([% borcnum %])</li>
126
            <li>[% boraddress %]<br />
126
            <li>[% boraddress %]<br />
127
			[% IF ( boraddress2 ) %][% boraddress2 %]<br />[% END %]
127
			[% IF ( boraddress2 ) %][% boraddress2 %]<br />[% END %]
128
            [% borcity %] [% borzip %]</li>
128
            [% borcity %] [% borzip %]</li>
Lines 163-169 function Dopop(link) { Link Here
163
		<h3>Hold needing transfer found: <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% itembiblionumber %]">[% title |html %]</a></h3>
163
		<h3>Hold needing transfer found: <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% itembiblionumber %]">[% title |html %]</a></h3>
164
                <h4>Hold for: </h4>
164
                <h4>Hold for: </h4>
165
                    <ul>
165
                    <ul>
166
                        <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% borsurname %], [% borfirstname %]</a> ([% borcnum %])</li>
166
                        <li>[% INCLUDE 'patron-default-view.inc' %][% borsurname %], [% borfirstname %]</a> ([% borcnum %])</li>
167
                        <li>[% boraddress %]<br />
167
                        <li>[% boraddress %]<br />
168
						[% IF ( boraddress2 ) %][% boraddress2 %]<br />[% END %]
168
						[% IF ( boraddress2 ) %][% boraddress2 %]<br />[% END %]
169
						[% borcity %]  [% borzip %]</li>
169
						[% borcity %]  [% borzip %]</li>
Lines 269-275 function Dopop(link) { Link Here
269
        [% IF ( reservenotes ) %]<h4>Notes: [% reservenotes %]</h4>[% END %]
269
        [% IF ( reservenotes ) %]<h4>Notes: [% reservenotes %]</h4>[% END %]
270
        <h5>Hold for:</h5>
270
        <h5>Hold for:</h5>
271
		<ul>
271
		<ul>
272
            <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">
272
            <li>[% INCLUDE 'patron-default-view.inc' %]
273
                [% borsurname %], [% borfirstname %]
273
                [% borsurname %], [% borfirstname %]
274
            </a> ([% borcnum %])</li>
274
            </a> ([% borcnum %])</li>
275
            <li>[% boraddress %]<br />
275
            <li>[% boraddress %]<br />
Lines 331-337 function Dopop(link) { Link Here
331
                        <p class="problem">Item is withdrawn.</p>
331
                        <p class="problem">Item is withdrawn.</p>
332
                    [% END %]
332
                    [% END %]
333
                    [% IF ( errmsgloo.debarred ) %]
333
                    [% IF ( errmsgloo.debarred ) %]
334
                        <p class="problem"><a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% errmsgloo.debarborrowernumber %]">[% errmsgloo.debarname %]([% errmsgloo.debarcardnumber %])</a> is now debarred until [% errmsgloo.debarred %] </p>
334
                        <p class="problem">[% INCLUDE 'patron-default-view.inc' borrowernumber = errmsgloo.debarborrowernumber %][% errmsgloo.debarname %]([% errmsgloo.debarcardnumber %])</a> is now debarred until [% errmsgloo.debarred %] </p>
335
                    [% END %]
335
                    [% END %]
336
            [% END %]
336
            [% END %]
337
[% IF ( soundon ) %]
337
[% IF ( soundon ) %]
Lines 411-417 function Dopop(link) { Link Here
411
            <td>[% title |html %]</td>
411
            <td>[% title |html %]</td>
412
            <td>
412
            <td>
413
413
414
                <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% riborrowernumber %]">[% riborsurname %], [% ribortitle %] [% riborfirstname %]</a> ([% riborcnum %])
414
                [% INCLUDE 'patron-default-view.inc' borrowernumber = riborrowernumber %][% riborsurname %], [% ribortitle %] [% riborfirstname %]</a> ([% riborcnum %])
415
                [% IF ( flagset ) %]
415
                [% IF ( flagset ) %]
416
                ([% FOREACH flagloo IN flagloop %]
416
                ([% FOREACH flagloo IN flagloop %]
417
                [% flagloo.flag %]
417
                [% flagloo.flag %]
Lines 445-451 function Dopop(link) { Link Here
445
            <td>[% riloo.itemcallnumber %]</td>
445
            <td>[% riloo.itemcallnumber %]</td>
446
            <td>[% riloo.itemtype %] [% riloo.ccode %]</td>
446
            <td>[% riloo.itemtype %] [% riloo.ccode %]</td>
447
			<td>[% IF ( riloo.duedate ) %]
447
			<td>[% IF ( riloo.duedate ) %]
448
                <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% riloo.borrowernumber %]">
448
                [% INCLUDE 'patron-default-view.inc' borrowernumber = riloo.borrowernumber %]
449
                    [% riloo.borsurname %], [% riloo.borfirstname %] ([% riloo.borcategorycode %])
449
                    [% riloo.borsurname %], [% riloo.borfirstname %] ([% riloo.borcategorycode %])
450
                </a>
450
                </a>
451
            [% ELSE %]Not checked out[% END %]</td>
451
            [% ELSE %]Not checked out[% END %]</td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt (-1 / +1 lines)
Lines 65-71 $(document).ready(function() { Link Here
65
                            <br />Barcode: [% reser.barcode %]
65
                            <br />Barcode: [% reser.barcode %]
66
                    </td>
66
                    </td>
67
                    <td>[% IF ( reser.borrowername ) %]
67
                    <td>[% IF ( reser.borrowername ) %]
68
                        <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% reser.borrowernum %]">
68
                        [% INCLUDE 'patron-default-view.inc' borrowernumber = reser.borrowernum %]
69
                            [% reser.borrowername %] &nbsp; [% reser.borrowerfirstname %]
69
                            [% reser.borrowername %] &nbsp; [% reser.borrowerfirstname %]
70
                        </a>
70
                        </a>
71
                        <br />[% reser.borrowerphone %]<br />
71
                        <br />[% reser.borrowerphone %]<br />
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt (-1 / +1 lines)
Lines 77-83 $(document).ready(function() { Link Here
77
                    <strong>[% itemsloo.barcode %]</strong> <em>or any available</em>
77
                    <strong>[% itemsloo.barcode %]</strong> <em>or any available</em>
78
                [% END %]
78
                [% END %]
79
            </td>
79
            </td>
80
			<td class="hq-patron"><p><a href="/cgi-bin/koha/circ/circulation.pl?findborrower=[% itemsloo.cardnumber %]#reserves">[% itemsloo.surname %], [% itemsloo.firstname %] ([% itemsloo.cardnumber %])</a></p> <p>[% itemsloo.phone %]</p></td>
80
			<td class="hq-patron"><p>[% INCLUDE 'patron-default-view.inc' borrowernumber = itemsloo.borrowernumber %][% itemsloo.surname %], [% itemsloo.firstname %] ([% itemsloo.cardnumber %])</a></p> <p>[% itemsloo.phone %]</p></td>
81
            <td class="hq-sendto">[% itemsloo.pickbranch %]</td>
81
            <td class="hq-sendto">[% itemsloo.pickbranch %]</td>
82
            <td class="hq-date">[% itemsloo.reservedate %]</td>
82
            <td class="hq-date">[% itemsloo.reservedate %]</td>
83
            <td class="hq-notes">[% itemsloo.notes %]</td>
83
            <td class="hq-notes">[% itemsloo.notes %]</td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt (-2 / +2 lines)
Lines 93-99 $.tablesorter.addParser({ Link Here
93
                            &nbsp; (<b>[% reserveloo.itemtype %]</b>)
93
                            &nbsp; (<b>[% reserveloo.itemtype %]</b>)
94
                            <br />Barcode: [% reserveloo.barcode %]
94
                            <br />Barcode: [% reserveloo.barcode %]
95
                    </td>
95
                    </td>
96
                    <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% reserveloo.borrowernum %]">[% reserveloo.borrowername %], [% reserveloo.borrowerfirstname %]</a><br />[% reserveloo.borrowerphone %]<br />
96
                    <td>[% INCLUDE 'patron-default-view.inc' borrowernumber = reserveloo.borrowernum %][% reserveloo.borrowername %], [% reserveloo.borrowerfirstname %]</a><br />[% reserveloo.borrowerphone %]<br />
97
                        [% IF ( reserveloo.borrowermail ) %]<a href="mailto:[% reserveloo.email %]?subject=Reservation: [% reserveloo.title %]">
97
                        [% IF ( reserveloo.borrowermail ) %]<a href="mailto:[% reserveloo.email %]?subject=Reservation: [% reserveloo.title %]">
98
                        [% reserveloo.borrowermail %]</a>[% END %]
98
                        [% reserveloo.borrowermail %]</a>[% END %]
99
                    </td>
99
                    </td>
Lines 152-158 $.tablesorter.addParser({ Link Here
152
                            [% UNLESS ( item_level_itypes ) %][% IF ( overloo.itemtype ) %]&nbsp; (<b>[% overloo.itemtype %]</b>)[% END %][% END %]
152
                            [% UNLESS ( item_level_itypes ) %][% IF ( overloo.itemtype ) %]&nbsp; (<b>[% overloo.itemtype %]</b>)[% END %][% END %]
153
                        <br />Barcode: [% overloo.barcode %]
153
                        <br />Barcode: [% overloo.barcode %]
154
                    </td>
154
                    </td>
155
                    <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% overloo.borrowernum %]">[% overloo.borrowername %], [% overloo.borrowerfirstname %]</a><br />[% overloo.borrowerphone %]<br />
155
                    <td>[% INCLUDE 'patron-default-view.inc' borrowernumber = overloo.borrowernum %][% overloo.borrowername %], [% overloo.borrowerfirstname %]</a><br />[% overloo.borrowerphone %]<br />
156
                        [% IF ( overloo.borrowermail ) %]<a href="mailto:[% overloo.email %]?subject=Reservation: [% overloo.title |url %]">
156
                        [% IF ( overloo.borrowermail ) %]<a href="mailto:[% overloo.email %]?subject=Reservation: [% overloo.title |url %]">
157
        [% overloo.borrowermail %]</a>[% END %]
157
        [% overloo.borrowermail %]</a>[% END %]
158
                    </td>
158
                    </td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt (-2 / +8 lines)
Lines 40-46 Link Here
40
[% ELSE %]
40
[% ELSE %]
41
41
42
<form method="post" id="changepasswordf" action="/cgi-bin/koha/members/member-password.pl">
42
<form method="post" id="changepasswordf" action="/cgi-bin/koha/members/member-password.pl">
43
<input type="hidden" name="destination" value="[% destination %]" />	
43
<input type="hidden" name="destination" value="[% destination %]" />
44
<input type="hidden" name="cardnumber" value="[% cardnumber %]" />
44
<input type="hidden" name="cardnumber" value="[% cardnumber %]" />
45
<input type="hidden" name="borrowernumber" id="borrowernumber" value="[% borrowernumber %]" />
45
<input type="hidden" name="borrowernumber" id="borrowernumber" value="[% borrowernumber %]" />
46
	[% IF ( errormsg ) %]
46
	[% IF ( errormsg ) %]
Lines 85-91 Link Here
85
	</li>
85
	</li>
86
	</ol>
86
	</ol>
87
</fieldset>
87
</fieldset>
88
	<fieldset class="action"><input type="submit" value="Save" /> <a class="cancel" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">Cancel</a></fieldset>
88
	<fieldset class="action"><input type="submit" value="Save" />
89
		[% IF ( destination == 'circ' ) %]
90
		<a class="cancel" href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% borrowernumber %]">
91
		[% ELSE %]
92
		<a class="cancel" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">
93
		[% END %]
94
			Cancel</a></fieldset>
89
</form>[% END %]
95
</form>[% END %]
90
96
91
</div>
97
</div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt (-1 / +1 lines)
Lines 60-66 Link Here
60
							[% END %]
60
							[% END %]
61
							[% END %]
61
							[% END %]
62
							<td>[% resultsloo.cardnumber %]</td>
62
							<td>[% resultsloo.cardnumber %]</td>
63
							<td style="white-space: nowrap;"><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% resultsloo.borrowernumber %]">
63
							<td style="white-space: nowrap;">[% INCLUDE 'patron-default-view.inc' borrowernumber = resultsloo.borrowernumber %]
64
                            [% INCLUDE 'patron-title.inc' category_type = resultsloo.category_type firstname = resultsloo.firstname surname = resultsloo.surname othernames = resultsloo.othernames cardnumber = resultsloo.cardnumber %]</a> <br />
64
                            [% INCLUDE 'patron-title.inc' category_type = resultsloo.category_type firstname = resultsloo.firstname surname = resultsloo.surname othernames = resultsloo.othernames cardnumber = resultsloo.cardnumber %]</a> <br />
65
                            [% IF ( resultsloo.streetnumber ) %][% resultsloo.streetnumber %] [% END %][% resultsloo.address %][% IF ( resultsloo.address2 ) %]<br />[% resultsloo.address2 %][% END %][% IF ( resultsloo.city ) %]<br />[% resultsloo.city %][% IF ( resultsloo.state ) %],[% END %][% END %][% IF ( resultsloo.state ) %] [% resultsloo.state %][% END %] [% IF ( resultsloo.zipcode ) %]  [% resultsloo.zipcode %][% END %][% IF ( resultsloo.country ) %], [% resultsloo.country %][% END %]</td>
65
                            [% IF ( resultsloo.streetnumber ) %][% resultsloo.streetnumber %] [% END %][% resultsloo.address %][% IF ( resultsloo.address2 ) %]<br />[% resultsloo.address2 %][% END %][% IF ( resultsloo.city ) %]<br />[% resultsloo.city %][% IF ( resultsloo.state ) %],[% END %][% END %][% IF ( resultsloo.state ) %] [% resultsloo.state %][% END %] [% IF ( resultsloo.zipcode ) %]  [% resultsloo.zipcode %][% END %][% IF ( resultsloo.country ) %], [% resultsloo.country %][% END %]</td>
66
							<td>[% resultsloo.category_description %] ([% resultsloo.category_type %])</td>
66
							<td>[% resultsloo.category_description %] ([% resultsloo.category_type %])</td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt (-3 / +8 lines)
Lines 74-80 Link Here
74
		Add[% IF ( categoryname ) %] [% categoryname %] patron[% ELSE %][% IF ( I ) %] Organization patron[% END %][% IF ( A ) %] Adult patron[% END %][% IF ( C ) %] Child patron[% END %][% IF ( P ) %] Professional patron[% END %][% IF ( S ) %] Staff patron[% END %][% END %]
74
		Add[% IF ( categoryname ) %] [% categoryname %] patron[% ELSE %][% IF ( I ) %] Organization patron[% END %][% IF ( A ) %] Adult patron[% END %][% IF ( C ) %] Child patron[% END %][% IF ( P ) %] Professional patron[% END %][% IF ( S ) %] Staff patron[% END %][% END %]
75
[% surname %] [% firstname %]
75
[% surname %] [% firstname %]
76
[% ELSE %] 
76
[% ELSE %] 
77
<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% firstname %] [% surname %]</a> &rsaquo; <strong>[% IF ( opduplicate ) %]Duplicate[% ELSE %]Modify[% END %][% IF ( categoryname ) %] [% categoryname %] patron[% ELSE %][% IF ( I ) %] Organization patron[% END %][% IF ( A ) %] Adult patron[% END %][% IF ( C ) %] Child patron[% END %][% IF ( P ) %] Professional patron[% END %][% IF ( S ) %] Staff patron[% END %][% END %]
77
[% INCLUDE 'patron-default-view.inc' %][% firstname %] [% surname %]</a> &rsaquo; <strong>[% IF ( opduplicate ) %]Duplicate[% ELSE %]Modify[% END %][% IF ( categoryname ) %] [% categoryname %] patron[% ELSE %][% IF ( I ) %] Organization patron[% END %][% IF ( A ) %] Adult patron[% END %][% IF ( C ) %] Child patron[% END %][% IF ( P ) %] Professional patron[% END %][% IF ( S ) %] Staff patron[% END %][% END %]
78
</strong>[% END %]</div>
78
</strong>[% END %]</div>
79
[% IF ( opadd ) %]<div id="doc" class="yui-t7">[% ELSE %]<div id="doc3" class="yui-t2">[% END %]
79
[% IF ( opadd ) %]<div id="doc" class="yui-t7">[% ELSE %]<div id="doc3" class="yui-t2">[% END %]
80
   
80
   
Lines 1326-1332 Link Here
1326
			       [% IF ( opduplicate ) %] 
1326
			       [% IF ( opduplicate ) %] 
1327
			           <textarea id="debarredcomment" name="debarredcomment" cols="55" rows="3" onclick="this.value=''">[% debarredcomment %]</textarea>
1327
			           <textarea id="debarredcomment" name="debarredcomment" cols="55" rows="3" onclick="this.value=''">[% debarredcomment %]</textarea>
1328
			       [% ELSE %]
1328
			       [% ELSE %]
1329
				   <textarea id="debarredcomment" name="debarredcomment" cols="55" rows="3" ">[% debarredcomment %]</textarea> 
1329
				   <textarea id="debarredcomment" name="debarredcomment" cols="55" rows="3">[% debarredcomment %]</textarea>
1330
			       [% END %]
1330
			       [% END %]
1331
	        </li>
1331
	        </li>
1332
1332
Lines 1464-1470 Link Here
1464
      [% IF ( opadd ) %]
1464
      [% IF ( opadd ) %]
1465
       <a class="cancel" href="/cgi-bin/koha/members/member.pl">Cancel</a>
1465
       <a class="cancel" href="/cgi-bin/koha/members/member.pl">Cancel</a>
1466
	   [% ELSE %]
1466
	   [% ELSE %]
1467
	  <a class="cancel" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">Cancel</a>
1467
	    [% IF ( destination == 'circ' ) %]
1468
		<a class="cancel" href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% borrowernumber %]">
1469
		[% ELSE %]
1470
		<a class="cancel" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">
1471
		[% END %]
1472
		Cancel</a>
1468
	   [% END %]
1473
	   [% END %]
1469
    </fieldset>
1474
    </fieldset>
1470
</form>
1475
</form>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt (-1 / +1 lines)
Lines 16-22 Link Here
16
16
17
<div id="main">
17
<div id="main">
18
18
19
<h3><a href="/cgi-bin/koha/circ/circulation.pl?findborrower=[% cardnumber %]">Account Summary: [% firstname %] [% surname %] ([% cardnumber %])</a></h3>
19
<h3>[% INCLUDE 'patron-default-view.inc' %]Account Summary: [% firstname %] [% surname %] ([% cardnumber %])</a></h3>
20
20
21
<ul><li>[% address %]<br />[% address2 %]</li><li>[% city %], [% zipcode %]</li>
21
<ul><li>[% address %]<br />[% address2 %]</li><li>[% city %], [% zipcode %]</li>
22
<li>[% IF ( phone ) %][% phone %][% ELSE %](no phone number on file)[% END %]</li>
22
<li>[% IF ( phone ) %][% phone %][% ELSE %](no phone number on file)[% END %]</li>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt (-7 / +2 lines)
Lines 4-15 Link Here
4
<link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon %][% ELSE %][% themelang %]/includes/favicon.ico[% END %]" type="image/x-icon" />
4
<link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon %][% ELSE %][% themelang %]/includes/favicon.ico[% END %]" type="image/x-icon" />
5
 <link rel="stylesheet" type="text/css" href="[% themelang %]/css/print.css" />
5
 <link rel="stylesheet" type="text/css" href="[% themelang %]/css/print.css" />
6
6
7
<script language="javascript">
7
8
    function printThenClose() {
9
        window.print();
10
        window.close();
11
    }
12
</script>
13
</head>
8
</head>
14
<body onload="printThenClose();">
9
<body onload="printThenClose();">
15
10
Lines 18-24 Link Here
18
<h3>[% LibraryName %]</h3>
13
<h3>[% LibraryName %]</h3>
19
[% IF ( branchname ) %][% branchname %]<br />[% END %]
14
[% IF ( branchname ) %][% branchname %]<br />[% END %]
20
Checked out to [% firstname %] [% surname %] <br />
15
Checked out to [% firstname %] [% surname %] <br />
21
(<a href="/cgi-bin/koha/circ/circulation.pl?findborrower=[% cardnumber %]">[% cardnumber %]</a>)<br />
16
([% INCLUDE 'patron-default-view.inc' %][% cardnumber %]</a>)<br />
22
17
23
[% todaysdate %]<br />
18
[% todaysdate %]<br />
24
19
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (-3 / +3 lines)
Lines 226-236 function validate1(date) { Link Here
226
    [% END %]
226
    [% END %]
227
    [% IF ( isguarantee ) %]
227
    [% IF ( isguarantee ) %]
228
        [% IF ( guaranteeloop ) %]
228
        [% IF ( guaranteeloop ) %]
229
            <li><span class="label">Guarantees:</span><ul>[% FOREACH guaranteeloo IN guaranteeloop %]<li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guaranteeloo.borrowernumber %]">[% guaranteeloo.name %]  </a></li>[% END %]</ul></li>
229
            <li><span class="label">Guarantees:</span><ul>[% FOREACH guaranteeloo IN guaranteeloop %]<li>[% INCLUDE 'patron-default-view.inc' borrowernumber = guaranteeloo.borrowernumber %][% guaranteeloo.name %]  </a></li>[% END %]</ul></li>
230
        [% END %]
230
        [% END %]
231
    [% ELSE %]
231
    [% ELSE %]
232
        [% IF ( guarantorborrowernumber ) %]
232
        [% IF ( guarantorborrowernumber ) %]
233
            <li><span class="label">Guarantor:</span><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantorborrowernumber %]">[% guarantorsurname %], [% guarantorfirstname %]</a></li>
233
            <li><span class="label">Guarantor:</span>[% INCLUDE 'patron-default-view.inc' borrowernumber = guarantorborrowernumber %][% guarantorsurname %], [% guarantorfirstname %]</a></li>
234
        [% END %]
234
        [% END %]
235
    [% END %]
235
    [% END %]
236
</ol>
236
</ol>
Lines 572-578 function validate1(date) { Link Here
572
        <td>[% relissueloo.itemcallnumber %]</td>
572
        <td>[% relissueloo.itemcallnumber %]</td>
573
        <td>[% relissueloo.charge %]</td>
573
        <td>[% relissueloo.charge %]</td>
574
        <td>[% relissueloo.replacementprice %]</td>
574
        <td>[% relissueloo.replacementprice %]</td>
575
	    <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% relissueloo.borrowernumber %]">[% relissueloo.firstname %] [% relissueloo.surname %] ([% relissueloo.cardnumber %])</a></td>
575
	    <td>[% INCLUDE 'patron-default-view.inc' borrowernumber = relissueloo.borrowernumber %][% relissueloo.firstname %] [% relissueloo.surname %] ([% relissueloo.cardnumber %])</a></td>
576
        </tr>
576
        </tr>
577
  [% END %]
577
  [% END %]
578
        </tbody>
578
        </tbody>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/update-child.tt (-1 / +2 lines)
Lines 36-42 confirm_updatechild([% borrowernumber %]); Link Here
36
36
37
[% IF ( SUCCESS ) %]
37
[% IF ( SUCCESS ) %]
38
<script language="javascript" type="text/javascript">
38
<script language="javascript" type="text/javascript">
39
self.opener.location.href='/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]';
39
[% IF ( PatronDefaultView == 'circ' ) %]self.opener.location.href='/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% borrowernumber %]';
40
[% ELSE %]self.opener.location.href='/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]';[% END %]
40
window.close();
41
window.close();
41
</script>
42
</script>
42
[% END %]
43
[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/list.tt (-2 / +2 lines)
Lines 78-84 Link Here
78
			            <th>Date</th>
78
			            <th>Date</th>
79
			            <th>Action</th>
79
			            <th>Action</th>
80
			            <th>Barcode</th>
80
			            <th>Barcode</th>
81
			            <th>Cardnumber</th>
81
			            <th>Patron</th>
82
		            </tr>
82
		            </tr>
83
		        </thead>
83
		        </thead>
84
		        <tbody>
84
		        <tbody>
Lines 97-103 Link Here
97
			                <td>
97
			                <td>
98
			                [% IF ( operation.actionissue ) %]
98
			                [% IF ( operation.actionissue ) %]
99
		                        [% IF ( operation.borrowernumber ) %]
99
		                        [% IF ( operation.borrowernumber ) %]
100
		                            <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% operation.borrowernumber %]" title="[% operation.borrower %]">[% operation.cardnumber %]</a>
100
		                            [% INCLUDE 'patron-default-view.inc' borrowernumber = operation.borrowernumber %][% operation.borrower %] ([% operation.cardnumber %])</a>
101
		                        [% ELSE %]
101
		                        [% ELSE %]
102
		                            <span class="error">[% operation.cardnumber %]</span>
102
		                            <span class="error">[% operation.cardnumber %]</span>
103
		                        [% END %]
103
		                        [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt (-4 / +4 lines)
Lines 54-63 function CheckForm(f) { Link Here
54
	</div>
54
	</div>
55
	[% END %]
55
	[% END %]
56
	[% IF ( message.ERROR_no_borrower_from_item ) %]<p>Warning: Unable to determine patron from item barcode ([% message.badbarcode %]). Cannot check in.</p>[% END %]
56
	[% IF ( message.ERROR_no_borrower_from_item ) %]<p>Warning: Unable to determine patron from item barcode ([% message.badbarcode %]). Cannot check in.</p>[% END %]
57
	[% IF ( message.issue ) %]<p>Checked out <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% message.biblionumber %]">[% message.title |html %]</a> ([% message.barcode %]) to <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% message.borrowernumber %]">[% message.firstname %] [% message.surname %]</a> ([% message.cardnumber %]): [% message.datetime %]</p>[% END %]
57
	[% IF ( message.issue ) %]<p>Checked out <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% message.biblionumber %]">[% message.title |html %]</a> ([% message.barcode %]) to [% INCLUDE 'patron-default-view.inc' borrowernumber = message.borrowernumber %][% message.firstname %] [% message.surname %]</a> ([% message.cardnumber %]): [% message.datetime %]</p>[% END %]
58
	[% IF ( message.renew ) %]<p>Renewed <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% message.biblionumber %]">[% message.title |html %]</a>  ([% message.barcode %]) for <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% message.borrowernumber %]">[% message.firstname %] [% message.surname %]</a> ([% message.cardnumber %]): [% message.datetime %]</p>[% END %]
58
	[% IF ( message.renew ) %]<p>Renewed <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% message.biblionumber %]">[% message.title |html %]</a>  ([% message.barcode %]) for [% INCLUDE 'patron-default-view.inc' borrowernumber = message.borrowernumber %][% message.firstname %] [% message.surname %]</a> ([% message.cardnumber %]): [% message.datetime %]</p>[% END %]
59
	[% IF ( message.return ) %]<p>Checked in <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% message.biblionumber %]">[% message.title |html %]</a> ([% message.barcode %]) from <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% message.borrowernumber %]">[% message.firstname %] [% message.surname %]</a> ([% message.cardnumber %]): [% message.datetime %]</p>[% END %]
59
	[% IF ( message.return ) %]<p>Checked in <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% message.biblionumber %]">[% message.title |html %]</a> ([% message.barcode %]) from [% INCLUDE 'patron-default-view.inc' borrowernumber = message.borrowernumber %][% message.firstname %] [% message.surname %]</a> ([% message.cardnumber %]): [% message.datetime %]</p>[% END %]
60
	[% IF ( message.payment ) %]<p>Accepted payment ([% message.amount %]) from <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% message.borrowernumber %]">[% message.firstname %] [% message.surname %]</a> ([% message.cardnumber %]): [% message.datetime %]</p>[% END %]
60
	[% IF ( message.payment ) %]<p>Accepted payment ([% message.amount %]) from [% INCLUDE 'patron-default-view.inc' borrowernumber = message.borrowernumber %][% message.firstname %] [% message.surname %]</a> ([% message.cardnumber %]): [% message.datetime %]</p>[% END %]
61
  [% END %]
61
  [% END %]
62
[% ELSE %]
62
[% ELSE %]
63
  <h2>Upload Offline Circulation Data</h2>
63
  <h2>Upload Offline Circulation Data</h2>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/members-search.tt (-1 / +1 lines)
Lines 113-119 function add_item(borrowernum,batch_id,type_id){ Link Here
113
    [% END %]
113
    [% END %]
114
    <td> <input type="checkbox" name="borrowernumber" id="patron[% resultsloo.borrowernumber %]" value="[% resultsloo.borrowernumber %]" />	</td>
114
    <td> <input type="checkbox" name="borrowernumber" id="patron[% resultsloo.borrowernumber %]" value="[% resultsloo.borrowernumber %]" />	</td>
115
    <td>[% resultsloo.cardnumber %]</td>
115
    <td>[% resultsloo.cardnumber %]</td>
116
    <td style="white-space: nowrap;"><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% resultsloo.borrowernumber %]">[% resultsloo.surname %], [% resultsloo.firstname %]</a> <br /> [% resultsloo.address %][% IF ( resultsloo.address2 ) %]<br />[% resultsloo.address2 %][% END %][% IF ( resultsloo.city ) %]<br />[% resultsloo.city %][% END %]</td>
116
    <td style="white-space: nowrap;">[% INCLUDE 'patron-default-view.inc' borrowernumber = resultsloo.borrowernumber %][% resultsloo.surname %], [% resultsloo.firstname %]</a> <br /> [% resultsloo.address %][% IF ( resultsloo.address2 ) %]<br />[% resultsloo.address2 %][% END %][% IF ( resultsloo.city ) %]<br />[% resultsloo.city %][% END %]</td>
117
    <td>[% resultsloo.category_description %] ([% resultsloo.categorycode %])</td>
117
    <td>[% resultsloo.category_description %] ([% resultsloo.categorycode %])</td>
118
    <td>[% resultsloo.branchcode %]</td>
118
    <td>[% resultsloo.branchcode %]</td>
119
    <td>[% resultsloo.dateexpiry %]</td>
119
    <td>[% resultsloo.dateexpiry %]</td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tt (-1 / +1 lines)
Lines 51-57 function Dopop(link) { Link Here
51
					[% loopro.rowtitle %]</td>
51
					[% loopro.rowtitle %]</td>
52
					[% FOREACH loopcel IN loopro.loopcell %]
52
					[% FOREACH loopcel IN loopro.loopcell %]
53
						[% IF ( loopcel.hilighted ) %]<td>[% ELSE %]<td>[% END %]
53
						[% IF ( loopcel.hilighted ) %]<td>[% ELSE %]<td>[% END %]
54
							[% IF ( loopcel.reference ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% loopcel.reference %]">[% END %]
54
							[% IF ( loopcel.reference ) %][% INCLUDE 'patron-default-view.inc' borrowernumber = loopcel.reference %][% END %]
55
							[% IF ( loopcel.value ) %][% loopcel.value %][% END %]
55
							[% IF ( loopcel.value ) %][% loopcel.value %][% END %]
56
							[% IF ( loopcel.reference ) %]</a>[% END %]
56
							[% IF ( loopcel.reference ) %]</a>[% END %]
57
						</td>
57
						</td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt (-8 / +8 lines)
Lines 204-213 function checkMultiHold() { Link Here
204
      <h3>Cannot Place Hold</h3>
204
      <h3>Cannot Place Hold</h3>
205
  	  <ul>
205
  	  <ul>
206
        [% IF ( maxreserves ) %]
206
        [% IF ( maxreserves ) %]
207
          <li><strong>Too Many Holds: </strong> <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% borrowerfirstname %] [% borrowersurname %] </a> has too many holds.</li>
207
          <li><strong>Too Many Holds: </strong> [% INCLUDE 'patron-default-view.inc' %][% borrowerfirstname %] [% borrowersurname %] </a> has too many holds.</li>
208
        [% END %]
208
        [% END %]
209
        [% IF ( alreadyreserved ) %]
209
        [% IF ( alreadyreserved ) %]
210
          <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% borrowerfirstname %] [% borrowersurname %]</a> <strong>already has a hold</strong> on this item </li>
210
          <li>[% INCLUDE 'patron-default-view.inc' %][% borrowerfirstname %] [% borrowersurname %]</a> <strong>already has a hold</strong> on this item </li>
211
        [% END %]
211
        [% END %]
212
        [% IF ( none_available ) %]
212
        [% IF ( none_available ) %]
213
          <li> <strong>No copies are available</strong> to be placed on hold</li>
213
          <li> <strong>No copies are available</strong> to be placed on hold</li>
Lines 223-233 function checkMultiHold() { Link Here
223
[% IF ( messages ) %]
223
[% IF ( messages ) %]
224
    <div class="dialog message"><ul>
224
    <div class="dialog message"><ul>
225
    [% IF ( expiry ) %]
225
    [% IF ( expiry ) %]
226
    <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% borrowerfirstname %] [% borrowersurname %]</a>'s <strong>account has expired</strong></li>
226
    <li>[% INCLUDE 'patron-default-view.inc' %][% borrowerfirstname %] [% borrowersurname %]</a>'s <strong>account has expired</strong></li>
227
    [% END %]
227
    [% END %]
228
228
229
[% IF ( diffbranch ) %]
229
[% IF ( diffbranch ) %]
230
    <li> <strong>Pickup library is different</strong> than <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% borrowerfirstname %] [% borrowersurname %]</a>'s home library ([% borrower_branchname %] / [% borrower_branchcode %] )</li>
230
    <li> <strong>Pickup library is different</strong> than [% INCLUDE 'patron-default-view.inc' %][% borrowerfirstname %] [% borrowersurname %]</a>'s home library ([% borrower_branchname %] / [% borrower_branchcode %] )</li>
231
    [% END %]
231
    [% END %]
232
232
233
</ul></div>
233
</ul></div>
Lines 265-271 function checkMultiHold() { Link Here
265
265
266
       <ol> <li><span class="label">Patron:</span>
266
       <ol> <li><span class="label">Patron:</span>
267
            [% IF ( borrowernumber ) %]
267
            [% IF ( borrowernumber ) %]
268
                <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% borrowerfirstname %] [% borrowersurname %] ([% cardnumber %])</a>
268
                [% INCLUDE 'patron-default-view.inc' %][% borrowerfirstname %] [% borrowersurname %] ([% cardnumber %])</a>
269
            [% ELSE %]
269
            [% ELSE %]
270
                Not defined yet
270
                Not defined yet
271
            [% END %]
271
            [% END %]
Lines 460-466 function checkMultiHold() { Link Here
460
                            Can't be cancelled when item is in transit
460
                            Can't be cancelled when item is in transit
461
                    [% ELSE %]
461
                    [% ELSE %]
462
                    [% IF ( itemloo.waitingdate ) %]Waiting[% ELSE %]On hold[% END %]
462
                    [% IF ( itemloo.waitingdate ) %]Waiting[% ELSE %]On hold[% END %]
463
                    [% IF ( itemloo.canreservefromotherbranches ) %]for <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% itemloo.ReservedForBorrowernumber %]">[% itemloo.ReservedForFirstname %] [% itemloo.ReservedForSurname %]</a>[% END %] [% IF ( itemloo.waitingdate ) %]at[% ELSE %]expected at[% END %] [% itemloo.ExpectedAtLibrary %]
463
                    [% IF ( itemloo.canreservefromotherbranches ) %]for [% INCLUDE 'patron-default-view.inc' borrowernumber = itemloo.ReservedForBorrowernumber %][% itemloo.ReservedForFirstname %] [% itemloo.ReservedForSurname %]</a>[% END %] [% IF ( itemloo.waitingdate ) %]at[% ELSE %]expected at[% END %] [% itemloo.ExpectedAtLibrary %]
464
                    since
464
                    since
465
                    [% IF ( itemloo.waitingdate ) %][% itemloo.waitingdate %][% ELSE %][% IF ( itemloo.reservedate ) %][% itemloo.reservedate %][% END %][% END %]. <a class="info" href="modrequest.pl?CancelBiblioNumber=[% itemloo.biblionumber %]&amp;CancelBorrowerNumber=[% itemloo.ReservedForBorrowernumber %]&amp;CancelItemnumber=[% itemloo.itemnumber %]"  onclick="if (window.confirm('Are you sure you want to delete this hold?')) {return true;} else {return false;}">Cancel hold</a>
465
                    [% IF ( itemloo.waitingdate ) %][% itemloo.waitingdate %][% ELSE %][% IF ( itemloo.reservedate ) %][% itemloo.reservedate %][% END %][% END %]. <a class="info" href="modrequest.pl?CancelBiblioNumber=[% itemloo.biblionumber %]&amp;CancelBorrowerNumber=[% itemloo.ReservedForBorrowernumber %]&amp;CancelItemnumber=[% itemloo.itemnumber %]"  onclick="if (window.confirm('Are you sure you want to delete this hold?')) {return true;} else {return false;}">Cancel hold</a>
466
466
Lines 526-532 function checkMultiHold() { Link Here
526
            [% END %]
526
            [% END %]
527
527
528
          [% IF ( biblioloo.alreadyres ) %]
528
          [% IF ( biblioloo.alreadyres ) %]
529
              <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% borrowerfirstname %] [% borrowersurname %]</a> <strong>already has a hold</strong> on this item </li>
529
              <li>[% INCLUDE 'patron-default-view.inc' %][% borrowerfirstname %] [% borrowersurname %]</a> <strong>already has a hold</strong> on this item </li>
530
          [% END %]
530
          [% END %]
531
          [% IF ( biblioloo.none_avail ) %]
531
          [% IF ( biblioloo.none_avail ) %]
532
              <li> <strong>No copies are available</strong> to be placed on hold</li>
532
              <li> <strong>No copies are available</strong> to be placed on hold</li>
Lines 639-645 function checkMultiHold() { Link Here
639
    [% END %]
639
    [% END %]
640
640
641
        <td>
641
        <td>
642
          <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% reserveloo.borrowernumber %]" >
642
          [% INCLUDE 'patron-default-view.inc' borrowernumber = reserveloo.borrowernumber %]
643
	  [% IF ( reserveloo.hidename ) %]
643
	  [% IF ( reserveloo.hidename ) %]
644
	      [% reserveloo.cardnumber (reserveloo.borrowernumber) %]
644
	      [% reserveloo.cardnumber (reserveloo.borrowernumber) %]
645
	  [% ELSE %]
645
	  [% ELSE %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt (-1 / +1 lines)
Lines 44-50 Link Here
44
    <tbody>[% FOREACH review IN reviews %]
44
    <tbody>[% FOREACH review IN reviews %]
45
    <tr>
45
    <tr>
46
        <td>
46
        <td>
47
            <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% review.borrowernumber %]">[% review.surname %], [% review.firstname %]</a>
47
            [% INCLUDE 'patron-default-view.inc' borrowernumber = review.borrowernumber %][% review.surname %], [% review.firstname %]</a>
48
        </td>
48
        </td>
49
        <td>
49
        <td>
50
            <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% review.biblionumber %]">[% review.bibliotitle %]</a>
50
            <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% review.biblionumber %]">[% review.bibliotitle %]</a>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/viewalerts.tt (-1 / +1 lines)
Lines 26-32 Link Here
26
			[% FOREACH alertloo IN alertloop %]
26
			[% FOREACH alertloo IN alertloop %]
27
				<tr>
27
				<tr>
28
					<td>[% alertloo.name %]</td>
28
					<td>[% alertloo.name %]</td>
29
					<td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% alertloo.borrowernumber %]" class="button">View</a></td>
29
					<td>[% INCLUDE 'patron-default-view.inc' borrowernumber = alertloo.borrowernumber %]View</a></td>
30
				</tr>
30
				</tr>
31
			[% END %]
31
			[% END %]
32
			</table>
32
			</table>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt (-3 / +3 lines)
Lines 145-162 $(document).ready(function() { calcNewsuggTotal(); }); Link Here
145
            <tr>
145
            <tr>
146
                <th><label for="suggesteddate">Suggestion creation</label> </th>
146
                <th><label for="suggesteddate">Suggestion creation</label> </th>
147
                <td><input type="text" id="suggesteddate" name="suggesteddate" size="10" maxlength="10" value="[% suggesteddate %]"/></td>
147
                <td><input type="text" id="suggesteddate" name="suggesteddate" size="10" maxlength="10" value="[% suggesteddate %]"/></td>
148
                <td><input type="hidden" id="suggestedby" name="suggestedby" value="[% suggestedby %]"/>[% IF ( suggestedby_borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% suggestedby_borrowernumber %]">[% suggestedby_surname %], [% suggestedby_firstname %]</a>  [% suggestedby_branchcode %] ([% suggestedby_description %])[% END %]
148
                <td><input type="hidden" id="suggestedby" name="suggestedby" value="[% suggestedby %]"/>[% IF ( suggestedby_borrowernumber ) %][% INCLUDE 'patron-default-view.inc' borrowernumber = suggestedby_borrowernumber %][% suggestedby_surname %], [% suggestedby_firstname %]</a>  [% suggestedby_branchcode %] ([% suggestedby_description %])[% END %]
149
                </td>
149
                </td>
150
            </tr>
150
            </tr>
151
            <tr>
151
            <tr>
152
                <th><label for="managedon">Suggestion management</label> </th>
152
                <th><label for="managedon">Suggestion management</label> </th>
153
                <td><input type="text" id="managedon" name="manageddate" size="10" maxlength="10" value="[% manageddate %]" /></td>
153
                <td><input type="text" id="managedon" name="manageddate" size="10" maxlength="10" value="[% manageddate %]" /></td>
154
                <td><input type="hidden" id="managedby" name="managedby" value="[% managedby %]"/>[% IF ( managedby_borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% managedby_borrowernumber %]">[% managedby_surname %], [% managedby_firstname %]</a> [% managedby_branchcode %] ([% managedby_description %])[% END %]</td>
154
                <td><input type="hidden" id="managedby" name="managedby" value="[% managedby %]"/>[% IF ( managedby_borrowernumber ) %][% INCLUDE 'patron-default-view.inc' borrowernumber = managedby_borrowernumber %][% managedby_surname %], [% managedby_firstname %]</a> [% managedby_branchcode %] ([% managedby_description %])[% END %]</td>
155
            </tr>
155
            </tr>
156
            <tr>
156
            <tr>
157
                <th><label for="accepteddate">Suggestion Accepted</label> </th>
157
                <th><label for="accepteddate">Suggestion Accepted</label> </th>
158
                <td><input type="text" id="accepteddate" name="accepteddate" size="10" maxlength="10" value="[% accepteddate %]" /></td>
158
                <td><input type="text" id="accepteddate" name="accepteddate" size="10" maxlength="10" value="[% accepteddate %]" /></td>
159
                <td><input type="hidden" id="acceptedby" name="acceptedby" value="[% acceptedby %]"/>[% IF ( acceptedby_borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% acceptedby_borrowernumber %]">[% acceptedby_surname %], [% acceptedby_firstname %]</a> [% acceptedby_branchcode %] ([% acceptedby_description %])[% END %]</td>
159
                <td><input type="hidden" id="acceptedby" name="acceptedby" value="[% acceptedby %]"/>[% IF ( acceptedby_borrowernumber ) %][% INCLUDE 'patron-default-view.inc' borrowernumber = acceptedby_borrowernumber %][% acceptedby_surname %], [% acceptedby_firstname %]</a> [% acceptedby_branchcode %] ([% acceptedby_description %])[% END %]</td>
160
            </tr>
160
            </tr>
161
            </tbody>
161
            </tbody>
162
        </table></li></ol>
162
        </table></li></ol>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt (-8 / +7 lines)
Lines 153-179 Link Here
153
                                    <td>[% loopro.timestamp %]</td>
153
                                    <td>[% loopro.timestamp %]</td>
154
                                    <td>
154
                                    <td>
155
                                       [% IF ( module == 'CIRCULATION' ) %]
155
                                       [% IF ( module == 'CIRCULATION' ) %]
156
                                        <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% loopro.user %]" title="display detail for this user."> [% loopro.user %] </a>
156
                                       [% INCLUDE 'patron-default-view.inc' borrowernumber = loopro.user %] [% loopro.user %] </a>
157
                                        [% ELSE %]
157
                                        [% ELSE %]
158
                                        <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% loopro.user %]" title="display detail for this librarian."> [% loopro.user %] </a>
158
                                        [% INCLUDE 'patron-default-view.inc' borrowernumber = loopro.user %] [% loopro.user %] </a>
159
                                        [% END %]
159
                                        [% END %]
160
                                    </td>
160
                                    </td>
161
                                    <td>[% loopro.module %]</td>
161
                                    <td>[% loopro.module %]</td>
162
                                    <td>[% loopro.action %]</td>
162
                                    <td>[% loopro.action %]</td>
163
                                    <td>
163
                                    <td>
164
                                        [% IF ( module == 'MEMBERS' ) %]
164
                                        [% IF ( module == 'MEMBERS' ) %]
165
                                            <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% loopro.object %]" title="Display member details."> member [% loopro.object %] </a>
165
                                            [% INCLUDE 'patron-default-view.inc' borrowernumber = loopro.object %] patron [% loopro.object %] </a>
166
                                        [% ELSE %]
166
                                        [% ELSE %]
167
                                            [% IF ( module == 'CIRCULATION' ) %]
167
                                            [% IF ( module == 'CIRCULATION' ) %]
168
                                            <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% loopro.object %]" title="Display member details.">
168
                                            [% INCLUDE 'patron-default-view.inc' borrowernumber = loopro.object %] [% IF ( loopro.object ) %]
169
                                                [% IF ( loopro.object ) %]
169
                                                    patron [% loopro.object %]
170
                                                    member [% loopro.object %]
171
                                                [% END %]
170
                                                [% END %]
172
                                            </a>
171
                                            </a>
173
                                            [% ELSE %]
172
                                            [% ELSE %]
174
                                                [% IF ( module == 'CATALOGUING' ) %]
173
                                                [% IF ( module == 'CATALOGUING' ) %]
175
                                                    [% IF ( info == 'item' ) %]
174
                                                    [% IF ( info == 'item' ) %]
176
                                                        <a href="/cgi-bin/koha/catalogue/moredetail.pl?item=[% loopro.object %]&biblionumber=[% loopro.biblionumber %]&bi=[% loopro.biblioitemnumber %]#item[% loopro.object %]">Item [% loopro.object %]</a>
175
                                                        <a href="/cgi-bin/koha/catalogue/moredetail.pl?item=[% loopro.object %]&amp;biblionumber=[% loopro.biblionumber %]&amp;bi=[% loopro.biblioitemnumber %]#item[% loopro.object %]">Item [% loopro.object %]</a>
177
                                                    [% ELSE %]
176
                                                    [% ELSE %]
178
                                                        <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loopro.object %]" title="Display detail for this biblio">biblio [% loopro.object %]</a>
177
                                                        <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loopro.object %]" title="Display detail for this biblio">biblio [% loopro.object %]</a>
179
                                                    [% END %]
178
                                                    [% END %]
Lines 208-214 Link Here
208
                                for <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% object %]">Bibliographic Record [% object %]</a>
207
                                for <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% object %]">Bibliographic Record [% object %]</a>
209
                            [% END %]
208
                            [% END %]
210
                            [% IF ( MEMBERS ) %]
209
                            [% IF ( MEMBERS ) %]
211
                                for <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% object %]">[% INCLUDE 'patron-title.inc' %]</a>
210
                                for [% INCLUDE 'patron-default-view.inc' borrowernumber = object %][% INCLUDE 'patron-title.inc' %]</a>
212
                            [% END %]
211
                            [% END %]
213
                            .
212
                            .
214
                        </div>
213
                        </div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt (-2 / +1 lines)
Lines 403-409 function placeHold () { Link Here
403
            [% FOREACH shelvesloo IN shelvesloop %]
403
            [% FOREACH shelvesloo IN shelvesloop %]
404
                [% IF ( shelvesloo.toggle ) %]<tr class="highlight">[% ELSE %]<tr>[% END %]
404
                [% IF ( shelvesloo.toggle ) %]<tr class="highlight">[% ELSE %]<tr>[% END %]
405
		<td><a href="shelves.pl?viewshelf=[% shelvesloo.shelf %]">[% shelvesloo.shelfname |html %]</a></td>
405
		<td><a href="shelves.pl?viewshelf=[% shelvesloo.shelf %]">[% shelvesloo.shelfname |html %]</a></td>
406
        <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% shelvesloo.owner %]">[% shelvesloo.ownername %]</td>
406
        <td>[% INCLUDE 'patron-default-view.inc' borrowernumber = shelvesloo.owner %][% shelvesloo.ownername %]</td>
407
		<td>[% shelvesloo.count %] item(s)</td>
407
		<td>[% shelvesloo.count %] item(s)</td>
408
        <td>[% IF ( shelvesloo.authorsort ) %]Author[% ELSIF ( shelvesloo.yearsort ) %]Year[% ELSE %]Title[% END %]</td>
408
        <td>[% IF ( shelvesloo.authorsort ) %]Author[% ELSIF ( shelvesloo.yearsort ) %]Year[% ELSE %]Title[% END %]</td>
409
        <td>[% IF ( shelvesloo.viewcategory1 ) %]Private[% END %]
409
        <td>[% IF ( shelvesloo.viewcategory1 ) %]Private[% END %]
410
- 

Return to bug 7680