Attachment 25949 Details for Bug 11713 – Bug 11713 - Use new DataTables include in course reserves templates

[patch] Bug 11713 - Use new DataTables include in course reserves templates

Bug-11713---Use-new-DataTables-include-in-course-r.patch (text/plain), 6.42 KB, created by Kyle M Hall (khall) on 2014-03-07 18:02:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kyle M Hall (khall)

Created: 2014-03-07 18:02:45 UTC

Size: 6.42 KB

patch

obsolete

>From 1badce66915d47e2ee070785688557d2098f8cb1 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Fri, 7 Feb 2014 12:09:08 -0500
>Subject: [PATCH] Bug 11713 - Use new DataTables include in course reserves templates
>
>This patch modifies two course reserves templates to use the new
>DataTables include. This simplifies the inclusion of assets and updates
>to the latest DataTables version. Also included:
>
>- Adds a sorting filter on the course reserves detail table to excluding
>  articles from sorting.
>- Corrects the styling of toolbar buttons (buttons should have btn and
>  btn-small classes).
>
>To test you must have UseCourseReserves enabled and have multiple
>existing courses, at least one of which should have items on reserve.
>
>1. View the list of courses. Table sorting should work correctly. The
>   "new course" button should look consistent with other staff client
>   toolbar buttons.
>
>2. View the list of reserves on a course.
>   - Toolbar buttons should look consistent with other staff client
>     toolbar buttons.
>   - Sorting should work correctly, excluding sorting on the Edit,
>     Remove, and "Other course reserves" columns.
>   - Titles on reserve which begin with an article should be sorted
>     correctly with article excluded
>   - Test sorting with item-level_itypes on and off.
>   - Test sorting using a patron whose permissions include various
>     combinations of add_reserves and delete_reserves
>
>Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
>---
> .../en/modules/course_reserves/course-details.tt   |   15 +++++++--------
> .../en/modules/course_reserves/course-reserves.tt  |    6 ++----
> 2 files changed, 9 insertions(+), 12 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt
>index ea58136..3bd1b1a 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt
>@@ -6,9 +6,7 @@
> [% INCLUDE 'doc-head-close.inc' %]
> 
> <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
>-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script>
>-[% INCLUDE 'datatables-strings.inc' %]
>-<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>
>+[% INCLUDE 'datatables.inc' %]
> <script type="text/javascript">
> //<![CDATA[
>     $(document).ready(function(){
>@@ -17,7 +15,8 @@
>             "aLengthMenu": [[10, 20, 50, 100, -1], [10, 20, 50, 100, "All"]],
>             "iDisplayLength": 20,
>             "aoColumnDefs": [
>-                { 'bSortable': false, 'aTargets': [ 'NoSort' ] }
>+                { 'bSortable': false, 'aTargets': [ 'NoSort' ] },
>+                { 'sType': "anti-the", 'aTargets' : [ 'antithe'] }
>             ]
>         }));
> 
>@@ -47,9 +46,9 @@
>         <div id="yui-main">
>             <div id="toolbar">
>                 <ul class="toolbar">
>-                    [% IF CAN_user_coursereserves_add_reserves %]<li><a class="btn" id="add_items" href="/cgi-bin/koha/course_reserves/add_items.pl?course_id=[% course.course_id %]"><i class="icon-plus"></i> Add reserves</a></li>[% END %]
>-                    [% IF ( CAN_user_coursereserves_manage_courses ) %]<li><a class="btn" id="edit_course" href="/cgi-bin/koha/course_reserves/course.pl?course_id=[% course.course_id %]"><i class="icon-pencil"></i> Edit course</a></li>[% END %]
>-                    [% IF ( CAN_user_coursereserves_manage_courses ) %]<li><a class="btn" id="delete_course" href="/cgi-bin/koha/course_reserves/mod_course.pl?course_id=[% course.course_id %]&amp;action=del"><i class="icon-remove"></i> Delete course</a></li>[% END %]
>+                    [% IF CAN_user_coursereserves_add_reserves %]<li><a class="btn btn-small" id="add_items" href="/cgi-bin/koha/course_reserves/add_items.pl?course_id=[% course.course_id %]"><i class="icon-plus"></i> Add reserves</a></li>[% END %]
>+                    [% IF ( CAN_user_coursereserves_manage_courses ) %]<li><a class="btn btn-small" id="edit_course" href="/cgi-bin/koha/course_reserves/course.pl?course_id=[% course.course_id %]"><i class="icon-pencil"></i> Edit course</a></li>[% END %]
>+                    [% IF ( CAN_user_coursereserves_manage_courses ) %]<li><a class="btn btn-small" id="delete_course" href="/cgi-bin/koha/course_reserves/mod_course.pl?course_id=[% course.course_id %]&amp;action=del"><i class="icon-remove"></i> Delete course</a></li>[% END %]
>                 </ul>
>             </div>
> 
>@@ -73,7 +72,7 @@
>                 <caption>Reserves</caption>
>                 <thead>
>                     <tr>
>-                        <th>Title</th>
>+                        <th class="antithe">Title</th>
>                         <th>Barcode</th>
>                         <th>Call number</th>
>                         [% IF item_level_itypes %]<th>Item type</th>[% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt
>index 820c1a2..15ae5ba 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt
>@@ -4,9 +4,7 @@
> [% INCLUDE 'doc-head-close.inc' %]
> 
> <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
>-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script>
>-[% INCLUDE 'datatables-strings.inc' %]
>-<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>
>+[% INCLUDE 'datatables.inc' %]
> <script type="text/javascript" id="js">
> $(document).ready(function() {
>     $("#course_reserves_table").dataTable($.extend(true, {}, dataTablesDefaults, {
>@@ -34,7 +32,7 @@ $(document).ready(function() {
>                     <div id="toolbar">
>                         <ul class="toolbar">
>                             [% IF ( CAN_user_coursereserves_manage_courses ) %]
>-                            <li><a class="btn" id="new_course" href="/cgi-bin/koha/course_reserves/course.pl">New course</a></li>
>+                            <li><a class="btn btn-small" id="new_course" href="/cgi-bin/koha/course_reserves/course.pl"><i class="icon-plus"></i> New course</a></li>
>                             [% END %]
>                         </ul>
>                     </div>
>-- 
>1.7.2.5

Actions: View | Diff | Splinter Review

Attachments on bug 11713: 25146 | 25865 | 25949 | 26032