Bug 14272: (follow-up) Fixing layout issues and expiration date hint

[koha.git] / koha-tmpl / opac-tmpl / bootstrap / en / modules / opac-illrequests.tt

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt
index 8091efa..9fd474d 100644 (file)
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt
@@ -62,7 +62,7 @@
                             <p>
                                 [% Koha.Preference('ILLModuleCopyrightClearance') | $raw %]
                             </p>
-                            <a href="?method=create&stage=copyrightclearance&backend=[% whole.value.backend | html %]"
+                            <a href="?method=create&stage=copyrightclearance&backend=[% whole.value.backend | uri %]"
                                class="btn btn-sm btn-default"><i class="fa fa-check"></i> Yes</a>
                             <a href="/cgi-bin/koha/opac-illrequests.pl"
                                class="btn btn-sm btn-default"><i class="fa fa-times"></i> No</a>
@@ -99,7 +99,7 @@
                                 </button>
                                 <ul id="backend-dropdown-options" class="dropdown-menu nojs" aria-labelledby="ill-backend-dropdown">
                                     [% FOREACH backend IN backends %]
-                                        <li><a href="/cgi-bin/koha/opac-illrequests.pl?method=create&amp;backend=[% backend | html %]">[% backend | html %]</a></li>
+                                        <li><a href="/cgi-bin/koha/opac-illrequests.pl?method=create&amp;backend=[% backend | uri %]">[% backend | html %]</a></li>
                                     [% END %]
                                 </ul>
                         [% ELSE %]
@@ -126,6 +126,7 @@
                         <tbody>
                             [% FOREACH request IN requests %]
                                 [% status = request.status | html %]
+                                [% type = request.get_type %]
                                 <tr>
                                     <td>[% request.id | html %]</td>
                                     <td>
@@ -135,12 +136,14 @@
                                         [% IF request.metadata.Title %][% request.metadata.Title | html %][% ELSE %]<span>N/A</span>[% END %]
                                     </td>
                                     <td>[% request.backend | html %]</td>
-                                    <td>[% request.medium | html %]</td>
+                                    <td>
+                                        [% IF type %][% type | html %][% ELSE %]<span>N/A</span>[% END %]
+                                    </td>
                                     <td>[% request.capabilities.$status.name | html %]</td>
                                     <td><span title="[% request.placed | html %]">[% request.placed | $KohaDates %]</span></td>
                                     <td><span title="[% request.updated | html %]">[% request.updated | $KohaDates %]</span></td>
                                     <td>
-                                        <a href="/cgi-bin/koha/opac-illrequests.pl?method=view&amp;illrequest_id=[% request.id | html %]" class="btn btn-default btn-small pull-right">View</a>
+                                        <a href="/cgi-bin/koha/opac-illrequests.pl?method=view&amp;illrequest_id=[% request.id | uri %]" class="btn btn-default btn-small pull-right">View</a>
                                     </td>
                                 </tr>
                             [% END %]
@@ -149,11 +152,12 @@
                 [% ELSIF method == 'view' %]
                     <h2>View interlibrary loan request</h2>
                     [% INCLUDE messages %]
-                    [% status = request.status | html %]
+                    [% status = request.status %]
                     <form method="post" action="?method=update" id="illrequestupdate-form" novalidate="novalidate">
                             <fieldset class="rows">
                                 <legend id="library_legend">Details from library</legend>
                                 <ol>
+                                    [% type = request.get_type %]
                                     <li>
                                         <label for="request_id">Request ID:</label>
                                         [% request.id | html %]
@@ -165,7 +169,7 @@
                                     [% IF request.biblio_id %]
                                         <li>
                                             <label for="biblio">Requested item:</label>
-                                            <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% request.biblio_id | html %]">Click here to view</a>
+                                            <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% request.biblio_id | uri %]">Click here to view</a>
                                         </li>
                                     [% END %]
                                     <li>
@@ -178,7 +182,7 @@
                                     </li>
                                     <li>
                                         <label for="medium">Request type:</label>
-                                        [% request.medium | html %]
+                                        [% IF type %][% type | html %][% ELSE %]<span>N/A</span>[% END %]
                                     </li>
                                     <li>
                                         <label for="placed">Request placed:</label>