Fix loginform.mustache backport to 4.2

danielneis · Dec 7, 2023 · 64b3f27 · 64b3f27
1 parent 9056abb
commit 64b3f27
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 22 deletions.
diff --git a/templates/core/loginform.mustache b/templates/core/loginform.mustache
@@ -26,7 +26,6 @@
     * cansignup - Signup allowed?,
     * cookieshelpicon - cookies help icon details
     * error - Any errors in the form?,
-    * info - Info notification to display,
     * forgotpasswordurl - Forgot password url,
     * hasidentityproviders - Flag, set to true to hide identity providers,
     * hasinstructions - Flag, set to true to show instructions,
@@ -76,7 +75,6 @@
             "ltr": true
         },
         "error": "",
-        "info": "",
         "forgotpasswordurl": "http://localhost/stable_master/login/forgot_password.php",
         "hasidentityproviders": false,
         "hasinstructions": true,
@@ -120,10 +118,6 @@
         <a href="#" id="loginerrormessage" class="sr-only">{{error}}</a>
         <div class="alert alert-danger" role="alert">{{error}}</div>
     {{/error}}
-    {{#info}}
-        <a href="#" id="logininfomessage" class="sr-only">{{info}}</a>
-        <div class="alert alert-info" role="alert">{{info}}</div>
-    {{/info}}
     {{#cansignup}}
         <a href="{{signupurl}}" class="sr-only">{{#str}} tocreatenewaccount {{/str}}</a>
     {{/cansignup}}
@@ -154,11 +148,6 @@
                 !}}placeholder="{{#cleanstr}}password{{/cleanstr}}" {{!
                 !}}autocomplete="current-password">
         </div>
-        {{#recaptcha}}
-            <div class="login-form-recaptcha form-group">
-                {{{recaptcha}}}
-            </div>
-        {{/recaptcha}}
         <div class="login-form-submit form-group">
             <button class="btn btn-primary btn-lg" type="submit" id="loginbtn">{{#str}}login{{/str}}</button>
         </div>

diff --git a/templates/core/loginform.mustache.upstream b/templates/core/loginform.mustache.upstream
@@ -26,7 +26,6 @@
     * cansignup - Signup allowed?,
     * cookieshelpicon - cookies help icon details
     * error - Any errors in the form?,
-    * info - Info notification to display,
     * forgotpasswordurl - Forgot password url,
     * hasidentityproviders - Flag, set to true to hide identity providers,
     * hasinstructions - Flag, set to true to show instructions,
@@ -76,7 +75,6 @@
             "ltr": true
         },
         "error": "",
-        "info": "",
         "forgotpasswordurl": "http://localhost/stable_master/login/forgot_password.php",
         "hasidentityproviders": false,
         "hasinstructions": true,
@@ -114,10 +112,6 @@
         <a href="#" id="loginerrormessage" class="sr-only">{{error}}</a>
         <div class="alert alert-danger" role="alert">{{error}}</div>
     {{/error}}
-    {{#info}}
-        <a href="#" id="logininfomessage" class="sr-only">{{info}}</a>
-        <div class="alert alert-info" role="alert">{{info}}</div>
-    {{/info}}
     {{#cansignup}}
         <a href="{{signupurl}}" class="sr-only">{{#str}} tocreatenewaccount {{/str}}</a>
     {{/cansignup}}
@@ -148,11 +142,6 @@
                 !}}placeholder="{{#cleanstr}}password{{/cleanstr}}" {{!
                 !}}autocomplete="current-password">
         </div>
-        {{#recaptcha}}
-            <div class="login-form-recaptcha form-group">
-                {{{recaptcha}}}
-            </div>
-        {{/recaptcha}}
         <div class="login-form-submit form-group">
             <button class="btn btn-primary btn-lg" type="submit" id="loginbtn">{{#str}}login{{/str}}</button>
         </div>