From 6c1ce8a21835a39386e218b54e5c0113701d8e7f Mon Sep 17 00:00:00 2001
From: Dmitriy Sim <simdim555@gmail.com>
Date: Thu, 6 May 2021 13:08:13 +0300
Subject: [PATCH] update

---
 juice/login/login.ftl                | 34 +++++++++++++------
 juice/login/register.ftl             | 16 ++++++++-
 juice/login/resources/css/styles.css | 50 +++++++++++++++++++++++-----
 3 files changed, 80 insertions(+), 20 deletions(-)

diff --git a/juice/login/login.ftl b/juice/login/login.ftl
index a789581..13dd17b 100644
--- a/juice/login/login.ftl
+++ b/juice/login/login.ftl
@@ -33,7 +33,7 @@
                         <#if usernameEditDisabled??>
                             <input tabindex="1" id="username" class="${properties.kcInputClass!}" name="username" value="${(login.username!'')}" placeholder=${msg("usernameOrEmail")}  type="text" disabled />
                         <#else>
-                            <input tabindex="1" id="username" class="${properties.kcInputClass!}" name="username" value="${(login.username!'')}" placeholder=${msg("usernameOrEmail")} type="text" autofocus autocomplete="off"
+                            <input tabindex="1" id="username" class="${properties.kcInputClass!}" name="username" value="${(login.username!'')}" placeholder=${msg("usernameOrEmail")} type="text" autofocus autocomplete="username"
                                 aria-invalid="<#if messagesPerField.existsError('username','password')>true</#if>"
                             />
                             <#if messagesPerField.existsError('username','password')>
@@ -48,7 +48,7 @@
 
                     <div class="${properties.kcFormGroupClass!}">
 
-                        <input tabindex="2" id="password" class="${properties.kcInputClass!}" name="password" type="password" placeholder=${msg("password")} autocomplete="off"
+                        <input tabindex="2" id="password" class="${properties.kcInputClass!}" name="password" type="password" placeholder=${msg("password")}
                             aria-invalid="<#if messagesPerField.existsError('username','password')>true</#if>"
                         />
                         <label class="login-form-input-label">${msg("password")}</label>
@@ -60,8 +60,8 @@
                     </div>
 
                     
-            <#if realm.password && social.providers??>
-                <div id="kc-social-providers" class="${properties.kcFormSocialAccountSectionClass!}">
+                <#if realm.password && social.providers??>
+                    <div id="kc-social-providers" class="${properties.kcFormSocialAccountSectionClass!}">
                     <div class="separate-container">
                         <div class="separator"></div>
                             <div class="separate-text">${msg("identity-provider-login-label")} </div>
@@ -90,12 +90,26 @@
                             </a>
                         </#list>
                     </ul>
-                </div>
-            </#if>
+                    </div>
+                </#if>
             
-            <div class="signup-terms login-signup-terms">${msg("signinTerms")}</div>
+                 <#if realm.internationalizationEnabled  && locale.supported?size gt 1>
+                    <#if locale.current="Deutsch">
+                        <div class="signup-terms login-signup-terms">
+                        Mit der Registrierung erklären Sie sich mit den 
+                        <a href="https://app.jplus-pilot.com/legal/tos_de.html">Nutzungsbedingungen</a> und der 
+                        <a href="https://app.jplus-pilot.com/legal/gdpr_de.html">Datenschutzerklärung</a> von Juice einverstanden.
+                        </div>
+                    <#else>
+                        <div class="signup-terms login-signup-terms">
+                        By signing up, you agree to Juice's 
+                        <a href="https://app.jplus-pilot.com/legal/tos_en.html">ToS</a> and 
+                        <a href=" https://app.jplus-pilot.com/legal/gdpr_en.html">Privacy</a>
+                        </div>
+                    </#if>
+                </#if>
 
-                    <div>
+                <div>
                         <div class="${properties.kcFormGroupClass!} ${properties.kcFormSettingClass!}">
                             <div id="kc-form-options">
                                     <#if realm.resetPasswordAllowed>
@@ -110,11 +124,11 @@
                                 </div>
                             </div>
                         </#if>
-                    </div>
+                </div>
 
                 </form>
             </#if>
-            </div>
+        </div>
         </div>
     </#if>
 </@layout.registrationLayout>
diff --git a/juice/login/register.ftl b/juice/login/register.ftl
index 03c8027..268e763 100644
--- a/juice/login/register.ftl
+++ b/juice/login/register.ftl
@@ -110,7 +110,21 @@
                     <input class="${properties.kcButtonClass!} ${properties.kcButtonBlockClass!} ${properties.kcButtonLargeClass!}" type="submit" value="${msg("doRegister")}"/>
                 </div>
                 
-                <div class="signup-terms">${msg("signupTerms")}</div>
+                 <#if realm.internationalizationEnabled  && locale.supported?size gt 1>
+                    <#if locale.current="Deutsch">
+                        <div class="signup-terms">
+                        Mit der Registrierung erklären Sie sich mit den 
+                        <a href="https://app.jplus-pilot.com/legal/tos_de.html">Nutzungsbedingungen</a> und der 
+                        <a href="https://app.jplus-pilot.com/legal/gdpr_de.html">Datenschutzerklärung</a> von Juice einverstanden.
+                        </div>
+                    <#else>
+                        <div class="signup-terms">
+                        By signing up, you agree to Juice's 
+                        <a href="https://app.jplus-pilot.com/legal/tos_en.html">ToS</a> and 
+                        <a href=" https://app.jplus-pilot.com/legal/gdpr_en.html">Privacy</a>
+                        </div>
+                    </#if>
+                </#if>
 
             </div>
 
diff --git a/juice/login/resources/css/styles.css b/juice/login/resources/css/styles.css
index b1027e4..979d182 100644
--- a/juice/login/resources/css/styles.css
+++ b/juice/login/resources/css/styles.css
@@ -213,6 +213,19 @@ a.verify-email-link:hover {
     font-size: 16px;
     line-height: 24px;
     color: #BDBFBF;
+    box-shadow: inset 0 0 0 50px rgb(33, 33, 33) !important; 
+    -webkit-box-shadow: inset 0 0 0 50px rgb(33, 33, 33) !important; 
+    -webkit-text-fill-color: #BDBFBF; 
+    background-clip: content-box !important; 
+    filter: none;
+}
+.pf-c-form-control:-webkit-autofill, 
+.pf-c-form-control:-webkit-autofill:hover, 
+.pf-c-form-control:-webkit-autofill:focus, 
+.pf-c-form-control:-webkit-autofill:active { 
+    background: rgb(33, 33, 33); 
+    color: #BDBFBF; 
+    background-clip: content-box !important; 
 }
 
 .form-group {
@@ -379,6 +392,13 @@ a.verify-email-link:hover {
 .login-signup-terms {
     margin: 32px auto;
 }
+#kc-form-wrapper .signup-terms a, 
+.signup-terms a {
+    font-family: "Swis721 Th BT";
+    font-weight: 300;
+    text-decoration: underline;
+    color: #98989E;
+}
 
 .form-horizontal .form-group {
     margin-right: 0px;
@@ -654,10 +674,31 @@ a.verify-email-link:hover {
     }
 }
 
+@media (max-height: 824px) and (max-width: 920px) {
+    .login-pf body::before {
+        display: none;
+    }
+    .juice-footer {
+        display: none;
+    }
+}
+
+@media (max-height: 784px) {
+    .login-pf body::before {
+        display: none;
+    }
+    .juice-footer {
+        display: none;
+    }
+}
+
 @media (max-height: 680px) {
     .login-pf body {
         align-items: unset;
     }
+    .juice-footer {
+        display: none;
+    }
 }
 
 @media (max-width: 767px) {
@@ -706,15 +747,6 @@ a.verify-email-link:hover {
     }
 }
 
-@media (max-height: 440px) {
-    .login-pf body::before {
-        display: none;
-    }
-    .juice-footer {
-        display: none;
-    }
-}
-
 @media (max-width: 360px) {
     .card-login {
         width: 360px;