From oleonard at myacpl.org Mon Feb 3 18:07:32 2014 From: oleonard at myacpl.org (Owen Leonard) Date: Mon, 3 Feb 2014 12:07:32 -0500 Subject: [Koha-patches] [PATCH] Bug 11670 - Remove sorting from patron lists action columns Message-ID: <1391447252-13686-1-git-send-email-oleonard@myacpl.org> The list of patron lists has sortable columns for the add, edit, and delete buttons. These columns should not be sortable. This patch removes sorting. This patch also adds the "btn-mini" class to the in-table buttons to make the table more compact. To test you must have existing patron lists. Apply the patch and navigate to Tools -> Patron lists. The columns containing the add, edit, and delete buttons should not be sortable. Other columns should sort correctly. --- .../prog/en/modules/patron_lists/lists.tt | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt index 901b925..ec8c2b4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt @@ -8,7 +8,11 @@ - -[% INCLUDE 'datatables-strings.inc' %] - +[% INCLUDE 'datatables.inc' %] -[% INCLUDE 'datatables-strings.inc' %] - +[% INCLUDE 'datatables.inc' %] -[% INCLUDE 'datatables-strings.inc' %] - +[% INCLUDE 'datatables.inc' %] -[% INCLUDE 'datatables-strings.inc' %] -[% END %] +[% INCLUDE 'datatables.inc' %][% END %] @@ -46,7 +44,7 @@ var MSG_EXPORT_SELECT_CHECKOUTS = _("You must select checkout(s) to export"); { "aTargets": [ -1, -2[% IF ( exports_enabled ) %], -3[% END %] ], "bSortable": false, "bSearchable": false } ], "aoColumns": [ - { "sType": "title-string" },{ "sType": "html" },null,{ "sType": "title-string" },null,null,null,null,null,null[% IF ( exports_enabled ) %],null[% END %] + { "sType": "title-string" },{ "sType": "anti-the" },null,{ "sType": "title-string" },null,null,null,null,null,null[% IF ( exports_enabled ) %],null[% END %] ], "bPaginate": false })); @@ -55,7 +53,7 @@ var MSG_EXPORT_SELECT_CHECKOUTS = _("You must select checkout(s) to export"); "sDom": 't', "aaSorting": [], "aoColumns": [ - { "sType": "title-string" },{ "sType": "html" },null,{ "sType": "title-string" },null,null,null,null,{ "sType": "html" } + { "sType": "title-string" },{ "sType": "anti-the" },null,{ "sType": "title-string" },null,null,null,null,{ "sType": "html" } ], "bPaginate": false })); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt index d55382e..1742e30 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt @@ -3,9 +3,7 @@ [% INCLUDE 'doc-head-close.inc' %] [% INCLUDE 'calendar.inc' %] - -[% INCLUDE 'datatables-strings.inc' %] - +[% INCLUDE 'datatables.inc' %] -[% INCLUDE 'datatables-strings.inc' %] - + +[% INCLUDE 'datatables.inc' %] -[% INCLUDE 'datatables-strings.inc' %] - + +[% INCLUDE 'datatables.inc' %] -[% INCLUDE 'datatables-strings.inc' %] - + +[% INCLUDE 'datatables.inc' %] - -[% INCLUDE 'datatables-strings.inc' %] - +[% INCLUDE 'datatables.inc' %] -- 1.7.9.5 From oleonard at myacpl.org Fri Feb 7 21:49:36 2014 From: oleonard at myacpl.org (Owen Leonard) Date: Fri, 7 Feb 2014 15:49:36 -0500 Subject: [Koha-patches] [PATCH] Bug 11717 - Use new DataTables include in member templates Message-ID: <1391806176-24773-1-git-send-email-oleonard@myacpl.org> Bug 10649 introduced a new include file for adding DataTables-related JavaScript assets. This patch adds use of this include file to all member pages which use DataTables. Apply the patch and test the following pages to confirm that table sorting works correctly: - Patron details (members/moremember.pl) - The checkouts, relatives' checkouts, and holds tables have been modified to exclude articles when sorting of titles. - Notices (members/notices.pl) - Circulation history (members/readingrec.pl) - Statistics (members/statistics.pl) - Update child to adult patron (members/update-child.pl) - This is the page which appears in a pop-up when you update a child patron to an adult (from the "More" menu in the toolbar when viewing patron details). --- .../prog/en/modules/members/moremember.tt | 12 +++++------- .../prog/en/modules/members/notices.tt | 4 +--- .../prog/en/modules/members/readingrec.tt | 6 ++---- .../prog/en/modules/members/statistics.tt | 6 ++---- .../prog/en/modules/members/update-child.tt | 6 ++---- 5 files changed, 12 insertions(+), 22 deletions(-) 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 79d319e..27d1d4b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -9,10 +9,8 @@ [% INCLUDE 'doc-head-close.inc' %] [% INCLUDE 'calendar.inc' %] - - -[% INCLUDE 'datatables-strings.inc' %] - + +[% INCLUDE 'datatables.inc' %] -[% INCLUDE 'datatables-strings.inc' %] - +[% INCLUDE 'datatables.inc' %] -[% INCLUDE 'datatables-strings.inc' %] - + +[% INCLUDE 'datatables.inc' %] -[% INCLUDE 'datatables-strings.inc' %] - + +[% INCLUDE 'datatables.inc' %] [% INCLUDE 'calendar.inc' %] -[% INCLUDE 'datatables-strings.inc' %] - + +[% INCLUDE 'datatables.inc' %] -[% INCLUDE 'datatables-strings.inc' %] - +[% INCLUDE 'datatables.inc' %] -[% INCLUDE 'datatables-strings.inc' %] - +[% INCLUDE 'datatables.inc' %] [% END %] -[% INCLUDE 'datatables-strings.inc' %] - + +[% INCLUDE 'datatables.inc' %] -[% INCLUDE 'datatables-strings.inc' %] - + +[% INCLUDE 'datatables.inc' %] -[% INCLUDE 'datatables-strings.inc' %] - + +[% INCLUDE 'datatables.inc' %] -[% INCLUDE 'datatables-strings.inc' %] - + +[% INCLUDE 'datatables.inc' %] -[% INCLUDE 'datatables-strings.inc' %] - + +[% INCLUDE 'datatables.inc' %] +[% INCLUDE 'datatables.inc' %] - -[% INCLUDE 'datatables-strings.inc' %] - +[% INCLUDE 'datatables.inc' %] - -[% INCLUDE 'datatables-strings.inc' %] - - -[% INCLUDE 'datatables-strings.inc' %] - +[% INCLUDE 'datatables.inc' %] - [% INCLUDE 'datatables-strings.inc' %] - + + [% INCLUDE 'datatables.inc' %] - - [% INCLUDE 'datatables-strings.inc' %] - + + [% INCLUDE 'datatables.inc' %] + -[% INCLUDE 'datatables-strings.inc' %] - + +[% INCLUDE 'datatables.inc' %] -[% INCLUDE 'datatables-strings.inc' %] - + +[% INCLUDE 'datatables.inc' %] - [% INCLUDE 'datatables-strings.inc' %] - - + + [% INCLUDE 'datatables.inc' %] -- 1.7.9.5 From oleonard at myacpl.org Fri Feb 14 15:02:06 2014 From: oleonard at myacpl.org (Owen Leonard) Date: Fri, 14 Feb 2014 09:02:06 -0500 Subject: [Koha-patches] [PATCH] Bug 11756 - Hold ratios report sorting incorrectly Message-ID: <1392386526-19021-1-git-send-email-oleonard@myacpl.org> The DataTables plugin doesn't by default take multiple columns into account when sorting. The hold ratios report presents a situation where it makes sense to sort by default based on two columns: hold count and title, since there are likely to be many titles with the same hold count. This patch adds sorting by default on holds (descending) and title (ascending). It also modifies the configuration of the title sort to exclude articles when sorting. To test, view the hold ratios report. If necessary use the filter form to reduce the minimum hold ratio and generate more results. Confirm that the correct columns can be sorted. Note that by default one can manually trigger sorting on two columns by shift-clicking the second column header. --- .../prog/en/modules/circ/reserveratios.tt | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt index d55382e..2cc539a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt @@ -17,9 +17,21 @@ function () { $(this).toggleClass("ulined") } ); $("#holdst").dataTable($.extend(true, {}, dataTablesDefaults, { + "aaSorting": [ [0,'desc'], [3,'asc'] ], "aoColumnDefs": [ { "aTargets": [ 8 ], "sType": "natural" } ], + "aoColumns": [ + null, + null, + null, + { "sType": "anti-the" }, + null, + null, + null, + null, + null + ], "aLengthMenu": [[10, 20, 50, 100, -1], [10, 20, 50, 100, "All"]], "iDisplayLength": 20, "sPaginationType": "four_button" -- 1.7.9.5 From oleonard at myacpl.org Fri Feb 14 16:11:57 2014 From: oleonard at myacpl.org (Owen Leonard) Date: Fri, 14 Feb 2014 10:11:57 -0500 Subject: [Koha-patches] [PATCH] Bug 11763 - Consolidate fund action links into menu Message-ID: <1392390717-21925-1-git-send-email-oleonard@myacpl.org> This patch moves the fund Edit/Delete/Add child links on the fund view into a pop-up menu, allow the table to be more compact and the links to be more distinct. To test you must apply the patches on Bug 11578 if necessary. Apply the patch and view the funds list page (Administration -> Funds). For each line there should be an "Actions" menu containing the Edit/Delete/Add cihld links. Each should function correctly. Test with inactive budgets shown and hidden. --- .../prog/en/modules/admin/aqbudgets.tt | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt index 4132ae6..33810a2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt @@ -331,9 +331,16 @@ var MSG_PARENT_BENEATH_BUDGET = "- " + _("New budget-parent is beneath budget")
Instructors | Staff note | Public note | -# of Students | +# of students | Enabled | @@ -107,7 +84,5 @@ $(document).ready(function() { - - [% INCLUDE 'intranet-bottom.inc' %] -- 1.7.9.5 From oleonard at myacpl.org Thu Feb 20 16:25:42 2014 From: oleonard at myacpl.org (Owen Leonard) Date: Thu, 20 Feb 2014 10:25:42 -0500 Subject: [Koha-patches] [PATCH] Bug 11802 - Patron purchase suggestions page requires some corrections Message-ID: <1392909942-30565-1-git-send-email-oleonard@myacpl.org> This patch corrects some errors with the staff client's patron purchase suggestions page (members/purchase-suggestions.pl). To test, apply the patch and make sure the patronimages system preference is enabled. - View the purchase suggestions page for a patron whose record has a patron image attached. The image should appear in the left-hand sidebar. - View the page for a patron who has submitted no purchase suggestions. The message should be styled correctly. - The toolbar on the page should look correct and work correctly. --- .../en/modules/members/purchase-suggestions.tt | 10 ++++++---- members/purchase-suggestions.pl | 3 +++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt index 58e8e24..2d198a2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt @@ -33,8 +33,8 @@
---|
[% END %] + [% IF ( AmazonCoverImages || LocalCoverImages ) %] | [% END %] | Results | Location | |
---|---|---|---|---|
- - - - | + [% IF ( LocalCoverImages ) %] + + [% END %] + [% IF ( AmazonCoverImages ) %] + + + + [% END %] + [% END %]
--
1.7.9.5
From oleonard at myacpl.org Thu Feb 20 21:45:34 2014
From: oleonard at myacpl.org (Owen Leonard)
Date: Thu, 20 Feb 2014 15:45:34 -0500
Subject: [Koha-patches] [PATCH] Bug 11805 - Use validation plugin when
creating new basket in Acquisitions
Message-ID: <1392929135-4925-1-git-send-email-oleonard@myacpl.org>
The page for adding a new basket in Acquisitions includes some custom
form validation JavaScript which can be removed in favor of HTML5
validation attributes and Koha's built-in validation plugin. This patch
does so.
To test, apply the patch and go to Acquisitions -> Choose a vendor ->
New basket. Try submitting the form without entering a basket name. This
should trigger a validation warning.
Submission of the form with valid data should work correctly. Editing an
existing basket should also work correctly.
---
.../prog/en/modules/acqui/basketheader.tt | 27 +++-----------------
1 file changed, 4 insertions(+), 23 deletions(-)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt
index 85fc946..84b318c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt
@@ -8,26 +8,6 @@
[% INCLUDE 'doc-head-close.inc' %]
-
[% INCLUDE 'header.inc' %]
@@ -54,7 +34,7 @@ function Check(ff) {
Edit basket [% basketname %][% ELSE %]Add a basket to [% booksellername %][% END %] - -- 1.7.9.5 From oleonard at myacpl.org Thu Feb 20 22:10:57 2014 From: oleonard at myacpl.org (Owen Leonard) Date: Thu, 20 Feb 2014 16:10:57 -0500 Subject: [Koha-patches] [PATCH] Bug 11806 - Use validation plugin when creating new OAI set Message-ID: <1392930657-5303-1-git-send-email-oleonard@myacpl.org> The form for adding a new OAI indicates that two fields are required but does nothing to enforce this rule. This can be handled client-side with HTML5 validation attributes and Koha's built-in validation plugin. This patch implements this. To test, apply the patch and go to Administration -> OAI sets configuration -> New set. Try submitting the form without entering a setSpec and/or setName. Doing so should trigger a validation warning. Submission of the form with valid data should work correctly. Editing an existing set should also work correctly. --- .../prog/en/modules/admin/oai_sets.tt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt index a480b74..02eaf39 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt @@ -32,7 +32,7 @@ function delDescField(minusButton) {
[% IF ( op_new || op_mod ) %]
- |