[Koha-patches] [PATCH] Bug 5877 Follow-up for Offline circulation improvements
Owen Leonard
oleonard at myacpl.org
Thu Jan 19 18:52:13 CET 2012
Internationalization fix: Offline circulation operations in
Circulation.pm return English strings for display in the
template. These strings can't be translated, so we must check
their values in the JavaScript and return a translatable
string based on their values.
Interface change: Switching to text links for checking/unchecking
checkboxes since that is more consistent with other areas in
Koha.
---
C4/Circulation.pm | 2 +-
.../prog/en/modules/offline_circ/list.tt | 38 +++++++++++++++++---
2 files changed, 34 insertions(+), 6 deletions(-)
diff --git a/C4/Circulation.pm b/C4/Circulation.pm
index 00cdc10..1e013b2 100644
--- a/C4/Circulation.pm
+++ b/C4/Circulation.pm
@@ -3105,7 +3105,7 @@ sub ProcessOfflineIssue {
if ( $borrower->{borrowernumber} ) {
my $itemnumber = C4::Items::GetItemnumberFromBarcode( $operation->{barcode} );
unless ($itemnumber) {
- return "barcode not found";
+ return "Barcode not found.";
}
my $issue = GetOpenIssue( $itemnumber );
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 8b1f69b..e286cc8 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
@@ -2,10 +2,20 @@
<title>Koha › Circulation › Offline Circulation</title>
[% INCLUDE "doc-head-close.inc" %]
<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
+ <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
<script type="text/javascript" language="javascript">
+ //<![CDATA[
$(document).ready(function() {
- $('#checkall').click(function() {
- $(":checkbox").attr('checked', $('#checkall').is(':checked'));
+
+ $("span.clearall").html("<a id=\"CheckNone\" href=\"/cgi-bin/koha/offline_circ/list.pl\">"+_('Uncheck All')+"<\/a>");
+ $("span.checkall").html("<a id=\"CheckAll\" href=\"/cgi-bin/koha/offline_circ/list.pl\">"+_('Check All')+"<\/a>");
+ $('#CheckNone').click(function() {
+ $("#operations").unCheckCheckboxes();
+ return false;
+ });
+ $('#CheckAll').click(function() {
+ $("#operations").checkCheckboxes();
+ return false;
});
$('#process,#delete').click(function() {
var action = $(this).attr("id");
@@ -17,7 +27,23 @@
async: false,
dataType: "text",
success: function(data) {
- cb.replaceWith(data);
+ if( data == "Added." ){
+ cb.replaceWith(_("Added."));
+ } else if ( data == "Deleted."){
+ cb.replaceWith(_("Deleted."));
+ } else if ( data == "Success."){
+ cb.replaceWith(_("Success."));
+ } else if ( data == "Item not issued."){
+ cb.replaceWith(_("Item not checked out."));
+ } else if ( data == "Item not found."){
+ cb.replaceWith(_("Item not found."));
+ } else if ( data == "Barcode not found."){
+ cb.replaceWith(_("Item not found."));
+ } else if ( data == "Borrower not found."){
+ cb.replaceWith(_("Patron not found."));
+ } else {
+ cb.replaceWith(data);
+ }
}});
});
if( $('#operations tbody :checkbox').size() == 0 ) {
@@ -25,6 +51,7 @@
}
});
});
+ //]]>
</script>
</head>
<body>
@@ -42,11 +69,12 @@
[% IF ( pending_operations ) %]
<form>
-
+ <p><span class="checkall"></span> |
+ <span class="clearall"></span></p>
<table id="operations">
<thead>
<tr>
- <th><input type="checkbox" name="checkall" id="checkall" /></th>
+ <th> </th>
<th>Date</th>
<th>Action</th>
<th>Barcode</th>
--
1.7.3
More information about the Koha-patches
mailing list