@@ -, +, @@ --- koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 9 ++- .../prog/en/modules/ill/ill-requests.tt | 84 ++++++++++++++-------- 2 files changed, 61 insertions(+), 32 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css +++ a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css @@ -3081,6 +3081,10 @@ fieldset.rows + fieldset.action { margin-top: 20px; } +#interlibraryloans h3#dataPreviewLabel { + margin: 0.3em 0; +} + #interlibraryloans .bg-info { overflow: auto; position: relative; @@ -3149,8 +3153,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 { --- a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt +++ a/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( @@ -483,19 +483,31 @@ [% capabilities = request.capabilities %] [% req_status = request.status %]

Manage ILL request

-
- - - Edit request - - [% FOREACH action IN actions %] - [% IF action.method != 0 %] - - - [% action.ui_method_name %] +
+
+
+ + + Edit request + + [% FOREACH action IN actions %] + [% IF action.method != 0 %] + + + [% action.ui_method_name %] + + [% END %] + [% END %] +
+
+
+
+ + + Display supplier metadata - [% END %] - [% END %] +
+
@@ -562,21 +574,33 @@
[% END %]
-
-

Toggle full supplier metadata

-
- [% FOREACH attr IN request.illrequestattributes %] -
- [% attr.type %]: - [% attr.value %] -
- [% END %] -
- -
+ + [% ELSIF query_type == 'illlist' %]

View ILL requests

--