Attachment 76072 Details for Bug 20651 – Bug 20561: Improve full supplier metadata display

[patch] Bug 20561: Improve full supplier metadata display

Bug-20561-Improve-full-supplier-metadata-display.patch (text/plain), 5.73 KB, created by Jonathan Druart on 2018-06-14 20:43:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2018-06-14 20:43:07 UTC

Size: 5.73 KB

patch

obsolete

>From 84c91c72b4ccca5a7f8508071f9a8809779933e5 Mon Sep 17 00:00:00 2001
>From: Andrew Isherwood <andrew.isherwood@ptfs-europe.com>
>Date: Tue, 24 Apr 2018 16:03:40 +0100
>Subject: [PATCH] Bug 20561: Improve full supplier metadata display
>
>This patch improves the display of the extra metadata that may be
>returned by an ILL supplier.
>
>The display of the metadata has been moved from the "Toggle full
>supplier metadata" link at the bottom of the page to a button on the
>right of the request toolbar, labelled "Display supplier metadata".
>Clicking this button opens a modal displaying the metadata.
>
>To test:
>1) Ensure ILL is enabled and you have at least one request
>2) From the "View ILL requests" page, click "Manage request" on a
>request
>3) Click the "Display supplier metadata" button on the right of the
>toolbar
>4) Observe that a modal opens containing the metadata
>
>Signed-off-by: Magnus Enger <magnus@enger.priv.no>
>The modal looks good!
>
>Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>
>https://bugs.koha-community.org/show_bug.cgi?id=20651
>---
> koha-tmpl/intranet-tmpl/prog/css/staff-global.css  |  9 +++--
> .../prog/en/modules/ill/ill-requests.tt            | 40 +++++++++++++++-------
> 2 files changed, 35 insertions(+), 14 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/css/staff-global.css
>index c68bff67f9..3fc7ae31a8 100644
>--- a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css
>+++ b/koha-tmpl/intranet-tmpl/prog/css/staff-global.css
>@@ -3088,6 +3088,10 @@ fieldset.rows + fieldset.action {
>     margin-top: 20px;
> }
> 
>+#interlibraryloans h3#dataPreviewLabel {
>+    margin: 0.3em 0;
>+}
>+
> #interlibraryloans .bg-info {
>     overflow: auto;
>     position: relative;
>@@ -3156,8 +3160,9 @@ fieldset.rows + fieldset.action {
>     margin-bottom: 1em;
> }
> 
>-#ill-view-panel #requestattributes .label {
>-    width: auto;
>+#requestattributes {
>+    font-family: monospace;
>+    line-height: 1.3em;
> }
> 
> table#ill-requests {
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt
>index 70f31cad16..db5b77c61f 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt
>@@ -193,12 +193,6 @@
>             }
>         };
> 
>-        // Toggle request attributes in Illview
>-        $('#toggle_requestattributes').on('click', function(e) {
>-            e.preventDefault();
>-            $('#requestattributes').toggleClass('content_hidden');
>-        });
>-
>         // Filter partner list
>         $('#partner_filter').keyup(function() {
>             var needle = $('#partner_filter').val();
>@@ -216,6 +210,12 @@
>             });
>         });
> 
>+        // Display the modal containing request supplier metadata
>+        $('#ill-request-display-metadata').on('click', function(e) {
>+            e.preventDefault();
>+            $('#dataPreview').modal({show:true});
>+        });
>+
>         // Get our data from the API and process it prior to passing
>         // it to datatables
>         var ajax = $.ajax(
>@@ -496,6 +496,10 @@
>                                 </a>
>                             [% END %]
>                         [% END %]
>+                        <a title="Display supplier metadata" id="ill-request-display-metadata" class="btn btn-sm btn-default pull-right" href="#">
>+                            <span class="fa fa-eye"></span>
>+                            Display supplier metadata
>+                        </a>
>                     </div>
>                     <div id="ill-view-panel" class="panel panel-default">
>                         <div class="panel-heading">
>@@ -562,17 +566,29 @@
>                                     </div>
>                                 [% END %]
>                             </div>
>-                            <div class="rows">
>-                                <h3><a id="toggle_requestattributes" href="#">Toggle full supplier metadata</a></h3>
>-                                <div id="requestattributes" class="content_hidden">
>-                                    [% FOREACH attr IN request.illrequestattributes %]
>+                        </div>
>+                    </div>
>+
>+                    <div id="dataPreview" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="dataPreviewLabel" aria-hidden="true">
>+                        <div class="modal-dialog">
>+                            <div class="modal-content">
>+                                <div class="modal-header">
>+                                    <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">Ã</button>
>+                                    <h3 id="dataPreviewLabel"> Supplier metadata</h3>
>+                                </div>
>+                                <div class="modal-body">
>+                                    <div id="requestattributes">
>+                                        [% FOREACH attr IN request.illrequestattributes %]
>                                         <div class="requestattr-[% attr.type %]">
>                                             <span class="label">[% attr.type %]:</span>
>                                             [% attr.value %]
>                                         </div>
>-                                    [% END %]
>+                                            [% END %]
>+                                    </div>
>+                                </div>
>+                                <div class="modal-footer">
>+                                    <button class="btn btn-default" data-dismiss="modal" aria-hidden="true">Close</button>
>                                 </div>
>-
>                             </div>
>                         </div>
>                     </div>
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 20651: 74812 | 74836 | 75277 | 75627 | 75655 | 76072 | 76073