Index: src/bp-xprofile/admin/css/admin-rtl.css =================================================================== --- src/bp-xprofile/admin/css/admin-rtl.css (revision 10352) +++ src/bp-xprofile/admin/css/admin-rtl.css (working copy) @@ -284,3 +284,30 @@ display: none; visibility: hidden; } + +.bp-help-tooltip { + border: 1px solid #DFDFDF; + background-color: #FAFAFA; + display: inline-block; + color: #888; + border-radius: 50%; + width: 17px; + height: 17px; + text-align: center; + vertical-align: middle; + line-height: 17px; + margin-right: 3px; +} + +.ui-tooltip { + padding: 8px; + position: absolute; + z-index: 9999; + max-width: 300px; + -webkit-box-shadow: 0 0 5px #aaa; + box-shadow: 0 0 5px #aaa; + background-color: #fff; +} +body .ui-tooltip { + border-width: 2px; +} \ No newline at end of file Index: src/bp-xprofile/admin/css/admin.css =================================================================== --- src/bp-xprofile/admin/css/admin.css (revision 10352) +++ src/bp-xprofile/admin/css/admin.css (working copy) @@ -284,3 +284,30 @@ display: none; visibility: hidden; } + +.bp-help-tooltip { + border: 1px solid #DFDFDF; + background-color: #FAFAFA; + display: inline-block; + color: #888; + border-radius: 50%; + width: 17px; + height: 17px; + text-align: center; + vertical-align: middle; + line-height: 17px; + margin-left: 3px; +} + +.ui-tooltip { + padding: 8px; + position: absolute; + z-index: 9999; + max-width: 300px; + -webkit-box-shadow: 0 0 5px #aaa; + box-shadow: 0 0 5px #aaa; + background-color: #fff; +} +body .ui-tooltip { + border-width: 2px; +} \ No newline at end of file Index: src/bp-xprofile/admin/js/admin.js =================================================================== --- src/bp-xprofile/admin/js/admin.js (revision 10352) +++ src/bp-xprofile/admin/js/admin.js (working copy) @@ -82,6 +82,9 @@ if ( XProfileAdmin.supports_options_field_types.indexOf( forWhat ) >= 0 ) { document.getElementById( forWhat ).style.display = ''; + document.getElementById( 'create_search_link' ).checked = true; + } else { + document.getElementById( 'create_search_link' ).checked = false; } } @@ -180,6 +183,8 @@ // Set focus in Field Title, if we're on the right page jQuery( '#bp-xprofile-add-field #title' ).focus(); + jQuery( '.bp-help-tooltip' ).tooltip(); + // Set up the notice that shows when no member types are selected for a field. toggle_no_member_type_notice(); jQuery( 'input.member-type-selector' ).on( 'change', function() { Index: src/bp-xprofile/bp-xprofile-admin.php =================================================================== --- src/bp-xprofile/bp-xprofile-admin.php (revision 10352) +++ src/bp-xprofile/bp-xprofile-admin.php (working copy) @@ -412,6 +412,15 @@ bp_xprofile_delete_meta( $field_id, 'field', 'signup_position' ); } + // Save create_search_link. + if ( 1 != $field_id ) { + if ( isset( $_POST['create_search_link'] ) && $_POST['create_search_link'] == '1') { + bp_xprofile_update_field_meta( $field_id, 'create_search_link', $_POST['create_search_link'] ); + } else { + bp_xprofile_update_field_meta( $field_id, 'create_search_link', '0' ); + } + } + /** * Fires at the end of the process to save a field for a user, if successful. * @@ -746,6 +755,7 @@ */ wp_enqueue_style ( 'thickbox' ); wp_enqueue_script( 'media-upload' ); + wp_enqueue_script('jquery-ui-tooltip'); // Get Avatar Uploader. bp_attachments_enqueue_scripts( 'BP_Attachment_Avatar' ); Index: src/bp-xprofile/bp-xprofile-cssjs.php =================================================================== --- src/bp-xprofile/bp-xprofile-cssjs.php (revision 10352) +++ src/bp-xprofile/bp-xprofile-cssjs.php (working copy) @@ -41,6 +41,7 @@ wp_enqueue_script( 'jquery-ui-draggable' ); wp_enqueue_script( 'jquery-ui-droppable' ); wp_enqueue_script( 'jquery-ui-sortable' ); + wp_enqueue_script( 'jquery-ui-tooltip' ); $min = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min'; wp_enqueue_script( 'xprofile-admin-js', buddypress()->plugin_url . "bp-xprofile/admin/js/admin{$min}.js", array( 'jquery', 'jquery-ui-sortable' ), bp_get_version() ); Index: src/bp-xprofile/bp-xprofile-filters.php =================================================================== --- src/bp-xprofile/bp-xprofile-filters.php (revision 10352) +++ src/bp-xprofile/bp-xprofile-filters.php (working copy) @@ -339,7 +339,12 @@ * @return string */ function xprofile_filter_link_profile_data( $field_value, $field_type = 'textbox' ) { + global $field; + if( !$field->need_create_search_link() ) { + return $field_value; + } + if ( 'datebox' === $field_type ) { return $field_value; } Index: src/bp-xprofile/classes/class-bp-xprofile-field.php =================================================================== --- src/bp-xprofile/classes/class-bp-xprofile-field.php (revision 10352) +++ src/bp-xprofile/classes/class-bp-xprofile-field.php (working copy) @@ -140,6 +140,16 @@ protected $allow_custom_visibility; /** + * Create search link for field. + * + * @since 1.9.0 + * @since 2.4.0 Property marked protected. Now accessible by magic method or by `get_default_visibility()`. + * + * @var string Default field data visibility. + */ + public $create_search_link; + + /** * Field type option. * * @since 2.0.0 @@ -184,6 +194,8 @@ $this->type_obj = bp_xprofile_create_field_type( 'textbox' ); $this->type_obj->field_obj = $this; } + + add_action( 'bp_xprofile_admin_all_filelds_additional_settings', array( $this, 'create_search_link_settings' ) ); } /** @@ -272,7 +284,7 @@ // Create the field type and store a reference back to this object. $this->type_obj = bp_xprofile_create_field_type( $this->type ); - $this->type_obj->field_obj = $this;; + $this->type_obj->field_obj = $this; } /** @@ -808,6 +820,44 @@ return $this->allow_custom_visibility; } + /** + * Get fieleld create_search_link option + * + * Lazy-loaded to reduce overhead. + * + * Defaults to true for multi and default fields. false for single fields + * + * @since Patch 1.0.1 + * + * @author Lenlay + * + * @return bool. + */ + public function need_create_search_link() { + + if ( ! isset( $this->create_search_link ) ) { + $is_multi_field = !empty( $this->get_children( true ) )? true : false; + + $create_search_link = bp_xprofile_get_meta( $this->id, 'field', 'create_search_link' ); + + if( $create_search_link !== '' ){ + + if ( '0' === $create_search_link ) { + $this->create_search_link = false; + } else { + $this->create_search_link = true; + } + + } else { + + $this->create_search_link = $is_multi_field || $this->is_default_field(); + + } + } + + return apply_filters( 'bp_xprofile_field_need_search_link', $this->create_search_link, $this->id ); + } + /** Static Methods ********************************************************/ public static function get_type( $field_id = 0 ) { @@ -1455,6 +1505,13 @@ $this->render_admin_form_children(); ?> +

+ +