From 5fbbdb915f9a41070ff71aac902622f0a7bb5ef7 Mon Sep 17 00:00:00 2001
From: Christopher Brannon <cbrannon@cdalibrary.org>
Date: Sun, 16 Sep 2018 22:06:10 +0000
Subject: [PATCH] Bug 13272: Adds type="text" to inputs missing it

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 92a2d74c1c134674b9798981208b9ad5863a6b42)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
---
 .../prog/en/includes/borrower_debarments.inc              | 4 ++--
 koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc   | 5 +++--
 koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc  | 4 ++--
 koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc  | 4 ++--
 .../intranet-tmpl/prog/en/includes/patron-search.inc      | 4 ++--
 .../intranet-tmpl/prog/en/modules/acqui/z3950_search.tt   | 4 ++--
 .../intranet-tmpl/prog/en/modules/admin/smart-rules.tt    | 4 ++--
 .../prog/en/modules/cataloguing/z3950_auth_search.tt      | 4 ++--
 .../prog/en/modules/cataloguing/z3950_search.tt           | 4 ++--
 .../intranet-tmpl/prog/en/modules/circ/branchtransfers.tt | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt   | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt     | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt   | 6 +++---
 .../prog/en/modules/members/memberentrygen.tt             | 2 +-
 .../intranet-tmpl/prog/en/modules/members/paycollect.tt   | 6 +++---
 .../intranet-tmpl/prog/en/modules/reserve/request.tt      | 4 ++--
 .../prog/en/modules/tools/import_borrowers.tt             | 8 ++++----
 17 files changed, 35 insertions(+), 34 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc
index 92dda54b34..2155b47e75 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc
@@ -58,8 +58,8 @@
             <fieldset class="rows" id="manual_restriction_form">
                 <legend>Add manual restriction</legend>
                 <ol>
-                    <li><label for="rcomment">Comment:</label> <input type="text" id="rcomment" name="comment" /></li>
-                    <li><label for="rexpiration">Expiration:</label> <input name="expiration" id="rexpiration" size="10" value="" class="datepicker" />
+                    <li><label for="rcomment">Comment:</label> <input type="text" id="rcomment" name="comment" type="text" /></li>
+                    <li><label for="rexpiration">Expiration:</label> <input name="expiration" id="rexpiration" size="10" value="" class="datepicker" type="text" />
                         <a href="#" class="clear-date" id="clear-date-rexpiration">Clear date</a></li>
                 </ol>
             <fieldset class="action"><input type="submit" value="Add restriction" /> <a href="#" class="cancel" id="cancel_manual_restriction">Cancel</a></fieldset>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc
index ada7f193b4..fed4a65135 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc
@@ -9,14 +9,15 @@
 <div id="checkin_search" class="residentsearch">
     <p class="tip">Scan a barcode to check in:</p>
     <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off">
-        <input class="head-searchbox" name="barcode" id="ret_barcode" size="40" />
+        <input class="head-searchbox" name="barcode" id="ret_barcode" size="40" type="text" />
+
         <input value="Submit" class="submit" type="submit" />
     </form>
 </div>
 <div id="renew_search" class="residentsearch">
     <p class="tip">Scan a barcode to renew:</p>
     <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off">
-        <input class="head-searchbox" name="barcode" id="ren_barcode" size="40" />
+        <input class="head-searchbox" name="barcode" id="ren_barcode" size="40" type="text" />
         <input value="Submit" class="submit" type="submit" />
     </form>
 </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc
index 7fec2dd754..a5a9f277ac 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc
@@ -8,14 +8,14 @@
 <div id="checkin_search" class="residentsearch">
     <p class="tip">Scan a barcode to check in:</p>
     <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off">
-        <input class="head-searchbox" name="barcode" id="ret_barcode" size="40" accesskey="r" />
+        <input class="head-searchbox" name="barcode" id="ret_barcode" size="40" accesskey="r" type="text" />
         <input value="Submit" class="submit" type="submit" />
     </form>
 </div>
 <div id="renew_search" class="residentsearch">
     <p class="tip">Scan a barcode to renew:</p>
     <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off">
-        <input class="head-searchbox" name="barcode" id="ren_barcode" size="40" />
+        <input class="head-searchbox" name="barcode" id="ren_barcode" size="40" type="text" />
         <input value="Submit" class="submit" type="submit" />
     </form>
 </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc
index 59ddcecc6c..5ca135a8a4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc
@@ -8,14 +8,14 @@
 <div id="checkin_search" class="residentsearch">
     <p class="tip">Scan a barcode to check in:</p>
     <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off">
-        <input name="barcode" class="head-searchbox" id="ret_barcode" size="40" accesskey="r" />
+        <input name="barcode" class="head-searchbox" id="ret_barcode" size="40" accesskey="r" type="text" />
         <input value="Submit" class="submit" type="submit" />
     </form>
 </div>
 <div id="renew_search" class="residentsearch">
     <p class="tip">Scan a barcode to renew:</p>
         <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off">
-            <input class="head-searchbox" name="barcode" id="ren_barcode" size="40" />
+            <input class="head-searchbox" name="barcode" id="ren_barcode" size="40" type="text" />
             <input value="Submit" class="submit" type="submit" />
         </form>
     </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
index 84e67a30ae..f36d856e4c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
@@ -123,14 +123,14 @@
     <div id="checkin_search" class="residentsearch">
     <p class="tip">Scan a barcode to check in:</p>
     <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off">
-    <input class="head-searchbox" name="barcode" id="ret_barcode" size="40" accesskey="r" />
+    <input class="head-searchbox" name="barcode" id="ret_barcode" size="40" accesskey="r" type="text" />
     <input value="Submit" class="submit" type="submit" />
     </form>
     </div>
         <div id="renew_search" class="residentsearch">
         <p class="tip">Scan a barcode to renew:</p>
             <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off">
-                <input class="head-searchbox" name="barcode" id="ren_barcode" size="40" />
+                <input class="head-searchbox" name="barcode" id="ren_barcode" size="40" type="text" />
                 <input value="Submit" class="submit" type="submit" />
             </form>
         </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt
index 81445f0a03..2efafde19b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt
@@ -166,7 +166,7 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :
         [% IF ( show_nextbutton ) %]
             <input type="button" name="changepage_next" value="Next page" data-currentpage="[% current_page %]" />
         [% END %]
-        <br />Go to page : <input id="goto_page" name="goto_page" value="[% current_page %]" size="4" /><input type="submit" name="changepage_goto" value="Go" />
+        <br />Go to page : <input id="goto_page" name="goto_page" value="[% current_page | html %]" size="4" type="text" /> <input type="submit" name="changepage_goto" value="Go" />
     </form>
 
     [% ELSE %]
@@ -227,4 +227,4 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :
     [% Asset.js("js/z3950_search.js") %]
 [% END %]
 
-[% INCLUDE 'intranet-bottom.inc' %]
\ No newline at end of file
+[% INCLUDE 'intranet-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
index 86226cb7d3..5ecc0fdaed 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
@@ -524,8 +524,8 @@
                         [% END %]
                         </select>
                     </td>
-                    <td><input name="maxissueqty" size="3" /></td>
-                    <td><input name="maxonsiteissueqty" size="3" /></td>
+                    <td><input name="maxissueqty" size="3" type="text" /></td>
+                    <td><input name="maxonsiteissueqty" size="3" type="text" /></td>
                     <td class="actions"><button type="submit" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> Add</td>
                 </tr>
             </table>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt
index 5bc8f9d8d9..8d70acc8a6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt
@@ -143,7 +143,7 @@
         [% IF ( show_nextbutton ) %]
             <input type="button" name="changepage_next" value="Next page" data-currentpage="[% current_page %]" />
         [% END %]
-        <br />Go to page : <input id="goto_page" name="goto_page" value="[% current_page %]" size="4" /><input type="submit" name="changepage_goto" value="Go" />
+        <br />Go to page : <input id="goto_page" name="goto_page" value="[% current_page | html %]" size="4" type="text" /><input type="submit" name="changepage_goto" value="Go" />
     </form>
 
 <p><form method="get" action="/cgi-bin/koha/cataloguing/z3950_auth_search.pl"><input type="hidden" name="authid" value="[% authid %]" /><input type="submit" value="Try another search"/></form></p>
@@ -225,4 +225,4 @@
     [% Asset.js("js/z3950_search.js") %]
 [% END %]
 
-[% INCLUDE 'intranet-bottom.inc' popup_window=1 %]
\ No newline at end of file
+[% INCLUDE 'intranet-bottom.inc' popup_window=1 %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt
index 7325414d88..968c65544c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt
@@ -173,7 +173,7 @@
         [% IF ( show_nextbutton ) %]
             <input type="button" name="changepage_next" value="Next page" data-currentpage="[% current_page %]" />
         [% END %]
-        <br />Go to page : <input id="goto_page" name="goto_page" value="[% current_page %]" size="4" /><input type="submit" name="changepage_goto" value="Go" />
+        <br />Go to page : <input id="goto_page" name="goto_page" value="[% current_page | html %]" size="4" type="text" /><input type="submit" name="changepage_goto" value="Go" />
     </form>
 
     [% ELSE %]
@@ -246,4 +246,4 @@
     [% INCLUDE 'z3950_search.inc' %]
 [% END %]
 
-[% INCLUDE 'intranet-bottom.inc' popup_window=1 %]
\ No newline at end of file
+[% INCLUDE 'intranet-bottom.inc' popup_window=1 %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt
index 451f25221f..551620fc9b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt
@@ -152,7 +152,7 @@
             </li>
             <li>
                 <label for="barcode">Enter barcode: </label>
-                <input name="barcode" id="barcode" size="15" class="focus" /> <input type="submit" value="Submit" />
+                <input name="barcode" id="barcode" size="15" class="focus" type="text" /> <input type="submit" value="Submit" />
             </li>
 			</ol>
         </fieldset>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt
index 8014ab0a8e..2848e01b5f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt
@@ -93,7 +93,7 @@
                             <fieldset>
                                 <legend>Check In</legend>
                                 <label for="checkin-barcode">Enter item barcode: </label>
-                                <input name="barcode" id="checkin-barcode" size="14" class="focus"/>
+                                <input name="barcode" id="checkin-barcode" size="14" class="focus" type="text" />
                                 <input type="submit" class="submit" value="Submit" />
                             </fieldset>
                         </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt
index d4397e032f..f0a1c3740c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt
@@ -153,7 +153,7 @@
 
                             <label for="barcode">Enter item barcode: </label>
 
-                            <input name="barcode" id="barcode" size="14" class="focus"/>
+                            <input name="barcode" id="barcode" size="14" class="focus" type="text" />
 
                             <input type="submit" class="submit" value="Submit" />
                         </fieldset>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
index 15daf7dee3..bbb4bb916c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
@@ -559,11 +559,11 @@
 	<legend>Check in</legend>
             <label for="barcode">Enter item barcode: </label>
 			[% IF ( exemptfine ) %]
-			<input name="barcode" id="barcode" size="14" class="focus alert"/>
+			<input name="barcode" id="barcode" size="14" class="focus alert" type="text" />
 			[% ELSIF ( dropboxmode ) %]
-			<input name="barcode" id="barcode" size="14" class="focus alert"/>
+			<input name="barcode" id="barcode" size="14" class="focus alert" type="text" />
 			[% ELSE %]
-			<input name="barcode" id="barcode" size="14" class="focus"/>
+			<input name="barcode" id="barcode" size="14" class="focus" type="text" />
 			[% END %]
             <input type="submit" class="submit" value="Submit" />
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
index 31bd4f1834..5f1e90f049 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
@@ -954,7 +954,7 @@
                         <legend id="manual_restriction_lgd">Add manual restriction</legend>
                         <ol>
                             <li><label for="debarred_comment">Comment: </label><input type="text" id="debarred_comment" name="debarred_comment" onchange="$('#add_debarment').val(1);" /></li>
-                            <li><label for="debarred_expiration">Expiration: </label><input name="debarred_expiration" id="debarred_expiration" size="10" value="" class="datepicker" onchange="$('#add_debarment').val(1);" />
+                            <li><label for="debarred_expiration">Expiration: </label><input name="debarred_expiration" id="debarred_expiration" size="10" value="" class="datepicker" onchange="$('#add_debarment').val(1);" type="text" />
                                     <a href='javascript:void(0)' onclick="$('#debarred_expiration').val('');">Clear date</a></li>
 
                         </ol>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt
index fb42d4317a..939636634d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt
@@ -86,7 +86,7 @@
     <li>
         <label for="paid">Collect from patron: </label>
             <!-- default to paying all -->
-        <input name="paid" id="paid" value="[% amountoutstanding %]" />
+        <input name="paid" id="paid" value="[% amountoutstanding | html %]"  type="text" />
     </li>
     [% SET payment_types = AuthorisedValues.GetAuthValueDropbox('PAYMENT_TYPE') %]
     [% IF payment_types %]
@@ -142,7 +142,7 @@
                 <li>
                     <label for="paid">Writeoff amount: </label>
                     <!-- default to writing off all -->
-                    <input name="amountwrittenoff" id="amountwrittenoff" value="[% amountoutstanding | $Price on_editing => 1 %]" />
+                    <input name="amountwrittenoff" id="amountwrittenoff" value="[% amountoutstanding | $Price on_editing => 1 | html %]" type="text" />
                 </li>
             </ol>
         </fieldset>
@@ -169,7 +169,7 @@
     <li>
         <label for="paid">Collect from patron: </label>
         <!-- default to paying all -->
-        <input name="paid" id="paid" value="[% total | format('%.2f') %]" />
+        <input name="paid" id="paid" value="[% total | format('%.2f') %]" type="text" />
     </li>
     [% SET payment_types = AuthorisedValues.GetAuthValueDropbox('PAYMENT_TYPE') %]
     [% IF payment_types %]
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 91e9e5b754..652a935c70 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
@@ -427,14 +427,14 @@ function checkMultiHold() {
 	[% IF ( reserve_in_future ) %]
 	<li>
         <label for="from">Hold starts on date:</label>
-        <input name="reserve_date" id="from" size="10" class="datepickerfrom">
+        <input name="reserve_date" id="from" size="10" class="datepickerfrom" type="text" >
         <a href="#" id="clear-date-from" class="clear-date">Clear date</a>
 	</li>
 	[% END %]
 
 	<li>
         <label for="to">Hold expires on date:</label>
-        <input name="expiration_date" id="to" size="10" class="datepickerto" />
+        <input name="expiration_date" id="to" size="10" class="datepickerto" / type="text" >
         <a href="#" id="clear-date-to" class="clear-date">Clear date</a>
 	</li>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt
index f2b5c3c588..f416b08d50 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt
@@ -186,9 +186,9 @@
                         </li>
                     [% CASE %]
                         <li>
-                            <label class="description" for="[% borrower_field.field %]">[% borrower_field.description %]: </label>
-                            <input id="[% borrower_field.field %]" name="[% borrower_field.field %]" />
-                            <span class="field_hint">[% borrower_field.field %]</span>
+                            <label class="description" for="[% borrower_field.field | html %]">[% borrower_field.description | html %]: </label>
+                            <input id="[% borrower_field.field | html %]" name="[% borrower_field.field | html %]" type="text" />
+                            <span class="field_hint">[% borrower_field.field | html %]</span>
                         </li>
                     [% END %]
                 [% END %]
@@ -196,7 +196,7 @@
                 [% IF ( Koha.Preference('ExtendedPatronAttributes') == 1 ) %]
                     <li>
                         <label class="description" for="patron_attributes">Patron attributes: </label>
-                        <input id="patron_attributes" name="patron_attributes" />
+                        <input id="patron_attributes" name="patron_attributes" type="text" />
                         <span class="field_hint">patron_attributes</span>
                     </li>
                 [% END %]
-- 
2.39.5