From 028e03d8b1a5979d0e93df5c084fa794ff08c87a Mon Sep 17 00:00:00 2001
From: Christophe Maudoux <chrmdx@gmail.com>
Date: Thu, 5 Aug 2021 22:59:33 +0200
Subject: [PATCH] Be more consistent (#2585)

---
 lemonldap-ng-portal/site/templates/bootstrap/captcha.tpl      | 2 +-
 .../site/templates/bootstrap/certificateReset.tpl             | 2 +-
 lemonldap-ng-portal/site/templates/bootstrap/checkdevops.tpl  | 2 +-
 lemonldap-ng-portal/site/templates/bootstrap/checkuser.tpl    | 2 +-
 lemonldap-ng-portal/site/templates/bootstrap/gpgform.tpl      | 2 +-
 lemonldap-ng-portal/site/templates/bootstrap/mail.tpl         | 2 +-
 lemonldap-ng-portal/site/templates/bootstrap/register.tpl     | 4 ++--
 lemonldap-ng-portal/t/41-Captcha.t                            | 2 +-
 .../t/67-CheckUser-with-Impersonation-and-Macros.t            | 4 ++--
 9 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/lemonldap-ng-portal/site/templates/bootstrap/captcha.tpl b/lemonldap-ng-portal/site/templates/bootstrap/captcha.tpl
index ab58ea8bf..cff170998 100644
--- a/lemonldap-ng-portal/site/templates/bootstrap/captcha.tpl
+++ b/lemonldap-ng-portal/site/templates/bootstrap/captcha.tpl
@@ -5,7 +5,7 @@
 <!-- //endif -->
 
 <div class="form-group">
-  <img class="renewcaptchaclick" src="<TMPL_VAR NAME="STATIC_PREFIX">common/icons/arrow_refresh.png" alt="Renew Captcha" title="Renew Captcha" autocomplete="one-time-code" class="img-thumbnail mb-3" />
+  <img class="renewcaptchaclick" src="<TMPL_VAR NAME="STATIC_PREFIX">common/icons/arrow_refresh.png" alt="Renew Captcha" title="Renew Captcha" class="img-thumbnail mb-3" autocomplete="one-time-code" />
   <img id="captcha" src="<TMPL_VAR NAME=CAPTCHA_SRC>" class="img-thumbnail" />
 </div>
 <div class="input-group mb-3">
diff --git a/lemonldap-ng-portal/site/templates/bootstrap/certificateReset.tpl b/lemonldap-ng-portal/site/templates/bootstrap/certificateReset.tpl
index 0f7295ba8..23171e6fa 100644
--- a/lemonldap-ng-portal/site/templates/bootstrap/certificateReset.tpl
+++ b/lemonldap-ng-portal/site/templates/bootstrap/certificateReset.tpl
@@ -25,7 +25,7 @@
         <div class="input-group-prepend">
           <span class="input-group-text"><label for="mailfield" class="mb-0"><i class="fa fa-envelope"></i></label></span>
         </div>
-        <input id="mailfield" name="mail" type="text" value="<TMPL_VAR NAME="MAIL">" class="form-control" autocomplete="email" trplaceholder="mail" required />
+        <input id="mailfield" name="mail" type="text" value="<TMPL_VAR NAME="MAIL">" class="form-control"  trplaceholder="mail" required autocomplete="email" />
       </div>
 
       <TMPL_IF NAME=CAPTCHA_SRC>
diff --git a/lemonldap-ng-portal/site/templates/bootstrap/checkdevops.tpl b/lemonldap-ng-portal/site/templates/bootstrap/checkdevops.tpl
index 09f4934f0..90f647791 100644
--- a/lemonldap-ng-portal/site/templates/bootstrap/checkdevops.tpl
+++ b/lemonldap-ng-portal/site/templates/bootstrap/checkdevops.tpl
@@ -33,7 +33,7 @@
       <input type="hidden" name="token" value="<TMPL_VAR NAME="TOKEN">" />
     </TMPL_IF>
     <TMPL_IF NAME="DOWNLOAD">
-      <input id="urlfield" name="url" type="text" class="form-control" value="<TMPL_VAR NAME="URL">" autocomplete="url" trplaceholder="URL / DNS" aria-required="true"/>
+      <input id="urlfield" name="url" type="text" class="form-control" value="<TMPL_VAR NAME="URL">" trplaceholder="URL / DNS" aria-required="true" autocomplete="url" />
       <pre><textarea id="checkDevOpsFile" name="checkDevOpsFile" class="form-control rounded-1" rows="6" trplaceholder="pasteHere"><TMPL_VAR NAME="FILE"></textarea></pre>
     <TMPL_ELSE>
       <pre><textarea id="checkDevOpsFile" name="checkDevOpsFile" class="form-control rounded-1" rows="6" trplaceholder="pasteHere" required><TMPL_VAR NAME="FILE"></textarea></pre>
diff --git a/lemonldap-ng-portal/site/templates/bootstrap/checkuser.tpl b/lemonldap-ng-portal/site/templates/bootstrap/checkuser.tpl
index 2f181aed8..912fd9d4c 100644
--- a/lemonldap-ng-portal/site/templates/bootstrap/checkuser.tpl
+++ b/lemonldap-ng-portal/site/templates/bootstrap/checkuser.tpl
@@ -17,7 +17,7 @@
         <div class="input-group-prepend">
           <span class="input-group-text"><label for="urlfield" class="mb-0"><i class="fa fa-link"></i></label></span>
         </div>
-        <input id="urlfield" name="url" type="text" class="form-control" value="<TMPL_VAR NAME="URL">" autocomplete="url" trplaceholder="URL / DNS" aria-required="true"/>
+        <input id="urlfield" name="url" type="text" class="form-control" value="<TMPL_VAR NAME="URL">" trplaceholder="URL / DNS" aria-required="true" autocomplete="url" />
       </div>
       <button type="submit" class="btn btn-success">
         <span class="fa fa-search"></span>
diff --git a/lemonldap-ng-portal/site/templates/bootstrap/gpgform.tpl b/lemonldap-ng-portal/site/templates/bootstrap/gpgform.tpl
index dc7e4a967..4536a29b8 100644
--- a/lemonldap-ng-portal/site/templates/bootstrap/gpgform.tpl
+++ b/lemonldap-ng-portal/site/templates/bootstrap/gpgform.tpl
@@ -5,7 +5,7 @@
     <div class="input-group-prepend">
       <span class="input-group-text"><label for="userfield" class="mb-0"><i class="fa fa-user"></i></label></span>
     </div>
-    <input id="userfield" name="user" type="text" class="form-control" value="<TMPL_VAR NAME="LOGIN">" autocomplete="email" trplaceholder="mail" required aria-required="true"/>
+    <input id="userfield" name="user" type="text" class="form-control" value="<TMPL_VAR NAME="LOGIN">" trplaceholder="mail" required aria-required="true" autocomplete="email" />
   </div>
 
   <div class="input-group mb-3">
diff --git a/lemonldap-ng-portal/site/templates/bootstrap/mail.tpl b/lemonldap-ng-portal/site/templates/bootstrap/mail.tpl
index 36959a961..197b670f4 100644
--- a/lemonldap-ng-portal/site/templates/bootstrap/mail.tpl
+++ b/lemonldap-ng-portal/site/templates/bootstrap/mail.tpl
@@ -25,7 +25,7 @@
         <div class="input-group-prepend">
           <span class="input-group-text"><label for="mail" class="mb-0"><i class="fa fa-envelope"></i></label></span>
         </div>
-        <input id="mail" name="mail" type="text" value="<TMPL_VAR NAME="MAIL">" class="form-control" autocomplete="email" trplaceholder="mail" required />
+        <input id="mail" name="mail" type="text" value="<TMPL_VAR NAME="MAIL">" class="form-control" trplaceholder="mail" required autocomplete="email" />
       </div>
 
       <TMPL_IF NAME=CAPTCHA_SRC>
diff --git a/lemonldap-ng-portal/site/templates/bootstrap/register.tpl b/lemonldap-ng-portal/site/templates/bootstrap/register.tpl
index 16f88fffa..488f2bf77 100644
--- a/lemonldap-ng-portal/site/templates/bootstrap/register.tpl
+++ b/lemonldap-ng-portal/site/templates/bootstrap/register.tpl
@@ -23,7 +23,7 @@
       <div class="input-group-prepend">
         <span class="input-group-text"><label for="firstnamefield" class="mb-0"><i class="fa fa-user"></i></label></span>
       </div>
-      <input id="firstnamefield" name="firstname" type="text" value="<TMPL_VAR NAME="FIRSTNAME">" class="form-control" autocomplete="given-name" trplaceholder="firstName" required aria-required="true"/>
+      <input id="firstnamefield" name="firstname" type="text" value="<TMPL_VAR NAME="FIRSTNAME">" class="form-control" trplaceholder="firstName" required aria-required="true" autocomplete="given-name" />
     </div>
 
     <div class="input-group mb-3">
@@ -37,7 +37,7 @@
       <div class="input-group-prepend">
         <span class="input-group-text"><label for="mailfield" class="mb-0"><i class="fa fa-envelope"></i></label></span>
       </div>
-      <input id="mailfield" name="mail" type="text" value="<TMPL_VAR NAME="MAIL">" class="form-control" autocomplete="email" trplaceholder="mail" required aria-required="true"/>
+      <input id="mailfield" name="mail" type="text" value="<TMPL_VAR NAME="MAIL">" class="form-control" trplaceholder="mail" required aria-required="true" autocomplete="email" />
     </div>
 
     <TMPL_IF NAME=CAPTCHA_SRC>
diff --git a/lemonldap-ng-portal/t/41-Captcha.t b/lemonldap-ng-portal/t/41-Captcha.t
index d0966ddd6..8be3beaa0 100644
--- a/lemonldap-ng-portal/t/41-Captcha.t
+++ b/lemonldap-ng-portal/t/41-Captcha.t
@@ -134,7 +134,7 @@ m%<input[^>]*name="password"%,
         ' New captcha image inserted' );
     ok(
         $res->[2]->[0] =~
-m#<img class="renewcaptchaclick" src="/static/common/icons/arrow_refresh.png" alt="Renew Captcha" title="Renew Captcha" autocomplete="one-time-code" class="img-thumbnail mb-3" />#,
+m#<img class="renewcaptchaclick" src="/static/common/icons/arrow_refresh.png" alt="Renew Captcha" title="Renew Captcha" class="img-thumbnail mb-3" autocomplete="one-time-code" />#,
         ' Renew Captcha button found'
     ) or explain( $res->[2]->[0], 'Renew captcha button not found' );
     ok( $res->[2]->[0] =~ /captcha\.(?:min\.)?js/, 'Get captcha javascript' );
diff --git a/lemonldap-ng-portal/t/67-CheckUser-with-Impersonation-and-Macros.t b/lemonldap-ng-portal/t/67-CheckUser-with-Impersonation-and-Macros.t
index d6afb1de9..bd9e35d30 100644
--- a/lemonldap-ng-portal/t/67-CheckUser-with-Impersonation-and-Macros.t
+++ b/lemonldap-ng-portal/t/67-CheckUser-with-Impersonation-and-Macros.t
@@ -124,7 +124,7 @@ count(1);
   expectForm( $res, undef, '/checkuser', 'user', 'url' );
 ok(
     $res->[2]->[0] =~
-m%<input id="urlfield" name="url" type="text" class="form-control" value="http://test1.example.com" autocomplete="url" trplaceholder="URL / DNS"%,
+m%<input id="urlfield" name="url" type="text" class="form-control" value="http://test1.example.com" trplaceholder="URL / DNS" aria-required="true" autocomplete="url" />%,
     'Found HTTP url'
 ) or explain( $res->[2]->[0], 'HTTP url' );
 ok(
@@ -224,7 +224,7 @@ ok(
   expectForm( $res, undef, '/checkuser', 'user', 'url' );
 ok(
     $res->[2]->[0] =~
-m%<input id="urlfield" name="url" type="text" class="form-control" value="https://test2.example.com" autocomplete="url" trplaceholder="URL / DNS"%,
+m%<input id="urlfield" name="url" type="text" class="form-control" value="https://test2.example.com" trplaceholder="URL / DNS" aria-required="true" autocomplete="url" />%,
     'Found HTTPS url'
 ) or explain( $res->[2]->[0], 'HTTP url' );
 count(2);