Bug 21460: (follow-up) Fix bugs found in QA
[koha-equinox.git] / koha-tmpl / intranet-tmpl / prog / en / modules / ill / ill-requests.tt
index 8ff3c44..88ee777 100644 (file)
 [% USE Branches %]
 [% USE Koha %]
 [% USE KohaDates %]
+[% SET footerjs = 1 %]
+[% USE AuthorisedValues %]
+[% USE ColumnsSettings %]
+[% USE Price %]
 
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; ILL requests  &rsaquo;</title>
+<title>Koha &rsaquo; ILL requests</title>
 [% INCLUDE 'doc-head-close.inc' %]
-[% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") | $raw %]
-[% Asset.css("css/datatables.css") | $raw %]
-[% INCLUDE 'datatables.inc' %]
-<script type="text/javascript">
-    //<![CDATA[
-    $(document).ready(function() {
-
-        // Illview Datatable setup
-
-        // Fields we don't want to display
-        var ignore = [
-            'accessurl',
-            'backend',
-            'branchcode',
-            'completed',
-            'capabilities',
-            'cost',
-            'medium',
-            'notesopac',
-            'notesstaff',
-            'placed',
-            'replied'
-        ];
-
-        // Fields we need to expand (flatten)
-        var expand = [
-            'metadata',
-            'patron'
-        ];
-
-        // Expanded fields
-        // This is auto populated
-        var expanded = {};
-
-        // The core fields that should be displayed first
-        var core = [
-            'metadata_Author',
-            'metadata_Title',
-            'borrowername',
-            'biblio_id',
-            'library',
-            'status',
-            'updated',
-            'illrequest_id',
-            'comments',
-            'action' // Action should always be last
-        ];
-
-        // Remove any fields we're ignoring
-        var removeIgnore = function(dataObj) {
-            dataObj.forEach(function(thisRow) {
-                ignore.forEach(function(thisIgnore) {
-                    if (thisRow.hasOwnProperty(thisIgnore)) {
-                        delete thisRow[thisIgnore];
-                    }
-                });
-            });
-        };
-
-        // Expand any fields we're expanding
-        var expandExpand = function(row) {
-            expand.forEach(function(thisExpand) {
-                if (row.hasOwnProperty(thisExpand)) {
-                    if (!expanded.hasOwnProperty(thisExpand)) {
-                        expanded[thisExpand] = [];
-                    }
-                    var expandObj = row[thisExpand];
-                    Object.keys(expandObj).forEach(
-                        function(thisExpandCol) {
-                            var expColName = thisExpand + '_' + thisExpandCol;
-                            // Keep a list of fields that have been expanded
-                            // so we can create toggle links for them
-                            if (expanded[thisExpand].indexOf(expColName) == -1) {
-                                expanded[thisExpand].push(expColName);
-                            }
-                            expandObj[expColName] =
-                                expandObj[thisExpandCol];
-                            delete expandObj[thisExpandCol];
-                        }
-                    );
-                    $.extend(true, row, expandObj);
-                    delete row[thisExpand];
-                }
-            });
-        };
-
-        // Build a de-duped list of all column names
-        var allCols = {};
-        core.map(function(thisCore) {
-            allCols[thisCore] = 1;
-        });
-
-        // Strip the expand prefix if it exists, we do this for display
-        var stripPrefix = function(value) {
-            expand.forEach(function(thisExpand) {
-                var regex = new RegExp(thisExpand + '_', 'g');
-                value = value.replace(regex, '');
-            });
-            return value;
-        };
-
-        // Our 'render' function for borrowerlink
-        var createPatronLink = function(data, type, row) {
-            return '<a title="' + _("View borrower details") + '" ' +
-                'href="/cgi-bin/koha/members/moremember.pl?' +
-                'borrowernumber='+row.borrowernumber+'">' +
-                row.patron_firstname + ' ' + row.patron_surname +
-                '</a>';
-        };
-
-        // Our 'render' function for biblio_id
-        var createBiblioLink = function(data, type, row) {
-            return (row.biblio_id) ?
-                '<a title="' + _("View biblio details") + '" ' +
-                'href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=' +
-                row.biblio_id + '">' +
-                row.biblio_id +
-                '</a>' : '';
-        };
-
-        // Our 'render' function for the library name
-        var createLibrary = function(data, type, row) {
-            return row.library.branchname;
-        };
-
-        // Render function for request ID
-        var createRequestId = function(data, type, row) {
-            return row.id_prefix + row.illrequest_id;
-        };
-
-        // Render function for request status
-        var createStatus = function(data, type, row, meta) {
-            var origData = meta.settings.oInit.originalData;
-            if (origData.length > 0) {
-                var status_name = meta.settings.oInit.originalData[0].capabilities[
-                    row.status
-                ].name;
-                switch( status_name ) {
-                    case "New request":
-                        return _("New request");
-                    case "Requested":
-                        return _("Requested");
-                    case "Requested from partners":
-                        return _("Requested from partners");
-                    case "Request reverted":
-                        return _("Request reverted");
-                    case "Queued request":
-                        return _("Queued request");
-                    case "Cancellation requested":
-                        return _("Cancellation requested");
-                    case "Completed":
-                        return _("Completed");
-                    case "Delete request":
-                        return _("Delete request");
-                    default:
-                        return status_name;
-                }
-            } else {
-                return '';
-            }
-        };
-
-        // Render function for creating a row's action link
-        var createActionLink = function(data, type, row) {
-            return '<a class="btn btn-default btn-sm" ' +
-                'href="/cgi-bin/koha/ill/ill-requests.pl?' +
-                'method=illview&amp;illrequest_id=' +
-                row.illrequest_id +
-                '">' + _("Manage request") + '</a>';
-        };
-
-        // Columns that require special treatment
-        var specialCols = {
-            action: {
-                name: '',
-                func: createActionLink
-            },
-            borrowername: {
-                name: _("Patron"),
-                func: createPatronLink
-            },
-            illrequest_id: {
-                name: _("Request number"),
-                func: createRequestId
-            },
-            status: {
-                name: _("Status"),
-                func: createStatus
-            },
-            biblio_id: {
-                name: _("Bibliograpic record ID"),
-                func: createBiblioLink
-            },
-            library: {
-                name: _("Library"),
-                func: createLibrary
-            }
-        };
-
-        // Toggle request attributes in Illview
-        $('#toggle_requestattributes').on('click', function(e) {
-            e.preventDefault();
-            $('#requestattributes').toggleClass('content_hidden');
-        });
-
-        // Toggle new comment form in Illview
-        $('#toggle_addcomment').on('click', function(e) {
-            e.preventDefault();
-            $('#addcomment').toggleClass('content_hidden');
-        });
-
-        // Filter partner list
-        $('#partner_filter').keyup(function() {
-            var needle = $('#partner_filter').val();
-            $('#partners > option').each(function() {
-                var regex = new RegExp(needle, 'i');
-                if (
-                    needle.length == 0 ||
-                    $(this).is(':selected') ||
-                    $(this).text().match(regex)
-                ) {
-                    $(this).show();
-                } else {
-                    $(this).hide();
-                }
-            });
-        });
-
-        // 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(
-            '/api/v1/illrequests?embed=metadata,patron,capabilities,library,comments'
-            ).done(function() {
-                var data = JSON.parse(ajax.responseText);
-                // Make a copy, we'll be removing columns next and need
-                // to be able to refer to data that has been removed
-                var dataCopy = $.extend(true, [], data);
-                // Remove all columns we're not interested in
-                removeIgnore(dataCopy);
-                // Expand columns that need it and create an array
-                // of all column names
-                $.each(dataCopy, function(k, row) {
-                    expandExpand(row);
-                });
-
-                // Assemble an array of column definitions for passing
-                // to datatables
-                var colData = [];
-                Object.keys(allCols).forEach(function(thisCol) {
-                    // Create the base column object
-                    var colObj = {
-                        name: thisCol,
-                        className: thisCol
-                    };
-                    // We may need to process the data going in this
-                    // column, so do it if necessary
-                    if (
-                        specialCols.hasOwnProperty(thisCol) &&
-                        specialCols[thisCol].hasOwnProperty('func')
-                    ) {
-                        colObj.render = specialCols[thisCol].func;
-                    } else {
-                        colObj.data = thisCol;
-                    }
-                    colData.push(colObj);
-                });
-
-                // Initialise the datatable
-                $('#ill-requests').DataTable($.extend(true, {}, dataTablesDefaults, {
-                    'aoColumnDefs': [  // Last column shouldn't be sortable or searchable
-                        {
-                            'aTargets': [ 'actions' ],
-                            'bSortable': false,
-                            'bSearchable': false
-                        },
-                    ],
-                    'aaSorting': [[ 6, 'desc' ]], // Default sort, updated descending
-                    'processing': true, // Display a message when manipulating
-                    'iDisplayLength': 10, // 10 results per page
-                    'sPaginationType': "full_numbers", // Pagination display
-                    'deferRender': true, // Improve performance on big datasets
-                    'data': dataCopy,
-                    'columns': colData,
-                    'originalData': data // Enable render functions to access
-                                       // our original data
-                }));
-            }
-        );
-
-    });
-    //]]>
-</script>
 </head>
 
 <body id="illrequests" class="ill">
 
 <div id="doc3" class="yui-t2">
     <div id="bd">
+        [% IF query_type == 'illlist' %]
+        <div id="illfilter_yui_column" class="yui-b">
+            <form method="get" id="illfilter_form">
+                <fieldset class="brief">
+                    <h3>Filters</h3>
+                    <ol>
+                        <li>
+                            <label for="illfilter_status">Status:</label>
+                            <select name="illfilter_status" id="illfilter_status">
+                                <option value=""></option>
+                            </select>
+                        </li>
+                        <li>
+                            <label for="illfilter_dateplaced_start">Date placed between:</label>
+                            <input type="text" name="illfilter_dateplaced_start" id="illfilter_dateplaced_start" class="datepicker" />
+                        </li>
+                        <li>
+                            <label for="illfilter_dateplaced_end">and:</label>
+                            <input type="text" name="illfilter_dateplaced_end" id="illfilter_dateplaced_end" class="datepicker" />
+                        </li>
+                        <li>
+                            <label for="illfilter_datemodified_start">Updated between:</label>
+                            <input type="text" name="illfilter_datemodified_start" id="illfilter_datemodified_start" class="datepicker" />
+                        </li>
+                        <li>
+                            <label for="illfilter_datemodified_end">and:</label>
+                            <input type="text" name="illfilter_datemodified_end" id="illfilter_datemodified_end" class="datepicker" />
+                        </li>
+                        <li>
+                            <label for="illfilter_branchname">Library:</label>
+                            <select name="illfilter_branchname" id="illfilter_branchname">
+                                <option value=""></option>
+                            </select>
+                        </li>
+                        <li>
+                            <label for="illfilter_patron">Patron:</label>
+                            <input type="text" name="illfilter_patron" id="illfilter_patron" />
+                        </li>
+                    </ol>
+                    <fieldset class="action">
+                        <input type="submit" value="Search" />
+                        <input type="button" value="Clear" id="clear_search" />
+                    </fieldset>
+                </fieldset>
+            </form>
+        </div>
+        [% END %]
         <div id="yui-main">
             <div id="interlibraryloans" class="yui-b">
-        [% IF !backends_available %]
+        [% IF !backends_available || !has_branch %]
             <div class="dialog message">ILL module configuration problem. Take a look at the <a href="/cgi-bin/koha/about.pl#sysinfo">about page</a></div>
         [% ELSE %]
                 [% INCLUDE 'ill-toolbar.inc' %]
                                 <ol>
                                     <li>
                                         <label for="partner_filter">Filter partner libraries:</label>
-                                        <input type="text" id="partner_filter">
+                                        <input type="text" id="partner_filter" />
                                     </li>
                                     <li>
                                         <label for="partners" class="required">Select partner libraries:</label>
 
                                     </li>
                                     <li>
-                                        <label for="subject" class="required">Subject Line</label>
+                                        <label for="subject" class="required">Subject line:</label>
                                         <input type="text" name="subject" id="subject" type="text" value="[% whole.value.draft.subject | html %]" required="required" />
                                     </li>
                                     <li>
                             </fieldset>
                             <fieldset class="action">
                                 <input type="submit" class="btn btn-default" value="Send email"/>
-                                <span><a href="[% ill_url | uri %]" title="Return to request details">Cancel</a></span>
+                                <span><a href="[% ill_url | url %]" title="Return to request details">Cancel</a></span>
                             </fieldset>
                         </form>
                     [% ELSE %]
                             <legend>Interlibrary loan request details</legend>
                             <p>No partners have been defined yet. Please create appropriate patron records (by default ILLLIBS category).</p>
                             <p>Be sure to provide email addresses for these patrons.</p>
-                            <p><span><a href="[% ill_url | uri %]" title="Return to request details">Cancel</a></span></p>
+                            <p><span><a href="[% ill_url | url %]" title="Return to request details">Cancel</a></span></p>
                         </fieldset>
                     [% END %]
                 <!-- generic_confirm ends here -->
                         <fieldset class="rows">
                             <legend>Request details</legend>
                             <ol>
+                                [% type = request.get_type %]
                                 <li class="borrowernumber">
                                     <label for="borrowernumber">Patron ID:</label>
                                     [% request.borrowernumber | html %]
                                 <li class="status">
                                     <label class="status">Status:</label>
                                     [% stat = request.status %]
-                                    [% request.capabilities.$stat.name | html %]
+                                    [% current_alias = request.status_alias %]
+                                    <select id="status_alias" name="status_alias">
+                                        [% IF !current_alias %]
+                                        <option value="" selected>
+                                        [% ELSE %]
+                                        <option value="">
+                                        [% END %]
+                                            [% request.capabilities.$stat.name | html %]
+                                        </option>
+                                        [% FOREACH alias IN AuthorisedValues.Get('ILLSTATUS') %]
+                                            [% IF alias.authorised_value == current_alias %]
+                                            <option value="[% alias.authorised_value | html %]" selected>
+                                            [% ELSE %]
+                                            <option value="[% alias.authorised_value | html %]">
+                                            [% END %]
+                                                [% alias.lib | html %]
+                                            </option>
+                                        [% END %]
+                                    </select>
                                 </li>
                                 <li class="updated">
                                     <label class="updated">Last updated:</label>
-                                    [% request.updated | $KohaDates with_hours => 1 | html %]
+                                    [% request.updated | $KohaDates  with_hours => 1 %]
                                 </li>
                                 <li class="medium">
                                     <label class="medium">Request type:</label>
-                                    [% request.medium | html %]
+                                    [% IF type %][% type | html %][% ELSE %]<span>N/A</span>[% END %]
                                 </li>
                                 <li class="cost">
                                     <label class="cost">Cost:</label>
-                                    [% IF request.cost %][% request.cost | html %][% ELSE %]<span>N/A</span>[% END %]
+                                    [% IF request.cost %][% request.cost | $Price %][% ELSE %]<span>N/A</span>[% END %]
                                 </li>
                                 <li class="price_paid">
                                     <label class="price_paid">Price paid:</label>
                             <input type="hidden" name="method" value="delete" />
                             <input type="hidden" name="confirmed" value="1" />
                             <input type="hidden" name="illrequest_id" value="[% request.id | html %]" />
-                            <button type="submit" class="btn btn-default btn-sm approve"><i class="fa fa-fw fa-check"></i> Yes, delete</button>
+                            <button type="submit" class="btn btn-default approve"><i class="fa fa-fw fa-check"></i> Yes, delete</button>
                         </form>
-                        <a class="btn btn-default btn-sm deny" href="/cgi-bin/koha/ill/ill-requests.pl?method=illview&amp;illrequest_id=[% request.id | html %]"><i class="fa fa-fw fa-remove"></i>No, do not delete</a>
+                        <a class="btn btn-default deny" href="/cgi-bin/koha/ill/ill-requests.pl?method=illview&amp;illrequest_id=[% request.id | html %]"><i class="fa fa-fw fa-remove"></i>No, do not delete</a>
                     </div>
 
                 [% ELSIF query_type == 'illview' %]
                     [% req_status = request.status %]
+
+                    [% IF error %]
+                      [% IF error == 'migrate_target' %]
+                          <div class="alert">
+                              The backend you tried to migrate to does not yet support migrations, please try again with an alternative target.
+                          </div>
+                      [% END %]
+                    [% END %]
+
                     <h1>Manage ILL request</h1>
-                    <div id="toolbar" class="btn-toolbar">
-                        <a title="Edit request" id="ill-toolbar-btn-edit-action" class="btn btn-sm btn-default" href="/cgi-bin/koha/ill/ill-requests.pl?method=edit_action&amp;illrequest_id=[% request.illrequest_id | html %]">
+                    <div id="request-toolbar" class="btn-toolbar">
+                        <a title="Edit request" id="ill-toolbar-btn-edit-action" class="btn btn-default" href="/cgi-bin/koha/ill/ill-requests.pl?method=edit_action&amp;illrequest_id=[% request.illrequest_id | html %]">
                         <span class="fa fa-pencil"></span>
                         Edit request
                         </a>
                         [% FOREACH action IN request.available_actions %]
-                            [% IF action.method != 0 %]
-                                <a title="[% action.ui_method_name | html %]" id="ill-toolbar-btn-[% action.id | lower | html %]" class="btn btn-sm btn-default" href="/cgi-bin/koha/ill/ill-requests.pl?method=[% action.method | html %]&amp;illrequest_id=[% request.illrequest_id | html %]">
+                            [% IF action.method == 'migrate' %]
+                                [% IF backends.size > 2 %]
+                                    <div class="dropdown btn-group">
+                                        <button class="btn btn-default dropdown-toggle" type="button" id="ill-migrate-dropdown" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
+                                            <i class="fa [% action.ui_method_icon | html %]"></i> [% action.ui_method_name | html %] <span class="caret"></span>
+                                        </button>
+                                        <ul class="dropdown-menu" aria-labelledby="ill-migrate-dropdown">
+                                            [% FOREACH backend IN backends %]
+                                                [% IF backend != request.backend %]
+                                                    <li><a href="/cgi-bin/koha/ill/ill-requests.pl?method=[% action.method | uri %]&amp;illrequest_id=[% request.illrequest_id | uri %]&amp;backend=[% backend | uri %]">[% backend | html %]</a></li>
+                                                [% END %]
+                                            [% END %]
+                                        </ul>
+                                    </div>
+                                [% ELSIF backends.size == 2 %]
+                                    [% FOREACH backend IN backends %]
+                                        [% IF backend != request.backend %]
+                                            <a title="[% action.ui_method_name | html %]" id="ill-toolbar-btn-[% action.id | lower | html %]" class="btn btn-default" href="/cgi-bin/koha/ill/ill-requests.pl?method=[% action.method | uri %]&amp;illrequest_id=[% request.illrequest_id | uri %]&amp;backend=[% backend | uri %]">
+                                            <span class="fa [% action.ui_method_icon | html %]"></span>
+                                            [% action.ui_method_name | html %]
+                                            </a>
+                                        [% END %]
+                                    [% END %]
+                                [% END %]
+                            [% ELSIF action.method != 0 %]
+                                <a title="[% action.ui_method_name | html %]" id="ill-toolbar-btn-[% action.id | lower | html %]" class="btn btn-default" href="/cgi-bin/koha/ill/ill-requests.pl?method=[% action.method | uri %]&amp;illrequest_id=[% request.illrequest_id | uri %]">
                                 <span class="fa [% action.ui_method_icon | html %]"></span>
                                 [% action.ui_method_name | html %]
                                 </a>
                             [% END %]
                         [% END %]
-                        <a title="Display supplier metadata" id="ill-request-display-metadata" class="btn btn-sm btn-default pull-right" href="#">
+                        <a title="Display supplier metadata" id="ill-request-display-metadata" class="btn btn-default pull-right" href="#">
                             <span class="fa fa-eye"></span>
                             Display supplier metadata
                         </a>
+                        <a title="ILL request log" id="ill-request-display-log" class="btn btn-default pull-right" href="#">
+                            <span class="fa fa-calendar"></span>
+                            ILL request log
+                        </a>
                     </div>
-                    <div id="ill-view-panel" class="panel panel-default">
+                    <div class="ill-view-panel panel panel-default">
                         <div class="panel-heading">
                             <h3>Request details</h3>
                         </div>
                         <div class="panel-body">
                             <h4>Details from library</h4>
                             <div class="rows">
-                                <div class="orderid">
-                                    <span class="label orderid">Order ID:</span>
-                                    [% IF request.orderid %][% request.orderid | html %][% ELSE %]<span>N/A</span>[% END %]
-                                </div>
-                                <div class="borrowernumber">
-                                    <span class="label borrowernumber">Patron:</span>
-                                    [% borrowerlink = "/cgi-bin/koha/members/moremember.pl" _ "?borrowernumber=" _ request.patron.borrowernumber %]
-                                    <a href="[% borrowerlink | uri %]" title="View borrower details">
-                                    [% request.patron.firstname _ " " _ request.patron.surname _ " [" _ request.patron.cardnumber _ "]" | html %]
-                                    </a>
-                                </div>
+                                <ol>
+                                    <li class="orderid">
+                                        <span class="label orderid">Order ID:</span>
+                                        [% IF request.orderid %][% request.orderid | html %][% ELSE %]<span>N/A</span>[% END %]
+                                    </li>
+                                    <li class="borrowernumber">
+                                        <span class="label borrowernumber">Patron:</span>
+                                        [% borrowerlink = "/cgi-bin/koha/members/moremember.pl" _ "?borrowernumber=" _ request.patron.borrowernumber %]
+                                        <a href="[% borrowerlink | url %]" title="View borrower details">
+                                        [% request.patron.firstname _ " " _ request.patron.surname _ " [" _ request.patron.cardnumber _ "]" | html %]
+                                        </a>
+                                    </li>
 
-                                <div class="biblio_id">
-                                    <span class="label biblio_id">Bibliographic record ID:</span>
-                                    [% IF request.biblio_id %]
-                                        <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% request.biblio_id | uri %]">[% request.biblio_id | html %]</a>
-                                    [% ELSE %]
-                                        <span>N/A</span>
-                                    [% END %]
-                                </div>
-                                <div class="branchcode">
-                                    <span class="label branchcode">Library:</span>
-                                    [% Branches.GetName(request.branchcode) | html %]
-                                </div>
-                                <div class="status">
-                                    <span class="label status">Status:</span>
-                                    [% request.capabilities.$req_status.name | html %]
-                                </div>
-                                <div class="updated">
-                                    <span class="label updated">Last updated:</span>
-                                    [% request.updated | $KohaDates with_hours => 1 | html %]
-                                </div>
-                                <div class="medium">
-                                    <span class="label medium">Request type:</span>
-                                    [% request.medium | html %]
-                                </div>
-                                <div class="cost">
-                                    <span class="label cost">Cost:</span>
-                                    [% IF request.cost %][% request.cost | html %][% ELSE %]<span>N/A</span>[% END %]
-                                </div>
-                                <div class="price_paid">
-                                    <span class="label price_paid">Price paid:</span>
-                                    [% IF request.price_paid %][% request.price_paid | html %][% ELSE %]<span>N/A</span>[% END %]
-                                </div>
-                                <div class="req_id">
-                                    <span class="label req_id">Request number:</span>
-                                    [% request.id_prefix _ request.illrequest_id | html %]
-                                </div>
-                                <div class="notesstaff">
-                                    <span class="label notes_staff">Staff notes:</span>
-                                    <pre>[% request.notesstaff | html %]</pre>
-                                </div>
-                                <div class="notesopac">
-                                    <span class="label notes_opac">Notes:</span>
-                                    <pre>[% request.notesopac | html %]</pre>
-                                </div>
+                                    <li class="biblio_id">
+                                        <span class="label biblio_id">Bibliographic record ID:</span>
+                                        [% IF request.biblio_id %]
+                                            <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% request.biblio_id | uri %]">[% request.biblio_id | html %]</a>
+                                        [% ELSE %]
+                                            <span>N/A</span>
+                                        [% END %]
+                                    </li>
+                                    <li class="branchcode">
+                                        <span class="label branchcode">Library:</span>
+                                        [% Branches.GetName(request.branchcode) | html %]
+                                    </li>
+                                    <li class="status">
+                                        <span class="label status">Status:</span>
+                                        [% IF request.statusalias %]
+                                            [% request.statusalias.lib | html %]
+                                        [% ELSE %]
+                                            [% request.capabilities.$req_status.name | html%]
+                                            [% IF request.requested_partners.length > 0 %]
+                                                ([% request.requested_partners | html %])
+                                            [% END %]
+                                        [% END %]
+                                    </li>
+                                    <li class="updated">
+                                        <span class="label updated">Last updated:</span>
+                                        [% request.updated | $KohaDates  with_hours => 1 %]
+                                    </li>
+                                    <li class="medium">
+                                        <span class="label medium">Request type:</span>
+                                        [% type = request.get_type %]
+                                        [% IF type %][% type | html %][% ELSE %]<span>N/A</span>[% END %]
+                                    </li>
+                                    <li class="cost">
+                                        <span class="label cost">Cost:</span>
+                                        [% IF request.cost %][% request.cost | $Price %][% ELSE %]<span>N/A</span>[% END %]
+                                    </li>
+                                    <li class="price_paid">
+                                        <span class="label price_paid">Price paid:</span>
+                                        [% IF request.price_paid %][% request.price_paid | $Price %][% ELSE %]<span>N/A</span>[% END %]
+                                    </li>
+                                    <li class="req_id">
+                                        <span class="label req_id">Request number:</span>
+                                        [% request.id_prefix _ request.illrequest_id | html %]
+                                    </li>
+                                    <li class="notesstaff">
+                                        <span class="label notes_staff">Staff notes:</span>
+                                        <p>[% request.notesstaff | html %]</p>
+                                    </li>
+                                    <li class="notesopac">
+                                        <span class="label notes_opac">Notes:</span>
+                                        <p>[% request.notesopac | html %]</p>
+                                    </li>
+                                </ol>
                             </div>
                             <div class="rows">
                                 <h4>Details from supplier ([% request.backend | html %])</h4>
-                                [% FOREACH meta IN request.metadata %]
-                                    <div class="requestmeta-[% meta.key.replace('\s','_') | html %]">
-                                        <span class="label">[% meta.key | html %]:</span>
-                                        [% meta.value | html %]
-                                    </div>
-                                [% END %]
+                                <ol>
+                                    [% FOREACH meta IN request.metadata %]
+                                        <li class="requestmeta-[% meta.key.replace('\s','_') | html %]">
+                                            <span class="label">[% meta.key | html %]:</span>
+                                            [% meta.value | html %]
+                                        </li>
+                                    [% END %]
+                                </ol>
                             </div>
                         </div>
                     </div>
                         </div>
                     </div>
 
-                    <div id="ill-view-panel" class="panel panel-default">
+                    <div id="requestLog" 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="requestLogLabel"> Request log</h3>
+                                </div>
+                                <div class="modal-body">
+                                [% IF request.logs.size > 0 %]
+                                    [% FOREACH log IN request.logs %]
+                                        [% tpl = log.template %]
+                                        [% INCLUDE $tpl log=log %]
+                                    [% END %]
+                                [% ELSE %]
+                                    There are no recorded logs for this request
+                                [% END %]
+                                </div>
+                                <div class="modal-footer">
+                                    <button class="btn btn-default" data-dismiss="modal" aria-hidden="true">Close</button>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+
+                    <div class="ill-view-panel panel panel-default">
                         <div class="panel-heading">
-                            <h3>[% request.illcomments.count %] comments</h3>
+                            <h3>[% request.illcomments.count | html %] comments</h3>
                         </div>
                         <div class="panel-body">
                             [% IF request.illcomments.count && request.illcomments.count > 0 %]
                                 [% FOREACH comment IN request.illcomments %]
-                                    <div class="rows comment_[% comment.patron.categorycode %]">
+                                    <div class="rows comment_[% comment.patron.categorycode | html %]">
                                     <h5>Comment by:
-                                    <a href="[% borrowerlink %]" title="View borrower details">
+                                    <a href="[% borrowerlink | url %]" title="View borrower details">
                                     [% comment.patron.firstname _ " " _ comment.patron.surname _ " [" _ comment.patron.cardnumber _ "]" | html %]</a>
                                     [% comment.timestamp | $KohaDates with_hours => 1 %]</h5>
                                     <p>[% comment.comment | html %]</p>
                                     <div id="addcomment" class="content_hidden">
                                         <form class="validated" method="post" action="/cgi-bin/koha/ill/ill-requests.pl">
                                             <input type="hidden" value="save_comment" name="method">
-                                            <input type="hidden" value="[% csrf_token %]" name="csrf_token">
-                                            <input type="hidden" value="[% request.illrequest_id %]" name="illrequest_id">
+                                            <input type="hidden" value="[% csrf_token | html %]" name="csrf_token">
+                                            <input type="hidden" value="[% request.illrequest_id | html %]" name="illrequest_id">
                                             <fieldset class="rows">
                                                 <ol>
                                                     <li>
                                                         <label class="required" for="comment">Comment: </label>
-                                                        <textarea type="text" class="required" required="required" value="" cols="80" rows="10" id="comment" name="comment"></textarea>
+                                                        <textarea class="required" required="required" cols="80" rows="10" id="comment" name="comment"></textarea>
                                                         <span class="required">Required</span>
                                                     </li>
                                                 </ol>
                                         </form>
                                     </div>
                                 </div>
-                            </div>
+                        </div>
                     </div>
 
                 [% ELSIF query_type == 'illlist' %]
                     <h1>View ILL requests</h1>
                     <div id="results">
                         <h3>Details for all requests</h3>
+                        [% INCLUDE 'ill-list-table.inc' %]
 
-                        <table id="ill-requests">
-                            <thead>
-                                <tr id="illview-header">
-                                    <th>Author</th>
-                                    <th>Title</th>
-                                    <th>Patron</th>
-                                    <th>Bibliographic record ID</th>
-                                    <th>Library</th>
-                                    <th>Status</th>
-                                    <th>Updated on</th>
-                                    <th>Request number</th>
-                                    <th>Comments</th>
-                                    <th class="actions"></th>
-                                </tr>
-                            </thead>
-                            <tbody id="illview-body">
-                            </tbody>
-                        </table>
                     </div>
                 [% ELSE %]
                 <!-- Custom Backend Action -->
             </div>
         </div>
     </div>
-</div>
+
+[% MACRO jsinclude BLOCK %]
+    [% INCLUDE 'datatables.inc' %]
+    [% INCLUDE 'columns_settings.inc' %]
+    [% INCLUDE 'calendar.inc' %]
+    [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") | $raw %]
+    <script>
+        var prefilters = '[% prefilters | $raw %]';
+        // Set column settings
+        var columns_settings = [% ColumnsSettings.GetColumns( 'illrequests', 'ill-requests', 'ill-requests', 'json' ) %];
+    </script>
+    [% INCLUDE 'ill-list-table-strings.inc' %]
+    [% Asset.js("js/ill-list-table.js") | $raw %]
+[% END %]
 
 [% TRY %]
 [% PROCESS backend_jsinclude %]