Bugzilla – Attachment 4838 Details for
Bug 5436
Extended patron attributes display improvements
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
proposed patch (follow-up comment 20)
0001-BZ-5436-follow-up-from-owen-comment-20.patch (text/plain), 11.16 KB, created by
Paul Poulain
on 2011-08-04 12:08:29 UTC
(
hide
)
Description:
proposed patch (follow-up comment 20)
Filename:
MIME Type:
Creator:
Paul Poulain
Created:
2011-08-04 12:08:29 UTC
Size:
11.16 KB
patch
obsolete
>From 5e97d897e9218f1656b3566f49b6da77d864be4d Mon Sep 17 00:00:00 2001 >From: Paul Poulain <paul.poulain@biblibre.com> >Date: Thu, 4 Aug 2011 14:06:10 +0200 >Subject: [PATCH] BZ 5436 - follow-up from owen comment 20 > >--- > .../intranet-tmpl/prog/en/css/staff-global.css | 14 ------ > .../prog/en/modules/admin/patron-attr-types.tt | 2 +- > .../intranet-tmpl/prog/en/modules/circ/returns.tt | 5 +- > .../prog/en/modules/members/moremember.tt | 48 +++++++++----------- > 4 files changed, 26 insertions(+), 43 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css >index 5dfce15..b524566 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css >+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css >@@ -1953,20 +1953,6 @@ ul.budget_hierarchy li:last-child:after { > ul.budget_hierarchy li:first-child:after { > content: ""; > } >-#cartmenulink img { >- background-image : none; >- display : inline; >- padding : 3px 6px 0 0; >-} >- >-* html #cartmenulink { >- border : 1px solid #336600; >-} >- >-* html #listsmenulink { >- border : 1px solid #006699; >-} >- > #collapsedaddress { > border: solid 1px #eee; > margin-right: 10px; >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt >index 513722c..3998882 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt >@@ -124,7 +124,7 @@ function CheckAttributeTypeForm(f) { > </li> > <li><label for="display_checkout">Display in check-out: </label> > <input type="checkbox" id="display_checkout" name="display_checkout" [% display_checkout_checked %] /> >- <span>Check to show this attribute in member check-out.</span> >+ <span>Check to show this attribute in patron check-out.</span> > </li> > > <li><label for="authorised_value_category">Authorized value category: </label> >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 581a285..4a1ede0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt >@@ -80,7 +80,7 @@ function Dopop(link) { > </div> > [% END %] > <!-- case of a mistake in transfer loop --> >-[% IF ( WrongTransfer ) %]<div 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> >+[% IF ( WrongTransfer ) %]<div class="dialog message"><!-- WrongTransfer --><h3>Please return <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber %]">[% title |html %]</a> to [% TransferWaitingAt %] 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 %]"> > [% borsurname %], [% borfirstname %]</a> ([% borcnum %])</li> >@@ -396,7 +396,7 @@ function Dopop(link) { > [% IF ( riloop ) %] > <h2>Checked-In items</h2> > <table> >- <tr><th>Due Date</th><th>Title</th> <th>Author</th> <th>Barcode</th><th>Call Number</th><th>Type</th> <th>Patron</th><th>Note</th></tr> >+ <tr><th>Due Date</th><th>Title</th> <th>Author</th> <th>Barcode</th><th>Shelving Location</th><th>Call Number</th><th>Type</th> <th>Patron</th><th>Note</th></tr> > > [% FOREACH riloo IN riloop %] > <tr> >@@ -412,6 +412,7 @@ function Dopop(link) { > [% riloo.itemtitle |html %]</a></td> > <td>[% riloo.itemauthor %]</td> > <td><a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% riloo.itembiblionumber %]&itemnumber=[% riloo.itemnumber %]#item[% riloo.itemnumber %]">[% riloo.barcode %]</a></td> >+ <td>[% riloo.location %]</td> > <td>[% riloo.itemcallnumber %]</td> > <td>[% riloo.itemtype %] [% riloo.ccode %]</td> > <td>[% IF ( riloo.duedate ) %] >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 46ecfa2..67286bf 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >@@ -179,7 +179,7 @@ function validate1(date) { > > [% UNLESS ( I ) %][% IF ( othernames ) %]“[% othernames %]”[% END %] > >-<p class="address"> >+<p class="address">[% streetnumber %] > [% IF ( roaddetails ) %] > [% roaddetails %], > [% END %] >@@ -212,7 +212,9 @@ function validate1(date) { > [% END %] > <li><span class="label">Initials: </span>[% initials %]</li> > <li><span class="label">Date of birth:</span>[% dateofbirth %]</li> >- <li><span class="label">Sex:</span>[% sex %]</li>[% END %] >+ <li><span class="label">Gender:</span> >+ [% IF ( sex == 'F' ) %]Female[% ELSIF ( sex == 'M' ) %]Male[% ELSE %][% sex %][% END %] >+ </li>[% END %] > [% IF ( printethnicityline ) %] > <li><span class="label">Ethnicity:</span>[% ethnicity %]</li> > <li><span class="label">Ethnicity notes: </span>[% ethnotes %]</li> >@@ -339,8 +341,8 @@ function validate1(date) { > </li>[% END %] > [% IF ( sort1 ) %]<li><span class="label">Sort field 1:</span>[% lib1 %]</li>[% END %] > [% IF ( sort2 ) %]<li><span class="label">Sort field 2:</span>[% lib2 %]</li>[% END %] >- <li><span class="label">OPAC login: </span>[% userid %]</li> >- <li><span class="label">OPAC password: </span> >+ <li><span class="label">Username: </span>[% userid %]</li> >+ <li><span class="label">Password: </span> > [% IF ( password ) %] > ******* > [% ELSE %] >@@ -390,7 +392,7 @@ function validate1(date) { > <ul> > <li><a href="/cgi-bin/koha/members/moremember.pl#checkedout">[% issuecount %] Checkout(s)</a></li> > [% IF ( 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> > [% END %] > <li><a href="/cgi-bin/koha/members/moremember.pl#finesandcharges">Fines & Charges</a></li> > <li>[% IF ( countreserv ) %] >@@ -486,9 +488,13 @@ function validate1(date) { > [% IF ( issueloo.return_failed ) %] > <td class="problem">Checkin Failed</td> > [% ELSE %] >+ [% IF ( issueloo.norenew_reason_on_reserve ) %] >+ <td><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% issueloo.biblionumber %]">On Hold</a></td> >+ [% ELSE %] > <td><input type="checkbox" name="barcodes[]" value="[% issueloo.barcode %]" onclick="uncheck_sibling(this);" /> > <input type="checkbox" name="all_barcodes[]" value="[% issueloo.barcode %]" checked="checked" style="display: none;" /> > </td> >+ [% END %] > [% END %] > </tr> > [% END %] >@@ -511,21 +517,17 @@ function validate1(date) { > > [% IF ( 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">Call no</th> > <th scope="col">Charge</th> > <th scope="col">Price</th> >+ <th scope="col">Patron</th> > </tr> > </thead> > <tbody> >@@ -544,16 +546,13 @@ function validate1(date) { > <span class="dmg">[% relissueloo.itemdamaged %]</span> > [% END %] > </td> >- <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% relissueloo.biblionumber %]"><strong>[% relissueloo.title |html %]</strong></a>[% IF ( relissueloo.author ) %], by [% relissueloo.author %][% END %] [% IF ( relissueloo.publishercode ) %]; [% relissueloo.publishercode %] [% END %] [% IF ( relissueloo.publicationyear ) %], [% relissueloo.publicationyear %][% END %]</td> >- <td>[% relissueloo.collection %]</td> >- <td>[% relissueloo.stocknumber %]</td> >- <td><a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% relissueloo.biblionumber %]&itemnumber=[% relissueloo.itemnumber %]#item[% relissueloo.itemnumber %]">[% relissueloo.barcode %]</a></td> >+ <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% relissueloo.biblionumber %]"><strong>[% relissueloo.title |html %]</strong></a>[% IF relissueloo.author %], by [% relissueloo.author %][% END %] [% IF relissueloo.publishercode %]; [% relissueloo.publishercode %] [% END %] [% IF relissueloo.publicationyear %], [% relissueloo.publicationyear %][% END %] <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% relissueloo.biblionumber %]&itemnumber=[% relissueloo.itemnumber %]#item[% relissueloo.itemnumber %]">[% relissueloo.barcode %]</a></td> > <td>[% UNLESS ( noItemTypeImages ) %] [% IF ( relissueloo.itemtype_image ) %]<img src="[% relissueloo.itemtype_image %]" alt="" />[% END %][% END %][% relissueloo.itemtype_description %]</td> > <td>[% relissueloo.issuedate %]</td> >- <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% relissueloo.borrowernumber %]">[% relissueloo.borrowername %]</a></td> >- <td>[% relissueloo.itemcallnumber %]</td> >- <td>[% relissueloo.charge %]</td> >- <td>[% relissueloo.replacementprice %]</td> >+ <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.borrowername %] ([% relissueloo.cardnumber %])</a></td> > </tr> > [% END %] > </tbody> >@@ -603,18 +602,15 @@ function validate1(date) { > <option value="del">Yes</option> > </select> > <input type="hidden" name="biblionumber" value="[% reservloo.biblionumber %]" /> >- <input type="hidden" name="borrowernumber" value="[% reservloo.borrowernumber %]" /> >+ <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" /> > </td> > </tr> > [% END %]</tbody> > </table> > >- <fieldset class="action"> >- <input type="submit" name="renew_checked" value="Renew or Return checked items" /> >- <input type="submit" id="renew_all" name="renew_all" value="Renew all" /> >- </fieldset> >- [% ELSE %]<p>Patron has nothing checked out.</p>[% END %] >-</form> >+ <fieldset class="action"><input type="submit" class="cancel" name="submit" value="Cancel Marked Requests" /></fieldset> >+ </form> >+ [% ELSE %]<p>Patron has nothing on hold.</p>[% END %] > </div> > > </div> >-- >1.7.4.1 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 5436
:
3378
|
3647
|
4595
|
4608
|
4638
|
4829
|
4838
|
4872
|
4906
|
5526