Attachment 17440 Details for Bug 9463 – Bug 9463 [Revised] Use DataTables on patron sent notices page

[patch] Bug 9463 [Revised] Use DataTables on patron sent notices page

Bug-9463-Revised-Use-DataTables-on-patron-sent-not.patch (text/plain), 4.79 KB, created by Jonathan Druart on 2013-04-15 09:10:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2013-04-15 09:10:49 UTC

Size: 4.79 KB

patch

obsolete

>From 2397042128941a1108d853a1d47e40eeca3bc638 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Wed, 23 Jan 2013 12:25:39 -0500
>Subject: [PATCH] Bug 9463 [Revised] Use DataTables on patron sent notices
> page
>
>Replace the tablesorter plugin with the DataTables plugin on the
>patron sent notices page.
>
>This patch adds default sorting by time (descending).
>
>This patch depends on the one for Bug 9887, which introduces a new
>DataTables plugin to allow sorting on data embedded in a <span>'s
>"title" attribute. This allows sorting to be done on an unformatted
>datetime.
>
>To test, open the sent notices page for a patron who has multiple sent
>notices. Confirm that table sorting works correctly with various date
>format settings.
>
>Revision corrects an error which occurs when there are no notices:
>Instead of displaying an empty table with a message the table is not
>displayed and a standard dialog message is displayed. In order to
>prevent page-specific CSS and JS from conflicting with the standard
>"message" class the page-specific classes have been changed from
>"message*" to "notice*" Test this change by viewing a page with existing
>notices and clicking the titles to show/hide the notice contents.
>
>Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
>Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
>---
> .../prog/en/modules/members/notices.tt             |   42 +++++++++++---------
> 1 file changed, 23 insertions(+), 19 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt
>index 1d7ec31..f3727f7 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt
>@@ -2,19 +2,24 @@
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Sent notices for [% INCLUDE 'patron-title.inc' %]</title>
> [% INCLUDE 'doc-head-close.inc' %]
>-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
>+<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>
> <script type="text/javascript">
> //<![CDATA[
>     $(document).ready(function() {
>-	$("#noticestable").tablesorter({
>-	    [% IF ( dateformat == 'metric' ) %]
>-		dateFormat: 'uk'
>-	    [% END %]
>-	});
>+    $("#noticestable").dataTable($.extend(true, {}, dataTablesDefaults, {
>+        "aaSorting": [[ 3, "desc" ]],
>+        "aoColumns": [ null,null,null,{ "sType": "title-string" } ],
>+        "aLengthMenu": [[10, 20, 50, 100, -1], [10, 20, 50, 100, "All"]],
>+        "iDisplayLength": 20,
>+        "sPaginationType": "four_button"
>+    }));
> 
>-    $(".message").hide();
>-    $(".message-title").click(function(e){
>-        $(this).next(".message").toggle();
>+    $(".notice").hide();
>+    $(".notice-title").click(function(e){
>+        $(this).next(".notice").toggle();
>         e.preventDefault();
>     });
>     
>@@ -22,8 +27,8 @@
> //]]>
> </script>
> <style type="text/css">
>-    p.message { display: none; }
>-    a.message-title { font-weight: bold; display: block; }
>+    p.notice { display: none; }
>+    a.notice-title { font-weight: bold; display: block; }
> </style>
> </head>
> <body id="pat_notices" class="pat">
>@@ -39,7 +44,7 @@
> [% INCLUDE 'members-toolbar.inc' %]
> <h1>Sent notices for [% INCLUDE 'patron-title.inc' %]</h1>
> 
>-
>+[% IF ( QUEUED_MESSAGES ) %]
>     <table id="noticestable">
> 	<thead>
> 	    <tr>
>@@ -49,13 +54,12 @@
> 		<th>Time</th>
> 	    </tr>
> 	</thead>
>-[% IF ( QUEUED_MESSAGES ) %]
> 	<tbody>
> 	    [% FOREACH QUEUED_MESSAGE IN QUEUED_MESSAGES %]
> 	    <tr>
> 		<td>
>-            <a class="message-title" href="#">[% QUEUED_MESSAGE.subject %]</a>
>-            <p class="message">
>+            <a class="notice-title" href="#">[% QUEUED_MESSAGE.subject %]</a>
>+            <p class="notice">
>                 [% QUEUED_MESSAGE.content FILTER html_line_break %]
>             </p>
>         </td>
>@@ -73,14 +77,14 @@
>             [% ELSIF ( QUEUED_MESSAGE.status == 'deleted' ) %]deleted
>             [% ELSE %][% QUEUED_MESSAGE.status %][% END %]
>         </td>
>-        <td>[% QUEUED_MESSAGE.time_queued | $KohaDates with_hours => 1 %]</td>
>+        <td><span title="[% QUEUED_MESSAGE.time_queued %]">[% QUEUED_MESSAGE.time_queued | $KohaDates with_hours => 1 %]</span></td>
> 	    </tr>
> 	    [% END %]
> 	</tbody>
>-    [% ELSE %]
>-    <tr><td colspan="4">There is no record of any messages that have been sent to this patron.</td></tr>
>-    [% END %]
>     </table>
>+[% ELSE %]
>+    <div class="dialog message">There is no record of any messages that have been sent to this patron.</div>
>+[% END %]
> 
> </div>
> </div>
>-- 
>1.7.10.4

Actions: View | Diff | Splinter Review

Attachments on bug 9463: 14796 | 14810 | 14886 | 15686 | 17081 | 17100 | 17111 | 17226 | 17227 | 17287 | 17397 | 17440