From 6c591fc33ccaa27df641166d2bfce9f170bdaa2a Mon Sep 17 00:00:00 2001 From: nikitasinelnikov Date: Wed, 16 Oct 2019 17:47:12 +0300 Subject: [PATCH] - fixed RTL styles for member directory; --- assets/css/um-members-rtl.css | 82 +++++++++++ assets/css/um-members.css | 118 +++++++-------- assets/js/dropdown.js | 3 +- assets/sass/um-members-rtl.sass | 135 ++++++++++++++++++ assets/sass/um-members.sass | 81 ++++------- includes/admin/templates/directory/search.php | 12 +- includes/core/class-enqueue.php | 17 ++- templates/members-list.php | 2 +- templates/members.php | 2 +- 9 files changed, 322 insertions(+), 130 deletions(-) create mode 100644 assets/css/um-members-rtl.css create mode 100644 assets/sass/um-members-rtl.sass diff --git a/assets/css/um-members-rtl.css b/assets/css/um-members-rtl.css new file mode 100644 index 00000000..2729938f --- /dev/null +++ b/assets/css/um-members-rtl.css @@ -0,0 +1,82 @@ +.um-directory .um-member-directory-header .um-member-directory-header-row .um-member-directory-search-line label { + margin: 0 0 0 10px; } + +.um-directory .um-member-directory-header .um-member-directory-header-row .um-member-directory-nav-line .um-member-directory-view-type { + margin: 0 0 0 10px; } + +.um-directory .um-member-directory-header .um-member-directory-header-row .um-member-directory-nav-line .um-member-directory-sorting .um-member-directory-sorting-a a { + margin: 0 0 0 5px; } + +.um-directory .um-member-directory-header .um-member-directory-header-row .um-member-directory-nav-line .um-member-directory-sorting .um-member-directory-sorting-a .um-new-dropdown { + right: -12px; + left: auto; } + +.um-directory .um-member-directory-header .um-member-directory-header-row .um-member-directory-nav-line .um-member-directory-filters .um-member-directory-filters-a a { + 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; } + .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; } + +.um-directory .um-member-directory-header .um-member-directory-header-row .um-filtered-line .um-members-filter-tag { + margin: 0 0 5px 10px; } + .um-directory .um-member-directory-header .um-member-directory-header-row .um-filtered-line .um-members-filter-tag:first-child { + margin-left: 10px; } + .um-directory .um-member-directory-header .um-member-directory-header-row .um-filtered-line .um-members-filter-tag .um-members-filter-remove { + margin-left: 0; + margin-right: 10px; } + +.um-directory .um-members-wrapper .um-members.um-members-grid .um-member .um-member-card .um-members-edit-btn a.um-edit-profile-btn:before { + margin-right: 0; + margin-left: 8px; } + +.um-directory .um-members-wrapper .um-members.um-members-list .um-member .um-member-card-container .um-member-photo { + margin: 0 0 0 15px; } + +.um-directory .um-members-wrapper .um-members.um-members-list .um-member .um-member-card-container .um-member-card .um-member-card-content { + margin: 0 0 0 10px; } + +.um-directory .um-members-wrapper .um-members.um-members-list .um-member .um-member-card-container .um-member-card .um-member-card-actions .um-member-cog .um-new-dropdown { + right: auto; + left: 0; + text-align: right; } + +.um-directory .um-members-pagination-box .um-members-pagi { + align-items: center; } + .um-directory .um-members-pagination-box .um-members-pagi .pagi.pagi-arrow { + transform: rotate(180deg); } + +.um-directory.uimob340 .um-member-directory-header .um-member-directory-header-row .um-member-directory-nav-line .um-member-directory-view-type { + margin: 0 0 0 2px; } + +.um-directory.uimob340 .um-member-directory-header .um-member-directory-header-row .um-member-directory-nav-line .um-member-directory-sorting .um-new-dropdown { + right: auto; + left: 0; } + +.um-directory.uimob340 .um-members-wrapper .um-members.um-members-list .um-member .um-member-photo { + margin: 0 0 0 10px; } + +.um-directory.uimob340 .um-members-wrapper .um-members.um-members-list .um-member .um-member-card-footer .um-member-card-footer-buttons { + margin: 0 0 0 10px; } + +.um-directory.uimob500 .um-member-directory-header .um-member-directory-header-row .um-member-directory-nav-line .um-member-directory-view-type { + margin: 0 0 0 5px; } + +.um-directory.uimob500 .um-members-wrapper .um-members.um-members-list .um-member .um-member-photo { + margin: 0 0 0 10px; } + +.um-directory.uimob500 .um-members-wrapper .um-members.um-members-list .um-member .um-member-card-footer { + align-items: flex-start; } + .um-directory.uimob500 .um-members-wrapper .um-members.um-members-list .um-member .um-member-card-footer .um-member-card-footer-buttons { + margin: 0 0 0 10px; } + .um-directory.uimob500 .um-members-wrapper .um-members.um-members-list .um-member .um-member-card-footer .um-member-card-footer-buttons .um-members-list-footer-button-wrapper { + margin: 0 0 5px 10px; } + +.um-directory.uimob800 .um-members-wrapper .um-members.um-members-list .um-member .um-member-photo { + margin: 0 0 0 10px; } + +.um-directory.uimob800 .um-members-wrapper .um-members.um-members-list .um-member .um-member-card-footer .um-member-card-footer-buttons { + margin: 0 0 0 10px; } + .um-directory.uimob800 .um-members-wrapper .um-members.um-members-list .um-member .um-member-card-footer .um-member-card-footer-buttons .um-members-list-footer-button-wrapper { + margin: 0 0 5px 10px; } diff --git a/assets/css/um-members.css b/assets/css/um-members.css index 8935fc27..8469dc77 100644 --- a/assets/css/um-members.css +++ b/assets/css/um-members.css @@ -206,8 +206,15 @@ body #content .um-directory a { flex-wrap: nowrap; flex: 5; } .um-directory .um-member-directory-header .um-member-directory-header-row .um-member-directory-nav-line .um-member-directory-sorting .um-member-directory-sorting-a { + display: flex; + flex-direction: row; + justify-content: flex-start; + align-items: baseline; + flex-wrap: nowrap; position: relative; cursor: pointer; } + .um-directory .um-member-directory-header .um-member-directory-header-row .um-member-directory-nav-line .um-member-directory-sorting .um-member-directory-sorting-a a { + margin: 0 5px 0 0; } .um-directory .um-member-directory-header .um-member-directory-header-row .um-member-directory-nav-line .um-member-directory-sorting .um-member-directory-sorting-a i.um-faicon-caret-down { display: inline; } .um-directory .um-member-directory-header .um-member-directory-header-row .um-member-directory-nav-line .um-member-directory-sorting .um-member-directory-sorting-a i.um-faicon-caret-up { @@ -223,10 +230,22 @@ body #content .um-directory a { .um-directory .um-member-directory-header .um-member-directory-header-row .um-member-directory-nav-line .um-member-directory-sorting .um-member-directory-sorting-a .um-new-dropdown li a[data-selected="1"] { display: none; } .um-directory .um-member-directory-header .um-member-directory-header-row .um-member-directory-nav-line .um-member-directory-filters { + display: flex; + flex-direction: row; + justify-content: flex-end; + align-items: baseline; + flex-wrap: nowrap; flex: 2; text-align: right; } .um-directory .um-member-directory-header .um-member-directory-header-row .um-member-directory-nav-line .um-member-directory-filters .um-member-directory-filters-a { + display: flex; + flex-direction: row; + justify-content: flex-start; + align-items: baseline; + flex-wrap: nowrap; cursor: pointer; } + .um-directory .um-member-directory-header .um-member-directory-header-row .um-member-directory-nav-line .um-member-directory-filters .um-member-directory-filters-a a { + margin: 0 5px 0 0; } .um-directory .um-member-directory-header .um-member-directory-header-row .um-member-directory-nav-line .um-member-directory-filters .um-member-directory-filters-a i.um-faicon-caret-down { display: inline; } .um-directory .um-member-directory-header .um-member-directory-header-row .um-member-directory-nav-line .um-member-directory-filters .um-member-directory-filters-a i.um-faicon-caret-up { @@ -274,6 +293,11 @@ body #content .um-directory a { box-sizing: border-box; margin: 4px 8px 0 8px; } .um-directory .um-member-directory-header .um-member-directory-header-row .um-search .um-search-filter.um-slider-filter-type .um-slider-range { + display: flex; + flex-direction: row; + justify-content: flex-start; + align-items: baseline; + flex-wrap: nowrap; margin: 6px 0 0 8px; font-size: 0.8em; } .um-directory .um-member-directory-header .um-member-directory-header-row .um-search .um-search-filter.um-datepicker-filter-type, .um-directory .um-member-directory-header .um-member-directory-header-row .um-search .um-search-filter.um-timepicker-filter-type { @@ -509,6 +533,9 @@ body #content .um-directory a { padding: 12px 0 0 0; line-height: 16px; vertical-align: middle; } + .um-directory .um-members-wrapper .um-members.um-members-grid .um-member .um-member-card .um-member-meta-main .um-member-meta .um-member-metaline strong { + display: block; + clear: both; } .um-directory .um-members-wrapper .um-members.um-members-grid .um-member .um-member-card .um-member-meta-main .um-member-meta .um-member-metaline span { display: block; text-align: center; } @@ -642,14 +669,19 @@ body #content .um-directory a { color: #444; font-weight: 700; } .um-directory .um-members-wrapper .um-members.um-members-list .um-member .um-member-card-container .um-member-card .um-member-card-content .um-member-tagline { + display: flex; + flex-direction: row; + justify-content: flex-start; + align-items: baseline; + flex-wrap: wrap; width: 100%; font-size: 13px; - line-height: 22px; color: #999; - padding: 0 15px 0 0; } + padding: 0; + box-sizing: border-box; } .um-directory .um-members-wrapper .um-members.um-members-list .um-member .um-member-card-container .um-member-card .um-member-card-content .um-member-meta-main { width: 100%; - padding: 0 10px 0 0; + padding: 0; box-sizing: border-box; display: none; } .um-directory .um-members-wrapper .um-members.um-members-list .um-member .um-member-card-container .um-member-card .um-member-card-content .um-member-meta-main.no-animate { @@ -659,22 +691,18 @@ body #content .um-directory a { width: 100%; display: block; margin: 10px 0 0 0; - padding: 15px 0; box-sizing: border-box; border: none; } .um-directory .um-members-wrapper .um-members.um-members-list .um-member .um-member-card-container .um-member-card .um-member-card-content .um-member-meta-main .um-member-meta .um-member-metaline { + display: flex; + flex-direction: row; + justify-content: flex-start; + align-items: center; + flex-wrap: wrap; font-size: 13px; padding: 12px 0 0 0; line-height: 16px; - vertical-align: middle; - clear: both; - text-align: left; width: 100%; } - .um-directory .um-members-wrapper .um-members.um-members-list .um-member .um-member-card-container .um-member-card .um-member-card-content .um-member-meta-main .um-member-meta .um-member-metaline span { - text-align: left; - display: block; } - .um-directory .um-members-wrapper .um-members.um-members-list .um-member .um-member-card-container .um-member-card .um-member-card-content .um-member-meta-main .um-member-meta .um-member-metaline span strong, .um-directory .um-members-wrapper .um-members.um-members-list .um-member .um-member-card-container .um-member-card .um-member-card-content .um-member-meta-main .um-member-meta .um-member-metaline span span { - float: left; } .um-directory .um-members-wrapper .um-members.um-members-list .um-member .um-member-card-container .um-member-card .um-member-card-content .um-member-meta-main .um-member-meta .um-member-connect { padding-top: 10px; } .um-directory .um-members-wrapper .um-members.um-members-list .um-member .um-member-card-container .um-member-card .um-member-card-content .um-member-meta-main .um-member-meta .um-member-connect a { @@ -719,43 +747,6 @@ body #content .um-directory a { text-align: left; } .um-directory .um-members-wrapper .um-members.um-members-list .um-member .um-member-card-container .um-member-card .um-member-card-actions a { box-sizing: border-box; } - .um-directory .um-members-wrapper .um-members.um-members-list .um-member .um-member-card-container .um-member-card .um-member-card-actions div[class$="stats"] { - text-align: center; } - .um-directory .um-members-wrapper .um-members.um-members-list .um-member .um-member-card-container .um-member-card .um-member-card-actions .um-members-edit-btn { - margin: 2px 0; - height: 40px; } - .um-directory .um-members-wrapper .um-members.um-members-list .um-member .um-member-card-container .um-member-card .um-member-card-actions .um-members-edit-btn a.um-edit-profile-btn { - padding: 10px 15px !important; - transition: none !important; - display: inline-block !important; - margin: 0 auto !important; - min-width: 110px; - width: auto; - text-align: center; - font-size: 13px; } - .um-directory .um-members-wrapper .um-members.um-members-list .um-member .um-member-card-container .um-member-card .um-member-card-actions .um-members-edit-btn a.um-edit-profile-btn:before { - font-family: "FontAwesome"; - margin-right: 8px; - width: 14px; - text-align: left; - display: inline-block; - font-size: 16px; - position: relative; - left: 0; - top: 1px; - content: "\f013"; } - .um-directory .um-members-wrapper .um-members.um-members-list .um-member .um-member-card-container .um-member-card .um-member-card-actions .um-edit-profile-btn:before { - font-family: "FontAwesome"; - margin-right: 8px; - width: 14px; - text-align: left; - display: inline-block; - font-size: 16px; - font-weight: 400; - position: relative; - left: 0; - top: 1px; - content: "\f013"; } .um-directory .um-members-wrapper .um-members.um-members-list .um-member .um-member-card-footer { display: flex; flex-direction: row; @@ -821,11 +812,14 @@ body #content .um-directory a { margin: 0 0 10px 0; padding: 0; } .um-directory .um-members-pagination-box .um-members-pagi { + display: flex; + flex-direction: row; + justify-content: center; + align-items: baseline; + flex-wrap: nowrap; width: 100%; - float: left; margin: 0; - text-align: center; - padding: 5px 0; + padding: 0; font-size: 15px; } .um-directory .um-members-pagination-box .um-members-pagi .pagi { cursor: pointer; @@ -837,13 +831,15 @@ body #content .um-directory a { padding: 0 14px; color: #666 !important; font-weight: normal; } - .um-directory .um-members-pagination-box .um-members-pagi .pagi.pagi-arrow i:before { - font-size: 20px; - vertical-align: middle !important; - height: 34px; - line-height: 34px; - top: -2px; - position: relative; } + .um-directory .um-members-pagination-box .um-members-pagi .pagi.pagi-arrow { + line-height: 38px; } + .um-directory .um-members-pagination-box .um-members-pagi .pagi.pagi-arrow i:before { + font-size: 20px; + vertical-align: middle !important; + height: 34px; + line-height: 34px; + top: -2px; + position: relative; } .um-directory .um-members-pagination-box .um-members-pagi .pagi.current { cursor: default; color: #fff !important; } @@ -922,6 +918,8 @@ body #content .um-directory a { margin: 0 0 5px 0; } .um-directory.uimob340 .um-members-wrapper .um-members.um-members-list .um-member .um-member-card-footer .um-member-card-footer-buttons .um-members-list-footer-button-wrapper a.um-button { width: 100% !important; } + .um-directory.uimob340 .um-members-pagination-box .um-members-pagi { + display: none; } .um-directory.uimob500 .um-member-directory-header .um-member-directory-header-row .um-member-directory-search-line { width: 100%; } .um-directory.uimob500 .um-member-directory-header .um-member-directory-header-row.um-member-directory-search-row { @@ -956,6 +954,8 @@ body #content .um-directory a { margin: 0 10px 0 0; } .um-directory.uimob500 .um-members-wrapper .um-members.um-members-list .um-member .um-member-card-footer .um-member-card-footer-buttons .um-members-list-footer-button-wrapper { margin: 0 10px 5px 0; } + .um-directory.uimob500 .um-members-pagination-box .um-members-pagi { + display: none; } .um-directory.uimob800 .um-member-directory-header .um-member-directory-header-row .um-member-directory-search-line { width: 100%; } .um-directory.uimob800 .um-member-directory-header .um-search { diff --git a/assets/js/dropdown.js b/assets/js/dropdown.js index d46a07a4..19c4317e 100644 --- a/assets/js/dropdown.js +++ b/assets/js/dropdown.js @@ -51,8 +51,7 @@ function um_init_new_dropdown() { jQuery( document.body ).bind( 'click', function( event ) { if ( jQuery('.um-new-dropdown').find( '.' + jQuery( event.target ).attr('class').replace( ' ', '.' ) ).length === 0 && - '.' + jQuery(event.target).parent().attr('class') !== element ) { - + ( '.' + jQuery(event.target).parent().attr('class') ) !== element ) { //event = ev; jQuery('.um-new-dropdown').hide(); jQuery('.um-new-dropdown').parent().data( 'um-new-dropdown-show', false ); diff --git a/assets/sass/um-members-rtl.sass b/assets/sass/um-members-rtl.sass new file mode 100644 index 00000000..70a6a6d9 --- /dev/null +++ b/assets/sass/um-members-rtl.sass @@ -0,0 +1,135 @@ +@import "selectors" +@import "mixins" +@import "colors" + +.#{$prefix}directory + .um-member-directory-header + .um-member-directory-header-row + .um-member-directory-search-line + label + margin: 0 0 0 10px + .um-member-directory-nav-line + .um-member-directory-view-type + margin: 0 0 0 10px + .um-member-directory-sorting + .um-member-directory-sorting-a + a + margin: 0 0 0 5px + .um-new-dropdown + right: -12px + left: auto + .um-member-directory-filters + .um-member-directory-filters-a + a + margin: 0 0 0 5px + + .um-search + .um-search-filter + &.um-datepicker-filter-type, + &.um-timepicker-filter-type + input + margin: 0 0 0 5px + &:nth-child(even) + margin: 0 5px 0 0 + + .um-filtered-line + .um-members-filter-tag + margin: 0 0 5px 10px + &:first-child + margin-left: 10px + .um-members-filter-remove + margin-left: 0 + margin-right: 10px + + + .um-members-wrapper + .um-members + &.um-members-grid + .um-member + .um-member-card + .um-members-edit-btn + a.um-edit-profile-btn + &:before + margin-right: 0 + margin-left: 8px + + &.um-members-list + .um-member + .um-member-card-container + .um-member-photo + margin: 0 0 0 15px + + .um-member-card + .um-member-card-content + margin: 0 0 0 10px + + .um-member-card-actions + .um-member-cog + .um-new-dropdown + right: auto + left: 0 + text-align: right + + + .um-members-pagination-box + .um-members-pagi + align-items: center + .pagi + &.pagi-arrow + transform: rotate(180deg) + + &.uimob340 + .um-member-directory-header + .um-member-directory-header-row + .um-member-directory-nav-line + .um-member-directory-view-type + margin: 0 0 0 2px + .um-member-directory-sorting + .um-new-dropdown + right: auto + left: 0 + + .um-members-wrapper + .um-members + &.um-members-list + .um-member + .um-member-photo + margin: 0 0 0 10px + + .um-member-card-footer + .um-member-card-footer-buttons + margin: 0 0 0 10px + + &.uimob500 + .um-member-directory-header + .um-member-directory-header-row + .um-member-directory-nav-line + .um-member-directory-view-type + margin: 0 0 0 5px + .um-members-wrapper + .um-members + &.um-members-list + .um-member + .um-member-photo + margin: 0 0 0 10px + + .um-member-card-footer + align-items: flex-start + .um-member-card-footer-buttons + margin: 0 0 0 10px + .um-members-list-footer-button-wrapper + margin: 0 0 5px 10px + + &.uimob800 + .um-members-wrapper + .um-members + &.um-members-list + .um-member + .um-member-photo + margin: 0 0 0 10px + + .um-member-card-footer + .um-member-card-footer-buttons + margin: 0 0 0 10px + .um-members-list-footer-button-wrapper + margin: 0 0 5px 10px \ No newline at end of file diff --git a/assets/sass/um-members.sass b/assets/sass/um-members.sass index f77c418f..5dd045ef 100644 --- a/assets/sass/um-members.sass +++ b/assets/sass/um-members.sass @@ -167,8 +167,11 @@ body +flex( row, flex-start, baseline, nowrap ) flex: 5 .um-member-directory-sorting-a + +flex( row, flex-start, baseline, nowrap ) position: relative cursor: pointer + a + margin: 0 5px 0 0 i &.um-faicon-caret-down display: inline @@ -188,10 +191,14 @@ body a[data-selected="1"] display: none .um-member-directory-filters + +flex( row, flex-end, baseline, nowrap ) flex: 2 text-align: right .um-member-directory-filters-a + +flex( row, flex-start, baseline, nowrap ) cursor: pointer + a + margin: 0 5px 0 0 i &.um-faicon-caret-down display: inline @@ -244,6 +251,7 @@ body margin: 4px 8px 0 8px .um-slider-range + +flex( row, flex-start, baseline, nowrap ) margin: 6px 0 0 8px font-size: 0.8em &.um-datepicker-filter-type, @@ -484,6 +492,9 @@ body padding: 12px 0 0 0 line-height: 16px vertical-align: middle + strong + display: block + clear: both span display: block text-align: center @@ -609,14 +620,16 @@ body font-weight: 700 .um-member-tagline + +flex( row, flex-start, baseline, wrap ) width: 100% font-size: 13px - line-height: 22px + //line-height: 22px color: #999 - padding: 0 15px 0 0 + padding: 0 + box-sizing: border-box .um-member-meta-main width: 100% - padding: 0 10px 0 0 + padding: 0 box-sizing: border-box display: none &.no-animate @@ -626,23 +639,15 @@ body width: 100% display: block margin: 10px 0 0 0 - padding: 15px 0 box-sizing: border-box border: none .um-member-metaline + +flex( row, flex-start, center, wrap ) font-size: 13px padding: 12px 0 0 0 line-height: 16px - vertical-align: middle - clear: both - text-align: left width: 100% - span - text-align: left - display: block - strong, span - float: left .um-member-connect padding-top: 10px @@ -687,45 +692,6 @@ body a box-sizing: border-box - div[class$="stats"] - text-align: center - - .um-members-edit-btn - margin: 2px 0 - height: 40px - a.um-edit-profile-btn - padding: 10px 15px !important - transition: none !important - display: inline-block !important - margin: 0 auto !important - min-width: 110px - width: auto - text-align: center - font-size: 13px - &:before - font-family: "FontAwesome" - margin-right: 8px - width: 14px - text-align: left - display: inline-block - font-size: 16px - position: relative - left: 0 - top: 1px - content: "\f013" - .um-edit-profile-btn - &:before - font-family: "FontAwesome" - margin-right: 8px - width: 14px - text-align: left - display: inline-block - font-size: 16px - font-weight: 400 - position: relative - left: 0 - top: 1px - content: "\f013" .um-member-card-footer +flex( row, flex-end, center, nowrap ) @@ -779,11 +745,10 @@ body margin: 0 0 10px 0 padding: 0 .um-members-pagi + +flex( row, center, baseline, nowrap ) width: 100% - float: left margin: 0 - text-align: center - padding: 5px 0 + padding: 0 font-size: 15px .pagi cursor: pointer @@ -796,6 +761,7 @@ body color: #666 !important font-weight: normal &.pagi-arrow + line-height: 38px i:before font-size: 20px vertical-align: middle !important @@ -906,7 +872,9 @@ body margin: 0 0 5px 0 a.um-button width: 100% !important - + .um-members-pagination-box + .um-members-pagi + display: none &.uimob500 .um-member-directory-header @@ -952,6 +920,9 @@ body margin: 0 10px 0 0 .um-members-list-footer-button-wrapper margin: 0 10px 5px 0 + .um-members-pagination-box + .um-members-pagi + display: none &.uimob800 .um-member-directory-header .um-member-directory-header-row diff --git a/includes/admin/templates/directory/search.php b/includes/admin/templates/directory/search.php index b656cb59..41b186b4 100644 --- a/includes/admin/templates/directory/search.php +++ b/includes/admin/templates/directory/search.php @@ -93,19 +93,11 @@ global $post_id; ?> 'add_text' => __( 'Add New Custom Field', 'ultimate-member' ), 'show_default_number' => 1, ), -// array( -// 'id' => '_um_search_filters', -// 'type' => 'text', -// 'label' => __( 'Default filters', 'ultimate-member' ), -// 'tooltip' => __( 'You can set default filters like URL parameters', 'ultimate-member' ), -// 'value' => UM()->query()->get_meta_value('_um_search_filters', null, 'na' ), -// 'placeholder' => 'field1=val1&field2=val2' -// ), array( 'id' => '_um_search_filters', 'type' => 'md_default_filters', - 'label' => __( 'Default filters', 'ultimate-member' ), - 'tooltip' => __( 'You can set default filters', 'ultimate-member' ), + 'label' => __( 'Admin filtering', 'ultimate-member' ), + 'tooltip' => __( 'Limit which users appear in the member directory e.g only display users from USA', 'ultimate-member' ), 'value' => $_um_search_filters, 'options' => UM()->member_directory()->filter_fields, 'add_text' => __( 'Add New Filter', 'ultimate-member' ), diff --git a/includes/core/class-enqueue.php b/includes/core/class-enqueue.php index 8a9818b6..6c186946 100644 --- a/includes/core/class-enqueue.php +++ b/includes/core/class-enqueue.php @@ -177,6 +177,10 @@ if ( ! class_exists( 'um\core\Enqueue' ) ) { wp_register_style( 'um_ui', $this->css_baseurl . 'jquery-ui.css', array(), ultimatemember_version ); wp_register_style( 'um_members', $this->css_baseurl . 'um-members.css', array( 'um_ui' ), ultimatemember_version ); + if ( is_rtl() ) { + wp_register_style( 'um_members_rtl', $this->css_baseurl . 'um-members-rtl.css', array( 'um_members' ), ultimatemember_version ); + } + wp_register_style( 'um_profile', $this->css_baseurl . 'um-profile.css', array(), ultimatemember_version ); wp_register_style( 'um_account', $this->css_baseurl . 'um-account.css', array(), ultimatemember_version ); wp_register_style( 'um_misc', $this->css_baseurl . 'um-misc.css', array(), ultimatemember_version ); @@ -276,7 +280,12 @@ if ( ! class_exists( 'um\core\Enqueue' ) ) { */ function load_css() { wp_enqueue_style( 'um_styles' ); - wp_enqueue_style( 'um_members' ); + if ( is_rtl() ) { + wp_enqueue_style( 'um_members_rtl' ); + } else { + wp_enqueue_style( 'um_members' ); + } + wp_enqueue_style( 'um_profile' ); wp_enqueue_style( 'um_account' ); wp_enqueue_style( 'um_misc' ); @@ -325,7 +334,11 @@ if ( ! class_exists( 'um\core\Enqueue' ) ) { function load_customjs() { wp_enqueue_script('um_conditional'); wp_enqueue_script('um_scripts'); - wp_enqueue_script('um_members'); + if ( is_rtl() ) { + wp_enqueue_style( 'um_members_rtl' ); + } else { + wp_enqueue_style( 'um_members' ); + } wp_enqueue_script('um_profile'); wp_enqueue_script('um_account'); } diff --git a/templates/members-list.php b/templates/members-list.php index 2c77f5c3..706f5710 100644 --- a/templates/members-list.php +++ b/templates/members-list.php @@ -84,7 +84,7 @@ <# if ( typeof user. !== 'undefined' ) { #>
- {{{user.label_}}}: {{{user.}}} + {{{user.label_}}}: {{{user.}}}
<# } #> diff --git a/templates/members.php b/templates/members.php index ec7b6664..ac7ccf2d 100644 --- a/templates/members.php +++ b/templates/members.php @@ -229,7 +229,7 @@ if ( ( ( $search && $show_search ) || ( $filters && $show_filters && count( $sea
 
- +