From fe07102b37d01b2e7b9fd072c0197cb86b314496 Mon Sep 17 00:00:00 2001
From: Fridolin Somers <fridolin.somers@biblibre.com>
Date: Tue, 10 Aug 2021 11:47:26 -1000
Subject: [PATCH] Bug 28839: Better texts in stage MARC for import

Tool stage MARC for import is /cgi-bin/koha/tools/stage-marc-import.pl.
Its form contains texts in legends, labels, hints.

I feel like :
Labels are sometimes too long, showing them on multilines, like "Modify record using the following template". Long texts should be in legend or hint.
Legend are sometimes contains redundant text, like "Stage records into the reservoir".
Section beginning with "Comments about this file" is missing a legend, it looks like it is part of the upper section for profile.

Also lengends should be driving the user, that is why optional parts
contains a legend with "?".

Test plan :
Compare texts in page without and with patch

Signed-off-by: Barbara Johnson <barbara.johnson@bedfordtx.gov>

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

Bug 28839: (QA follow-up) Fix tabs/indentation in code paragraph

QA tools complained about a tab char. Cleaned up the template paragraph
it pointed out, removing tabs and correcting indentation.

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

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 .../en/modules/tools/stage-marc-import.tt     | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt
index 4cd9e4b456..bfb63b7385 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt
@@ -97,20 +97,21 @@
 </ul>
 <form method="post" action="[% SCRIPT_NAME | html %]" id="uploadfile" enctype="multipart/form-data">
 <fieldset class="rows" id="uploadform">
-<legend>Stage records into the reservoir</legend>
+<legend>Upload a file to stage</legend>
 <ol>
-	<li>
+    <li>
         <div id="fileuploadform">
-		<label for="fileToUpload">Select the file to stage: </label>
-		<input type="file" id="fileToUpload" name="fileToUpload" />
-        </div>	</li>
+            <label for="fileToUpload">File: </label>
+            <input type="file" id="fileToUpload" name="fileToUpload" />
+        </div>
+    </li>
 </ol>
     <fieldset class="action">
         <button id="fileuploadbutton">Upload file</button>
         <button id="fileuploadcancel">Cancel</button>
     </fieldset>
 </fieldset>
-		
+
     <div id="fileuploadpanel">
         <div id="fileuploadstatus" class="progress_panel">Upload progress:
             <progress id="fileuploadprogress" max="100" value="0">
@@ -122,10 +123,10 @@
 </form>
 
 <fieldset class="rows" id="profile_fieldset">
-    <legend>Profile settings</legend>
+    <legend>Pre-fill values with profile?</legend>
     <ol>
         <li>
-            <label for="profile">Pre-fill values with profile</label>
+            <label for="profile">Profile: </label>
             <select name="profile" id="profile">
                 <option value="">Do not use profile</option>
             </select>
@@ -145,6 +146,7 @@
         <input type="hidden" name="uploadedfileid" id="uploadedfileid" value="" />
         <input type="hidden" name="runinbackground" id="runinbackground" value="" />
         <input type="hidden" name="completedJobID" id="completedJobID" value="" />
+    <legend>Settings</legend>
 	<ol><li>
 		<label for="comments">Comments about this file: </label>
 		<input type="text" id="comments" name="comments" />
@@ -182,12 +184,12 @@
 
   [% IF MarcModificationTemplatesLoop %]
     <fieldset class="rows">
-      <legend>Use MARC Modification Template:</legend>
+      <legend>Modify records using a MARC modification template?</legend>
       <ol>
         <li>
-          <label for="comments">Modify record using the following template: </label>
+          <label for="comments">Template: </label>
           <select name="marc_modification_template_id" id="marc_modification_template_id">
-            <option value="">Do not use.</option>
+            <option value="">Do not use template</option>
               [% FOREACH mmt IN MarcModificationTemplatesLoop %]
                 <option value="[% mmt.template_id | html %]">[% mmt.name | html %]</option>
               [% END %]
-- 
2.39.2