Bugzilla – Attachment 13116 Details for
Bug 8986
Batch patron modification template corrections
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 8986 - Batch patron modification template corrections
0001-Bug-8986-Batch-patron-modification-template-correcti.patch (text/plain), 13.01 KB, created by
Owen Leonard
on 2012-10-30 13:55:52 UTC
(
hide
)
Description:
Bug 8986 - Batch patron modification template corrections
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2012-10-30 13:55:52 UTC
Size:
13.01 KB
patch
obsolete
>From abc0c8461a0a9592e8a3d7f4277330b1ea3da012 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Tue, 30 Oct 2012 09:51:31 -0400 >Subject: [PATCH] Bug 8986 - Batch patron modification template corrections >Content-Type: text/plain; charset="utf-8" > >Many minor template changes: > >- Correcting title and headings >- Adding translation to string in JavaScript >- Tweaking table sorter >- Wrapping card number in link to patron detail page >- Adding standard styles to "clear" links (see patron attributes) >- Terminiology corrections (borrower-> patron, cardnumber -> card number) >- Capitalization corrections >- Make labels clickable >--- > .../prog/en/modules/tools/modborrowers.tt | 62 +++++++++++--------- > 1 file changed, 35 insertions(+), 27 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt >index 8f33fe6..6f45c6a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt >@@ -1,15 +1,19 @@ > [% USE KohaDates %] > [% INCLUDE 'doc-head-open.inc'%] >-<title>Koha › Tools › [% IF ( del ) %]Batch item deletion[% ELSE %]Batch item modification[% END %] </title> >+<title>Koha › Tools › Batch patron modification</title> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'calendar.inc' %] > <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script> >-<script type="text/JavaScript" language="JavaScript"> >+<script type="text/JavaScript"> > //<![CDATA[ > var patron_attributes_lib = new Array(); > var patron_attributes_values = new Array(); > $(document).ready(function() { >- $("#borrowerst").tablesorter(); >+ $("#borrowerst").tablesorter({ >+ [% IF ( op == 'show' ) %]headers: { 0: { sorter: false}},[% END %] >+ widgets : ['zebra'], >+ sortList: [[1,0]] >+ }); > > $("#selectallbutton").click(function() { > $("#borrowerst").find("input:checkbox").each(function() { >@@ -53,7 +57,7 @@ > var information_category_node = $(select_attr).parent().parent().find('span.information_category'); > information_category_node.html(""); > if ( category.length > 0 ) { >- information_category_node.html('This attribute will be only applied to the borrower\'s category "' + category + '"'); >+ information_category_node.html(_("This attribute will be only applied to the patron\'s category") +' "' + category + '"'); > } > if ( type == 'select' ) { > var options = '<option value = ""></option>'; >@@ -70,7 +74,7 @@ > var li_node = $("li.attributes:last"); > var li_clone = $(li_node).clone(); > if ( $(li_clone).find("a.delete").length == 0 ) { >- $(li_clone).append('[<a href="#" title="Delete" class="delete" onclick="del_attributes(this);return false;">X</a>]'); >+ $(li_clone).append('<a href="#" title="Delete" class="clear-field" onclick="del_attributes(this);return false;">Delete</a>'); > } > $(li_clone).find('select[name="patron_attributes"]').change(function() { > updateAttrValues(this); >@@ -106,7 +110,7 @@ > <div id="breadcrumbs"> > <a href="/cgi-bin/koha/mainpage.pl">Home</a> › > <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> › >- <a href="/cgi-bin/koha/tools/modborrowers.pl">Patrons modification</a> >+ <a href="/cgi-bin/koha/tools/modborrowers.pl">Batch patron modification</a> > </div> > > <div id="doc3" class="yui-t2"> >@@ -114,7 +118,7 @@ > <div id="yui-main"> > <div class="yui-b"> > [% IF ( op == 'show_form' ) %] >- <h1>Batch patrons modification</h1> >+ <h1>Batch patron modification</h1> > <form method="post" enctype="multipart/form-data" action="/cgi-bin/koha/tools/modborrowers.pl"> > <fieldset class="rows"> > <legend>Use a file</legend> >@@ -124,7 +128,7 @@ > <legend>Or list cardnumbers one by one</legend> > <ol> > <li> >- <label for="cardnumberlist">Carnumber list (one cardnumber per line): </label> >+ <label for="cardnumberlist">Card number list (one cardnumber per line): </label> > <textarea rows="10" cols="30" id="cardnumberlist" name="cardnumberlist">[% cardnumberlist %]</textarea> > </li> > </ol> >@@ -163,7 +167,7 @@ > <ul class="warnings"> > [% FOREACH error IN errors %] > [% IF ( error.error == 'can_not_update' ) %] >- <li>Can not update borrower with borrowernumber [% error.borrowernumber %]</li> >+ <li>Can not update patron with borrowernumber [% error.borrowernumber %]</li> > [% ELSE %] > <li>[% error.error %]</li> > [% END %] >@@ -188,14 +192,14 @@ > [% IF ( op == 'show' ) %] > <th> </th> > [% END %] >+ <th>Card number</th> > <th>Surname</th> > <th>Firstname</th> >- <th>Branchname</th> >- <th>Categorycode</th> >- <th>Cardnumber</th> >- <th>dateenrolled</th> >- <th>dateexpiry</th> >- <th>debarred</th> >+ <th>Library</th> >+ <th>Category</th> >+ <th>Registration date</th> >+ <th>Expiry date</th> >+ <th>Restricted</th> > [% FOREACH attrh IN attributes_header %] > <th>[% attrh.attribute %]</th> > [% END %] >@@ -207,11 +211,11 @@ > [% IF ( op == 'show' ) %] > <td><input type="checkbox" name="borrowernumber" value="[% borrower.borrowernumber %]" checked="checked" /></td> > [% END %] >+ <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrower.borrowernumber %]">[% borrower.cardnumber %]</a></td> > <td>[% borrower.surname %]</td> > <td>[% borrower.firstname %]</td> > <td>[% borrower.branchname %]</td> > <td>[% borrower.categorycode %]</td> >- <td>[% borrower.cardnumber %]</td> > <td>[% borrower.dateenrolled | $KohaDates %]</td> > <td>[% borrower.dateexpiry | $KohaDates %]</td> > <td>[% borrower.debarred | $KohaDates %]</td> >@@ -237,7 +241,11 @@ > <ol> > [% FOREACH field IN fields %] > <li> >- <label style="width:20em;"> >+ [% IF ( field.mandatory ) %] >+ <label for="[% field.name %]" class="required"> >+ [% ELSE %] >+ <label for="[% field.name %]"> >+ [% END %] > [% SWITCH ( field.name ) %] > [% CASE 'surname' %] > Surname: >@@ -269,11 +277,11 @@ > <input type="checkbox" title="Check to delete this field" name="disable_input" value="[% field.name %]" /> > [% END %] > [% IF ( field.type == 'text' ) %] >- <input type="text" name="[% field.name %]" value="" /> >+ <input type="text" name="[% field.name %]" id="[% field.name %]" value="" /> > [% END %] > [% IF ( field.type == 'select' ) %] > [% IF field.option.size %] >- <select name="[% field.name %]" > >+ <select class="bfield" name="[% field.name %]" id="[% field.name %]"> > [% FOREACH opt IN field.option %] > <option value="[% opt.value %]">[% opt.lib %]</option> > [% END %] >@@ -284,23 +292,22 @@ > [% END %] > [% IF ( field.type == 'date' ) %] > <input type="text" name="[% field.name %]" id="[% field.name %]" value="" size="10" maxlength="10" readonly="readonly" class="datepicker" /> >- <a href="#" onclick="clearDate('[% field.name %]');return false;">X</a> >+ <a href="#" class="clear-field" onclick="clearDate('[% field.name %]');return false;">Clear</a> > [% END %] > </li> > [% END %] > [% IF ( patron_attributes_codes ) %] > <li class="attributes"> >- <label style="width:20em;">Attribute: >- <select name="patron_attributes"> >+ <label for="patron_attributes">Attribute:</label> >+ <select name="patron_attributes" id="patron_attributes"> > [% FOREACH pac IN patron_attributes_codes %] > <option value="[% pac.attribute_code %]" data-type="[% pac.type %]" data-category="[% pac.category_lib %]">[% pac.attribute_lib %]</option> > [% END %] > </select> >- </label> > <input type="checkbox" title="check to delete this field" name="disable_input" value="attr0_value" /> > <span class="patron_attributes_value"></span> >- <a href="#" title="Add an attribute" onclick="add_attributes(); return false;">+</a> >- <span class="information_category"></span> >+ <a href="#" class="clone-field" title="Add an attribute" onclick="add_attributes(); return false;">New</a> >+ <span class="information_category hint"></span> > </li> > [% END %] > </ol> >@@ -314,8 +321,9 @@ > [% END %] > [% END %] > [% IF ( op == 'show_results' ) %] >- <br/> >- <a href="/cgi-bin/koha/tools/modborrowers.pl" title="new Batch patrons modification">new Batch patrons modification</a> >+ <p> >+ <a href="/cgi-bin/koha/tools/modborrowers.pl" title="New batch patrons modification">New batch patron modification</a> >+ </p> > [% END %] > </div> > </div> >-- >1.7.9.5 >
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 8986
:
13116
|
13175
|
13320
|
13531
|
13533