Ticket #7364: 7364-01.patch

src/bp-xprofile/bp-xprofile-template.php

@@ -1358 +1358 @@
          *
          *    @type int    $field_id ID of the field to render.
          *    @type string $before   Markup to render before the field.
+         *    @type string $before_controls  markup before form controls.
          *    @type string $after    Markup to render after the field.
+         *    @type string $after_controls Markup after the form controls.
          *    @type string $class    Class to apply to the field markup.
+         *    @type string $label_class Class to apply for the label element.
+         *    @type string $notoggle_tag Markup element to use for notoggle tag.
+         *    @type string $notoggle_class Class to apply to the notoggle element.
          * }
          * @return string $retval
          */
@@ -1367 +1372 @@
 
                 // Parse optional arguments.
                 $r = bp_parse_args( $args, array(
-                        'field_id' => bp_get_the_profile_field_id(),
-                        'before'   => '',
-                        'after'    => '',
-                        'class'    => 'bp-xprofile-visibility'
+                        'field_id'         => bp_get_the_profile_field_id(),
+                        'before'           => '',
+                        'before_controls'  => '',
+                        'after'            => '',
+                        'after_controls'   => '',
+                        'class'            => 'bp-xprofile-visibility',
+                        'label_class'      => 'bp-screen-reader-text',
+                        'notoggle_tag'     => 'span',
+                        'notoggle_class'   => 'field-visibility-settings-notoggle',
                 ), 'xprofile_settings_visibility_select' );
 
                 // Empty return value, filled in below if a valid field ID is found.
@@ -1387 +1397 @@
 
                         <?php if ( bp_current_user_can( 'bp_xprofile_change_field_visibility' ) ) : ?>
 
-                                <label for="<?php echo esc_attr( 'field_' . $r['field_id'] ) ; ?>_visibility" class="bp-screen-reader-text"><?php
+                        <?php echo $r['before_controls']; ?>
+
+                                <label for="<?php echo esc_attr( 'field_' . $r['field_id'] ) ; ?>_visibility" class="<?php echo esc_attr( $r['label_class'] ); ?>"><?php
                                         /* translators: accessibility text */
                                         _e( 'Select visibility', 'buddypress' );
                                 ?></label>
@@ -1401 +1413 @@
 
                                 </select>
 
+                        <?php echo $r['after_controls']; ?>
+
                         <?php else : ?>
 
-                                <span class="field-visibility-settings-notoggle"><?php bp_the_profile_field_visibility_level_label(); ?></span>
+                                <<?php echo esc_html( $r['notoggle_tag'] ); ?> class="<?php echo esc_attr( $r['notoggle_class'] ); ?>"><?php bp_the_profile_field_visibility_level_label(); ?></<?php echo esc_html( $r['notoggle_tag'] ); ?>>
 
                         <?php endif;