From f621e7b8c80719547ebcda75ece2019f1ec13b4a Mon Sep 17 00:00:00 2001 From: Matthias Meusburger <matthias.meusburger@biblibre.com> Date: Mon, 28 Jun 2010 17:17:41 +0200 Subject: [PATCH] Follow-up fix for Bug 5952, Shows member relatives in issues list Content-Type: text/plain; charset="utf-8" - Moving columns around to match display of patron's own checkouts - Correcting terminology (issues, borrowers) - Hiding columns added in previous patch which do not display in the standard checkout list: materials, stock number, collection. If these are to be added they should be added to all displays. --- .../prog/en/modules/circ/circulation.tmpl | 27 ++++++++----------- .../prog/en/modules/members/moremember.tmpl | 21 +++++---------- 2 files changed, 18 insertions(+), 30 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl index 5351208..5f3591c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl @@ -645,7 +645,7 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span> <a href="/cgi-bin/koha/circ/circulation.pl#checkouts">0 Checkouts</a> <!-- /TMPL_IF --></li> <!-- TMPL_IF NAME="displayrelissues" --> -<li><a href="/cgi-bin/koha/circ/circulation.pl#relissues">Relatives Issues</a></li> +<li><a href="/cgi-bin/koha/circ/circulation.pl#relissues">Relatives' Checkouts</a></li> <!-- /TMPL_IF --> <li><!-- TMPL_IF NAME="countreserv"--> <a href="/cgi-bin/koha/circ/circulation.pl#reserves"><!--TMPL_VAR NAME="countreserv"--> Hold(s)</a> @@ -830,18 +830,17 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span> <!-- TMPL_IF NAME="displayrelissues" --> <div id="relissues"> -<h2>Relatives issues</h2> <table id="relissuest"> <thead> <tr> <th scope="col">Due date</th> <th scope="col">Title</th> <th scope="col">Item Type</th> - <th scope="col">Branch</th> <th scope="col">Checked out on</th> + <th scope="col">Call no</th> <th scope="col">Charge</th> - <th scope="col">Borrower</th> - <th scope="col">Material</th> + <th scope="col">Price</th> + <th scope="col">Patron</th> </tr> </thead> <!-- TMPL_IF NAME="relissues" --> <tbody> @@ -856,12 +855,11 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span> <!-- TMPL_VAR NAME="dd" --></td> <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&type=intra"><strong><!-- TMPL_VAR NAME="title" escape="html" --></strong></a><!-- TMPL_IF NAME="author" -->, by <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF --><!-- TMPL_IF NAME="itemnotes" -->- <span class="circ-hlt"><!-- TMPL_VAR name="itemnotes" --></span><!-- /TMPL_IF --> <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->#item<!-- TMPL_VAR NAME="itemnumber" -->"><!-- TMPL_VAR NAME="barcode" --></a></td> <td><!-- TMPL_UNLESS NAME="noItemTypeImages" --> <!-- TMPL_IF NAME="itemtype_image" --><img src="<!-- TMPL_VAR NAME="itemtype_image" -->" alt="" /><!-- /TMPL_IF --><!-- /TMPL_UNLESS --><!-- TMPL_VAR NAME="itemtype" --></td> - <td><!-- TMPL_VAR NAME="branchdisplay" --> - <!--TMPL_IF Name="itemcallnumber"-->(<!-- TMPL_VAR NAME="itemcallnumber" -->)<!--/TMPL_IF--></td> <td><!-- TMPL_VAR NAME="displaydate" --></td> + <td><!-- TMPL_VAR NAME="itemcallnumber" --></td> <td><!-- TMPL_VAR NAME="charge" --></td> - <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="borrowername" --></a></td> - <td><!-- TMPL_VAR NAME="materials" --></td> + <td><!-- TMPL_VAR NAME="replacementprice" --></td> + <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="borrowername" --> (<!-- TMPL_VAR NAME="cardnumber" -->)</a></td> </tr> <!-- /TMPL_LOOP --> <!-- /loop todayissues --> <!-- /if todayissues --><!-- /TMPL_IF --> @@ -877,16 +875,13 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span> <!-- TMPL_VAR NAME="dd" --> </td> <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&type=intra"><strong><!-- TMPL_VAR NAME="title" escape="html" --></strong></a><!-- TMPL_IF NAME="author" -->, by <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF --> <!-- TMPL_IF NAME="itemnotes" -->- <!-- TMPL_VAR name="itemnotes" --><!-- /TMPL_IF --> <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->#item<!-- TMPL_VAR NAME="itemnumber" -->"><!-- TMPL_VAR NAME="barcode" --></a></td> - <td> - <!-- TMPL_VAR NAME="itemtype" --> - </td> - <td><!-- TMPL_VAR NAME="branchdisplay" --> - <!--TMPL_IF NAME="itemcallnumber"-->(<!-- TMPL_VAR NAME="itemcallnumber" -->)<!--/TMPL_IF--></td> + <td><!-- TMPL_UNLESS NAME="noItemTypeImages" --> <!-- TMPL_IF NAME="itemtype_image" --><img src="<!-- TMPL_VAR NAME="itemtype_image" -->" alt="" /><!-- /TMPL_IF --><!-- /TMPL_UNLESS --><!-- TMPL_VAR NAME="itemtype" --></td> <td><!-- TMPL_VAR NAME="displaydate" --></td> + <td><!-- TMPL_VAR NAME="itemcallnumber" --></td> <!-- TMPL_IF NAME="multiple_borrowers" --><td><!-- TMPL_VAR NAME="borrowername" --></td><!-- /TMPL_IF --> <td><!-- TMPL_VAR NAME="charge" --></td> - <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="borrowername" --></a></td> - <td><!-- TMPL_VAR NAME="materials" --></td> + <td><!-- TMPL_VAR NAME="replacementprice" --></td> + <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="borrowername" --> (<!-- TMPL_VAR NAME="cardnumber" -->)</a></td> </tr> <!-- /loop previssues --><!-- /TMPL_LOOP --> <!--/if previssues --><!-- /TMPL_IF --> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl index ad5731d..69cba4c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl @@ -394,7 +394,7 @@ function validate1(date) { <ul> <li><a href="/cgi-bin/koha/members/moremember.pl#checkedout"><!-- TMPL_VAR NAME="issuecount"--> Checkout(s)</a></li> <!-- TMPL_IF NAME="relissuecount" --> - <li><a href="/cgi-bin/koha/members/moremember.pl#relissues">Relatives issues</a></li> + <li><a href="/cgi-bin/koha/members/moremember.pl#relissues">Relatives' Checkouts</a></li> <!-- /TMPL_IF --> <li><a href="/cgi-bin/koha/members/moremember.pl#finesandcharges">Fines & Charges</a></li> <li><!-- TMPL_IF NAME="countreserv"--> @@ -515,21 +515,17 @@ function validate1(date) { <!-- TMPL_IF NAME="relissuecount" --> <div id="relissues"> - <h2>Relatives issues</h2> <table id="relissuest"> <thead> <tr> <th scope="col">Due date</th> <th scope="col">Title</th> - <th scope="col">Collection</th> - <th scope="col">Stock number</th> - <th scope="col">Barcode</th> <th scope="col">Item Type</th> - <th scope="col">Checked out on</th> - <th scope="col">Borrower</th> - <th scope="col">Call no</th> + <th scope="col">Checked out on</th> + <th scope="col">Call no</th> <th scope="col">Charge</th> <th scope="col">Price</th> + <th scope="col">Patron</th> </tr> </thead> <tbody> @@ -548,16 +544,13 @@ function validate1(date) { <span class="dmg"><!-- TMPL_VAR NAME="itemdamaged" --></span> <!-- /TMPL_IF --> </td> - <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><strong><!-- TMPL_VAR NAME="title" escape="html" --></strong></a><!-- TMPL_IF NAME="author" -->, by <!-- TMPL_VAR name="author" --><!-- /TMPL_IF --> <!-- TMPL_IF name="publishercode" -->; <!-- TMPL_VAR name="publishercode" --> <!-- /TMPL_IF --> <!-- TMPL_IF name="publicationyear" -->, <!-- TMPL_VAR name="publicationyear" --><!-- /TMPL_IF --></td> - <td><!-- TMPL_VAR NAME="collection" --></td> - <td><!-- TMPL_VAR NAME="stocknumber" --></td> - <td><a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->#item<!-- TMPL_VAR NAME="itemnumber" -->"><!-- TMPL_VAR NAME="barcode" --></a></td> + <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><strong><!-- TMPL_VAR NAME="title" escape="html" --></strong></a><!-- TMPL_IF NAME="author" -->, by <!-- TMPL_VAR name="author" --><!-- /TMPL_IF --> <!-- TMPL_IF name="publishercode" -->; <!-- TMPL_VAR name="publishercode" --> <!-- /TMPL_IF --> <!-- TMPL_IF name="publicationyear" -->, <!-- TMPL_VAR name="publicationyear" --><!-- /TMPL_IF --> <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->#item<!-- TMPL_VAR NAME="itemnumber" -->"><!-- TMPL_VAR NAME="barcode" --></a></td> <td><!-- TMPL_UNLESS NAME="noItemTypeImages" --> <!-- TMPL_IF NAME="itemtype_image" --><img src="<!-- TMPL_VAR NAME="itemtype_image" -->" alt="" /><!-- /TMPL_IF --><!-- /TMPL_UNLESS --><!-- TMPL_VAR NAME="itemtype_description" --></td> <td><!-- TMPL_VAR NAME="issuedate" --></td> - <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="borrowername" --></a></td> - <td><!-- TMPL_VAR NAME="itemcallnumber" --></td> + <td><!-- TMPL_VAR NAME="itemcallnumber" --></td> <td><!-- TMPL_VAR NAME="charge" --></td> <td><!-- TMPL_VAR NAME="replacementprice" --></td> + <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="borrowername" --> (<!-- TMPL_VAR NAME="cardnumber" -->)</a></td> </tr> <!-- /tmpl_loop --> </tbody> -- 1.7.3