Attachment 3650 Details for Bug 5952 – rebasing owen's patch : reformatted and some spellings update...

[patch] rebasing owen's patch : reformatted and some spellings update...

0001-reformatted-Follow-up-fix-for-Bug-5952-Shows-member-.patch (text/plain), 10.50 KB, created by dev_patches on 2011-04-05 08:19:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: dev_patches

Created: 2011-04-05 08:19:06 UTC

Size: 10.50 KB

patch

obsolete

>From 82933bd899950b749865be52768712eecd5cbf52 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Fri, 1 Apr 2011 14:30:03 -0400
>Subject: [PATCH] [reformatted] 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"></span>
>             <a href="/cgi-bin/koha/circ/circulation.pl#checkouts">0 Checkouts</a>
>     </li>
> 
>-<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>
> 
> <li>
>             <a href="/cgi-bin/koha/circ/circulation.pl#reserves"> Hold(s)</a>
>@@ -830,18 +830,17 @@ No patron matched <span class="ex"></span>
> 
> 
> <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>
> 	<tbody>
>@@ -856,12 +855,11 @@ No patron matched <span class="ex"></span>
>             </td>
>         <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=&amp;type=intra"><strong></strong></a>, by - <span class="circ-hlt"></span> <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=&amp;itemnumber=#item"></a></td>
>         <td> <img src="" alt="" /></td>
>-	<td>
>-        ()</td>
>         <td></td>
>+	<td></td>
>             <td></td>
>-            <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber="></a></td>
>-            <td></td>
>+            <td></td>
>+            <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber="> ()</a></td>
>     </tr>
>      
>     
>@@ -877,16 +875,13 @@ No patron matched <span class="ex"></span>
>         
>         </td>
>         <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=&amp;type=intra"><strong></strong></a>, by  -  <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=&amp;itemnumber=#item"></a></td>
>-        <td>
>-            
>-        </td>
>-	<td>
>-        ()</td>
>+        <td> <img src="" alt="" /></td>
>         <td></td>
>+	<td></td>
> 	<td></td>
>         <td></td>
>-	<td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber="></a></td>
>-        <td></td>
>+        <td></td>
>+	<td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber="> ()</a></td>
>     </tr>
>     
> 
>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"> Checkout(s)</a></li>
>     
>-        <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>
>     
> 		<li><a href="/cgi-bin/koha/members/moremember.pl#finesandcharges">Fines &amp; Charges</a></li>
> 		<li>
>@@ -515,21 +515,17 @@ function validate1(date) {
> 
> 
> <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"></span>
>                 
> </td>
>-            <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber="><strong></strong></a>, by  ;   , </td>
>-            <td></td>
>-            <td></td>
>-            <td><a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=&amp;itemnumber=#item"></a></td>
>+            <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber="><strong></strong></a>, by  ;   ,  <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=&amp;itemnumber=#item"></a></td>
> <td> <img src="" alt="" /></td>
>             <td></td>
>-	    <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber="></a></td>
>-	    <td></td>
>+            <td></td>
>             <td></td>
>             <td></td>
>+        <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber="> ()</a></td>
>         </tr>
>   
>         </tbody>
>-- 
>1.7.3
>

Actions: View | Diff | Splinter Review

Attachments on bug 5952: 3431 | 3447 | 3460 | 3604 | 3606 | 3650 | 3914