From e30ebbbabe062c422db48660599c48e989d8631d Mon Sep 17 00:00:00 2001
From: Fridolin Somers <fridolin.somers@biblibre.com>
Date: Tue, 10 Aug 2021 12:03:58 -1000
Subject: [PATCH] Bug 28840: Better texts in batch record modification/deletion

Tools batch record modification/deletion form contains texts in legends, labels, hints.

I feel like :
Labels are sometimes too long, showing them on multi-lines, like "Modify record using the following template". Long texts should be in legend or hint.
Legend are sometimes contains redundant text, like in tabs.
Also I propose to use "record id" instead of "record number".

Test plan :
Compare texts in page without and with patch
---
 .../prog/en/modules/tools/batch_delete_records.tt  | 10 ++++------
 .../en/modules/tools/batch_record_modification.tt  | 14 ++++++--------
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt
index 14341364b6..e7b735c786 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt
@@ -77,12 +77,11 @@
         <ul>
           <li><a href="#uploadfile_tab">Upload a file</a></li>
           [% IF lists.count %]<li id="show_list_option"><a href="#shelves_tab">Select a list of records</a></li>[% END %]
-          <li><a href="#enterlist_tab">Enter a list of record numbers</a></li>
+          <li><a href="#enterlist_tab">Enter a list of record ids</a></li>
         </ul>
 
         <div id="uploadfile_tab">
           <fieldset class="rows">
-            <legend>Use a file</legend>
             <ol>
               <li><label for="uploadfile">File: </label> <input type="file" id="uploadfile" name="uploadfile" /></li>
             </ol>
@@ -93,10 +92,9 @@
         [% IF lists.count %]
             <div id="shelves_tab">
               <fieldset class="rows">
-                <legend>Or select a list of records</legend>
                 <ol>
                   <li>
-                    <label for="shelf_number">Use records from the following list: </label>
+                    <label for="shelf_number">List: </label>
                     <select name="shelf_number" id="shelf_number">
                       <option value="">Select a list</option>
                         [% FOREACH list IN lists %]
@@ -113,11 +111,11 @@
 
         <div id="enterlist_tab">
           <fieldset class="rows">
-            <legend>Or enter a list of record numbers</legend>
             <ol>
               <li>
-                <label for="recordnumber_list">List of biblionumbers or authority ids (one per line): </label>
+                <label for="recordnumber_list">Ids: </label>
                 <textarea rows="10" cols="30" id="recordnumber_list" name="recordnumber_list"></textarea>
+                <div class="hint">Enter a list of biblionumbers or authority ids, one per line.</div>
               </li>
             </ol>
           </fieldset>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt
index 950854285c..dfb0d9d1df 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt
@@ -78,12 +78,11 @@
                                 <ul>
                                     <li><a href="#uploadfile_tab">Upload a file</a></li>
                                         [% IF lists.count %]<li id="show_list_option"><a href="#shelves_tab">Select a list of records</a></li>[% END %]
-                                    <li><a href="#enterlist_tab">Enter a list of record numbers</a></li>
+                                    <li><a href="#enterlist_tab">Enter a list of record ids</a></li>
                                 </ul>
 
                                 <div id="uploadfile_tab">
                                     <fieldset class="rows">
-                                        <legend>Use a file</legend>
                                         <ol>
                                             <li><label for="uploadfile">File: </label> <input type="file" id="uploadfile" name="uploadfile" /></li>
                                         </ol>
@@ -94,10 +93,9 @@
                                 [% IF lists.count %]
                                     <div id="shelves_tab">
                                         <fieldset class="rows">
-                                            <legend>Or select a list of records</legend>
                                             <ol>
                                                 <li>
-                                                    <label for="shelf_number">Use records from the following list: </label>
+                                                    <label for="shelf_number">List: </label>
                                                     <select name="shelf_number" id="shelf_number">
                                                         <option value="">Select a list</option>
                                                         [% FOREACH list IN lists %]
@@ -114,11 +112,11 @@
 
                                 <div id="enterlist_tab">
                                     <fieldset class="rows">
-                                        <legend>Or enter a list of record numbers</legend>
                                         <ol>
                                             <li>
-                                                <label for="recordnumber_list">List of biblionumbers or authority ids (one per line): </label>
+                                                <label for="recordnumber_list">Ids: </label>
                                                 <textarea rows="10" cols="30" id="recordnumber_list" name="recordnumber_list"></textarea>
+                                                <div class="hint">Enter a list of biblionumbers or authority ids, one per line.</div>
                                             </li>
                                         </ol>
                                     </fieldset>
@@ -128,10 +126,10 @@
                             </div> <!-- /#batch_mod_form -->
 
                             <fieldset class="rows">
-                                <legend>Use MARC Modification Template:</legend>
+                                <legend>MARC modification template</legend>
                                 <ol>
                                     <li>
-                                        <label for="marc_modification_template_id" class="required">Modify record using the following template: </label>
+                                        <label for="marc_modification_template_id" class="required">Template: </label>
                                         <select name="marc_modification_template_id" id="marc_modification_template_id" required="required">
                                             <option value="">Select a template</option>
                                             [% FOREACH mmt IN MarcModificationTemplatesLoop %]
-- 
2.32.0