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

- fix preloader

Browse Source 
- fix show after search
This commit is contained in:
andrewshuba
2019-09-05 13:41:08 +03:00
parent f8a7b0b5d5
commit 07dbea1918
3 changed files with 48 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/css/um-members.css
+8 -7
View File
@@ -116,15 +116,14 @@
.um-member.awaiting_admin_review,
.um-member.inactive,
.um-member.rejected {
.um-member.rejected {
opacity: 0.7;
}
.um-member-status {display:none}
.um-member-status.awaiting_admin_review,
.um-member-status.inactive,
.um-member-status.rejected
{
.um-member-status.rejected {
display: block;
position: absolute;
top: 0;
@@ -374,10 +373,12 @@ a.um-edit-profile-btn {
/* NEW STYLES FOR VIEW TYPE LIST*/
.um-directory {
position: relative;
}
.um-directory .um-member-directory-header {
box-sizing: border-box;
padding: 20px 0;
padding: 0;
width: 100%;
}
#content .um-member-directory-header a {
@@ -671,8 +672,8 @@ div.uimob500 .um-members-list .um-member-card-actions {
float: left;
top:0;
bottom:0;
background: rgba( 0, 0, 0, 0 );
/*background: rgba( 0, 0, 0, 0.8 );*/
background: rgba(255, 255, 255, 0.8);
z-index: 2;
}
@-webkit-keyframes um-ajax-spinning {
assets/js/um-members.js
+31 -19
View File
@@ -100,14 +100,14 @@ function um_set_range_label( slider, ui ) {
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') );
.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') );
.replace( '\{max_range\}', slider.slider( "values", 1 ) )
.replace( '\{field_label\}', slider.siblings( '.um-slider-range' )
.data('label') );
}
slider.siblings( '.um-slider-range' ).html( placeholder );
@@ -249,8 +249,6 @@ function um_build_template( directory, data ) {
jQuery( document ).trigger( "um_build_template", [ directory, data ] );
jQuery( window ).trigger( "resize" );
init_tipsy();
}
@@ -384,8 +382,8 @@ function um_change_tag( directory ) {
filter_title = filter.find('div.um-slider-range').data('label');
var filter_value_title = filter.find('div.um-slider-range').data( 'placeholder' ).replace( '\{min_range\}', filter_value_from )
.replace( '\{max_range\}', filter_value_to )
.replace( '\{field_label\}', filter.find('div.um-slider-range').data('label') );
.replace( '\{max_range\}', filter_value_to )
.replace( '\{field_label\}', filter.find('div.um-slider-range').data('label') );
filters_data.push( {'name':filter_name, 'label':filter_title, 'value_label':filter_value_title, 'value':[filter_value_from, filter_value_to], 'type':filter_type} );
}
@@ -495,6 +493,7 @@ jQuery(document).ready( function() {
if ( um_is_directory_busy( directory ) ) {
return false;
}
um_members_show_preloader( directory );
var $this = jQuery(this);
var views = $this.parents('.um-member-directory-view-type');
@@ -533,11 +532,12 @@ jQuery(document).ready( function() {
//searching
jQuery( document.body ).on( 'click', '.um-do-search', function() {
var directory = jQuery(this).parents('.um-directory');
var directory = jQuery(this).parents('.um-directory');
if ( um_is_directory_busy( directory ) ) {
return;
}
um_members_show_preloader( directory );
var pre_search = um_get_data_for_directory( directory, 'search' );
@@ -584,6 +584,8 @@ jQuery(document).ready( function() {
return;
}
um_members_show_preloader( directory );
var sort = jQuery(this).val();
//
@@ -693,6 +695,8 @@ jQuery(document).ready( function() {
return;
}
um_members_show_preloader( directory );
var page = jQuery(this).val();
directory.find('.pagi').removeClass('current');
@@ -771,6 +775,8 @@ jQuery(document).ready( function() {
return;
}
um_members_show_preloader( directory );
var filter_name = jQuery(this).prop('name');
var current_value = um_get_data_for_directory( directory, 'filter_' + filter_name );
@@ -875,6 +881,8 @@ jQuery(document).ready( function() {
return;
}
um_members_show_preloader( directory );
var filter_name = elem.data( 'filter_name' );
var range = elem.data( 'range' );
@@ -953,6 +961,8 @@ jQuery(document).ready( function() {
return;
}
um_members_show_preloader( directory );
var filter_name = elem.data( 'filter_name' );
var range = elem.data( 'range' );
@@ -1016,6 +1026,8 @@ jQuery(document).ready( function() {
return;
}
um_members_show_preloader( directory );
var removeItem = jQuery(this).data('value');
var filter_name = jQuery(this).data('name');
@@ -1074,6 +1086,8 @@ jQuery(document).ready( function() {
return;
}
um_members_show_preloader( directory );
directory.find( '.um-members-filter-remove' ).each( function() {
var removeItem = jQuery(this).data('value');
var filter_name = jQuery(this).data('name');
@@ -1186,20 +1200,18 @@ jQuery(document).ready( function() {
var hash = um_members_get_hash( directory );
um_member_directories.push( hash );
var show_after_search = false;
var search = um_get_search( directory );
if ( search && typeof search !== 'undefined' ) {
show_after_search = true;
}
var show_after_search = jQuery(this).data('show');
if ( ! ( directory.data( 'only_search' ) > 0 && show_after_search ) ) {
//show preloader at first
um_members_show_preloader( directory );
if( show_after_search === false ){
um_members_show_preloader( directory );
um_ajax_get_members( directory );
} else {
um_members_hide_preloader( directory );
return;
}
um_ajax_get_members( directory );
um_change_tag( directory );
templates/members.php
+9 -2
View File
@@ -118,11 +118,18 @@ foreach ( $args['view_types'] as $type ) {
UM()->get_template( 'members-' . $type . '.php', $basename, $args, true );
}
UM()->get_template( 'members-header.php', '', $args, true );
UM()->get_template( 'members-pagination.php', '', $args, true ); ?>
UM()->get_template( 'members-pagination.php', '', $args, true );
if( $args['must_search'] == 1 ) {
$after_search = 'true';
} else {
$after_search = 'false';
} ?>
<div class="um <?php echo esc_attr( $this->get_class( $mode ) ); ?> um-<?php echo esc_attr( substr( md5( $form_id ), 10, 5 ) ); ?>"
data-hash="<?php echo esc_attr( substr( md5( $form_id ), 10, 5 ) ) ?>" data-base-post="<?php echo esc_attr( $post->ID ) ?>"
data-view_type="<?php echo esc_attr( $current_view ) ?>" data-page="<?php echo esc_attr( $current_page ) ?>">
data-show="<?php echo esc_attr( $after_search ); ?>"
data-view_type="<?php echo esc_attr( $current_view ) ?>" data-page="<?php echo esc_attr( $current_page ) ?>">
<div class="um-form">