From 0ae3d49513303245656f2ad5826dc3bc6d16d75d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20OUDOT?= Date: Wed, 26 Sep 2018 18:14:34 +0200 Subject: [PATCH] Use FontAwesome 4 in templates (#1504) --- .../site/templates/bootstrap/2fchoice.tpl | 2 +- .../site/templates/bootstrap/2fregisters.tpl | 4 ++-- .../site/templates/bootstrap/confirm.tpl | 6 +++--- .../site/templates/bootstrap/customfooter.tpl | 2 +- .../site/templates/bootstrap/error.tpl | 4 ++-- .../site/templates/bootstrap/ext2fcheck.tpl | 6 +++--- .../site/templates/bootstrap/header.tpl | 6 +++--- .../site/templates/bootstrap/idpchoice.tpl | 4 ++-- .../site/templates/bootstrap/info.tpl | 4 ++-- .../site/templates/bootstrap/login.tpl | 10 +++++----- .../site/templates/bootstrap/mail.tpl | 16 ++++++++-------- .../site/templates/bootstrap/menu.tpl | 4 ++-- .../site/templates/bootstrap/notification.tpl | 2 +- .../site/templates/bootstrap/oidcConsents.tpl | 2 +- .../site/templates/bootstrap/openid.tpl | 2 +- .../site/templates/bootstrap/openidform.tpl | 2 +- .../site/templates/bootstrap/password.tpl | 10 +++++----- .../site/templates/bootstrap/public/test.tpl | 2 +- .../site/templates/bootstrap/register.tpl | 14 +++++++------- .../site/templates/bootstrap/sslform.tpl | 2 +- .../site/templates/bootstrap/standardform.tpl | 12 ++++++------ .../site/templates/bootstrap/totp2fcheck.tpl | 6 +++--- .../site/templates/bootstrap/totp2fregister.tpl | 8 ++++---- .../site/templates/bootstrap/u2fcheck.tpl | 2 +- .../site/templates/bootstrap/u2fregister.tpl | 8 ++++---- .../site/templates/bootstrap/upgradesession.tpl | 4 ++-- .../site/templates/bootstrap/utotp2fcheck.tpl | 8 ++++---- .../templates/bootstrap/yubikey2fregister.tpl | 4 ++-- .../site/templates/bootstrap/yubikeyform.tpl | 4 ++-- 29 files changed, 80 insertions(+), 80 deletions(-) diff --git a/lemonldap-ng-portal/site/templates/bootstrap/2fchoice.tpl b/lemonldap-ng-portal/site/templates/bootstrap/2fchoice.tpl index 4c9dd0878..069406c47 100644 --- a/lemonldap-ng-portal/site/templates/bootstrap/2fchoice.tpl +++ b/lemonldap-ng-portal/site/templates/bootstrap/2fchoice.tpl @@ -16,7 +16,7 @@
?cancel=1" class="btn btn-primary" role="button"> - + Cancel
diff --git a/lemonldap-ng-portal/site/templates/bootstrap/2fregisters.tpl b/lemonldap-ng-portal/site/templates/bootstrap/2fregisters.tpl index 6c3a1db05..96d0de49a 100644 --- a/lemonldap-ng-portal/site/templates/bootstrap/2fregisters.tpl +++ b/lemonldap-ng-portal/site/templates/bootstrap/2fregisters.tpl @@ -28,7 +28,7 @@ - + Unregister @@ -59,7 +59,7 @@ diff --git a/lemonldap-ng-portal/site/templates/bootstrap/confirm.tpl b/lemonldap-ng-portal/site/templates/bootstrap/confirm.tpl index 671bc8102..b89a141ea 100644 --- a/lemonldap-ng-portal/site/templates/bootstrap/confirm.tpl +++ b/lemonldap-ng-portal/site/templates/bootstrap/confirm.tpl @@ -28,11 +28,11 @@
@@ -57,7 +57,7 @@
diff --git a/lemonldap-ng-portal/site/templates/bootstrap/customfooter.tpl b/lemonldap-ng-portal/site/templates/bootstrap/customfooter.tpl index 0358055fb..341aea4cd 100644 --- a/lemonldap-ng-portal/site/templates/bootstrap/customfooter.tpl +++ b/lemonldap-ng-portal/site/templates/bootstrap/customfooter.tpl @@ -2,7 +2,7 @@

Service provided by - + LemonLDAP::NG free software covered by the GPL license. diff --git a/lemonldap-ng-portal/site/templates/bootstrap/error.tpl b/lemonldap-ng-portal/site/templates/bootstrap/error.tpl index 776589ef7..a1f9447ef 100644 --- a/lemonldap-ng-portal/site/templates/bootstrap/error.tpl +++ b/lemonldap-ng-portal/site/templates/bootstrap/error.tpl @@ -46,12 +46,12 @@

/?cancel=1&url=" class="btn btn-primary" role="button"> - + Go to portal " class="btn btn-danger" role="button"> - + Logout diff --git a/lemonldap-ng-portal/site/templates/bootstrap/ext2fcheck.tpl b/lemonldap-ng-portal/site/templates/bootstrap/ext2fcheck.tpl index ca8631619..1cd4f3d28 100644 --- a/lemonldap-ng-portal/site/templates/bootstrap/ext2fcheck.tpl +++ b/lemonldap-ng-portal/site/templates/bootstrap/ext2fcheck.tpl @@ -12,21 +12,21 @@ ">
- +

diff --git a/lemonldap-ng-portal/site/templates/bootstrap/header.tpl b/lemonldap-ng-portal/site/templates/bootstrap/header.tpl index 5b5eab1a1..54600afb7 100644 --- a/lemonldap-ng-portal/site/templates/bootstrap/header.tpl +++ b/lemonldap-ng-portal/site/templates/bootstrap/header.tpl @@ -14,17 +14,17 @@ //elsif:useexternallibs - + /css/styles.min.css" /> //elsif:cssminified bwr/bootstrap/dist/css/bootstrap.min.css" /> bwr/bootstrap/dist/css/bootstrap-theme.min.css" /> - bwr/font-awesome/dist/css/fontawesome-all.min.css" /> + bwr/font-awesome/css/font-awesome.min.css" /> /css/styles.min.css" /> //else --> bwr/bootstrap/dist/css/bootstrap.css" /> bwr/bootstrap/dist/css/bootstrap-theme.css" /> - bwr/font-awesome/dist/css/fontawesome-all.css" /> + bwr/font-awesome/css/font-awesome.css" /> /css/styles.css" /> diff --git a/lemonldap-ng-portal/site/templates/bootstrap/idpchoice.tpl b/lemonldap-ng-portal/site/templates/bootstrap/idpchoice.tpl index d62e24c14..4bda10d5a 100644 --- a/lemonldap-ng-portal/site/templates/bootstrap/idpchoice.tpl +++ b/lemonldap-ng-portal/site/templates/bootstrap/idpchoice.tpl @@ -34,7 +34,7 @@ " class="mr-2" alt="" title="" /> - + @@ -68,7 +68,7 @@
diff --git a/lemonldap-ng-portal/site/templates/bootstrap/info.tpl b/lemonldap-ng-portal/site/templates/bootstrap/info.tpl index 03640f6a8..7bbc8aa72 100644 --- a/lemonldap-ng-portal/site/templates/bootstrap/info.tpl +++ b/lemonldap-ng-portal/site/templates/bootstrap/info.tpl @@ -21,11 +21,11 @@
diff --git a/lemonldap-ng-portal/site/templates/bootstrap/login.tpl b/lemonldap-ng-portal/site/templates/bootstrap/login.tpl index 2d3721d7c..91192695b 100644 --- a/lemonldap-ng-portal/site/templates/bootstrap/login.tpl +++ b/lemonldap-ng-portal/site/templates/bootstrap/login.tpl @@ -14,7 +14,7 @@
@@ -114,14 +114,14 @@
- +
- +
@@ -137,7 +137,7 @@
@@ -174,7 +174,7 @@ diff --git a/lemonldap-ng-portal/site/templates/bootstrap/menu.tpl b/lemonldap-ng-portal/site/templates/bootstrap/menu.tpl index ab28c361f..bc70a7feb 100644 --- a/lemonldap-ng-portal/site/templates/bootstrap/menu.tpl +++ b/lemonldap-ng-portal/site/templates/bootstrap/menu.tpl @@ -9,7 +9,7 @@ diff --git a/lemonldap-ng-portal/site/templates/bootstrap/notification.tpl b/lemonldap-ng-portal/site/templates/bootstrap/notification.tpl index bf27e17d5..18bcb0e2c 100644 --- a/lemonldap-ng-portal/site/templates/bootstrap/notification.tpl +++ b/lemonldap-ng-portal/site/templates/bootstrap/notification.tpl @@ -23,7 +23,7 @@
diff --git a/lemonldap-ng-portal/site/templates/bootstrap/oidcConsents.tpl b/lemonldap-ng-portal/site/templates/bootstrap/oidcConsents.tpl index bfec79d30..7365cee74 100644 --- a/lemonldap-ng-portal/site/templates/bootstrap/oidcConsents.tpl +++ b/lemonldap-ng-portal/site/templates/bootstrap/oidcConsents.tpl @@ -16,7 +16,7 @@ " title="delete" class="oidcConsent"> - + Unregister diff --git a/lemonldap-ng-portal/site/templates/bootstrap/openid.tpl b/lemonldap-ng-portal/site/templates/bootstrap/openid.tpl index 8d39d73ae..4aa607e9a 100644 --- a/lemonldap-ng-portal/site/templates/bootstrap/openid.tpl +++ b/lemonldap-ng-portal/site/templates/bootstrap/openid.tpl @@ -24,7 +24,7 @@ diff --git a/lemonldap-ng-portal/site/templates/bootstrap/openidform.tpl b/lemonldap-ng-portal/site/templates/bootstrap/openidform.tpl index 5584ba2aa..07a738675 100644 --- a/lemonldap-ng-portal/site/templates/bootstrap/openidform.tpl +++ b/lemonldap-ng-portal/site/templates/bootstrap/openidform.tpl @@ -9,7 +9,7 @@ diff --git a/lemonldap-ng-portal/site/templates/bootstrap/password.tpl b/lemonldap-ng-portal/site/templates/bootstrap/password.tpl index ab49c3e30..508a3790a 100644 --- a/lemonldap-ng-portal/site/templates/bootstrap/password.tpl +++ b/lemonldap-ng-portal/site/templates/bootstrap/password.tpl @@ -15,7 +15,7 @@
- +

@@ -28,7 +28,7 @@
- +
@@ -38,19 +38,19 @@
- +
- +
diff --git a/lemonldap-ng-portal/site/templates/bootstrap/public/test.tpl b/lemonldap-ng-portal/site/templates/bootstrap/public/test.tpl index b93b57c58..01a540d93 100644 --- a/lemonldap-ng-portal/site/templates/bootstrap/public/test.tpl +++ b/lemonldap-ng-portal/site/templates/bootstrap/public/test.tpl @@ -17,7 +17,7 @@ diff --git a/lemonldap-ng-portal/site/templates/bootstrap/register.tpl b/lemonldap-ng-portal/site/templates/bootstrap/register.tpl index f360ceeb3..cdc708600 100644 --- a/lemonldap-ng-portal/site/templates/bootstrap/register.tpl +++ b/lemonldap-ng-portal/site/templates/bootstrap/register.tpl @@ -21,21 +21,21 @@
- +
" class="form-control" trplaceholder="firstName" required aria-required="true"/>
- +
" class="form-control" trplaceholder="lastName" required aria-required="true"/>
- +
" class="form-control" trplaceholder="mail" required aria-required="true"/>
@@ -46,7 +46,7 @@
- +
@@ -56,7 +56,7 @@ @@ -105,7 +105,7 @@ @@ -137,7 +137,7 @@ diff --git a/lemonldap-ng-portal/site/templates/bootstrap/sslform.tpl b/lemonldap-ng-portal/site/templates/bootstrap/sslform.tpl index 3dcb7641b..28a470a05 100644 --- a/lemonldap-ng-portal/site/templates/bootstrap/sslform.tpl +++ b/lemonldap-ng-portal/site/templates/bootstrap/sslform.tpl @@ -13,7 +13,7 @@ diff --git a/lemonldap-ng-portal/site/templates/bootstrap/standardform.tpl b/lemonldap-ng-portal/site/templates/bootstrap/standardform.tpl index 7242bfe76..216201ff0 100644 --- a/lemonldap-ng-portal/site/templates/bootstrap/standardform.tpl +++ b/lemonldap-ng-portal/site/templates/bootstrap/standardform.tpl @@ -1,14 +1,14 @@
- +
" trplaceholder="login" required aria-required="true"/>
- +
@@ -19,7 +19,7 @@
- +
@@ -31,7 +31,7 @@ @@ -39,14 +39,14 @@
?skin=&=&url="> - + Reset my password ?skin=&=&url="> - + Create an account diff --git a/lemonldap-ng-portal/site/templates/bootstrap/totp2fcheck.tpl b/lemonldap-ng-portal/site/templates/bootstrap/totp2fcheck.tpl index a26ae93fa..b4f5d6f62 100644 --- a/lemonldap-ng-portal/site/templates/bootstrap/totp2fcheck.tpl +++ b/lemonldap-ng-portal/site/templates/bootstrap/totp2fcheck.tpl @@ -12,20 +12,20 @@ ">
- +
diff --git a/lemonldap-ng-portal/site/templates/bootstrap/totp2fregister.tpl b/lemonldap-ng-portal/site/templates/bootstrap/totp2fregister.tpl index 913bb8c80..7cb8c27aa 100644 --- a/lemonldap-ng-portal/site/templates/bootstrap/totp2fregister.tpl +++ b/lemonldap-ng-portal/site/templates/bootstrap/totp2fregister.tpl @@ -32,11 +32,11 @@
- + Change key - + Register
@@ -47,11 +47,11 @@ diff --git a/lemonldap-ng-portal/site/templates/bootstrap/u2fcheck.tpl b/lemonldap-ng-portal/site/templates/bootstrap/u2fcheck.tpl index e5da3cf92..02c44f67b 100644 --- a/lemonldap-ng-portal/site/templates/bootstrap/u2fcheck.tpl +++ b/lemonldap-ng-portal/site/templates/bootstrap/u2fcheck.tpl @@ -29,7 +29,7 @@ diff --git a/lemonldap-ng-portal/site/templates/bootstrap/u2fregister.tpl b/lemonldap-ng-portal/site/templates/bootstrap/u2fregister.tpl index 9202893f1..c9ee7dd38 100644 --- a/lemonldap-ng-portal/site/templates/bootstrap/u2fregister.tpl +++ b/lemonldap-ng-portal/site/templates/bootstrap/u2fregister.tpl @@ -24,12 +24,12 @@
- + Register - + Verify
@@ -39,12 +39,12 @@ diff --git a/lemonldap-ng-portal/site/templates/bootstrap/upgradesession.tpl b/lemonldap-ng-portal/site/templates/bootstrap/upgradesession.tpl index 544a45db6..3172a8c11 100644 --- a/lemonldap-ng-portal/site/templates/bootstrap/upgradesession.tpl +++ b/lemonldap-ng-portal/site/templates/bootstrap/upgradesession.tpl @@ -9,11 +9,11 @@ "> diff --git a/lemonldap-ng-portal/site/templates/bootstrap/utotp2fcheck.tpl b/lemonldap-ng-portal/site/templates/bootstrap/utotp2fcheck.tpl index f2df384c1..b974cff88 100644 --- a/lemonldap-ng-portal/site/templates/bootstrap/utotp2fcheck.tpl +++ b/lemonldap-ng-portal/site/templates/bootstrap/utotp2fcheck.tpl @@ -15,7 +15,7 @@ @@ -47,20 +47,20 @@
- +
diff --git a/lemonldap-ng-portal/site/templates/bootstrap/yubikey2fregister.tpl b/lemonldap-ng-portal/site/templates/bootstrap/yubikey2fregister.tpl index 91233495a..a633ad4bb 100644 --- a/lemonldap-ng-portal/site/templates/bootstrap/yubikey2fregister.tpl +++ b/lemonldap-ng-portal/site/templates/bootstrap/yubikey2fregister.tpl @@ -36,12 +36,12 @@ diff --git a/lemonldap-ng-portal/site/templates/bootstrap/yubikeyform.tpl b/lemonldap-ng-portal/site/templates/bootstrap/yubikeyform.tpl index d04956470..8a4b2022e 100644 --- a/lemonldap-ng-portal/site/templates/bootstrap/yubikeyform.tpl +++ b/lemonldap-ng-portal/site/templates/bootstrap/yubikeyform.tpl @@ -1,7 +1,7 @@
- +
@@ -9,7 +9,7 @@