10h30/ultimatemember
1
0
Fork 0
mirror of https://github.com/10h30/ultimatemember.git synced 2026-07-12 19:26:35 +09:00
Code Issues Packages Projects Releases Wiki Activity

- fixed styles and timepicker filter on member directories;

Browse Source
This commit is contained in:
nikitasinelnikov
2019-11-21 00:13:02 +02:00
parent c65f3f298a
commit 1c1921e602
6 changed files with 50 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/css/um-members-rtl.css
+2 -2
View File
@@ -15,9 +15,9 @@
margin: 0 0 0 5px; }
.um-directory .um-member-directory-header .um-member-directory-header-row .um-search .um-search-filter.um-datepicker-filter-type input, .um-directory .um-member-directory-header .um-member-directory-header-row .um-search .um-search-filter.um-timepicker-filter-type input {
margin: 0 0 0 5px; }
margin: 0 0 0 5px !important; }
.um-directory .um-member-directory-header .um-member-directory-header-row .um-search .um-search-filter.um-datepicker-filter-type input:nth-child(even), .um-directory .um-member-directory-header .um-member-directory-header-row .um-search .um-search-filter.um-timepicker-filter-type input:nth-child(even) {
margin: 0 5px 0 0; }
margin: 0 5px 0 0 !important; }
.um-directory .um-member-directory-header .um-member-directory-header-row .um-filtered-line .um-members-filter-tag {
margin: 0 0 5px 10px; }
assets/css/um-members.css
+2 -2
View File
@@ -316,12 +316,12 @@ body #content .um-directory a {
flex-wrap: nowrap; }
.um-directory .um-member-directory-header .um-member-directory-header-row .um-search .um-search-filter.um-datepicker-filter-type input, .um-directory .um-member-directory-header .um-member-directory-header-row .um-search .um-search-filter.um-timepicker-filter-type input {
width: calc( 50% - 5px);
margin: 0 5px 0 0;
margin: 0 5px 0 0 !important;
box-sizing: border-box;
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box; }
.um-directory .um-member-directory-header .um-member-directory-header-row .um-search .um-search-filter.um-datepicker-filter-type input:nth-child(even), .um-directory .um-member-directory-header .um-member-directory-header-row .um-search .um-search-filter.um-timepicker-filter-type input:nth-child(even) {
margin: 0 0 0 5px; }
margin: 0 0 0 5px !important; }
.um-directory .um-member-directory-header .um-member-directory-header-row .um-search[style*="overflow: hidden;"] .um-search-filter {
pointer-events: none; }
.um-directory .um-member-directory-header .um-member-directory-header-row .um-search.um-search-invisible {
assets/js/um-members.js
+41 -7
View File
@@ -166,12 +166,23 @@ function um_get_current_page( directory ) {
function um_time_convert( time, range ) {
var hours = Math.floor( time / 60 );
var minutes = time % 60;
if ( range == 'to' ) {
if ( range === 'to' ) {
minutes = minutes + 1;
}
if ( minutes >= 60 ) {
minutes = 0;
hours = hours + 1;
if ( hours >= 24 ) {
hours = 0;
}
}
if ( minutes < 10 ) {
minutes = '0' + minutes;
}
return hours + ":" + minutes;
}
@@ -1075,7 +1086,6 @@ jQuery(document.body).ready( function() {
jQuery( document.body ).on( 'click', '.um-directory .um-clear-filters-a', function() {
jQuery('.um-search-filter input').val('');
var directory = jQuery(this).parents('.um-directory');
if ( um_is_directory_busy( directory ) ) {
return;
@@ -1126,12 +1136,21 @@ jQuery(document.body).ready( function() {
} else if ( type === 'slider' ) {
um_set_url_from_data( directory, 'filter_' + filter_name + '_from','' );
um_set_url_from_data( directory, 'filter_' + filter_name + '_to', '' );
jQuery( '.um-search-filter input[name="filter_' + filter_name + '_from"]' ).val('');
jQuery( '.um-search-filter input[name="filter_' + filter_name + '_to"]' ).val('');
} else if ( type === 'datepicker' ) {
um_set_url_from_data( directory, 'filter_' + filter_name + '_from','' );
um_set_url_from_data( directory, 'filter_' + filter_name + '_to', '' );
jQuery( '.um-search-filter input[name="filter_' + filter_name + '_from"]' ).val('');
jQuery( '.um-search-filter input[name="filter_' + filter_name + '_to"]' ).val('');
} else if ( type === 'timepicker' ) {
um_set_url_from_data( directory, 'filter_' + filter_name + '_from','' );
um_set_url_from_data( directory, 'filter_' + filter_name + '_to', '' );
jQuery( '.um-search-filter input[name="filter_' + filter_name + '_from"]' ).val('');
jQuery( '.um-search-filter input[name="filter_' + filter_name + '_to"]' ).val('');
}
});
@@ -1377,11 +1396,18 @@ jQuery(document.body).ready( function() {
if ( typeof current_value_to === "undefined" ) {
max = max.split(':');
var minutes = Math.ceil( max[1] ) + 1;
if ( minutes >= 60 ) {
minutes = '00';
max[0] = max[0]*1 + 1;
if ( max[0] >= 24 ) {
max[0] = '00';
}
}
current_value_to = max[0] + ':' + minutes;
}
if ( typeof context.select !== 'undefined' ) {
var change_val = elem.val();
var select_val = um_time_convert( context.select, range );
if ( range === 'from' ) {
@@ -1395,16 +1421,24 @@ jQuery(document.body).ready( function() {
} else if ( range === 'to' ) {
max = max.split(':');
var minutes = Math.ceil( max[1] ) + 1;
if ( minutes >= 60 ) {
minutes = '00';
max[0] = max[0]*1 + 1;
if ( max[0] >= 24 ) {
max[0] = '00';
}
}
current_value_to = max[0] + ':' + minutes;
}
}
var time = jQuery('#'+elemID).val();
var time = jQuery( '#' + elemID ).val();
if ( elem.data('range') == 'from' ) {
jQuery('#'+elem_filter_name+'_to').pickatime('picker').set('min', time);
if ( elem.data('range') === 'from' ) {
jQuery( '#' + elem_filter_name + '_to' ).pickatime('picker').set('min', time);
} else {
jQuery('#'+elem_filter_name+'_from').pickatime('picker').set('max', time);
jQuery( '#' + elem_filter_name + '_from').pickatime('picker').set('max', time);
}
um_set_url_from_data( directory, 'filter_' + filter_name + '_from', current_value_from );
assets/js/um-members.min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
assets/sass/um-members-rtl.sass
+2 -2
View File
@@ -28,9 +28,9 @@
&.um-datepicker-filter-type,
&.um-timepicker-filter-type
input
margin: 0 0 0 5px
margin: 0 0 0 5px !important
&:nth-child(even)
margin: 0 5px 0 0
margin: 0 5px 0 0 !important
.um-filtered-line
.um-members-filter-tag
assets/sass/um-members.sass
+2 -2
View File
@@ -267,11 +267,11 @@ body
+flex( row, flex-start, baseline, nowrap )
input
width: calc( 50% - 5px )
margin: 0 5px 0 0
margin: 0 5px 0 0 !important
+border-box
//float: left
&:nth-child(even)
margin: 0 0 0 5px
margin: 0 0 0 5px !important
&[style*="overflow: hidden;"]
.um-search-filter
pointer-events: none