Bug 21548: ILLLIBS patron category / partner_code seems extraneous
[koha-ffzg.git] / koha-tmpl / intranet-tmpl / prog / en / modules / ill / ill-requests.tt
index 1d93ea2..23c6c33 100644 (file)
 </head>
 
 <body id="illrequests" class="ill">
-[% INCLUDE 'header.inc' %]
-[% INCLUDE 'cat-search.inc' %]
+[% WRAPPER 'header.inc' %]
+    [% INCLUDE 'cat-search.inc' %]
+[% END %]
 
+[% WRAPPER 'sub-header.inc' %]
 <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
     <ol>
         <li>
                     New request
                 </a>
             </li>
-        [% ELSIF query_type == 'status' %]
+        [% ELSIF query_type == 'illview' %]
             <li>
                 <a href="/cgi-bin/koha/ill/ill-requests.pl">ILL requests</a>
             </li>
             <li>
                 <a href="#" aria-current="page">
-                    Status
+                    Manage request [% request.id_prefix _ request.illrequest_id | html %]
                 </a>
             </li>
         [% ELSE %]
@@ -50,6 +52,7 @@
         [% END %]
     </ol>
 </nav>
+[% END %]
 
 <div class="main container-fluid">
     <div class="row">
                                 </li>
                             </ol>
                             <fieldset class="action">
-                                <input type="submit" value="Search" />
+                                <input type="submit" class="btn btn-primary" value="Search" />
                                 <input type="button" value="Clear" id="clear_search" />
                             </fieldset>
                         </fieldset>
                     [% IF !whole.stage || whole.stage == 'form' %]
                         <h1 id="ill-issue-title">Issue requested item to [% INCLUDE 'patron-title.inc' patron = request.patron %]</h1>
                         [% IF !request.biblio_id || request.biblio_id.length == 0 %]
-                        <div class="alert">This item cannot be issued as it has no biblio record associated with it</div>
+                        <div class="alert">This item cannot be checked out out as there is no bibliographic record associated with it</div>
                         [% END %]
                         [% IF whole.value.errors.itemcount %]
                         <div class="alert">The bibliographic record for this request has multiple items, it should only have one. Please fix this then try again.</div>
                                                 [% END %]
                                             [% END %]
                                             [% IF whole.value.errors.branchcode %]
-                                            <span class="required">You must choose a branch</span>
+                                            <span class="required">You must choose a library</span>
                                             [% END %]
                                         </li>
                                         <li class="ill_checkout_due_date">
                                         <input name="item_type" type="hidden" value="[% items.0.itype | html %]">
                                     [% END %]
                                     <input type="hidden" value="[% request.illrequest_id | html %]" name="illrequest_id">
-                                    <input type="submit" value="Submit">
+                                    <input type="submit" class="btn btn-primary" value="Submit" />
                                     <a class="cancel" href="/cgi-bin/koha/ill/ill-requests.pl?method=illview&amp;illrequest_id=[% request.id | html %]">Cancel</a>
                                 </fieldset>
                             </form>
                                         <select size="5" multiple="true" id="partners" name="partners" required="required">
                                             [% FOREACH partner IN whole.value.partners %]
                                                 [% IF partner.email && partner.email.length > 0 %]
-                                                    <option data-partner-id="[% partner.id | html %]" value=[% partner.email | html %]>
+                                                    <option data-partner-id="[% partner.id | html %]" value=[% partner.borrowernumber | html %]>
                                                         [% partner.branchcode _ " - " _ partner.surname %]
                                                     </option>
                                                 [% END %]
                     [% ELSE %]
                         <fieldset class="rows">
                             <legend>Interlibrary loan request details</legend>
-                            <p>No partners have been defined yet. Please create appropriate patron records (by default ILLLIBS category).</p>
+                            <p>No partners have been defined yet. Please create appropriate patron records (by default IL category).</p>
                             <p>Be sure to provide email addresses for these patrons.</p>
                             <p><span><a href="[% ill_url | url %]" title="Return to request details">Cancel</a></span></p>
                         </fieldset>
                                 [% type = request.get_type %]
                                 <li class="borrowernumber">
                                     <label for="borrowernumber">Patron ID:</label>
-                                    [% request.borrowernumber | html %]
+                                    <input name="borrowernumber" id="borrowernumber" type="text" value="[% request.borrowernumber | html %]">
                                 </li>
                                 <li class="biblio_id">
                                     <label for="biblio_id" class="biblio_id">Bibliographic record ID:</label>
                                         [% END %]
                                             [% request.capabilities.$stat.name | html %]
                                         </option>
-                                        [% FOREACH alias IN AuthorisedValues.Get('ILLSTATUS') %]
+                                        [% FOREACH alias IN AuthorisedValues.Get('ILL_STATUS_ALIAS') %]
                                             [% IF alias.authorised_value == current_alias %]
                                             <option value="[% alias.authorised_value | html %]" selected>
                                             [% ELSE %]
                                     <input name="price_paid" id="price_paid" type="text" value="[% request.price_paid | html %]">
                                 </li>
                                 <li class="req_id">
-                                    <label class="req_id">Request number:</label>
+                                    <label class="req_id">Request ID:</label>
                                     [% request.id_prefix _ request.illrequest_id | html %]
                                 </li>
                                 <li class="notesstaff">
                             <input type="hidden" value="edit_action" name="method">
                             <input type="hidden" value="form" name="stage">
                             <input type="hidden" value="[% request.illrequest_id | html %]" name="illrequest_id">
-                            <input type="hidden" value="[% request.borrowernumber | html %]" name="borrowernumber">
-                            <input type="submit" value="Submit">
+                            <input type="submit" class="btn btn-primary" value="Submit" />
                             <a class="cancel" href="/cgi-bin/koha/ill/ill-requests.pl?method=illview&amp;illrequest_id=[% request.id | html %]">Cancel</a>
                         </fieldset>
                     </form>
                     </div>
 
                 [% ELSIF query_type == 'illview' %]
+                    [% IF whole.template.length > 0 %]
+                    [% PROCESS $whole.template %]
+                    [% END %]
                     [% req_status = request.status %]
 
                     [% IF error %]
                             <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>
+                        [% IF Koha.Preference('IllLog') %]
+                            <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>
+                        [% END %]
                     </div>
-                    <div class="ill-view-panel panel panel-default">
-                        <div class="panel-heading">
-                            <h3>Request details</h3>
-                        </div>
-                        <div class="panel-body">
+                    <div class="page-section">
+                        <h3>Request details</h3>
                             <h4>Details from library</h4>
                             <div class="rows">
                                 <ol>
                                     <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">
+                                        <a href="[% borrowerlink | url %]" title="View patron details">
                                         [% request.patron.firstname _ " " _ request.patron.surname _ " [" _ request.patron.cardnumber _ "]" | html %]
                                         </a>
                                     </li>
                                         [% 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>
+                                        <span class="label req_id">Request ID:</span>
                                         [% request.id_prefix _ request.illrequest_id | html %]
                                     </li>
                                     <li class="notesstaff">
                                         <p>[% request.notesstaff | html %]</p>
                                     </li>
                                     <li class="notesopac">
-                                        <span class="label notes_opac">Notes:</span>
+                                        <span class="label notes_opac">OPAC notes:</span>
                                         <p>[% request.notesopac | html %]</p>
                                     </li>
                                 </ol>
                                     [% END %]
                                 </ol>
                             </div>
-                        </div>
                     </div>
 
                     <div id="dataPreview" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="dataPreviewLabel" aria-hidden="true">
                         </div>
                     </div>
 
-                    <div class="ill-view-panel panel panel-default">
-                        <div class="panel-heading">
-                            <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 | html %]">
-                                    <h5>Comment by:
-                                    <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>
-                                [% END %]
-                            [% END %]
-                                <div class="rows">
-                                    <h3><a id="toggle_addcomment" href="#">Add comment</a></h3>
-                                    <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 | 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 class="required" required="required" cols="80" rows="10" id="comment" name="comment"></textarea>
-                                                        <span class="required">Required</span>
-                                                    </li>
-                                                </ol>
-                                            </fieldset>
-                                            <fieldset class="action">
-                                                <input type="submit" value="Submit">
-                                            </fieldset>
-                                        </form>
-                                    </div>
+                    <div class="page-section">
+                        <h3>[% request.illcomments.count | html %] comments</h3>
+                        [% IF request.illcomments.count && request.illcomments.count > 0 %]
+                            [% FOREACH comment IN request.illcomments %]
+                                <div class="rows comment_[% comment.patron.categorycode | html %]">
+                                <h5>Comment by:
+                                <a href="[% borrowerlink | url %]" title="View patron 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>
+                            [% END %]
+                        [% END %]
+                        <div class="rows">
+                            <h3><a id="toggle_addcomment" href="#">Add comment</a></h3>
+                            <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 | 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 class="required" required="required" cols="80" rows="10" id="comment" name="comment"></textarea>
+                                                <span class="required">Required</span>
+                                            </li>
+                                        </ol>
+                                    </fieldset>
+                                    <fieldset class="action">
+                                        <input type="submit" class="btn btn-primary" value="Submit" />
+                                    </fieldset>
+                                </form>
+                            </div>
                         </div>
                     </div>
 
                 [% ELSIF query_type == 'illlist' %]
                     <!-- illlist -->
                     <h1>View ILL requests</h1>
-                    <div id="results">
-                        <h3>Details for all requests</h3>
+                    <div id="results" class="page-section">
+                        <h2>Details for all requests</h2>
                         [% INCLUDE 'ill-list-table.inc' %]
-
                     </div> <!-- /#results -->
                 [% ELSIF query_type == 'availability' %]
                     <!-- availability -->
                     <h1>Availability</h1>
-                    <div id="results">
+                    <div id="results" class="page-section">
                         <h3>Displaying availability results</h3>
                         <form method="POST" action="/cgi-bin/koha/ill/ill-requests.pl">
                             [% FOREACH key IN whole.keys %]
     <script>
         var prefilters = '[% prefilters | $raw %]';
         // Set column settings
-        var columns_settings = [% TablesSettings.GetColumns( 'illrequests', 'ill-requests', 'ill-requests', 'json' ) %];
+        var table_settings = [% TablesSettings.GetTableSettings( 'illrequests', 'ill-requests', 'ill-requests', 'json' ) | $raw %];
 
         [% IF services_json.length > 0 %]
         var services = [% services_json | $raw %];