diff --git src/bp-xprofile/admin/css/admin.css src/bp-xprofile/admin/css/admin.css index 6dd7a20..4795078 100644 --- src/bp-xprofile/admin/css/admin.css +++ src/bp-xprofile/admin/css/admin.css @@ -284,3 +284,21 @@ p.member-type-none-notice { display: none; visibility: hidden; } + +.form-table.bp-date-options { + margin: 0 8px; +} + +.form-table.bp-date-options th { + width: 150px; +} + +.date-format-label { + display: inline-block; + width: 150px; +} + +.date-format-custom-value, +.date-range-numeric { + width: 56px; +} diff --git src/bp-xprofile/admin/js/admin.js src/bp-xprofile/admin/js/admin.js index 53f6b1c..b70a485 100644 --- src/bp-xprofile/admin/js/admin.js +++ src/bp-xprofile/admin/js/admin.js @@ -270,6 +270,47 @@ jQuery( document ).ready( function() { // Handle title placeholder text the WordPress way titleHint( 'title' ); + // On Date fields, selecting a date_format radio button should change the Custom value. + var $date_format = jQuery( 'input[name="date_format"]' ); + var $date_format_custom_value = jQuery( '#date-format-custom-value' ); + var $date_format_sample = jQuery( '#date-format-custom-sample' ); + $date_format.click( function( e ) { + switch ( e.target.value ) { + case 'elapsed' : + $date_format_custom_value.val( '' ); + $date_format_sample.html( '' ); + break; + + case 'custom' : + break; + + default : + $date_format_custom_value.val( e.target.value ); + $date_format_sample.html( jQuery( e.target ).siblings( '.date-format-label' ).html() ); + break; + } + } ); + + // Clicking into the custom date format field should select the Custom radio button. + var $date_format_custom = jQuery( '#date-format-custom' ); + $date_format_custom_value.focus( function() { + $date_format_custom.prop( 'checked', 'checked' ); + } ); + + // Validate custom date field. + var $date_format_spinner = jQuery( '#date-format-custom-spinner' ); + $date_format_custom_value.change( function( e ) { + $date_format_spinner.addClass( 'is-active' ); + jQuery.post( ajaxurl, { + action: 'date_format', + date: e.target.value + }, + function( response ) { + $date_format_spinner.removeClass( 'is-active' ); + $date_format_sample.html( response ); + } ); + } ); + // tabs init with a custom tab template and an "add" callback filling in the content var $tab_items, $tabs = jQuery( '#tabs' ).tabs(); diff --git src/bp-xprofile/bp-xprofile-admin.php src/bp-xprofile/bp-xprofile-admin.php index 352a8b0..006af0b 100644 --- src/bp-xprofile/bp-xprofile-admin.php +++ src/bp-xprofile/bp-xprofile-admin.php @@ -432,6 +432,9 @@ function xprofile_admin_manage_field( $group_id, $field_id = null ) { bp_xprofile_update_field_meta( $field_id, 'do_autolink', 'off' ); } + // @todo move this + $field->admin_save_settings(); + /** * Fires at the end of the process to save a field for a user, if successful. * diff --git src/bp-xprofile/classes/class-bp-xprofile-field-type-datebox.php src/bp-xprofile/classes/class-bp-xprofile-field-type-datebox.php index 6074c5b..ca83627 100644 --- src/bp-xprofile/classes/class-bp-xprofile-field-type-datebox.php +++ src/bp-xprofile/classes/class-bp-xprofile-field-type-datebox.php @@ -239,7 +239,17 @@ class BP_XProfile_Field_Type_Datebox extends BP_XProfile_Field_Type { case 'year': $html = sprintf( '', selected( $year, 0, false ), /* translators: no option picked in select box */ __( '----', 'buddypress' ) ); - for ( $i = 2037; $i > 1901; $i-- ) { + $settings = $this->get_field_settings( $this->field_obj->id ); + + if ( 'relative' === $settings['range_type'] ) { + $start = date( 'Y' ) + $settings['range_relative_start']; + $end = date( 'Y' ) + $settings['range_relative_end']; + } else { + $start = $settings['range_absolute_start']; + $end = $settings['range_absolute_end']; + } + + for ( $i = $end; $i >= $start; $i-- ) { $html .= sprintf( '', (int) $i, selected( $year, $i, false ), (int) $i ); } break; @@ -315,16 +325,230 @@ class BP_XProfile_Field_Type_Datebox extends BP_XProfile_Field_Type { } /** - * This method usually outputs HTML for this field type's children options on the wp-admin Profile Fields - * "Add Field" and "Edit Field" screens, but for this field type, we don't want it, so it's stubbed out. + * Get settings for a given date field. * - * @since 2.0.0 + * @since 2.7.0 + * + * @param int $field_id ID of the field. + * @return array + */ + public static function get_field_settings( $field_id ) { + $defaults = array( + 'date_format' => 'Y-m-d', + 'date_format_custom' => '', + 'range_type' => 'absolute', + 'range_absolute_start' => date( 'Y' ) - 60, + 'range_absolute_end' => date( 'Y' ) + 10, + 'range_relative_start' => '-10', + 'range_relative_end' => '20', + ); + + $settings = array(); + foreach ( $defaults as $key => $value ) { + $saved = bp_xprofile_get_meta( $field_id, 'field', $key, true ); + if ( '' !== $saved ) { + $settings[ $key ] = $saved; + } else { + $settings[ $key ] = $value; + } + } + + $settings = self::validate_settings( $settings ); + + return $settings; + } + + /** + * Validate date field settings. + * + * @since 2.7.0 + * + * @param array $settings Raw settings. + * @return array Validated settings. + */ + public static function validate_settings( $settings ) { + foreach ( $settings as $key => &$value ) { + switch ( $key ) { + case 'range_type' : + if ( $value !== 'absolute' ) { + $value = 'relative'; + } + break; + + // @todo More date restrictions? + case 'range_absolute_start' : + case 'range_absolute_end' : + $value = absint( $value ); + break; + + case 'range_relative_start' : + case 'range_relative_end' : + $value = intval( $value ); + break; + } + } + + return $settings; + } + + /** + * Save settings from the field edit screen in the Dashboard. + * + * @param int $field_id ID of the field. + * @return bool True on success. + */ + public function admin_save_settings( $field_id ) { + $existing_settings = self::get_field_settings( $field_id ); + + $saved_settings = array(); + foreach ( array_keys( $existing_settings ) as $setting ) { + switch ( $setting ) { + case 'range_relative_start' : + case 'range_relative_end' : + $op_key = $setting . '_type'; + if ( isset( $_POST[ $op_key ] ) && 'past' === $_POST[ $op_key ] ) { + $value = 0 - intval( $_POST[ $setting ] ); + } else { + $value = intval( $_POST[ $setting ] ); + } + + $saved_settings[ $setting ] = $value; + break; + + default : + if ( isset( $_POST[ $setting ] ) ) { + $saved_settings[ $setting ] = wp_unslash( $_POST[ $setting ] ); + } + break; + } + } + + $saved_settings = self::validate_settings( $saved_settings ); + + foreach ( $saved_settings as $setting_key => $setting_value ) { + bp_xprofile_update_meta( $field_id, 'field', $setting_key, $setting_value ); + } + + return true; + } + + /** + * Generate the settings markup for Date fields. + * + * @since 2.7.0 * * @param BP_XProfile_Field $current_field The current profile field on the add/edit screen. * @param string $control_type Optional. HTML input type used to render the current * field's child options. */ - public function admin_new_field_html( BP_XProfile_Field $current_field, $control_type = '' ) {} + public function admin_new_field_html( BP_XProfile_Field $current_field, $control_type = '' ) { + $type = array_search( get_class( $this ), bp_xprofile_get_field_types() ); + + if ( false === $type ) { + return; + } + + $class = $current_field->type != $type ? 'display: none;' : ''; + $current_type_obj = bp_xprofile_create_field_type( $type ); + + $settings = self::get_field_settings( $current_field->id ); + ?> + +
+ + + + + + + + + + + + +
+ + +
+ + + + + get_date_formats() as $format ): ?> + +
+ + + +
+ + +
+ +

+
+ + +
+ + + + + +
+ + +
+
+
+ type_obj->admin_save_settings( $this->id ); + } + + /** * Populates the items for radio buttons, checkboxes, and dropdown boxes. */ public function render_admin_form_children() {