Bugzilla – Attachment 51930 Details for
Bug 16592
Use Bootstrap modal for MARC and Card preview on acquisitions receipt summary page
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 16592 - Use Bootstrap modal for MARC and Card preview on acquisitions receipt summary page
Bug-16592---Use-Bootstrap-modal-for-MARC-and-Card-.patch (text/plain), 5.27 KB, created by
Marc Véron
on 2016-05-31 14:51:55 UTC
(
hide
)
Description:
Bug 16592 - Use Bootstrap modal for MARC and Card preview on acquisitions receipt summary page
Filename:
MIME Type:
Creator:
Marc Véron
Created:
2016-05-31 14:51:55 UTC
Size:
5.27 KB
patch
obsolete
>From 1d57d499bead0301fbdd87cbc80a3dbc2e4a1d0e Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Thu, 26 May 2016 07:26:33 -0400 >Subject: [PATCH] Bug 16592 - Use Bootstrap modal for MARC and Card preview on > acquisitions receipt summary page >MIME-Version: 1.0 >Content-Type: text/plain; charset=UTF-8 >Content-Transfer-Encoding: 8bit > >This patch replaces Greybox modals on the acquisitions receipt summary >page with Bootstrap modals. > >To test, apply the patch and go to Acquisitions -> Invoices -> View an >invoice -> Go to receipt page. > >- In the list of pending orders, test the "MARC" and "Card" links for > various titles. Each should trigger a Bootstrap modal with the correct > content. >- Repeat the same tests in the list of already received orders. > >Signed-off-by: Marc Véron <veron@veron.ch> >--- > .../intranet-tmpl/prog/en/modules/acqui/parcel.tt | 33 ++++++++++++++++++-- > 1 file changed, 30 insertions(+), 3 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >index 0500637..c66f2f2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >@@ -10,7 +10,7 @@ > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.dataTables.columnFilter.js"></script> > <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.cookie.min.js"></script> >-[% INCLUDE 'greybox.inc' %] >+<style type="text/css">#dataPreview { width : 80%; margin-left : -40%; } @media (max-width: 767px) { #dataPreview { margin: 0; width : auto; } }</style> > <script type="text/javascript"> > //<![CDATA[ > >@@ -104,6 +104,19 @@ > $.cookie("filter_parcel_ean", $("#eanfilter").val()); > }); > >+ $(".previewData").on("click", function(e){ >+ e.preventDefault(); >+ var ltitle = $(this).text(); >+ var page = $(this).attr("href"); >+ $("#dataPreviewLabel").text(ltitle); >+ $("#dataPreview .modal-body").load(page + " div"); >+ $('#dataPreview').modal({show:true}); >+ }); >+ $("#dataPreview").on("hidden", function(){ >+ $("#dataPreviewLabel").html(""); >+ $("#dataPreview .modal-body").html("<div id=\"loading\"><img src=\"[% interface %]/[% theme %]/img/loading-small.gif\" alt=\"\" /> "+_("Loading")+"</div>"); >+ }); >+ > }); > > // Case-insensitive version of jquery's contains function >@@ -275,7 +288,7 @@ > [<a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% loop_order.ordernumber %]&referrer=/cgi-bin/koha/acqui/parcel.pl%3Finvoiceid=[% invoiceid %]&type=vendor">Add vendor note</a>] > [% END %] > </td> >- <td><a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% loop_order.biblionumber %]" title="MARC" rel="gb_page_center[600,500]">MARC</a> | <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&id=[% loop_order.biblionumber %]" title="MARC" rel="gb_page_center[600,500]">Card</a></td> >+ <td><a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% loop_order.biblionumber %]" class="previewData">MARC</a> | <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&id=[% loop_order.biblionumber %]" class="previewData">Card</a></td> > <td>[% loop_order.quantity %]</td> > <td>[% loop_order.ecost | $Price %]</td> > <td>[% loop_order.total | $Price %]</td> >@@ -411,7 +424,7 @@ > (<a href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% order.suggestionid %]&op=show">suggestion #[% order.suggestionid %]</a>) > [% END %] > </td> >- <td><a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% order.biblionumber %]" title="MARC" rel="gb_page_center[600,500]">MARC</a> | <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&id=[% order.biblionumber %]" title="MARC" rel="gb_page_center[600,500]">Card</a></td> >+ <td><a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% order.biblionumber %]" class="previewData">MARC</a> | <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&id=[% order.biblionumber %]" class="previewData">Card</a></td> > <td>[% order.quantityreceived %]</td> > <td>[% order.budget.budget_name %]</td> > <td>[% order.ecost | $Price %]</td> >@@ -446,9 +459,23 @@ > </tbody> > </table> > </form> >+ > [% ELSE %]There are no received orders.[% END %] > </div> > >+<div id="dataPreview" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="dataPreviewLabel" aria-hidden="true"> >+ <div class="modal-header"> >+ <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">Ã</button> >+ <h3 id="dataPreviewLabel">MARC preview</h3> >+ </div> >+ <div class="modal-body"> >+ <div id="loading"> <img src="[% interface %]/[% theme %]/img/loading-small.gif" alt="" /> Loading </div> >+ </div> >+ <div class="modal-footer"> >+ <button class="btn" data-dismiss="modal" aria-hidden="true">Close</button> >+ </div> >+</div> >+ > [% IF (invoiceclosedate) %] > <a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% invoiceid %]">View invoice</a> > [% ELSE %] >-- >1.7.10.4
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 16592
:
51835
|
51930
|
52165