From 671f2b86a9aa5861cd0f7d605afc15118695866f Mon Sep 17 00:00:00 2001
From: Katrin Fischer <katrin.fischer.83@web.de>
Date: Wed, 26 Aug 2020 22:36:09 +0200
Subject: [PATCH] Bug 22789: (QA follow-up) Some minor formatting changes

- Remove the unordered list added to the holds list Details column
- Switch div to span to have the hint appear behind the checkbox

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 .../prog/en/includes/holds_table.inc          | 56 ++++++++-----------
 .../prog/en/modules/reserve/request.tt        |  2 +-
 2 files changed, 23 insertions(+), 35 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc
index 01dfed3171..f3aed75062 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc
@@ -140,53 +140,41 @@
             </td>
 
             <td>
-                <ul>
                 [% IF ( hold.found ) %]
-                    <li>
-                        <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% hold.biblionumber | uri %]&amp;itemnumber=[% hold.itemnumber | uri %]#item[% hold.itemnumber | uri %]">
-                            [% IF ( hold.barcodenumber ) %]
-                                [% hold.barcodenumber | html %]
-                                <input type="hidden" name="itemnumber" value="[% hold.itemnumber | html %]" />
-                            [% ELSE %]
-                                No barcode
-                            [% END %]
-                        </a>
-                    </li>
+                    <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% hold.biblionumber | uri %]&amp;itemnumber=[% hold.itemnumber | uri %]#item[% hold.itemnumber | uri %]">
+                        [% IF ( hold.barcodenumber ) %]
+                            [% hold.barcodenumber | html %]
+                            <input type="hidden" name="itemnumber" value="[% hold.itemnumber | html %]" />
+                        [% ELSE %]
+                            No barcode
+                        [% END %]
+                    </a>
                 [% ELSE %]
                     [% IF ( hold.item_level_hold ) %]
-                        <li>
-                            <i>
-                                Only item
-                                <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% hold.biblionumber | uri %]&amp;itemnumber=[% hold.itemnumber | uri %]#item[% hold.itemnumber | uri %]">
-                                    [% IF ( hold.barcodenumber ) %]
-                                        [% hold.barcodenumber | html %]
-                                        <input type="hidden" name="itemnumber" value="[% hold.itemnumber | html %]" />
-                                    [% ELSE %]
-                                        No barcode
-                                    [% END %]
-                                </a>
-                            </i>
-                        </li>
+                        <i>
+                            Only item
+                            <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% hold.biblionumber | uri %]&amp;itemnumber=[% hold.itemnumber | uri %]#item[% hold.itemnumber | uri %]">
+                                [% IF ( hold.barcodenumber ) %]
+                                    [% hold.barcodenumber | html %]
+                                    <input type="hidden" name="itemnumber" value="[% hold.itemnumber | html %]" />
+                                [% ELSE %]
+                                    No barcode
+                                [% END %]
+                            </a>
+                        </i>
                     [% ELSE %]
                         [% IF hold.itemtype %]
-                            <li>
-                                <i>Next available [% ItemTypes.GetDescription( hold.itemtype ) | html %] item</i>
-                            </li>
+                            <i>Next available [% ItemTypes.GetDescription( hold.itemtype ) | html %] item</i>
                         [% ELSE %]
-                            <li>
-                                <i>Next available</i>
-                            </li>
+                            <i>Next available</i>
                         [% END %]
 
                         <input type="hidden" name="itemnumber" value="" />
                     [% END %]
                 [% END %]
                 [% IF hold.non_priority %]
-                    <li>
-                        <i>Non priority hold</i>
-                    </li>
+                    <br><i>Non priority hold</i>
                 [% END %]
-                </ul>
             </td>
 
             [% IF ( CAN_user_reserveforothers_modify_holds_priority ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
index 36ca0a538f..984a71c415 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
@@ -480,7 +480,7 @@
                             <li id="non_priority_list_item">
                                 <label for="non_priority">Non priority hold:</label>
                                 <input name="non_priority" id="non_priority" type="checkbox" />
-                                <div class="hint">A non priority hold doesn't prevent a current checkout from renewing</div>
+                                <span class="hint">A non priority hold doesn't prevent a current checkout from renewing</span>
                             </li>
                         </ol>
 
-- 
2.39.5