WIP bootstrap4/fontawesome (#1504)

2018-09-23 20:18:57 +02:00 · 2018-09-23 20:18:57 +02:00 · 6e520b01b9
commit 6e520b01b9
parent 2157f98b75
4 changed files with 47 additions and 30 deletions
--- a/lemonldap-ng-portal/site/templates/bootstrap/checklogins.tpl
+++ b/lemonldap-ng-portal/site/templates/bootstrap/checklogins.tpl
@ -12,7 +12,7 @@
    </div>
    </TMPL_IF>
    <TMPL_IF NAME="STAYCONNECTED">
-    <div class="input-group">
+    <div class="input-group mb-3">
      <div class="input-group-prepend">
        <div class="input-group-text">
          <input type="checkbox" id="stayconnected" name="stayconnected" aria-describedby="stayConnectedLabel" />
--- a/lemonldap-ng-portal/site/templates/bootstrap/customfooter.tpl
+++ b/lemonldap-ng-portal/site/templates/bootstrap/customfooter.tpl
@ -1,8 +1,8 @@
  <!-- Custom HTML footer -->
    <p>
      <span trspan="serviceProvidedBy">Service provided by</span>
-      <a href="http://lemonldap-ng.org" target="_blank" class="btn btn-secondary btn-xs">
-        <span class="glyphicon glyphicon-new-window"></span>
+      <a href="https://lemonldap-ng.org" target="_blank" class="btn btn-secondary btn-sm">
+        <span class="fas fa-globe"></span>
        LemonLDAP::NG
      </a>
      <span trspan="gplSoft">free software covered by the GPL license</span>.
--- a/lemonldap-ng-portal/site/templates/bootstrap/mail.tpl
+++ b/lemonldap-ng-portal/site/templates/bootstrap/mail.tpl
@ -21,8 +21,10 @@

    <h3 trspan="forgotPwd">Forgot your password?</h3>

-    <div class="form-group input-group">
-      <span class="input-group-addon"><i class="glyphicon glyphicon-envelope"></i> </span>
+    <div class="input-group mb-3">
+      <div class="input-group-prepend">
+        <span class="input-group-text"><i class="fas fa-envelope"></i> </span>
+      </div>
      <input name="mail" type="text" value="<TMPL_VAR NAME="MAIL">" class="form-control" trplaceholder="mail" required />
    </div>

@ -30,8 +32,10 @@
    <div class="form-group">
      <img src="<TMPL_VAR NAME=CAPTCHA_SRC>" class="img-thumbnail" />
    </div>
-    <div class="form-group input-group">
-      <span class="input-group-addon"><i class="glyphicon glyphicon-eye-open"></i> </span>
+    <div class="input-group mb-3">
+      <div class="input-group-prepend">
+        <span class="input-group-text"><i class="fas fa-eye"></i> </span>
+      </div>
      <input type="text" name="captcha" size="<TMPL_VAR NAME=CAPTCHA_SIZE>" class="form-control" trplaceholder="captcha" required />
    </div>
    </TMPL_IF>
@ -39,8 +43,8 @@
      <input type="hidden" name="token" value="<TMPL_VAR NAME="TOKEN">" />
    </TMPL_IF>

-    <button type="submit" class="btn btn-success" >
-      <span class="glyphicon glyphicon-send"></span>
+    <button type="submit" class="btn btn-success">
+      <span class="fas fa-envelope-open-text"></span>
      <span trspan="sendPwd">Send me a new password</span>
    </button>
    
@ -71,16 +75,21 @@
      </p>


-      <div class="form-check">
-          <input class="form-check-input" id="resendconfirmation" type="checkbox" name="resendconfirmation" aria-describedby="resendconfirmationlabel">
+      <div class="input-group mb-3">
+        <div class="input-group-preprend">
+          <div class="input-group-text">
+            <input class="form-check-input" id="resendconfirmation" type="checkbox" name="resendconfirmation" aria-describedby="resendconfirmationlabel">
+          </div>
+        </div>
+        <p class="form-control">
          <label class="form-check-label" for="resendconfirmation" id="resendconfirmationlabel" trspan="confirmPwd">Yes, resend the mail</label>
+        </p>
      </div>

-      <div class="form-group">
-        <button type="submit" class="btn btn-success">
-          <span trspan="submit">Submit</span>
-        </button>
-      </div>
+      <button type="submit" class="btn btn-success">
+        <span class="fas fa-envelope-open-text"></span>
+        <span trspan="submit">Submit</span>
+      </button>

    </div>
    </form>
@ -103,26 +112,34 @@

        <h3 trspan="changePwd">Change your password</h3>

-        <div class="form-group input-group">
-          <span class="input-group-addon"><i class="glyphicon glyphicon-lock"></i> </span>
+        <div class="input-group mb-3">
+          <div class="input-group-prepend">
+            <span class="input-group-text"><i class="fas fa-lock"></i> </span>
+          </div>
          <input name="newpassword" type="password" class="form-control" trplaceholder="newPassword" />
        </div>

-        <div class="form-group input-group">
-          <span class="input-group-addon"><i class="glyphicon glyphicon-lock"></i> </span>
+        <div class="input-group mb-3">
+          <div class="input-group-prepend">
+            <span class="input-group-text"><i class="fas fa-lock"></i> </span>
          <input name="confirmpassword" type="password" class="form-control" trplaceholder="confirmPwd" />
        </div>

-        <div class="form-check">
-            <input class="form-check-input" id="reset" type="checkbox" name="reset" aria-describedby="resetlabel"/>
+        <div class="input-group mb-3">
+          <div class="input-group-prepend">
+            <div class="input-group-text">
+              <input class="form-check-input" id="reset" type="checkbox" name="reset" aria-describedby="resetlabel"/>
+            </div>
+          </div>
+          <p class="form-control">
            <label class="form-check-label" for="reset" id="resetlabel" trspan="generatePwd">Generate the password automatically</label>
+          </p>
        </div>

-        <div class="form-group">
-          <button type="submit" class="btn btn-success">
-            <span trspan="submit">Submit</span>
-          </button>
-        </div>
+        <button type="submit" class="btn btn-success">
+          <span class="fas fa-envelope-open-text"></span>
+          <span trspan="submit">Submit</span>
+        </button>

      </div>
      </form>
@ -157,7 +174,7 @@

  <div class="buttons">
    <a href="<TMPL_VAR NAME="PORTAL_URL">?skin=<TMPL_VAR NAME="SKIN"><TMPL_IF NAME="CHOICE_VALUE">&<TMPL_VAR NAME="CHOICE_PARAM">=<TMPL_VAR NAME="CHOICE_VALUE"></TMPL_IF><TMPL_IF NAME="AUTH_URL">&url=<TMPL_VAR NAME="AUTH_URL"></TMPL_IF>" class="btn btn-primary" role="button">
-      <span class="glyphicon glyphicon-home"></span>
+      <span class="fas fa-home"></span>
      <span trspan="back2Portal">Go back to portal</span>
    </a>
  </div>
--- a/lemonldap-ng-portal/site/templates/bootstrap/standardform.tpl
+++ b/lemonldap-ng-portal/site/templates/bootstrap/standardform.tpl
@ -38,14 +38,14 @@

 <div class="actions">
  <TMPL_IF NAME="DISPLAY_RESETPASSWORD">
-  <a class="btn btn-info" href="<TMPL_VAR NAME="MAIL_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>">
+  <a class="btn btn-secondary" href="<TMPL_VAR NAME="MAIL_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="fas fa-info-circle"></span>
    <span trspan="resetPwd">Reset my password</span>
  </a>
  </TMPL_IF>

  <TMPL_IF NAME="DISPLAY_REGISTER">
-  <a class="btn btn-warning" 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>">
+  <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="fas fa-plus-circle"></span>
    <span trspan="createAccount">Create an account</span>
  </a>