Bugzilla – Attachment 45387 Details for
Bug 12395
Save order line's creator
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 12395: QA follow-up - Use Bootstrap modal instead of Greybox
Bug-12395-QA-follow-up---Use-Bootstrap-modal-inste.patch (text/plain), 7.45 KB, created by
Owen Leonard
on 2015-12-03 19:44:44 UTC
(
hide
)
Description:
Bug 12395: QA follow-up - Use Bootstrap modal instead of Greybox
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2015-12-03 19:44:44 UTC
Size:
7.45 KB
patch
obsolete
>From d3b44999beb7733fa8e7e1fe7bd56453775d3867 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Thu, 3 Dec 2015 13:01:46 -0500 >Subject: [PATCH] Bug 12395: QA follow-up - Use Bootstrap modal instead of > Greybox >Content-Type: text/plain; charset="utf-8" > > - Using Bootstrap modals reduces unnecessary dependencies and allows > for more consistent styling (contents of the modal are styled by the > current page's CSS). > - Using standard <fieldset> + <ol> markup for showorder.tt. >--- > .../intranet-tmpl/prog/en/modules/acqui/parcel.tt | 42 ++++++++++++--- > .../prog/en/modules/acqui/showorder.tt | 61 ++++++++++------------ > 2 files changed, 63 insertions(+), 40 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 b63a333..e04a94e 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,6 @@ > [% 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' %] > <script type="text/javascript"> > //<![CDATA[ > >@@ -104,6 +103,19 @@ > $.cookie("filter_parcel_ean", $("#eanfilter").val()); > }); > >+ $(".preview_data").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 >@@ -128,6 +140,9 @@ > > //]]> > </script> >+<style type="text/css"> >+#dataPreview { width : 80%; margin-left : -40%; } @media (max-width: 767px) { #dataPreview { margin: 0; width : auto; } } >+</style> > </head> > <body id="acq_parcel" class="acq"> > [% INCLUDE 'header.inc' %] >@@ -276,9 +291,9 @@ > [% END %] > </td> > <td> >- <a href="/cgi-bin/koha/acqui/showorder.pl?ordernumber=[% loop_order.ordernumber %]" title="Order" rel="gb_page_center[600,500]">Order</a><br> >- <a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% loop_order.biblionumber %]" title="MARC" rel="gb_page_center[600,500]">MARC</a><br> >- <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&id=[% loop_order.biblionumber %]" title="Card" rel="gb_page_center[600,500]">Card</a> >+ <a href="/cgi-bin/koha/acqui/showorder.pl?ordernumber=[% loop_order.ordernumber %]" class="preview_data">Order</a><br> >+ <a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% loop_order.biblionumber %]" class="preview_data">MARC</a><br> >+ <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&id=[% loop_order.biblionumber %]" class="preview_data">Card</a> > </td> > <td>[% loop_order.quantity %]</td> > <td>[% loop_order.ecost | $Price %]</td> >@@ -416,9 +431,9 @@ > [% END %] > </td> > <td> >- <a href="/cgi-bin/koha/acqui/showorder.pl?ordernumber=[% order.ordernumber %]" title="Order" rel="gb_page_center[600,500]">Order</a><br> >- <a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% order.biblionumber %]" title="MARC" rel="gb_page_center[600,500]">MARC</a><br> >- <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&id=[% order.biblionumber %]" title="Card" rel="gb_page_center[600,500]">Card</a> >+ <a href="/cgi-bin/koha/acqui/showorder.pl?ordernumber=[% order.ordernumber %]" class="preview_data">Order</a><br> >+ <a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% order.biblionumber %]" class="preview_data">MARC</a><br> >+ <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&id=[% order.biblionumber %]" class="preview_data">Card</a> > </td> > <td>[% order.quantityreceived %]</td> > <td>[% order.budget.budget_name %]</td> >@@ -457,6 +472,19 @@ > [% ELSE %]There are no received orders.[% END %] > </div> > >+<div id="dataPreview" class="modal hide" 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">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 %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/showorder.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/showorder.tt >index 2749bd7..b34e3b9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/showorder.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/showorder.tt >@@ -1,38 +1,33 @@ > [% INCLUDE 'doc-head-open.inc' %] >-<style> >- td { >- padding: 0 1em; >- } >- td:first-child { >- font-weight: bold; >- text-align: right; >- } >-</style> >+<title>Koha › Acquisitions › Order details</title> >+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> > </head> > <body id="acq_showorder" class="acq"> >- [% IF order %] >- <table> >- <tbody> >- <tr> >- <td>Creation date</td> >- <td>[% order.entrydate %]</td> >- </tr> >- <tr> >- <td>Creator</td> >- <td>[% creator.firstname %] [% creator.surname %]</td> >- </tr> >- <tr> >- <td>Claims count</td> >- <td>[% order.claims_count %]</td> >- </tr> >- <tr> >- <td>Last claim date</td> >- <td>[% order.claimed_date %]</td> >- </tr> >- </tbody> >- </table> >- [% ELSE %] >- No order found. >- [% END %] >+ <div id="main"> >+ [% IF order %] >+ <fieldset class="rows"> >+ <ol> >+ <li> >+ <span class="label">Creation date: </span> >+ [% order.entrydate %] >+ </li> >+ <li> >+ <span class="label">Creator: </span> >+ [% creator.firstname %] [% creator.surname %] >+ </li> >+ <li> >+ <span class="label">Claims count: </span> >+ [% order.claims_count %] >+ </li> >+ <li> >+ <span class="label">Last claim date: </span> >+ [% order.claimed_date %] >+ </li> >+ </ol> >+ </fieldset> >+ [% ELSE %] >+ No order found >+ [% END %] >+ </div> > </body> > </html> >-- >2.1.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 12395
:
28754
|
28943
|
30128
|
30129
|
31409
|
31410
|
31411
|
33837
|
33838
|
33839
|
35769
|
35770
|
35771
|
35772
|
35779
|
35780
|
35781
|
35782
|
35864
|
36063
|
36075
|
36076
|
36077
|
36078
|
36079
|
36080
|
40132
|
40133
|
40134
|
40135
|
40136
|
40137
|
40138
|
40139
|
40161
|
43951
|
45387
|
58745
|
58746
|
58747
|
58748
|
58749
|
58750
|
61383
|
61384
|
71344
|
71345
|
71346
|
71347
|
71348
|
71349
|
72720
|
72721
|
72722
|
72723
|
72724
|
72725
|
74207
|
74208
|
74209
|
74210
|
74211
|
74212
|
74276
|
74277
|
74278
|
74279
|
74280
|
74281
|
74282
|
75900
|
75901
|
75902
|
75903
|
75904
|
75905
|
75906
|
75907
|
76074
|
76075
|
76076
|
76077
|
76078
|
76079
|
76080
|
76081
|
76082
|
76083
|
76084
|
76085
|
76086
|
76087
|
76088
|
76089