Changeset 11770 for trunk/src/bp-templates/bp-nouveau/includes/template-tags.php

Timestamp:

12/12/2017 02:41:37 PM (7 years ago)

Author:

hnla

Message:

Nouveau: re-factor bp_nouveau_signup_form error handling

Commit:

1. Re-factors the signup template for new class token rendering & error checking & display of BP signup errors.
2. Adds new function to provide html template markup for error string rendering.

Previously the signup form function rendered the BP global signup->errors via the BP action/do_action, proving hard to style messages in keeping with other site messages.

Commit builds a new function to pass the BP global buddypress()->signup->errors[ $name ] to, rendering the message string in suitable html. This function may be re-used for any additional in page error messages falling outside the Nouveau feedback message array.

Additionally no means of easily identifying the error fields existed, they would display as per browser 'required=required' styling. If BP global errors are set in each loop pass we generate a class 'invalid' to use to style the input on and that matches to the HTML5 pseudo class.

Props hnla, DJPaul, boonebgorges

Fixes #7642

File:

• trunk/src/bp-templates/bp-nouveau/includes/template-tags.php (modified) (5 diffs)

trunk/src/bp-templates/bp-nouveau/includes/template-tags.php

@@ -740 +740 @@
 
     } elseif ( ! empty( $bp_nouveau->object_nav ) ) {
+
         $bp_nouveau->displayed_nav = $bp_nouveau->object_nav;
 
@@ -752 +753 @@
          */
         $nav = apply_filters( 'bp_nouveau_get_nav', $nav, $n );
+
     }
 
@@ -2075 +2077 @@
 
     foreach ( $fields as $name => $attributes ) {
+        $classes = '';
+
         list( $label, $required, $value, $attribute_type, $type, $class ) = array_values( $attributes );
 
@@ -2133 +2137 @@
         }
 
-        if ( ! empty( $class ) ) {
-            // In case people are adding classes..
-            $classes = explode( ' ', $class );
-            $class = ' class="' . esc_attr( join( ' ', array_map( 'sanitize_html_class', $classes ) ) ) . '"';
-        }
-
-        // Do not fire the do_action to display errors for the private radio.
+        // Do not run function to display errors for the private radio.
         if ( 'private' !== $value ) {
+
             /**
-             * Fires and displays any member registration field errors.
+             * Fetch & display any BP member registration field errors.
              *
-             * @since 1.1.0 (BuddyPress)
+             * Passes BP signup errors to Nouveau's template function to
+             * render suitable markup for error string.
              */
-            do_action( "bp_{$name}_errors" );
+            if( isset( buddypress()->signup->errors[ $name ] ) ) {
+                nouveau_error_template( buddypress()->signup->errors[ $name ] );
+                $invalid = 'invalid';
+            }
+        }
+
+        if ( isset( $invalid ) && isset( buddypress()->signup->errors[ $name ] ) ) {
+            if ( ! empty( $class ) ) {
+                $class = $class . ' ' . $invalid;
+            } else {
+                $class = $invalid;
+            }
+        }
+
+        if ( $class ) {
+            $class = sprintf(
+                ' class="%s"',
+                esc_attr( join( ' ', array_map( 'sanitize_html_class', explode( ' ', $class ) ) ) )
+            );
         }
 
@@ -2232 +2250 @@
     }
 }
+
+/**
+ * Display supplemental error or feedback messages.
+ *
+ * This template handles in page error or feedback messages e.g signup fields
+ * 'Username exists' type registration field error notices.
+ *
+ * @param string $message required: the message to display.
+ * @param string $type optional: the type of error message e.g 'error'.
+ *
+ * @since 1.0.0
+ */
+function nouveau_error_template( $message = '', $type = '' ) {
+    if ( ! $message ) {
+        return;
+    }
+
+    $type = ( $type ) ? $type : 'error';
+    ?>
+
+    <div class="<?php echo esc_attr( 'bp-messages bp-feedback ' . $type ); ?>">
+        <span class="bp-icon" aria-hidden="true"></span>
+        <p><?php echo esc_html( $message ); ?></p>
+    </div>
+
+    <?php
+}