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

- fixed some colors in CSS;

Browse Source 
- fixed RTL layouts;
- fixed must search attr;
- fixed show only these users attr;
- changed CSS for fields (1px border);
- fixed UM dropdown JS for position;
This commit is contained in:
nikitasinelnikov
2019-09-11 16:07:51 +03:00
parent 6eb47f2368
commit 5241b95a98
12 changed files with 82 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/css/um-members.css
+16 -7
View File
@@ -85,7 +85,7 @@
width: 30%;
background: #fff;
text-align: center;
border: 1px solid #eee;
border: 1px solid #ddd;
box-sizing: border-box;
margin-bottom: 40px;
position: relative;
@@ -146,7 +146,9 @@
text-align: center;
}
.um-member-photo a{ display: inline !important; }
.um-member-photo a {
display: inline !important;
}
.um-member-photo img {
display: inline !important;
@@ -157,7 +159,9 @@
float: none !important;
}
.um-member.with-cover .um-member-photo {padding-top: 0}
.um-member.with-cover .um-member-photo {
padding-top: 0
}
.um-member.with-cover .um-member-photo img {
width: 90px;
height: 90px;
@@ -172,10 +176,15 @@
.um-member-photo.radius-2 img { -moz-border-radius: 4px !important;-webkit-border-radius: 4px !important;border-radius: 4px !important }
.um-member-photo.radius-3 img { -moz-border-radius: 0 !important;-webkit-border-radius: 0 !important; border-radius: 0 !important }
/*.um-directory.uimob500*/
/*.um-members-list .um-member-photo*/
/*
- Member name
*/
.um-member-card.no-photo {
padding-top: 30px;
}
@@ -841,12 +850,12 @@ div.uimob500 .um-members-list .um-member-card-actions {
.um-slider .ui-slider-range.ui-widget-header {
background: #44b0ec;
border: 2px solid #44b0ec !important;
margin-top: -2px;
border: 1px solid #44b0ec !important;
margin-top: -1px;
}
.um-slider.ui-slider.ui-slider-horizontal {
border: 2px solid #ddd !important;
border: 1px solid #ddd !important;
box-sizing: border-box;
}
assets/css/um-old-default.css
+2 -2
View File
@@ -128,7 +128,7 @@ div.uimob800 .um-account-side li a.current:hover
.select2-drop-active,
.select2-drop.select2-drop-above
{
border: 2px solid #ddd !important;
border: 1px solid #ddd !important;
}
.um .um-form .select2-container-multi .select2-choices .select2-search-field input[type=text] {
@@ -142,7 +142,7 @@ div.uimob800 .um-account-side li a.current:hover
.um .um-form .um-datepicker.picker__input.picker__input--active,
.um .um-form .um-datepicker.picker__input.picker__input--target,
.um .um-form textarea:focus {
border: 2px solid #bbb !important;
border: 1px solid #bbb !important;
}
.um .um-form input[type=text],
assets/css/um-profile.css
+4 -2
View File
@@ -143,7 +143,7 @@
height: 30px;
line-height: 30px;
z-index: 66;
padding-right: 10px;
margin-right: 10px;
}
.um-profile-edit i {
@@ -194,6 +194,8 @@
float: left;
position: relative;
width:200px;
margin: 0 0 0 30px;
box-sizing: border-box;
}
.um-profile-photo a.um-profile-photo-img {
@@ -201,7 +203,7 @@
position: absolute;
background: #fff;
padding: 5px;
left: 30px;
/*left: 30px;*/
}
.um-profile-photo a.um-profile-photo-img img {
assets/css/um-styles.css
+10 -5
View File
@@ -705,7 +705,13 @@ a.um-link-alt:hover {text-decoration: underline !important;}
margin: 0 !important;
}
.um-dropdown li a {
.um-dropdown ul {
background: #fff;
position: relative;
z-index: 16;
}
.um-dropdown li a {
display: block;
padding: 8px 12px;
color: #666;
@@ -718,7 +724,7 @@ a.um-link-alt:hover {text-decoration: underline !important;}
padding: 12px;
}
.um-dropdown li a:hover {
.um-dropdown li a:hover {
}
@@ -728,7 +734,6 @@ a.um-link-alt:hover {text-decoration: underline !important;}
.um-dropdown-arr {
position: absolute;
color: #fff;
font-size: 24px;
width: 24px;
height: 24px;
@@ -845,7 +850,7 @@ small.um-max-filesize span{
user-select: none;
background: none !important;
background-color: #fff !important;
border: 2px solid #ddd !important;
border: 1px solid #ddd !important;
}
.select2.select2-container .select2-selection .select2-selection__arrow b[role=presentation]{
display:none;
@@ -876,7 +881,7 @@ small.um-max-filesize span{
border-left: 0 !important;
}
.select2-container.select2-container--open .select2-dropdown{
border: 2px solid #ddd !important;
border: 1px solid #ddd !important;
}
.select2-results li{
list-style: none;
assets/css/um.rtl.css
+5 -3
View File
@@ -5,6 +5,7 @@
.um-profile-photo {
float: right;
margin: 0 30px 0 0;
}
.um-profile-photo a.um-profile-photo-img {
@@ -13,7 +14,7 @@
}
.um-cover + .um-header .um-profile-photo a.um-profile-photo-img {
right: 30px;
/*right: 30px;*/
}
div.uimob500 .um-profile-photo a.um-profile-photo-img {
@@ -22,8 +23,9 @@ div.uimob500 .um-profile-photo a.um-profile-photo-img {
.um-profile-edit {
right: auto;
left: 10px;
padding-left: 10px;
left: 0;
margin-left: 10px;
margin-right: 0;
}
div.uimob960 .um-header .um-profile-meta,
assets/js/um-functions.js
+2 -9
View File
@@ -34,6 +34,7 @@ function UM_domenus() {
if ( position === 'lc' && jQuery('html').attr('dir') === 'rtl' ){
position = 'rc';
}
if ( jQuery(window).width() <= 1200 && element === 'div.um-profile-edit' ) {
if ( jQuery('html').attr('dir') === 'rtl' ){
position = 'rc';
@@ -53,10 +54,8 @@ function UM_domenus() {
if ( top_ ) {
top_p = jQuery(element).find('img').height() + 4 + top_;
left_gap = 4;
} else {
top_p = jQuery(element).find('img').height() + 4;
left_gap = 0;
}
if ( top_p == 4 && element === 'div.um-cover' ) {
@@ -105,16 +104,10 @@ function UM_domenus() {
} else if ( position === 'bc' ) {
if ( jQuery('html').attr('dir') === 'rtl' ){
rtl_gap = 10;
} else {
rtl_gap = 0
}
menu.css({
'top' : top_p,
'width': 200,
'left': left_p + left_gap + rtl_gap,
'left': left_p,
'right' : 'auto',
'text-align' : 'center'
});
assets/js/um-functions.min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
assets/js/um-members.js
+23 -21
View File
@@ -431,6 +431,7 @@ function um_run_search( directory ) {
var search = directory.find('.um-search-line').val();
if ( search === pre_search || ( search === '' && typeof pre_search == 'undefined' ) ) {
um_members_hide_preloader( directory );
return;
}
@@ -442,9 +443,9 @@ function um_run_search( directory ) {
um_set_url_from_data( directory, 'page', '' );
var show_after_search = directory.data('must-search');
var search = um_get_search( directory );
if ( directory.find( '.um-members-filter-remove' ).length === 0 && ! search ) {
if ( show_after_search === 1 ) {
if ( show_after_search === 1 ) {
var search = um_get_search( directory );
if ( directory.find( '.um-members-filter-remove' ).length === 0 && ! search ) {
directory.data( 'searched', 0 );
directory.find('.um-members-grid, .um-members-list').remove();
directory.find( '.um-member-directory-sorting-options' ).prop( 'disabled', true );
@@ -727,9 +728,9 @@ jQuery(document).ready( function() {
var search_bar = jQuery(this).parents('.um-directory').find('.um-search');
if ( search_bar.is( ':visible' ) ) {
search_bar.slideUp(650);
search_bar.slideUp(250);
} else {
search_bar.slideDown(650);
search_bar.slideDown(250);
}
});
@@ -1077,9 +1078,9 @@ jQuery(document).ready( function() {
}
var show_after_search = directory.data('must-search');
var search = um_get_search( directory );
if ( directory.find( '.um-members-filter-remove' ).length === 0 && ! search ) {
if ( show_after_search === 1 ) {
if ( show_after_search === 1 ) {
var search = um_get_search( directory );
if ( directory.find( '.um-members-filter-remove' ).length === 0 && ! search ) {
directory.data( 'searched', 0 );
directory.find('.um-members-grid, .um-members-list').remove();
directory.find( '.um-member-directory-sorting-options' ).prop( 'disabled', true );
@@ -1159,14 +1160,16 @@ jQuery(document).ready( function() {
jQuery(this).hide();
var show_after_search = directory.data('must-search');
var search = um_get_search( directory );
if ( show_after_search === 1 && ! search ) {
directory.data( 'searched', 0 );
directory.find('.um-members-grid, .um-members-list').remove();
directory.find( '.um-member-directory-sorting-options' ).prop( 'disabled', true );
directory.find( '.um-member-directory-view-type' ).addClass( 'um-disabled' );
um_members_hide_preloader( directory );
return;
if ( show_after_search === 1 ) {
var search = um_get_search( directory );
if ( ! search ) {
directory.data( 'searched', 0 );
directory.find('.um-members-grid, .um-members-list').remove();
directory.find( '.um-member-directory-sorting-options' ).prop( 'disabled', true );
directory.find( '.um-member-directory-view-type' ).addClass( 'um-disabled' );
um_members_hide_preloader( directory );
return;
}
}
directory.find( '.um-member-directory-sorting-options' ).prop( 'disabled', false );
@@ -1188,11 +1191,10 @@ jQuery(document).ready( function() {
um_member_directories.push( hash );
var show_after_search = directory.data('must-search');
var search = um_get_search( directory );
var filters_data = um_get_filters_data( directory );
if ( ! filters_data.length && ! search ) {
if ( show_after_search === 1 ) {
if ( show_after_search === 1 ) {
var search = um_get_search( directory );
var filters_data = um_get_filters_data( directory );
if ( ! filters_data.length && ! search ) {
return;
}
}
assets/js/um-members.min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
includes/admin/assets/css/um-admin-select2.css
+2 -2
View File
@@ -92,7 +92,7 @@ body.um-admin .select2.select2-container .select2-selection{
user-select: none;
background: none !important;
background-color: #fff !important;
border: 2px solid #ddd !important;
border: 1px solid #ddd !important;
}
body.um-admin .select2.select2-container .select2-selection .select2-selection__arrow b[role=presentation]{
display:none;
@@ -123,7 +123,7 @@ body.um-admin .select2.select2-container .select2-selection .select2-selection__
border-left: 0 !important;
}
body.um-admin .select2-container.select2-container--open .select2-dropdown{
border: 2px solid #ddd !important;
border: 1px solid #ddd !important;
}
body.um-admin .select2-results li{
list-style: none;
includes/core/class-member-directory.php
+14 -8
View File
@@ -941,17 +941,23 @@ if ( ! class_exists( 'um\core\Member_Directory' ) ) {
* @param array $directory_data
*/
function show_only_these_users( $directory_data ) {
if ( ! empty( $directory_data['show_these_users'] ) && is_array( $directory_data['show_these_users'] ) ) {
$users_array = array();
if ( ! empty( $directory_data['show_these_users'] ) ) {
$show_these_users = maybe_unserialize( $directory_data['show_these_users'] );
foreach ( $directory_data['show_these_users'] as $username ) {
if ( false !== ( $exists_id = username_exists( $username ) ) ) {
$users_array[] = $exists_id;
if ( is_array( $show_these_users ) && ! empty( $show_these_users ) ) {
$users_array = array();
foreach ( $show_these_users as $username ) {
if ( false !== ( $exists_id = username_exists( $username ) ) ) {
$users_array[] = $exists_id;
}
}
if ( ! empty( $users_array ) ) {
$this->query_args['include'] = $users_array;
}
}
if ( ! empty( $users_array ) ) {
$this->query_args['include'] = $users_array;
}
}
}
templates/members.php
+2 -7
View File
@@ -123,15 +123,10 @@ foreach ( $args['view_types'] as $type ) {
UM()->get_template( 'members-header.php', '', $args, true );
UM()->get_template( 'members-pagination.php', '', $args, true );
if ( isset( $args['must_search'] ) && $args['must_search'] == 1 ) {
$must_search = 1;
} else {
$must_search = 0;
}
$must_search = 0;
$not_searched = false;
if ( ( ( $search && $show_search ) || ( $filters && $show_filters && count( $search_filters ) ) ) && isset( $args['must_search'] ) && $args['must_search'] == 1 ) {
$must_search = 1;
$not_searched = true;
if ( $search && $show_search && ! empty( $search_from_url ) ) {
$not_searched = false;