From b8cf97645b2622b8a6eaa2ee147f89ae910fefa3 Mon Sep 17 00:00:00 2001
From: Christophe Maudoux <chrmdx@gmail.com>
Date: Thu, 12 Aug 2021 21:05:55 +0200
Subject: [PATCH] Be more consistent (#2589)

---
 .../site/templates/bootstrap/finduser.tpl     |  9 +++++---
 .../site/templates/bootstrap/gpgform.tpl      | 22 +++++++++++++++----
 .../site/templates/bootstrap/login.tpl        |  8 +++++++
 .../site/templates/bootstrap/openidform.tpl   |  9 ++++++++
 .../site/templates/bootstrap/sslform.tpl      |  9 ++++++++
 .../site/templates/bootstrap/standardform.tpl |  2 +-
 6 files changed, 51 insertions(+), 8 deletions(-)

diff --git a/lemonldap-ng-portal/site/templates/bootstrap/finduser.tpl b/lemonldap-ng-portal/site/templates/bootstrap/finduser.tpl
index aa6f986b6..0966899fc 100644
--- a/lemonldap-ng-portal/site/templates/bootstrap/finduser.tpl
+++ b/lemonldap-ng-portal/site/templates/bootstrap/finduser.tpl
@@ -34,17 +34,20 @@
                   <span class="input-group-text"><label for="<TMPL_VAR NAME="key">" class="mb-0"><i class="fa fa-binoculars"></i></label></span>
                 </div>
                 <input id="findUser_<TMPL_VAR NAME="key">" name="<TMPL_VAR NAME="key">" type="text" autocomplete="off" class="form-control" placeholder="<TMPL_VAR NAME="value">" />
+                <div class="input-group-prepend">
+                  <span class="input-group-text"><i class="fa fa-search"></i></span>
+                </div>
               </div>
             </TMPL_IF>
           </TMPL_LOOP>
         </div>
-        <div class="modal-footer">
-          <button id="closefinduserform" type="button" class="btn btn-secondary" data-dismiss="modal"><span trspan="close">Close</span></button>
+        <div class="modal-footer justify-content-between">
+          
+          <button id="closefinduserform" type="button" class="btn btn-secondary mr-auto" data-dismiss="modal"><span trspan="close">Close</span></button>
           <button id="finduserbutton" type="submit" class="btn btn-info" data-dismiss="modal">
             <span class="fa fa-search"></span>
             <span trspan="searchAccount">Search for an account</span>
           </button>
-          <button id="resetfinduserform" type="button" class="btn btn-primary"><span trspan="cancel">Cancel</span></button>
         </div>
       </form>
       </div>
diff --git a/lemonldap-ng-portal/site/templates/bootstrap/gpgform.tpl b/lemonldap-ng-portal/site/templates/bootstrap/gpgform.tpl
index 41ef728d8..188b585d8 100644
--- a/lemonldap-ng-portal/site/templates/bootstrap/gpgform.tpl
+++ b/lemonldap-ng-portal/site/templates/bootstrap/gpgform.tpl
@@ -37,10 +37,24 @@
   </a>
   </TMPL_IF>
 
+  <TMPL_IF NAME="DISPLAY_UPDATECERTIF">
+     <a class="btn btn-secondary" href="<TMPL_VAR NAME="MAILCERTIF_URL">?skin=<TMPL_VAR NAME="SKIN"><TMPL_IF NAME="key">&<TMPL_VAR NAME="CHOICE_PARAM">=<TMPL_VAR NAME="key"></TMPL_IF><TMPL_IF NAME="AUTH_URL">&url=<TMPL_VAR NAME="AUTH_URL"></TMPL_IF>">
+        <span class="fa fa-refresh"></span>
+        <span trspan="certificateReset">Reset my certificate</span>
+     </a>
+  </TMPL_IF>
+
+  <TMPL_IF NAME="DISPLAY_FINDUSER">
+    <button type="button" class="btn btn-secondary" data-toggle="modal" data-target="#finduserModal">
+      <span class="fa fa-search"></span>
+      <span trspan="searchAccount">Search for an account</span>
+    </button>
+  </TMPL_IF>
+
   <TMPL_IF NAME="DISPLAY_REGISTER">
-  <a class="btn btn-secondary" href="<TMPL_VAR NAME="REGISTER_URL">?skin=<TMPL_VAR NAME="SKIN"><TMPL_IF NAME="key">&<TMPL_VAR NAME="CHOICE_PARAM">=<TMPL_VAR NAME="key"></TMPL_IF><TMPL_IF NAME="AUTH_URL">&url=<TMPL_VAR NAME="AUTH_URL"></TMPL_IF>">
-    <span class="fa fa-plus-circle"></span>
-    <span trspan="createAccount">Create an account</span>
-  </a>
+    <a class="btn btn-secondary" href="<TMPL_VAR NAME="REGISTER_URL">?skin=<TMPL_VAR NAME="SKIN"><TMPL_IF NAME="key">&<TMPL_VAR NAME="CHOICE_PARAM">=<TMPL_VAR NAME="key"></TMPL_IF><TMPL_IF NAME="AUTH_URL">&url=<TMPL_VAR NAME="AUTH_URL"></TMPL_IF>">
+      <span class="fa fa-plus-circle"></span>
+      <span trspan="createAccount">Create an account</span>
+    </a>
   </TMPL_IF>
 </div>
diff --git a/lemonldap-ng-portal/site/templates/bootstrap/login.tpl b/lemonldap-ng-portal/site/templates/bootstrap/login.tpl
index 9f86b07ab..a4ce0cca1 100644
--- a/lemonldap-ng-portal/site/templates/bootstrap/login.tpl
+++ b/lemonldap-ng-portal/site/templates/bootstrap/login.tpl
@@ -218,6 +218,14 @@
       </button>
       </div>
     </div>
+    <TMPL_IF NAME="DISPLAY_FINDUSER">
+      <div class="actions">
+      <button type="button" class="btn btn-secondary" data-toggle="modal" data-target="#finduserModal">
+        <span class="fa fa-search"></span>
+        <span trspan="searchAccount">Search for an account</span>
+      </button>
+      </div>
+    </TMPL_IF>
     </form>
   </div>
   </TMPL_IF>
diff --git a/lemonldap-ng-portal/site/templates/bootstrap/openidform.tpl b/lemonldap-ng-portal/site/templates/bootstrap/openidform.tpl
index a8a15e50e..1ba89a976 100644
--- a/lemonldap-ng-portal/site/templates/bootstrap/openidform.tpl
+++ b/lemonldap-ng-portal/site/templates/bootstrap/openidform.tpl
@@ -14,3 +14,12 @@
     <span trspan="connect">Connect</span>
   </button>
 </div>
+
+<TMPL_IF NAME="DISPLAY_FINDUSER">
+  <div class="actions">
+  <button type="button" class="btn btn-secondary" data-toggle="modal" data-target="#finduserModal">
+    <span class="fa fa-search"></span>
+    <span trspan="searchAccount">Search for an account</span>
+  </button>
+  </div>
+</TMPL_IF>
\ No newline at end of file
diff --git a/lemonldap-ng-portal/site/templates/bootstrap/sslform.tpl b/lemonldap-ng-portal/site/templates/bootstrap/sslform.tpl
index 34ff09f07..29ae6aac8 100644
--- a/lemonldap-ng-portal/site/templates/bootstrap/sslform.tpl
+++ b/lemonldap-ng-portal/site/templates/bootstrap/sslform.tpl
@@ -18,3 +18,12 @@
     <span trspan="connect">Connect</span>
   </button>
 </div>
+
+<TMPL_IF NAME="DISPLAY_FINDUSER">
+  <div class="actions">
+  <button type="button" class="btn btn-secondary" data-toggle="modal" data-target="#finduserModal">
+    <span class="fa fa-search"></span>
+    <span trspan="searchAccount">Search for an account</span>
+  </button>
+  </div>
+</TMPL_IF>
diff --git a/lemonldap-ng-portal/site/templates/bootstrap/standardform.tpl b/lemonldap-ng-portal/site/templates/bootstrap/standardform.tpl
index 63b33056c..3a6256e59 100644
--- a/lemonldap-ng-portal/site/templates/bootstrap/standardform.tpl
+++ b/lemonldap-ng-portal/site/templates/bootstrap/standardform.tpl
@@ -59,7 +59,7 @@
         <span class="fa fa-refresh"></span>
         <span trspan="certificateReset">Reset my certificate</span>
      </a>
-   </TMPL_IF>
+  </TMPL_IF>
 
   <TMPL_IF NAME="DISPLAY_FINDUSER">
     <button type="button" class="btn btn-secondary" data-toggle="modal" data-target="#finduserModal">