Bugzilla – Attachment 10397 Details for
Bug 8105
DataTables in Acquisision module: basketgroup.tt
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 8272 - OPAC : date expiration format
Bug-8272---OPAC--date-expiration-format.patch (text/plain), 5.44 KB, created by
Jonathan Druart
on 2012-06-21 07:57:47 UTC
(
hide
)
Description:
Bug 8272 - OPAC : date expiration format
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2012-06-21 07:57:47 UTC
Size:
5.44 KB
patch
obsolete
>From e2397371348203cdbf66e6621168217a6115176d Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Tue, 19 Jun 2012 13:08:28 -0400 >Subject: [PATCH] Bug 8272 - OPAC : date expiration format > >Adding TT date filter to output of expiration date >on OPAC user page. > >Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> >Signed-off-by: Delaye Stephane <stephane.delaye@biblibre.com> >Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> > >http://bugs.koha-community.org/show_bug.cgi?id=8105 >--- > .../prog/en/modules/acqui/basketgroup.tt | 30 +++++++++++++------ > koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt | 2 +- > 2 files changed, 21 insertions(+), 11 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt >index 9ab47f3..70c93cf 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt >@@ -1,6 +1,9 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Basket grouping for [% booksellername |html %]</title> >+<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" /> > [% INCLUDE 'doc-head-close.inc' %] >+<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script> >+<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script> > <script type="text/javascript" src="[% themelang %]/js/acq.js"></script> > [% IF ( grouping ) %] > <script type="text/javascript" src="[% yuipath %]/yahoo-dom-event/yahoo-dom-event.js"></script> >@@ -100,6 +103,17 @@ function submitForm(form) { > // $("#toolbar").empty(); > yuiToolbar(); > $("#basket_groups").tabs(); >+ >+ $("table").dataTable($.extend(true, {}, dataTablesDefaults, { >+ "aoColumnDefs": [ >+ { "aTargets": [ -1 ], "bSortable": false, "bSearchable": false }, >+ ], >+ "bAutoWidth": false, >+ "bPaginate": false, >+ "bInfo": false, >+ "bFilter": false, >+ } )); >+ > }); > > // YUI Toolbar Functions >@@ -250,10 +264,10 @@ function yuiToolbar() { > [% ELSE %]<li><a href="#closed">Closed</a></li>[% END %] > </ul> > <div id="opened"> >- <table> >+ <table id="basket_group_opened"> > <thead> > <tr> >- <th>Basket group</th><th colspan="3">Action</th> >+ <th>Basket group</th><th>Action</th> > </tr> > </thead> > <tbody> >@@ -267,13 +281,11 @@ function yuiToolbar() { > [% END %]</a> > </td> > <td> >+ <span> > <input type="button" onclick="closeandprint([% basketgroup.id %])" value="Close and Print" /> >- </td> >- <td> > <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="add" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="Edit" /></form> >- </td> >- <td> > <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="delete" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="Delete" /></form> >+ </span> > </td> > </tr> > [% END %] >@@ -282,10 +294,10 @@ function yuiToolbar() { > </table> > </div> > <div id="closed"> >- <table> >+ <table id="basket_group_closed"> > <thead> > <tr> >- <th>Basket group</th><th colspan="3">Action</th> >+ <th>Basket group</th><th>Action</th> > </tr> > </thead> > <tbody> >@@ -301,8 +313,6 @@ function yuiToolbar() { > </td> > <td> > <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="reopen" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="Reopen" /></form> >- </td> >- <td> > <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="print" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="Print" /></form> > </td> > </tr> >diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt >index 0b8930f..8ae9a77 100644 >--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt >+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt >@@ -83,7 +83,7 @@ $.tablesorter.addParser({ > > [% IF ( BORROWER_INF.warndeparture ) %] > <div class="dialog alert" id="warndeparture"> >- <strong>Please note:</strong><span> Your card will expire on <span id="warndeparture_date">[% BORROWER_INF.warndeparture %]</span>. Please contact the library for more information.</span> >+ <strong>Please note:</strong><span> Your card will expire on <span id="warndeparture_date">[% BORROWER_INF.warndeparture | $KohaDates %]</span>. Please contact the library for more information.</span> > [% IF ( BORROWER_INF.returnbeforeexpiry ) %]<span id="warndeparture_returnbeforeexpiry"> Also note that you must return all checked out items before your card expires.</span>[% END %] > </div> > [% END %] >-- >1.7.7.3
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 8105
:
9611
|
10083
|
10397
|
10398