Changeset 13111

Timestamp:

09/19/2021 01:02:18 PM (5 years ago)

Author:

imath

Message:

BP Blocks: add a link to reset the user password into the Login Form

• add a setting to let the Admin choose whether to show this link from the block’s inspector settings.
• Include this link under the "Log In" button if this setting is active.

Props ellucinda

Fixes #8100

Location:

trunk/src

Files:

• bp-core/bp-core-blocks.php (modified) (4 diffs)
• bp-core/classes/class-bp-core.php (modified) (1 diff)
• bp-core/css/blocks/login-form-rtl.css (modified) (1 diff)
• bp-core/css/blocks/login-form.css (modified) (1 diff)
• bp-core/js/blocks/login-form.js (modified) (4 diffs)
• bp-core/sass/blocks/login-form.scss (modified) (1 diff)
• js/bp-core/js/blocks/login-form.js (modified) (1 diff)
• js/bp-core/js/blocks/login-form/edit.js (modified) (3 diffs)

trunk/src/bp-core/bp-core-blocks.php

@@ -222 +222 @@
  */
 function bp_blocks_get_login_widget_registration_link( $content = '', $args = array() ) {
-    if ( isset( $args['form_id'] ) && 'bp-login-widget-form' === $args['form_id'] && bp_get_signup_allowed() ) {
-        $content .= sprintf(
-            '<p class="bp-login-widget-register-link"><a href="%1$s">%2$s</a></p>',
-            esc_url( bp_get_signup_page() ),
-            esc_html__( 'Register', 'buddypress' )
-        );
+    if ( isset( $args['form_id'] ) && 'bp-login-widget-form' === $args['form_id'] ) {
+        if ( bp_get_signup_allowed() ) {
+            $content .= sprintf(
+                '<p class="bp-login-widget-register-link"><a href="%1$s">%2$s</a></p>',
+                esc_url( bp_get_signup_page() ),
+                esc_html__( 'Register', 'buddypress' )
+            );
+        }
+
+        if ( isset( $args['include_pwd_link'] ) && true === $args['include_pwd_link'] ) {
+            $content .= sprintf(
+                '<p class="bp-login-widget-pwd-link"><a href="%1$s">%2$s</a></p>',
+                esc_url( wp_lostpassword_url( bp_get_root_domain() ) ),
+                esc_html__( 'Lost your password?', 'buddypress' )
+            );
+        }
     }
 
@@ -261 +271 @@
         $attributes,
         array(
-            'title' => '',
+            'title'         => '',
+            'forgotPwdLink' => false,
         )
     );
@@ -339 +350 @@
     } else {
         $action_output = '';
+        $pwd_link      = (bool) $block_args['forgotPwdLink'];
+
         if ( has_action( 'bp_before_login_widget_loggedout' ) ) {
             ob_start();
@@ -358 +371 @@
         $widget_content .= wp_login_form(
             array(
-                'echo'           => false,
-                'form_id'        => 'bp-login-widget-form',
-                'id_username'    => 'bp-login-widget-user-login',
-                'label_username' => __( 'Username', 'buddypress' ),
-                'id_password'    => 'bp-login-widget-user-pass',
-                'label_password' => __( 'Password', 'buddypress' ),
-                'id_remember'    => 'bp-login-widget-rememberme',
-                'id_submit'      => 'bp-login-widget-submit',
+                'echo'             => false,
+                'form_id'          => 'bp-login-widget-form',
+                'id_username'      => 'bp-login-widget-user-login',
+                'label_username'   => __( 'Username', 'buddypress' ),
+                'id_password'      => 'bp-login-widget-user-pass',
+                'label_password'   => __( 'Password', 'buddypress' ),
+                'id_remember'      => 'bp-login-widget-rememberme',
+                'id_submit'        => 'bp-login-widget-submit',
+                'include_pwd_link' => $pwd_link,
             )
         );

trunk/src/bp-core/classes/class-bp-core.php

@@ -398 +398 @@
                     'style_url'          => plugins_url( 'css/blocks/login-form.css', dirname( __FILE__ ) ),
                     'attributes'         => array(
-                        'title' => array(
+                        'title'         => array(
                             'type'    => 'string',
                             'default' => '',
+                        ),
+                        'forgotPwdLink' => array(
+                            'type'    => 'boolean',
+                            'default' => false,
                         ),
                     ),

trunk/src/bp-core/css/blocks/login-form-rtl.css

@@ -35 +35 @@
     vertical-align: super;
 }
+
+#bp-login-widget-form .bp-login-widget-pwd-link {
+    font-size: 80%;
+}

trunk/src/bp-core/css/blocks/login-form.css

@@ -35 +35 @@
     vertical-align: super;
 }
+
+#bp-login-widget-form .bp-login-widget-pwd-link {
+    font-size: 80%;
+}

trunk/src/bp-core/js/blocks/login-form.js

@@ -135 +135 @@
     PanelBody = _wp$components.PanelBody,
     TextControl = _wp$components.TextControl,
+    ToggleControl = _wp$components.ToggleControl,
     _wp$element = _wp.element,
     Fragment = _wp$element.Fragment,
@@ -149 +150 @@
   var attributes = _ref.attributes,
       setAttributes = _ref.setAttributes;
-  var title = attributes.title;
+  var title = attributes.title,
+      forgotPwdLink = attributes.forgotPwdLink;
   return createElement(Fragment, null, createElement(InspectorControls, null, createElement(PanelBody, {
     title: __('Settings', 'buddypress'),
@@ -159 +161 @@
       setAttributes({
         title: text
+      });
+    }
+  }), createElement(ToggleControl, {
+    label: __('Include the link to reset the user password', 'buddypress'),
+    checked: !!forgotPwdLink,
+    onChange: function onChange() {
+      setAttributes({
+        forgotPwdLink: !forgotPwdLink
       });
     }
@@ -244 +254 @@
       type: 'string',
       default: ''
+    },
+    forgotPwdLink: {
+      type: 'boolean',
+      default: false
     }
   },

trunk/src/bp-core/sass/blocks/login-form.scss

@@ -41 +41 @@
         vertical-align: super;
     }
+
+    .bp-login-widget-pwd-link {
+        font-size: 80%;
+    }
 }

trunk/src/js/bp-core/js/blocks/login-form.js

@@ -31 +31 @@
             default: '',
         },
+        forgotPwdLink: {
+            type: 'boolean',
+            default: false,
+        },
     },
     edit: editLoginForm,

trunk/src/js/bp-core/js/blocks/login-form/edit.js

@@ -10 +10 @@
         PanelBody,
         TextControl,
+        ToggleControl,
     },
     element: {
@@ -30 +31 @@
 
 const editLoginForm = ( { attributes, setAttributes } ) => {
-    const { title } = attributes;
+    const { title,forgotPwdLink } = attributes;
 
     return (
@@ -43 +44 @@
                         } }
                     />
+                    <ToggleControl
+                        label={ __( 'Include the link to reset the user password', 'buddypress' ) }
+                        checked={ !! forgotPwdLink }
+                        onChange={ () => {
+                            setAttributes( { forgotPwdLink: ! forgotPwdLink } );
+                        } }
+                    />
                 </PanelBody>
             </InspectorControls>