Bug 14100: Fix 3 occurrences more

[koha_ffzg] / koha-tmpl / opac-tmpl / bootstrap / en / modules / opac-reserve.tt

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt
index 6558e6e..a864dde 100644 (file)
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt
@@ -1,7 +1,7 @@
 [% USE Koha %]
 [% USE KohaDates %]
 [% INCLUDE 'doc-head-open.inc' %]
-[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › Placing a hold
+<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; Placing a hold</title>
 [% INCLUDE 'doc-head-close.inc' %]
 [% BLOCK cssinclude %][% END %]
 </head>
@@ -169,16 +169,22 @@
                                                         <li class="itype">
                                                             <span class="label">Item type: </span>
                                                             [% IF ( bibitemloo.imageurl ) %]<img src="[% bibitemloo.imageurl %]" alt="" />[% END %]
-                                                            [% bibitemloo.description %]
+                                                            [% bibitemloo.translated_description %]
                                                         </li>
                                                     [% END %]
 
-                                                    [% IF showholds || showpriority %]
+                                                    [% SET OPACShowHoldQueueDetails = Koha.Preference('OPACShowHoldQueueDetails') %]
+                                                    [% IF OPACShowHoldQueueDetails == 'holds_priority' || OPACShowHoldQueueDetails == 'priority' %]
                                                         <li class="priority">
-                                                            <span class="label">Holds and priority: </span>
-                                                            [% IF showpriority %] [% bibitemloo.rank %] [% END %]
-                                                            [% IF showholds && showpriority %] out of [% END %]
-                                                            [% IF showholds %] [% bibitemloo.reservecount %] [% END %]
+                                                            <span class="label">Your priority: </span>
+                                                            [% bibitemloo.rank %]
+                                                        </li>
+                                                    [% END %]
+
+                                                    [% IF OPACShowHoldQueueDetails == 'holds_priority' || OPACShowHoldQueueDetails == 'holds' %]
+                                                        <li class="holds-count">
+                                                            <span class="label">Number of holds: </span>
+                                                            [% bibitemloo.reservecount %]
                                                         </li>
                                                     [% END %]
 
@@ -243,44 +249,31 @@
                                                             </li>
                                                         [% END # / IF OpacHoldNotes %]
 
-                                                        [% IF OPACItemHolds == '1' or OPACItemHolds == 'force' %]
+                                                        <li>
+                                                        </li>
+                                                        [% IF bibitemloo.itemholdable %]
                                                             <!-- ITEM HOLDS -->
                                                             <li class="lradio place_on_type" style="display:none;">
-                                                                <label class="radio inline" for="reqany_[% bibitemloo.biblionumber %]">Next available item</label>
-                                                                [% IF OPACItemHolds == "1" %]
+                                                                [% IF NOT bibitemloo.force_hold %]
+                                                                    <label class="radio inline" for="reqany_[% bibitemloo.biblionumber %]">Next available item</label>
                                                                     <input type="radio" name="reqtype_[% bibitemloo.biblionumber %]"
                                                                             id="reqany_[% bibitemloo.biblionumber %]"
                                                                             class="selectany"
                                                                             value="Any"
                                                                             checked="checked"
                                                                     />
-                                                                [% ELSE %]
-                                                                    <input type="radio" name="reqtype_[% bibitemloo.biblionumber %]"
-                                                                            id="reqany_[% bibitemloo.biblionumber %]"
-                                                                            class="selectany"
-                                                                            value="Any"
-                                                                     />
                                                                 [% END %]
                                                                 <label class="radio inline" for="reqspecific_[% bibitemloo.biblionumber %]">A specific item</label>
-                                                                [% IF OPACItemHolds == "force" %]
-                                                                    <input type="radio" name="reqtype_[% bibitemloo.biblionumber %]"
-                                                                           id="reqspecific_[% bibitemloo.biblionumber %]"
-                                                                           class="selectspecific"
-                                                                           value="Specific"
-                                                                           checked="checked"
-                                                                    />
-                                                                [% ELSE %]
-                                                                    <input type="radio" name="reqtype_[% bibitemloo.biblionumber %]"
-                                                                           id="reqspecific_[% bibitemloo.biblionumber %]"
-                                                                           class="selectspecific"
-                                                                           value="Specific"
-                                                                    />
-                                                                [% END %]
+                                                                <input type="radio" name="reqtype_[% bibitemloo.biblionumber %]"
+                                                                       id="reqspecific_[% bibitemloo.biblionumber %]"
+                                                                       class="selectspecific"
+                                                                       value="Specific"
+                                                                />
                                                             </li>
-                                                        [% END # / IF OPACItemHolds %]
+                                                        [% END # / IF bibitemloo.itemholdable %]
                                                     </ul>
 
-                                                    [% IF OPACItemHolds == '1' || OPACItemHolds == 'force' %]
+                                                    [% IF bibitemloo.itemholdable %]
                                                         <table class="copiesrow table table-bordered table-striped" id="copiesrow_[% bibitemloo.biblionumber %]">
                                                             <caption>Select a specific item:</caption>
                                                             <tr>
@@ -323,7 +316,7 @@
                                                                                     <img src="[% itemLoo.imageurl %]" alt="" />
                                                                                 [% END %]
                                                                             [% END %]
-                                                                            [% itemLoo.description %]
+                                                                            [% itemLoo.translated_description %]
                                                                         </td>
                                                                     [% END %]
 
@@ -380,7 +373,7 @@
                                                                 </tr>
                                                             [% END # / FOREACH itemLoo IN bibitemloo.itemLoop%]
                                                         </table> <!-- / #copiesrow_[% bibitemloo.biblionumber %] -->
-                                                    [% END # / IF ( OPACItemHolds )%]
+                                                    [% END # / IF ( bibitemloo.itemholdable )%]
                                                 </div> <!-- / #hold-options-[% bibitemloo.biblionumber %] -->
                                             </fieldset>
                                         [% END # / IF ( bibitemloo.holdable ) %]
@@ -460,12 +453,11 @@
         // Hides all 'specific copy' table rows on load.
         $(".copiesrow").hide();
 
-        [% IF OPACItemHolds == 'force' %]
-          [% FOREACH bibitemloo IN bibitemloop %]
-            [% IF bibitemloo.holdable %]
-              $("#toggle-hold-options-[% bibitemloo.biblionumber %]").click();
-              $("#copiesrow_[% bibitemloo.biblionumber %]").show();
-            [% END %]
+        [% FOREACH bibitemloo IN bibitemloop %]
+          [% IF bibitemloo.force_hold %]
+            $("#toggle-hold-options-[% bibitemloo.biblionumber %]").click();
+            $("#reqspecific_[% bibitemloo.biblionumber %]").click();
+            $("#copiesrow_[% bibitemloo.biblionumber %]").show();
           [% END %]
         [% END %]
 
@@ -523,20 +515,16 @@
 
         $("#place_on_hdr").show();
 
-        [% IF OPACItemHolds == '1' %]
-            $(".place_on_type").show();
-            // onload, selectany is checked
-            $(".selectany").attr("checked", "checked");
-        [% END %]
+        $(".place_on_type").show();
+        // onload, selectany is checked
+        $(".selectany").attr("checked", "checked");
 
         // If the user is *allowed* to choose a specific item
         // The first one is preselected
-        [% IF OPACItemHolds =="1" %]
-            $("table.copiesrow").each(function(){
-                var id = suffixOf($(this).attr("id"), "_");
-                select_first_available(id);
-            });
-        [% END %]
+        $("table.copiesrow").each(function(){
+            var id = suffixOf($(this).attr("id"), "_");
+            select_first_available(id);
+        });
 
         // On confirmsjs change
         $(".confirmjs").change(function(){