[Koha-patches] [PATCH] Bug 7680 - PatronDefaultView preference to control whether patron links go to circ or patron details
Owen Leonard
oleonard at myacpl.org
Thu Mar 8 18:34:26 CET 2012
The new include, patron-default-view.inc, outputs the *opening* half of
the <a> so that individual templates can control whether to show
full name, barcode, both, etc.
Individual templates must often pass the "local" borrowernumber
variable via the INCLUDE if the variable is not called "borrowernumber":
[% INCLUDE 'patron-default-view.inc' borrowernumber = ITEM_DAT.borrowernumber %]
---
C4/Auth.pm | 1 +
installer/data/mysql/sysprefs.sql | 1 +
installer/data/mysql/updatedatabase.pl | 9 +++++++++
.../prog/en/modules/admin/aqbudgets.tt | 4 ++--
.../prog/en/modules/admin/preferences/patrons.pref | 6 ++++++
.../prog/en/modules/catalogue/detail.tt | 4 ++--
.../prog/en/modules/catalogue/issuehistory.tt | 2 +-
.../prog/en/modules/catalogue/moredetail.tt | 8 ++++----
.../prog/en/modules/circ/branchoverdues.tt | 4 ++--
.../prog/en/modules/circ/branchtransfers.tt | 6 +++---
.../prog/en/modules/circ/circulation.tt | 10 +++++-----
.../intranet-tmpl/prog/en/modules/circ/overdue.tt | 2 +-
.../intranet-tmpl/prog/en/modules/circ/returns.tt | 14 +++++++-------
.../prog/en/modules/circ/transferstoreceive.tt | 2 +-
.../prog/en/modules/circ/view_holdsqueue.tt | 2 +-
.../prog/en/modules/circ/waitingreserves.tt | 4 ++--
.../prog/en/modules/members/member-password.tt | 10 ++++++++--
.../prog/en/modules/members/member.tt | 2 +-
.../prog/en/modules/members/memberentrygen.tt | 11 ++++++++---
.../prog/en/modules/members/moremember-print.tt | 2 +-
.../prog/en/modules/members/moremember-receipt.tt | 9 ++-------
.../prog/en/modules/members/moremember.tt | 6 +++---
.../prog/en/modules/members/update-child.tt | 3 ++-
.../prog/en/modules/offline_circ/list.tt | 4 ++--
.../prog/en/modules/offline_circ/process_koc.tt | 8 ++++----
.../prog/en/modules/patroncards/members-search.tt | 2 +-
.../prog/en/modules/reports/bor_issues_top.tt | 2 +-
.../prog/en/modules/reserve/request.tt | 16 ++++++++--------
.../prog/en/modules/reviews/reviewswaiting.tt | 2 +-
.../prog/en/modules/serials/viewalerts.tt | 2 +-
.../prog/en/modules/suggestion/suggestion.tt | 6 +++---
.../intranet-tmpl/prog/en/modules/tools/viewlog.tt | 15 +++++++--------
.../prog/en/modules/virtualshelves/shelves.tt | 2 +-
33 files changed, 102 insertions(+), 79 deletions(-)
diff --git a/C4/Auth.pm b/C4/Auth.pm
index ccb2c15..4dbdd0f 100644
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -374,6 +374,7 @@ sub get_template_and_user {
IntranetUserCSS => C4::Context->preference("IntranetUserCSS"),
intranetuserjs => C4::Context->preference("intranetuserjs"),
intranetbookbag => C4::Context->preference("intranetbookbag"),
+ PatronDefaultView => C4::Context->preference("PatronDefaultView"),
suggestion => C4::Context->preference("suggestion"),
virtualshelves => C4::Context->preference("virtualshelves"),
StaffSerialIssueDisplayCount => C4::Context->preference("StaffSerialIssueDisplayCount"),
diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql
index bda97f5..1be4d5e 100644
--- a/installer/data/mysql/sysprefs.sql
+++ b/installer/data/mysql/sysprefs.sql
@@ -69,6 +69,7 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('memberofinstitution',0,'If ON, patrons can be linked to institutions',NULL,'YesNo');
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('noissuescharge',5,'Define maximum amount withstanding before check outs are blocked','','Integer');
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');
+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');
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacAuthorities',1,'If ON, enables the search authorities link on OPAC',NULL,'YesNo');
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('opacbookbag',1,'If ON, enables display of Cart feature','','YesNo');
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('intranetbookbag','1','If ON, enables display of Cart feature in the intranet','','YesNo');
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index ccca83a..88392b9 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -4765,6 +4765,15 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
SetVersion($DBversion);
}
+$DBversion = "3.07.00.XXX";
+if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
+ $dbh->do("INSERT INTO koha.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');");
+ print "Upgrade to $DBversion done (Bug 7680 - Create a PatronDefaultView preference for the staff client)\n";
+ SetVersion($DBversion);
+}
+
+
=head1 FUNCTIONS
=head2 DropAllForeignKeys($table)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
index 7fa91f7..fed38a4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
@@ -211,7 +211,7 @@
[% END %]
[% budge.budget_remaining %] </td>
- <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 %]
+ <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 %]
[% IF ( budge.budget_branchcode ) %]<br /><strong>Library: </strong>[% budge.budget_branchcode %][% END %]
[% IF ( budge.budget_notes ) %]<br /><strong>Notes: </strong>[% budge.budget_notes %][% END %]
[% IF ( budge.budget_hierarchy ) %]
@@ -294,7 +294,7 @@
<li>
<span class="label">Owner: </span>
<span id="budget_owner_name">
- <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% budget_owner_id %]">[% budget_owner_name %]</a>
+ [% INCLUDE 'patron-default-view.inc' borrowernumber = budget_owner_id %][% budget_owner_name %]</a>
</span>
<!-- FIXME: hardcoded button positions :/ -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref
index 3d88883..2490305 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref
@@ -94,6 +94,12 @@ Patrons:
class: integer
- days beforehand.
-
+ - Links to patron records point to
+ - pref: PatronDefaultView
+ choices:
+ circ: checkout
+ detail: "patron details"
+ -
- pref: patronimages
choices:
yes: Allow
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
index 858c2d6..51a4b33 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
@@ -308,7 +308,7 @@ function verify_images() {
[% IF ( itemloo.datedue ) %]
<span class="datedue">Checked out
[% UNLESS ( itemloo.NOTSAMEBRANCH ) %]
- to <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% itemloo.borrowernumber %]">
+ to [% INCLUDE 'patron-default-view.inc' borrowernumber = itemloo.borrowernumber %]
[% IF ( itemloo.hidepatronname ) %]
[% itemloo.cardnumber %]
[% ELSE %]
@@ -366,7 +366,7 @@ function verify_images() {
[% ELSE %]
Item-level hold
[% END %]
- [% IF ( canreservefromotherbranches ) %]for <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% itemloo.ReservedForBorrowernumber %]">
+ [% IF ( canreservefromotherbranches ) %]for [% INCLUDE 'patron-default-view.inc' borrowernumber = itemloo.ReservedForBorrowernumber %]
[% IF ( itemloo.hidepatronname ) %]
[% itemloo.Reservedcardnumber %]
[% ELSE %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt
index de5db0e..807b0ee 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt
@@ -34,7 +34,7 @@
<tbody>
[% FOREACH issue IN issues %]
[% UNLESS ( loop.odd ) %]<tr class="highlight">[% ELSE %]<tr>[% END %]
- <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>
+ <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>
<td>[% IF ( issue.barcode ) %]
<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% issue.biblionumber %]&itemnumber=[% issue.itemnumber %]">[% issue.barcode %]</a>
[% ELSE %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt
index 1a9536b..13b26b8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt
@@ -69,7 +69,7 @@
<ol class="bibliodetails">
<li><span class="label">Current Location:</span> [% ITEM_DAT.holdingbranchname %] </li>
- <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>
+ <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>
<li><span class="label">Current Renewals:</span> [% ITEM_DAT.renewals %] </li>
[% IF ( ITEM_DAT.itemlostloop ) %]
<li><span class="label">Lost Status:</span>
@@ -171,9 +171,9 @@
<li><span class="label">Last seen:</span> [% ITEM_DAT.datelastseen %] </li>
<li><span class="label">Last borrowed:</span> [% ITEM_DAT.datelastborrowed %] </li>
- [% 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> </li>[% END %]
- [% 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> </li>[% END %]
- [% 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> </li>[% END %]
+ [% IF ( ITEM_DAT.card0 ) %]<li><span class="label">Last Borrower:</span> [% INCLUDE 'patron-default-view.inc' borrowernumber = ITEM_DAT.borrower0 %][% ITEM_DAT.card0 %]</a> </li>[% END %]
+ [% IF ( ITEM_DAT.card1 ) %]<li><span class="label">Previous Borrower:</span> [% INCLUDE 'patron-default-view.inc' borrowernumber = ITEM_DAT.borrower1 %][% ITEM_DAT.card1 %]</a> </li>[% END %]
+ [% IF ( ITEM_DAT.card2 ) %]<li><span class="label">Previous Borrower:</span> [% INCLUDE 'patron-default-view.inc' borrowernumber = ITEM_DAT.borrower2 %][% ITEM_DAT.card2 %]</a> </li>[% END %]
<li><span class="label">Paid for?:</span> [% ITEM_DAT.paidfor %] </li>
<li><span class="label">Serial enumeration:</span> [% ITEM_DAT.enumchron %] </li>
<li><span class="label">Public Note:</span>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt
index a8a8912..a296536 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt
@@ -48,7 +48,7 @@
<br />Barcode : [% overduesloo.barcode %]
</td>
<td>
- <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% overduesloo.borrowernumber %]">[% overduesloo.borrowersurname %], [% overduesloo.borrowerfirstname %]</a><br />[% overduesloo.borrowerphone %]<br />
+ [% INCLUDE 'patron-default-view.inc' borrowernumber = overduesloo.borrowernumber %][% overduesloo.borrowersurname %], [% overduesloo.borrowerfirstname %]</a><br />[% overduesloo.borrowerphone %]<br />
[% IF ( overduesloo.borroweremail ) %]<a href="mailto:[% overduesloo.borroweremail %]?subject=Overdue: [% overduesloo.title |html %]">
[% overduesloo.borroweremail %]</a>[% END %]
</td>
@@ -126,7 +126,7 @@
</p>
</td>
<td>
- <p><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% todayoverduesloo.borrowernumber %]">[% todayoverduesloo.borrowersurname %] [% todayoverduesloo.borrowerfirstname %]</a><br />[% todayoverduesloo.borrowerphone %]<br />
+ <p>[% INCLUDE 'patron-default-view.inc' borrowernumber = todayoverduesloo.borrowernumber %][% todayoverduesloo.borrowersurname %] [% todayoverduesloo.borrowerfirstname %]</a><br />[% todayoverduesloo.borrowerphone %]<br />
[% IF ( todayoverduesloo.borroweremail ) %]<a href="mailto:[% todayoverduesloo.borroweremail %]?subject=Overdue: [% todayoverduesloo.title |html %]">
[% todayoverduesloo.borroweremail %]</a>[% END %]
</p>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt
index 097089a..1d21abe 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt
@@ -16,10 +16,10 @@
<table>
<caption>
[% IF ( reserved ) %]
- Reserve found for [% name %] (<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% borrowernumber %]</a>).
+ Reserve found for [% name %] ([% INCLUDE 'patron-default-view.inc' %][% borrowernumber %]</a>).
[% END %]
[% IF ( waiting ) %]
- Item is marked waiting at [% branchname %] for [% name %] (<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% borrowernumber %]</a>).
+ Item is marked waiting at [% branchname %] for [% name %] ([% INCLUDE 'patron-default-view.inc' %][% borrowernumber %]</a>).
[% END %]
</caption>
<tr>
@@ -116,7 +116,7 @@
<li>Item is already at destination library.</li>
[% END %]
[% IF ( errmsgloo.errwasreturned ) %]
- <li>Item was on loan to <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% errmsgloo.borrowernumber %]">
+ <li>Item was on loan to [% INCLUDE 'patron-default-view.inc' borrowernumber = errmsgloo.borrowernumber %]
[% errmsgloo.firstname %] [% errmsgloo.surname %]
([% errmsgloo.cardnumber %])</a> and has been returned.</li>
[% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
index 1d0e07a..4a54ecc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
@@ -249,15 +249,15 @@ function refocus(calendar) {
[% END %]
[% IF ( RESERVE_WAITING ) %]
- <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>
+ <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>
[% END %]
[% IF ( RESERVED ) %]
- <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>
+ <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>
[% END %]
[% IF ( ISSUED_TO_ANOTHER ) %]
- <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>
+ <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>
[% END %]
[% IF ( TOO_MANY ) %]
@@ -903,7 +903,7 @@ No patron matched <span class="ex">[% message %]</span>
<td>[% relissue.issuingbranchname %]</td>
<td>[% relissue.itemcallnumber %]</td>
<td>[% relissue.charge %]</td>
- <td>[% relissue.replacementprice %]</td><td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% relissue.borrowernumber %]">[% relissue.firstname %] [% relissue.surname %] ([% relissue.cardnumber %])</a></td>
+ <td>[% relissue.replacementprice %]</td><td>[% INCLUDE 'patron-default-view.inc' borrowernumber = relissue.borrowernumber %][% relissue.firstname %] [% relissue.surname %] ([% relissue.cardnumber %])</a></td>
</tr>
[% END %] <!-- /loop relissues -->
<!-- /if relissues -->[% END %]
@@ -926,7 +926,7 @@ No patron matched <span class="ex">[% message %]</span>
[% IF ( relprevissue.multiple_borrowers ) %]<td>[% relprevissue.firstname %] [% relprevissue.surname %]</td>[% END %]
<td>[% relprevissue.charge %]</td>
<td>[% relprevissue.replacementprice %]</td>
- <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% relprevissue.borrowernumber %]">[% relprevissue.firstname %] [% relprevissue.surname %] ([% relprevissue.cardnumber %])</a></td>
+ <td>[% INCLUDE 'patron-default-view.inc' borrowernumber = relprevissue.borrowernumber %][% relprevissue.firstname %] [% relprevissue.surname %] ([% relprevissue.cardnumber %])</a></td>
</tr>
<!-- /loop relprevissue -->[% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt
index e196399..66edb67 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt
@@ -116,7 +116,7 @@
<tbody>[% FOREACH overdueloo IN overdueloop %]
<tr>
<td>[% overdueloo.duedate %]</td>
- <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% overdueloo.borrowernumber %]">[% overdueloo.surname %] [% overdueloo.firstname %]</a>
+ <td>[% INCLUDE 'patron-default-view.inc' borrowernumber = overdueloo.borrowernumber %][% overdueloo.surname %] [% overdueloo.firstname %]</a>
[% IF ( overdueloo.email ) %][<a href="mailto:[% overdueloo.email %]?subject=Overdue: [% overdueloo.title |html %]">email</a>][% END %]
[% IF ( overdueloo.phone ) %]([% overdueloo.phone %])[% ELSIF ( overdueloo.mobile ) %]([% overdueloo.mobile %])[% ELSIF ( overdueloo.phonepro ) %]([% overdueloo.phonepro %])[% END %]</td>
<td>[% overdueloo.branchcode %]</td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
index 004a44e..b5b53b7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
@@ -88,7 +88,7 @@ function Dopop(link) {
<!-- case of a mistake in transfer loop -->
[% IF ( WrongTransfer ) %]<div id="return2" class="dialog message"><!-- WrongTransfer --><h3>Please return <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber %]">[% title |html %]</a> to [% TransferWaitingAt %]</h3><h3><a href="#" onclick="Dopop('transfer-slip.pl?transferitem=[% itemnumber %]&&branchcode=[% homebranch %]&op=slip'); return true;">Print Slip</a> or <a href="/cgi-bin/koha/circ/returns.pl?itemnumber=[% itemnumber %]&canceltransfer=1">Cancel Transfer</a></h3>
[% IF ( wborcnum ) %]<h5>Hold for:</h5>
- <ul><li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">
+ <ul><li>[% INCLUDE 'patron-default-view.inc' %]
[% borsurname %], [% borfirstname %]</a> ([% borcnum %])</li>
<li>[% wboraddress %][% IF ( wboraddress2 ) %]<br />
[% wboraddress2 %]<br />[% END %]
@@ -122,7 +122,7 @@ function Dopop(link) {
[% IF ( reservenotes ) %]<h4>Notes: [% reservenotes %]</h4>[% END %]
<h4>Hold for:</h4>
<ul>
- <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% borsurname %], [% borfirstname %]</a> ([% borcnum %])</li>
+ <li>[% INCLUDE 'patron-default-view.inc' %][% borsurname %], [% borfirstname %]</a> ([% borcnum %])</li>
<li>[% boraddress %]<br />
[% IF ( boraddress2 ) %][% boraddress2 %]<br />[% END %]
[% borcity %] [% borzip %]</li>
@@ -163,7 +163,7 @@ function Dopop(link) {
<h3>Hold needing transfer found: <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% itembiblionumber %]">[% title |html %]</a></h3>
<h4>Hold for: </h4>
<ul>
- <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% borsurname %], [% borfirstname %]</a> ([% borcnum %])</li>
+ <li>[% INCLUDE 'patron-default-view.inc' %][% borsurname %], [% borfirstname %]</a> ([% borcnum %])</li>
<li>[% boraddress %]<br />
[% IF ( boraddress2 ) %][% boraddress2 %]<br />[% END %]
[% borcity %] [% borzip %]</li>
@@ -269,7 +269,7 @@ function Dopop(link) {
[% IF ( reservenotes ) %]<h4>Notes: [% reservenotes %]</h4>[% END %]
<h5>Hold for:</h5>
<ul>
- <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">
+ <li>[% INCLUDE 'patron-default-view.inc' %]
[% borsurname %], [% borfirstname %]
</a> ([% borcnum %])</li>
<li>[% boraddress %]<br />
@@ -331,7 +331,7 @@ function Dopop(link) {
<p class="problem">Item is withdrawn.</p>
[% END %]
[% IF ( errmsgloo.debarred ) %]
- <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>
+ <p class="problem">[% INCLUDE 'patron-default-view.inc' borrowernumber = errmsgloo.debarborrowernumber %][% errmsgloo.debarname %]([% errmsgloo.debarcardnumber %])</a> is now debarred until [% errmsgloo.debarred %] </p>
[% END %]
[% END %]
[% IF ( soundon ) %]
@@ -411,7 +411,7 @@ function Dopop(link) {
<td>[% title |html %]</td>
<td>
- <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% riborrowernumber %]">[% riborsurname %], [% ribortitle %] [% riborfirstname %]</a> ([% riborcnum %])
+ [% INCLUDE 'patron-default-view.inc' borrowernumber = riborrowernumber %][% riborsurname %], [% ribortitle %] [% riborfirstname %]</a> ([% riborcnum %])
[% IF ( flagset ) %]
([% FOREACH flagloo IN flagloop %]
[% flagloo.flag %]
@@ -445,7 +445,7 @@ function Dopop(link) {
<td>[% riloo.itemcallnumber %]</td>
<td>[% riloo.itemtype %] [% riloo.ccode %]</td>
<td>[% IF ( riloo.duedate ) %]
- <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% riloo.borrowernumber %]">
+ [% INCLUDE 'patron-default-view.inc' borrowernumber = riloo.borrowernumber %]
[% riloo.borsurname %], [% riloo.borfirstname %] ([% riloo.borcategorycode %])
</a>
[% ELSE %]Not checked out[% END %]</td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt
index 2c84d5d..ef624c4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt
@@ -65,7 +65,7 @@ $(document).ready(function() {
<br />Barcode: [% reser.barcode %]
</td>
<td>[% IF ( reser.borrowername ) %]
- <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% reser.borrowernum %]">
+ [% INCLUDE 'patron-default-view.inc' borrowernumber = reser.borrowernum %]
[% reser.borrowername %] [% reser.borrowerfirstname %]
</a>
<br />[% reser.borrowerphone %]<br />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt
index d9ba8fc..cb12736 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt
@@ -77,7 +77,7 @@ $(document).ready(function() {
<strong>[% itemsloo.barcode %]</strong> <em>or any available</em>
[% END %]
</td>
- <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>
+ <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>
<td class="hq-sendto">[% itemsloo.pickbranch %]</td>
<td class="hq-date">[% itemsloo.reservedate %]</td>
<td class="hq-notes">[% itemsloo.notes %]</td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
index 3ec2707..6e082c7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
@@ -93,7 +93,7 @@ $.tablesorter.addParser({
(<b>[% reserveloo.itemtype %]</b>)
<br />Barcode: [% reserveloo.barcode %]
</td>
- <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% reserveloo.borrowernum %]">[% reserveloo.borrowername %], [% reserveloo.borrowerfirstname %]</a><br />[% reserveloo.borrowerphone %]<br />
+ <td>[% INCLUDE 'patron-default-view.inc' borrowernumber = reserveloo.borrowernum %][% reserveloo.borrowername %], [% reserveloo.borrowerfirstname %]</a><br />[% reserveloo.borrowerphone %]<br />
[% IF ( reserveloo.borrowermail ) %]<a href="mailto:[% reserveloo.email %]?subject=Reservation: [% reserveloo.title %]">
[% reserveloo.borrowermail %]</a>[% END %]
</td>
@@ -152,7 +152,7 @@ $.tablesorter.addParser({
[% UNLESS ( item_level_itypes ) %][% IF ( overloo.itemtype ) %] (<b>[% overloo.itemtype %]</b>)[% END %][% END %]
<br />Barcode: [% overloo.barcode %]
</td>
- <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% overloo.borrowernum %]">[% overloo.borrowername %], [% overloo.borrowerfirstname %]</a><br />[% overloo.borrowerphone %]<br />
+ <td>[% INCLUDE 'patron-default-view.inc' borrowernumber = overloo.borrowernum %][% overloo.borrowername %], [% overloo.borrowerfirstname %]</a><br />[% overloo.borrowerphone %]<br />
[% IF ( overloo.borrowermail ) %]<a href="mailto:[% overloo.email %]?subject=Reservation: [% overloo.title |url %]">
[% overloo.borrowermail %]</a>[% END %]
</td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt
index 1269270..00e39a1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt
@@ -40,7 +40,7 @@
[% ELSE %]
<form method="post" id="changepasswordf" action="/cgi-bin/koha/members/member-password.pl">
-<input type="hidden" name="destination" value="[% destination %]" />
+<input type="hidden" name="destination" value="[% destination %]" />
<input type="hidden" name="cardnumber" value="[% cardnumber %]" />
<input type="hidden" name="borrowernumber" id="borrowernumber" value="[% borrowernumber %]" />
[% IF ( errormsg ) %]
@@ -85,7 +85,13 @@
</li>
</ol>
</fieldset>
- <fieldset class="action"><input type="submit" value="Save" /> <a class="cancel" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">Cancel</a></fieldset>
+ <fieldset class="action"><input type="submit" value="Save" />
+ [% IF ( destination == 'circ' ) %]
+ <a class="cancel" href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% borrowernumber %]">
+ [% ELSE %]
+ <a class="cancel" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">
+ [% END %]
+ Cancel</a></fieldset>
</form>[% END %]
</div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt
index c3f3909..b2c919d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt
@@ -60,7 +60,7 @@
[% END %]
[% END %]
<td>[% resultsloo.cardnumber %]</td>
- <td style="white-space: nowrap;"><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% resultsloo.borrowernumber %]">
+ <td style="white-space: nowrap;">[% INCLUDE 'patron-default-view.inc' borrowernumber = resultsloo.borrowernumber %]
[% INCLUDE 'patron-title.inc' category_type = resultsloo.category_type firstname = resultsloo.firstname surname = resultsloo.surname othernames = resultsloo.othernames cardnumber = resultsloo.cardnumber %]</a> <br />
[% 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>
<td>[% resultsloo.category_description %] ([% resultsloo.category_type %])</td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
index 51a1ba1..0264d98 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
@@ -74,7 +74,7 @@
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 %]
[% surname %] [% firstname %]
[% ELSE %]
-<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% firstname %] [% surname %]</a> › <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 %]
+[% INCLUDE 'patron-default-view.inc' %][% firstname %] [% surname %]</a> › <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 %]
</strong>[% END %]</div>
[% IF ( opadd ) %]<div id="doc" class="yui-t7">[% ELSE %]<div id="doc3" class="yui-t2">[% END %]
@@ -1326,7 +1326,7 @@
[% IF ( opduplicate ) %]
<textarea id="debarredcomment" name="debarredcomment" cols="55" rows="3" onclick="this.value=''">[% debarredcomment %]</textarea>
[% ELSE %]
- <textarea id="debarredcomment" name="debarredcomment" cols="55" rows="3" ">[% debarredcomment %]</textarea>
+ <textarea id="debarredcomment" name="debarredcomment" cols="55" rows="3">[% debarredcomment %]</textarea>
[% END %]
</li>
@@ -1464,7 +1464,12 @@
[% IF ( opadd ) %]
<a class="cancel" href="/cgi-bin/koha/members/member.pl">Cancel</a>
[% ELSE %]
- <a class="cancel" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">Cancel</a>
+ [% IF ( destination == 'circ' ) %]
+ <a class="cancel" href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% borrowernumber %]">
+ [% ELSE %]
+ <a class="cancel" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">
+ [% END %]
+ Cancel</a>
[% END %]
</fieldset>
</form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt
index f84052b..ed2cf60 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt
@@ -16,7 +16,7 @@
<div id="main">
-<h3><a href="/cgi-bin/koha/circ/circulation.pl?findborrower=[% cardnumber %]">Account Summary: [% firstname %] [% surname %] ([% cardnumber %])</a></h3>
+<h3>[% INCLUDE 'patron-default-view.inc' %]Account Summary: [% firstname %] [% surname %] ([% cardnumber %])</a></h3>
<ul><li>[% address %]<br />[% address2 %]</li><li>[% city %], [% zipcode %]</li>
<li>[% IF ( phone ) %][% phone %][% ELSE %](no phone number on file)[% END %]</li>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt
index 4a85ccb..d3a352c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt
@@ -4,12 +4,7 @@
<link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon %][% ELSE %][% themelang %]/includes/favicon.ico[% END %]" type="image/x-icon" />
<link rel="stylesheet" type="text/css" href="[% themelang %]/css/print.css" />
-<script language="javascript">
- function printThenClose() {
- window.print();
- window.close();
- }
-</script>
+
</head>
<body onload="printThenClose();">
@@ -18,7 +13,7 @@
<h3>[% LibraryName %]</h3>
[% IF ( branchname ) %][% branchname %]<br />[% END %]
Checked out to [% firstname %] [% surname %] <br />
-(<a href="/cgi-bin/koha/circ/circulation.pl?findborrower=[% cardnumber %]">[% cardnumber %]</a>)<br />
+([% INCLUDE 'patron-default-view.inc' %][% cardnumber %]</a>)<br />
[% todaysdate %]<br />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
index c3d7063..d770d67 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
@@ -226,11 +226,11 @@ function validate1(date) {
[% END %]
[% IF ( isguarantee ) %]
[% IF ( guaranteeloop ) %]
- <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>
+ <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>
[% END %]
[% ELSE %]
[% IF ( guarantorborrowernumber ) %]
- <li><span class="label">Guarantor:</span><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantorborrowernumber %]">[% guarantorsurname %], [% guarantorfirstname %]</a></li>
+ <li><span class="label">Guarantor:</span>[% INCLUDE 'patron-default-view.inc' borrowernumber = guarantorborrowernumber %][% guarantorsurname %], [% guarantorfirstname %]</a></li>
[% END %]
[% END %]
</ol>
@@ -572,7 +572,7 @@ function validate1(date) {
<td>[% relissueloo.itemcallnumber %]</td>
<td>[% relissueloo.charge %]</td>
<td>[% relissueloo.replacementprice %]</td>
- <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% relissueloo.borrowernumber %]">[% relissueloo.firstname %] [% relissueloo.surname %] ([% relissueloo.cardnumber %])</a></td>
+ <td>[% INCLUDE 'patron-default-view.inc' borrowernumber = relissueloo.borrowernumber %][% relissueloo.firstname %] [% relissueloo.surname %] ([% relissueloo.cardnumber %])</a></td>
</tr>
[% END %]
</tbody>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/update-child.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/update-child.tt
index 81fa3b6..4b9c994 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/update-child.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/update-child.tt
@@ -36,7 +36,8 @@ confirm_updatechild([% borrowernumber %]);
[% IF ( SUCCESS ) %]
<script language="javascript" type="text/javascript">
-self.opener.location.href='/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]';
+[% IF ( PatronDefaultView == 'circ' ) %]self.opener.location.href='/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% borrowernumber %]';
+[% ELSE %]self.opener.location.href='/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]';[% END %]
window.close();
</script>
[% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/list.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/list.tt
index e286cc8..c2cfac0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/list.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/list.tt
@@ -78,7 +78,7 @@
<th>Date</th>
<th>Action</th>
<th>Barcode</th>
- <th>Cardnumber</th>
+ <th>Patron</th>
</tr>
</thead>
<tbody>
@@ -97,7 +97,7 @@
<td>
[% IF ( operation.actionissue ) %]
[% IF ( operation.borrowernumber ) %]
- <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% operation.borrowernumber %]" title="[% operation.borrower %]">[% operation.cardnumber %]</a>
+ [% INCLUDE 'patron-default-view.inc' borrowernumber = operation.borrowernumber %][% operation.borrower %] ([% operation.cardnumber %])</a>
[% ELSE %]
<span class="error">[% operation.cardnumber %]</span>
[% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt
index 6a66b6a..c65540d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt
@@ -54,10 +54,10 @@ function CheckForm(f) {
</div>
[% END %]
[% IF ( message.ERROR_no_borrower_from_item ) %]<p>Warning: Unable to determine patron from item barcode ([% message.badbarcode %]). Cannot check in.</p>[% END %]
- [% 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 %]
- [% 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 %]
- [% 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 %]
- [% 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 %]
+ [% 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 %]
+ [% 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 %]
+ [% 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 %]
+ [% 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 %]
[% END %]
[% ELSE %]
<h2>Upload Offline Circulation Data</h2>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/members-search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/members-search.tt
index cbd1db5..9a859a5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/members-search.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/members-search.tt
@@ -113,7 +113,7 @@ function add_item(borrowernum,batch_id,type_id){
[% END %]
<td> <input type="checkbox" name="borrowernumber" id="patron[% resultsloo.borrowernumber %]" value="[% resultsloo.borrowernumber %]" /> </td>
<td>[% resultsloo.cardnumber %]</td>
- <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>
+ <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>
<td>[% resultsloo.category_description %] ([% resultsloo.categorycode %])</td>
<td>[% resultsloo.branchcode %]</td>
<td>[% resultsloo.dateexpiry %]</td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tt
index b309d94..4548f7c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tt
@@ -51,7 +51,7 @@ function Dopop(link) {
[% loopro.rowtitle %]</td>
[% FOREACH loopcel IN loopro.loopcell %]
[% IF ( loopcel.hilighted ) %]<td>[% ELSE %]<td>[% END %]
- [% IF ( loopcel.reference ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% loopcel.reference %]">[% END %]
+ [% IF ( loopcel.reference ) %][% INCLUDE 'patron-default-view.inc' borrowernumber = loopcel.reference %][% END %]
[% IF ( loopcel.value ) %][% loopcel.value %][% END %]
[% IF ( loopcel.reference ) %]</a>[% END %]
</td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
index fa45e26..99b79ed 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
@@ -204,10 +204,10 @@ function checkMultiHold() {
<h3>Cannot Place Hold</h3>
<ul>
[% IF ( maxreserves ) %]
- <li><strong>Too Many Holds: </strong> <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% borrowerfirstname %] [% borrowersurname %] </a> has too many holds.</li>
+ <li><strong>Too Many Holds: </strong> [% INCLUDE 'patron-default-view.inc' %][% borrowerfirstname %] [% borrowersurname %] </a> has too many holds.</li>
[% END %]
[% IF ( alreadyreserved ) %]
- <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% borrowerfirstname %] [% borrowersurname %]</a> <strong>already has a hold</strong> on this item </li>
+ <li>[% INCLUDE 'patron-default-view.inc' %][% borrowerfirstname %] [% borrowersurname %]</a> <strong>already has a hold</strong> on this item </li>
[% END %]
[% IF ( none_available ) %]
<li> <strong>No copies are available</strong> to be placed on hold</li>
@@ -223,11 +223,11 @@ function checkMultiHold() {
[% IF ( messages ) %]
<div class="dialog message"><ul>
[% IF ( expiry ) %]
- <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% borrowerfirstname %] [% borrowersurname %]</a>'s <strong>account has expired</strong></li>
+ <li>[% INCLUDE 'patron-default-view.inc' %][% borrowerfirstname %] [% borrowersurname %]</a>'s <strong>account has expired</strong></li>
[% END %]
[% IF ( diffbranch ) %]
- <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>
+ <li> <strong>Pickup library is different</strong> than [% INCLUDE 'patron-default-view.inc' %][% borrowerfirstname %] [% borrowersurname %]</a>'s home library ([% borrower_branchname %] / [% borrower_branchcode %] )</li>
[% END %]
</ul></div>
@@ -265,7 +265,7 @@ function checkMultiHold() {
<ol> <li><span class="label">Patron:</span>
[% IF ( borrowernumber ) %]
- <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% borrowerfirstname %] [% borrowersurname %] ([% cardnumber %])</a>
+ [% INCLUDE 'patron-default-view.inc' %][% borrowerfirstname %] [% borrowersurname %] ([% cardnumber %])</a>
[% ELSE %]
Not defined yet
[% END %]
@@ -460,7 +460,7 @@ function checkMultiHold() {
Can't be cancelled when item is in transit
[% ELSE %]
[% IF ( itemloo.waitingdate ) %]Waiting[% ELSE %]On hold[% END %]
- [% 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 %]
+ [% 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 %]
since
[% IF ( itemloo.waitingdate ) %][% itemloo.waitingdate %][% ELSE %][% IF ( itemloo.reservedate ) %][% itemloo.reservedate %][% END %][% END %]. <a class="info" href="modrequest.pl?CancelBiblioNumber=[% itemloo.biblionumber %]&CancelBorrowerNumber=[% itemloo.ReservedForBorrowernumber %]&CancelItemnumber=[% itemloo.itemnumber %]" onclick="if (window.confirm('Are you sure you want to delete this hold?')) {return true;} else {return false;}">Cancel hold</a>
@@ -526,7 +526,7 @@ function checkMultiHold() {
[% END %]
[% IF ( biblioloo.alreadyres ) %]
- <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% borrowerfirstname %] [% borrowersurname %]</a> <strong>already has a hold</strong> on this item </li>
+ <li>[% INCLUDE 'patron-default-view.inc' %][% borrowerfirstname %] [% borrowersurname %]</a> <strong>already has a hold</strong> on this item </li>
[% END %]
[% IF ( biblioloo.none_avail ) %]
<li> <strong>No copies are available</strong> to be placed on hold</li>
@@ -639,7 +639,7 @@ function checkMultiHold() {
[% END %]
<td>
- <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% reserveloo.borrowernumber %]" >
+ [% INCLUDE 'patron-default-view.inc' borrowernumber = reserveloo.borrowernumber %]
[% IF ( reserveloo.hidename ) %]
[% reserveloo.cardnumber (reserveloo.borrowernumber) %]
[% ELSE %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt
index a1dabbd..76cb9971 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt
@@ -44,7 +44,7 @@
<tbody>[% FOREACH review IN reviews %]
<tr>
<td>
- <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% review.borrowernumber %]">[% review.surname %], [% review.firstname %]</a>
+ [% INCLUDE 'patron-default-view.inc' borrowernumber = review.borrowernumber %][% review.surname %], [% review.firstname %]</a>
</td>
<td>
<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% review.biblionumber %]">[% review.bibliotitle %]</a>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/viewalerts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/viewalerts.tt
index 9c3f83f..f1559dd 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/viewalerts.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/viewalerts.tt
@@ -26,7 +26,7 @@
[% FOREACH alertloo IN alertloop %]
<tr>
<td>[% alertloo.name %]</td>
- <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% alertloo.borrowernumber %]" class="button">View</a></td>
+ <td>[% INCLUDE 'patron-default-view.inc' borrowernumber = alertloo.borrowernumber %]View</a></td>
</tr>
[% END %]
</table>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
index 47ee96a..1b81d67 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
@@ -145,18 +145,18 @@ $(document).ready(function() { calcNewsuggTotal(); });
<tr>
<th><label for="suggesteddate">Suggestion creation</label> </th>
<td><input type="text" id="suggesteddate" name="suggesteddate" size="10" maxlength="10" value="[% suggesteddate %]"/></td>
- <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 %]
+ <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 %]
</td>
</tr>
<tr>
<th><label for="managedon">Suggestion management</label> </th>
<td><input type="text" id="managedon" name="manageddate" size="10" maxlength="10" value="[% manageddate %]" /></td>
- <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>
+ <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>
</tr>
<tr>
<th><label for="accepteddate">Suggestion Accepted</label> </th>
<td><input type="text" id="accepteddate" name="accepteddate" size="10" maxlength="10" value="[% accepteddate %]" /></td>
- <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>
+ <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>
</tr>
</tbody>
</table></li></ol>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt
index b2ab90f..d4b4575 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt
@@ -153,27 +153,26 @@
<td>[% loopro.timestamp %]</td>
<td>
[% IF ( module == 'CIRCULATION' ) %]
- <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% loopro.user %]" title="display detail for this user."> [% loopro.user %] </a>
+ [% INCLUDE 'patron-default-view.inc' borrowernumber = loopro.user %] [% loopro.user %] </a>
[% ELSE %]
- <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% loopro.user %]" title="display detail for this librarian."> [% loopro.user %] </a>
+ [% INCLUDE 'patron-default-view.inc' borrowernumber = loopro.user %] [% loopro.user %] </a>
[% END %]
</td>
<td>[% loopro.module %]</td>
<td>[% loopro.action %]</td>
<td>
[% IF ( module == 'MEMBERS' ) %]
- <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% loopro.object %]" title="Display member details."> member [% loopro.object %] </a>
+ [% INCLUDE 'patron-default-view.inc' borrowernumber = loopro.object %] patron [% loopro.object %] </a>
[% ELSE %]
[% IF ( module == 'CIRCULATION' ) %]
- <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% loopro.object %]" title="Display member details.">
- [% IF ( loopro.object ) %]
- member [% loopro.object %]
+ [% INCLUDE 'patron-default-view.inc' borrowernumber = loopro.object %] [% IF ( loopro.object ) %]
+ patron [% loopro.object %]
[% END %]
</a>
[% ELSE %]
[% IF ( module == 'CATALOGUING' ) %]
[% IF ( info == 'item' ) %]
- <a href="/cgi-bin/koha/catalogue/moredetail.pl?item=[% loopro.object %]&biblionumber=[% loopro.biblionumber %]&bi=[% loopro.biblioitemnumber %]#item[% loopro.object %]">Item [% loopro.object %]</a>
+ <a href="/cgi-bin/koha/catalogue/moredetail.pl?item=[% loopro.object %]&biblionumber=[% loopro.biblionumber %]&bi=[% loopro.biblioitemnumber %]#item[% loopro.object %]">Item [% loopro.object %]</a>
[% ELSE %]
<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loopro.object %]" title="Display detail for this biblio">biblio [% loopro.object %]</a>
[% END %]
@@ -208,7 +207,7 @@
for <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% object %]">Bibliographic Record [% object %]</a>
[% END %]
[% IF ( MEMBERS ) %]
- for <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% object %]">[% INCLUDE 'patron-title.inc' %]</a>
+ for [% INCLUDE 'patron-default-view.inc' borrowernumber = object %][% INCLUDE 'patron-title.inc' %]</a>
[% END %]
.
</div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt
index b054e09..ebc9a54 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt
@@ -403,7 +403,7 @@ function placeHold () {
[% FOREACH shelvesloo IN shelvesloop %]
[% IF ( shelvesloo.toggle ) %]<tr class="highlight">[% ELSE %]<tr>[% END %]
<td><a href="shelves.pl?viewshelf=[% shelvesloo.shelf %]">[% shelvesloo.shelfname |html %]</a></td>
- <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% shelvesloo.owner %]">[% shelvesloo.ownername %]</td>
+ <td>[% INCLUDE 'patron-default-view.inc' borrowernumber = shelvesloo.owner %][% shelvesloo.ownername %]</td>
<td>[% shelvesloo.count %] item(s)</td>
<td>[% IF ( shelvesloo.authorsort ) %]Author[% ELSIF ( shelvesloo.yearsort ) %]Year[% ELSE %]Title[% END %]</td>
<td>[% IF ( shelvesloo.viewcategory1 ) %]Private[% END %]
--
1.7.3
More information about the Koha-patches
mailing list