10h30/ultimatemember
1
0
Fork 0
mirror of https://github.com/10h30/ultimatemember.git synced 2026-07-14 04:06:36 +09:00
Code Issues Packages Projects Releases Wiki Activity

- default admin filters using with frontend filters;

Browse Source
This commit is contained in:
nikitasinelnikov
2020-01-10 17:31:55 +02:00
parent d42ee593f3
commit 16e0981e33
7 changed files with 122 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/admin/assets/css/um-admin-forms.css
+12 -1
View File
@@ -86,6 +86,10 @@ textarea.um-forms-field.um-small-field {
margin: 5px 0 0 0;
}
.um-md-default-filters-option-line .um.um-field-wrapper2 {
margin: 5px 0 0 0;
}
.um-multi-selects-option-line.um-admin-drag-fld {
background: none;
border: none;
@@ -147,6 +151,12 @@ textarea.um-forms-field.um-small-field {
}
.um-md-default-filters-option-line .um-field-wrapper2 input {
width: 100%;
float: left;
}
.um-md-default-filters-option-line .um-field-wrapper2 input.um-timepicker-filter,
.um-md-default-filters-option-line .um-field-wrapper2 input.um-datepicker-filter {
width: calc( 50% - 7px ) !important;
float: left;
}
@@ -158,7 +168,8 @@ textarea.um-forms-field.um-small-field {
display: block;
}
.um-md-default-filters-option-line .um-field-wrapper2 input:first-child {
.um-md-default-filters-option-line .um-field-wrapper2 input.um-timepicker-filter:first-child,
.um-md-default-filters-option-line .um-field-wrapper2 input.um-datepicker-filter:first-child {
margin-right: 11px;
}
includes/admin/assets/js/um-admin-forms.js
+25 -10
View File
@@ -406,18 +406,33 @@ jQuery(document).ready( function() {
});
function um_set_range_label( slider, ui ) {
var placeholder = slider.siblings( '.um-slider-range' ).data( 'placeholder' );
console.log( slider );
var placeholder = '';
var placeholder_s = slider.siblings( '.um-slider-range' ).data( 'placeholder-s' );
var placeholder_p = slider.siblings( '.um-slider-range' ).data( 'placeholder-p' );
if( ui ) {
placeholder = placeholder.replace( '\{min_range\}', ui.values[ 0 ] )
.replace( '\{max_range\}', ui.values[ 1 ] )
.replace( '\{field_label\}', slider.siblings( '.um-slider-range' )
.data('label') );
if ( ui ) {
if ( ui.values[ 0 ] === ui.values[ 1 ] ) {
placeholder = placeholder_s.replace( '\{value\}', ui.values[ 0 ] )
.replace( '\{field_label\}', slider.siblings( '.um-slider-range' )
.data('label') );
} else {
placeholder = placeholder_p.replace( '\{min_range\}', ui.values[ 0 ] )
.replace( '\{max_range\}', ui.values[ 1 ] )
.replace( '\{field_label\}', slider.siblings( '.um-slider-range' )
.data('label') );
}
} else {
placeholder = placeholder.replace( '\{min_range\}', slider.slider( "values", 0 ) )
.replace( '\{max_range\}', slider.slider( "values", 1 ) )
.replace( '\{field_label\}', slider.siblings( '.um-slider-range' )
.data('label') );
if ( slider.slider( "values", 0 ) === slider.slider( "values", 1 ) ) {
placeholder = placeholder_s.replace( '\{value\}', slider.slider( "values", 0 ) )
.replace( '\{field_label\}', slider.siblings( '.um-slider-range' )
.data('label') );
} else {
placeholder = placeholder_p.replace( '\{min_range\}', slider.slider( "values", 0 ) )
.replace( '\{max_range\}', slider.slider( "values", 1 ) )
.replace( '\{field_label\}', slider.siblings( '.um-slider-range' )
.data('label') );
}
}
slider.siblings( '.um-slider-range' ).html( placeholder );
includes/admin/core/class-admin-forms.php
+1 -1
View File
@@ -1345,7 +1345,7 @@ if ( ! class_exists( 'um\admin\core\Admin_Forms' ) ) {
$html .= "<li class=\"um-md-default-filters-option-line\"><span class=\"um-field-wrapper\">
<select $id_attr $name_attr $class_attr $data_attr>$options</select></span>
<span class=\"um-field-control\"><a href=\"javascript:void(0);\" class=\"um-select-delete\">" . __( 'Remove', 'ultimate-member' ) . "</a></span><span class=\"um-field-wrapper2 um\">" . UM()->member_directory()->show_filter( $value, array( 'form_id' => $post->ID ), $values[ $value ] ) . "</span></li>";
<span class=\"um-field-control\"><a href=\"javascript:void(0);\" class=\"um-select-delete\">" . __( 'Remove', 'ultimate-member' ) . "</a></span><span class=\"um-field-wrapper2 um\">" . UM()->member_directory()->show_filter( $value, array( 'form_id' => $post->ID ), $values[ $value ], true ) . "</span></li>";
}
} elseif ( ! empty( $field_data['show_default_number'] ) && is_numeric( $field_data['show_default_number'] ) && $field_data['show_default_number'] > 0 ) {
$i = 0;
includes/admin/core/class-admin-metabox.php
+5 -1
View File
@@ -19,6 +19,7 @@ if ( ! class_exists( 'um\admin\core\Admin_Metabox' ) ) {
* @var bool
*/
private $form_nonce_added = false;
private $directory_nonce_added = false;
/**
@@ -687,7 +688,10 @@ if ( ! class_exists( 'um\admin\core\Admin_Metabox' ) ) {
include_once $path . 'includes/admin/templates/directory/'. $box['id'] . '.php';
wp_nonce_field( basename( __FILE__ ), 'um_admin_save_metabox_directory_nonce' );
if ( ! $this->directory_nonce_added ) {
$this->directory_nonce_added = true;
wp_nonce_field( basename( __FILE__ ), 'um_admin_save_metabox_directory_nonce' );
}
}