From 2107336cf9b58113e3a99ebb7c521d053a6335eb Mon Sep 17 00:00:00 2001 From: ashubawork Date: Thu, 7 Dec 2023 13:36:51 +0200 Subject: [PATCH 01/43] - change placeholders for set password --- includes/core/class-mail.php | 22 ++++++++++++++++++++++ includes/core/class-user.php | 10 ++++++++-- includes/core/um-actions-register.php | 9 ++++++--- templates/email/welcome_email.php | 2 +- 4 files changed, 37 insertions(+), 6 deletions(-) diff --git a/includes/core/class-mail.php b/includes/core/class-mail.php index 8bd1acd7..af429cf2 100644 --- a/includes/core/class-mail.php +++ b/includes/core/class-mail.php @@ -423,6 +423,9 @@ if ( ! class_exists( 'um\core\Mail' ) ) { add_filter( 'um_template_tags_patterns_hook', array( UM()->mail(), 'add_placeholder' ) ); add_filter( 'um_template_tags_replaces_hook', array( UM()->mail(), 'add_replace_placeholder' ) ); + if ( array_key_exists( 'generated_pass', $args ) && 1 === absint( $args['generated_pass'] ) ) { + add_filter( 'um_template_tags_replaces_hook', array( UM()->mail(), 'add_replace_placeholder_set_password' ) ); + } /** * Filters email notification subject. @@ -621,6 +624,7 @@ if ( ! class_exists( 'um\core\Mail' ) ) { $placeholders[] = '{admin_email}'; $placeholders[] = '{submitted_registration}'; $placeholders[] = '{login_url}'; + $placeholders[] = '{login_button}'; $placeholders[] = '{password}'; $placeholders[] = '{account_activation_link}'; return $placeholders; @@ -639,9 +643,27 @@ if ( ! class_exists( 'um\core\Mail' ) ) { $replace_placeholders[] = um_admin_email(); $replace_placeholders[] = um_user_submitted_registration_formatted(); $replace_placeholders[] = um_get_core_page( 'login' ); + $replace_placeholders[] = esc_html__( 'Login to our site', 'ultimate-member' ); $replace_placeholders[] = esc_html__( 'Your set password', 'ultimate-member' ); $replace_placeholders[] = um_user( 'account_activation_link' ); return $replace_placeholders; } + + + public function add_replace_placeholder_set_password( $replace_placeholders ) { + $key = array_search( um_get_core_page( 'login' ), $replace_placeholders, true ); + if ( false !== $key ) { + $url = UM()->password()->reset_url(); + $replace_placeholders[ $key ] = add_query_arg( array( 'set_pass' => 'new_user' ), $url ); + } + + $button = esc_html__( 'Login to our site', 'ultimate-member' ); + $button_key = array_search( $button, $replace_placeholders , true ); + if ( false !== $key ) { + $url = UM()->password()->reset_url(); + $replace_placeholders[ $button_key ] = esc_html__( 'Set your password', 'ultimate-member' ); + } + return $replace_placeholders; + } } } diff --git a/includes/core/class-user.php b/includes/core/class-user.php index d4725da2..c47690f3 100644 --- a/includes/core/class-user.php +++ b/includes/core/class-user.php @@ -1690,7 +1690,7 @@ if ( ! class_exists( 'um\core\User' ) ) { ?> * */ - function approve( $repeat = true ) { + function approve( $repeat = true, $args = array() ) { $user_id = um_user( 'ID' ); if ( ! $repeat ) { @@ -1712,7 +1712,13 @@ if ( ! class_exists( 'um\core\User' ) ) { } else { //$userdata = get_userdata( $user_id ); //get_password_reset_key( $userdata ); - UM()->mail()->send( um_user( 'user_email' ), 'welcome_email' ); + $welcome_email_args = array(); + if ( true === (bool) $args['generated_pass'] ) { + $welcome_email_args = array( + 'generated_pass' => 1, + ); + } + UM()->mail()->send( um_user( 'user_email' ), 'welcome_email', $welcome_email_args ); } $this->set_status( 'approved' ); diff --git a/includes/core/um-actions-register.php b/includes/core/um-actions-register.php index 5f8a8404..f85c4ad4 100644 --- a/includes/core/um-actions-register.php +++ b/includes/core/um-actions-register.php @@ -8,12 +8,12 @@ if ( ! defined( 'ABSPATH' ) ) { * * @param int $user_id */ -function um_post_registration_approved_hook( $user_id ) { +function um_post_registration_approved_hook( $user_id, $args ) { um_fetch_user( $user_id ); - UM()->user()->approve(); + UM()->user()->approve( true, $args ); } -add_action( 'um_post_registration_approved_hook', 'um_post_registration_approved_hook' ); +add_action( 'um_post_registration_approved_hook', 'um_post_registration_approved_hook', 10, 2 ); /** * Account needs email validation. @@ -456,6 +456,9 @@ function um_submit_form_register( $args, $form_data ) { 'user_password' => $user_password, 'user_email' => trim( $user_email ), ); + if ( ! isset( $args['user_password'] ) ) { + $credentials['generated_pass'] = true; + } // @todo test when ready maybe remove if ( ! empty( $args['submitted'] ) ) { diff --git a/templates/email/welcome_email.php b/templates/email/welcome_email.php index b9807834..ac4ab960 100644 --- a/templates/email/welcome_email.php +++ b/templates/email/welcome_email.php @@ -23,7 +23,7 @@ if ( ! defined( 'ABSPATH' ) ) {
Thank you for signing up!Your account is now active.
-
Login to our site
+
{login_button}
If you have any problems, please contact us at {admin_email}
From ec477ba5f02aec8200cec25efc70da06a6f27084 Mon Sep 17 00:00:00 2001 From: Mykyta Synelnikov Date: Thu, 14 Dec 2023 12:09:49 +0200 Subject: [PATCH 02/43] - changed texts; --- includes/admin/core/class-admin-metabox.php | 4 ++-- includes/admin/templates/access/restrict_content.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/includes/admin/core/class-admin-metabox.php b/includes/admin/core/class-admin-metabox.php index 8605036b..603426b8 100644 --- a/includes/admin/core/class-admin-metabox.php +++ b/includes/admin/core/class-admin-metabox.php @@ -466,7 +466,7 @@ if ( ! class_exists( 'um\admin\core\Admin_Metabox' ) ) { array( 'id' => '_um_access_hide_from_queries', 'type' => 'checkbox', - 'label' => UM()->options()->get( 'disable_restriction_pre_queries' ) ? __( 'Hide from queries', 'ultimate-member' ) : __( 'Would you like to display 404 error on the term\'s archive page and terms\' posts single pages when users haven\'t access?', 'ultimate-member' ), + 'label' => UM()->options()->get( 'disable_restriction_pre_queries' ) ? __( 'Hide from queries', 'ultimate-member' ) : __( 'Would you like to display a 404 page for users who do not have access to this term on the term\'s archive page and terms\' posts single pages?', 'ultimate-member' ), 'description' => UM()->options()->get( 'disable_restriction_pre_queries' ) ? __( 'Exclude only from WP queries results', 'ultimate-member' ) : __( 'Recommended to be enabled. Restricted term\'s archive page and all terms\' posts will be hidden by exclusion from WP Query. The safest and most effective method that hides post and its comments from all requests, RSS feeds, etc. on your site', 'ultimate-member' ), 'value' => 1, 'conditional' => array( '_um_accessible', '!=', '0' ), @@ -618,7 +618,7 @@ if ( ! class_exists( 'um\admin\core\Admin_Metabox' ) ) { array( 'id' => '_um_access_hide_from_queries', 'type' => 'checkbox', - 'label' => UM()->options()->get( 'disable_restriction_pre_queries' ) ? __( 'Hide from queries', 'ultimate-member' ) : __( 'Would you like to display 404 error on the term\'s archive page and terms\' posts single pages when users haven\'t access?', 'ultimate-member' ), + 'label' => UM()->options()->get( 'disable_restriction_pre_queries' ) ? __( 'Hide from queries', 'ultimate-member' ) : __( 'Would you like to display a 404 page for users who do not have access to this term on the term\'s archive page and terms\' posts single pages?', 'ultimate-member' ), 'description' => UM()->options()->get( 'disable_restriction_pre_queries' ) ? __( 'Exclude only from WP queries results', 'ultimate-member' ) : __( 'Recommended to be enabled. Restricted term\'s archive page and all terms\' posts will be hidden by exclusion from WP Query. The safest and most effective method that hides post and its comments from all requests, RSS feeds, etc. on your site', 'ultimate-member' ), 'value' => ! empty( $data['_um_access_hide_from_queries'] ) ? $data['_um_access_hide_from_queries'] : '', 'conditional' => array( '_um_accessible', '!=', '0' ), diff --git a/includes/admin/templates/access/restrict_content.php b/includes/admin/templates/access/restrict_content.php index 732847c1..8226afb6 100644 --- a/includes/admin/templates/access/restrict_content.php +++ b/includes/admin/templates/access/restrict_content.php @@ -81,7 +81,7 @@ if ( ! defined( 'ABSPATH' ) ) { array( 'id' => '_um_access_hide_from_queries', 'type' => 'checkbox', - 'label' => UM()->options()->get( 'disable_restriction_pre_queries' ) ? __( 'Hide from queries', 'ultimate-member' ) : __( 'Would you like to display 404 page when users haven\'t access?', 'ultimate-member' ), + 'label' => UM()->options()->get( 'disable_restriction_pre_queries' ) ? __( 'Hide from queries', 'ultimate-member' ) : __( 'Would you like to display a 404 page for users who do not have access to this page?', 'ultimate-member' ), 'tooltip' => UM()->options()->get( 'disable_restriction_pre_queries' ) ? __( 'Exclude only from WP queries results', 'ultimate-member' ) : __( 'Recommended to be enabled. Restricted post will be hidden by exclusion from WP Query. The safest and most effective method that hides post and its comments from all requests, RSS feeds, etc. on your site', 'ultimate-member' ), 'value' => ! empty( $data['_um_access_hide_from_queries'] ) ? $data['_um_access_hide_from_queries'] : '', 'conditional' => array( '_um_accessible', '!=', '0' ), From 479cbe492be6ae713542eae81286bf63c5de2180 Mon Sep 17 00:00:00 2001 From: "WordPress .pot File Generator" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 20 Dec 2023 20:40:01 +0000 Subject: [PATCH 03/43] =?UTF-8?q?=F0=9F=94=84=20Generated=20POT=20File?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- languages/ultimate-member.pot | 182 ++++++++++++++++++---------------- 1 file changed, 98 insertions(+), 84 deletions(-) diff --git a/languages/ultimate-member.pot b/languages/ultimate-member.pot index 6f9e3717..9d1a0a1e 100644 --- a/languages/ultimate-member.pot +++ b/languages/ultimate-member.pot @@ -2,14 +2,14 @@ # This file is distributed under the same license as the Ultimate Member plugin. msgid "" msgstr "" -"Project-Id-Version: Ultimate Member 2.8.0\n" +"Project-Id-Version: Ultimate Member 2.8.1\n" "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/ultimate-member\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"POT-Creation-Date: 2023-12-07T23:36:31+00:00\n" +"POT-Creation-Date: 2023-12-20T20:39:58+00:00\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "X-Generator: WP-CLI 2.9.0\n" "X-Domain: ultimate-member\n" @@ -46,7 +46,7 @@ msgstr "" #: includes/admin/class-admin.php:1719 #: includes/admin/class-secure.php:102 #: includes/admin/class-secure.php:139 -#: includes/admin/core/class-admin-settings.php:3665 +#: includes/admin/core/class-admin-settings.php:3678 msgid "Security check" msgstr "" @@ -69,7 +69,7 @@ msgid "Settings" msgstr "" #: includes/admin/class-admin.php:1887 -#: includes/admin/core/class-admin-notices.php:1091 +#: includes/admin/core/class-admin-notices.php:1093 #: includes/admin/core/class-admin-settings.php:2234 #: includes/ajax/class-secure.php:34 msgid "Security Check" @@ -1627,8 +1627,7 @@ msgstr "" #: includes/admin/class-site-health.php:1799 #: includes/core/class-builtin.php:965 -#: includes/core/class-builtin.php:968 -msgid "Twitter" +msgid "X (formerly Twitter)" msgstr "" #: includes/admin/class-site-health.php:1800 @@ -2094,10 +2093,10 @@ msgstr "" #: includes/admin/core/class-admin-forms.php:1175 #: includes/admin/core/class-admin-forms.php:1313 #: includes/admin/core/class-admin-forms.php:1322 -#: includes/admin/core/class-admin-forms.php:1562 -#: includes/admin/core/class-admin-forms.php:1576 -#: includes/admin/core/class-admin-forms.php:1692 -#: includes/admin/core/class-admin-forms.php:1721 +#: includes/admin/core/class-admin-forms.php:1569 +#: includes/admin/core/class-admin-forms.php:1583 +#: includes/admin/core/class-admin-forms.php:1699 +#: includes/admin/core/class-admin-forms.php:1728 #: includes/core/um-actions-profile.php:846 #: assets/js/admin/forms.js:306 #: assets/js/admin/forms.js:380 @@ -2110,48 +2109,48 @@ msgstr "" msgid "Select media" msgstr "" -#: includes/admin/core/class-admin-forms.php:1392 +#: includes/admin/core/class-admin-forms.php:1399 #: assets/js/admin/forms.js:738 msgid "Select" msgstr "" -#: includes/admin/core/class-admin-forms.php:1393 +#: includes/admin/core/class-admin-forms.php:1400 msgid "Clear" msgstr "" -#: includes/admin/core/class-admin-forms.php:1693 -#: includes/admin/core/class-admin-forms.php:1722 +#: includes/admin/core/class-admin-forms.php:1700 +#: includes/admin/core/class-admin-forms.php:1729 #: includes/admin/templates/directory/sorting.php:22 #: assets/js/admin/forms.js:308 msgid "Meta key" msgstr "" -#: includes/admin/core/class-admin-forms.php:1694 +#: includes/admin/core/class-admin-forms.php:1701 #: includes/admin/templates/directory/sorting.php:30 #: assets/js/admin/forms.js:309 msgid "Data type" msgstr "" -#: includes/admin/core/class-admin-forms.php:1697 +#: includes/admin/core/class-admin-forms.php:1704 #: includes/admin/templates/directory/sorting.php:39 #: assets/js/admin/forms.js:312 msgid "Order" msgstr "" -#: includes/admin/core/class-admin-forms.php:1698 +#: includes/admin/core/class-admin-forms.php:1705 #: includes/admin/templates/directory/sorting.php:43 #: assets/js/admin/forms.js:313 msgid "ASC" msgstr "" -#: includes/admin/core/class-admin-forms.php:1699 +#: includes/admin/core/class-admin-forms.php:1706 #: includes/admin/templates/directory/sorting.php:44 #: assets/js/admin/forms.js:314 msgid "DESC" msgstr "" -#: includes/admin/core/class-admin-forms.php:1701 -#: includes/admin/core/class-admin-forms.php:1723 +#: includes/admin/core/class-admin-forms.php:1708 +#: includes/admin/core/class-admin-forms.php:1730 #: includes/admin/core/class-admin-metabox.php:2356 #: assets/js/admin/forms.js:316 msgid "Label" @@ -3523,107 +3522,118 @@ msgstr "" msgid "You have %1$s invalid or expired license keys for %2$s. Please go to the Licenses page to correct this issue." msgstr "" -#. translators: %1$s is a plugin name; %2$s is a plugin version; %3$s is a plugin name; %4$s is a plugin version; %5$s is a upgrade link. -#: includes/admin/core/class-admin-notices.php:648 -msgid "%1$s version %2$s needs to be updated to work correctly.
It is necessary to update the structure of the database and options that are associated with %3$s %4$s.
Please visit \"Upgrade\" page and run the upgrade process." +#: includes/admin/core/class-admin-notices.php:647 +msgid "version needs to be updated to work correctly." msgstr "" -#: includes/admin/core/class-admin-notices.php:653 +#: includes/admin/core/class-admin-notices.php:649 +msgid "It is necessary to update the structure of the database and options that are associated with current version" +msgstr "" + +#: includes/admin/core/class-admin-notices.php:651 +msgid "Please run the upgrade process on this " +msgstr "" + +#: includes/admin/core/class-admin-notices.php:651 +msgid "page" +msgstr "" + +#: includes/admin/core/class-admin-notices.php:655 msgid "Visit Upgrade Page" msgstr "" -#: includes/admin/core/class-admin-notices.php:668 +#: includes/admin/core/class-admin-notices.php:670 msgid "Settings successfully upgraded" msgstr "" #. translators: %1$s is a plugin name title; %2$s is a plugin version. -#: includes/admin/core/class-admin-notices.php:676 +#: includes/admin/core/class-admin-notices.php:678 msgid "%1$s %2$s Successfully Upgraded" msgstr "" #. translators: %s: plugin name. -#: includes/admin/core/class-admin-notices.php:707 +#: includes/admin/core/class-admin-notices.php:709 msgid "Hey there! It's been one month since you installed %s. How have you found the plugin so far?" msgstr "" -#: includes/admin/core/class-admin-notices.php:711 +#: includes/admin/core/class-admin-notices.php:713 msgid "I love it!" msgstr "" -#: includes/admin/core/class-admin-notices.php:712 +#: includes/admin/core/class-admin-notices.php:714 msgid "It's good but could be better" msgstr "" -#: includes/admin/core/class-admin-notices.php:713 +#: includes/admin/core/class-admin-notices.php:715 msgid "I don't like the plugin" msgstr "" -#: includes/admin/core/class-admin-notices.php:722 +#: includes/admin/core/class-admin-notices.php:724 msgid "Leave Review" msgstr "" -#: includes/admin/core/class-admin-notices.php:731 -#: includes/admin/core/class-admin-notices.php:740 +#: includes/admin/core/class-admin-notices.php:733 +#: includes/admin/core/class-admin-notices.php:742 msgid "Provide Feedback" msgstr "" #. translators: %1$s is a plugin name; %2$s is a #. -#: includes/admin/core/class-admin-notices.php:764 +#: includes/admin/core/class-admin-notices.php:766 msgid "%1$s future plans! Detailed future list is here" msgstr "" #. translators: %s override templates page link. -#: includes/admin/core/class-admin-notices.php:788 +#: includes/admin/core/class-admin-notices.php:790 msgid "Your templates are out of date. Please visit override templates status page and update templates." msgstr "" #. translators: %s child-theme article link. -#: includes/admin/core/class-admin-notices.php:821 +#: includes/admin/core/class-admin-notices.php:823 msgid "We highly recommend using a child-theme for Ultimate Member customization, which hasn't dependencies with the official themes repo, so your custom files cannot be rewritten after a theme upgrade.
Otherwise, the customization files may be deleted after every theme upgrade." msgstr "" -#: includes/admin/core/class-admin-notices.php:846 +#: includes/admin/core/class-admin-notices.php:848 msgid "Important Update" msgstr "" -#: includes/admin/core/class-admin-notices.php:847 +#: includes/admin/core/class-admin-notices.php:849 msgid "Ultimate Member has a new additional feature to secure your Ultimate Member forms to prevent attacks from injecting accounts with administrative roles & capabilities." msgstr "" -#: includes/admin/core/class-admin-notices.php:850 +#: includes/admin/core/class-admin-notices.php:852 msgid "Manage Security Settings" msgstr "" -#: includes/admin/core/class-admin-notices.php:851 +#: includes/admin/core/class-admin-notices.php:853 msgid "Read the documentation" msgstr "" -#: includes/admin/core/class-admin-notices.php:871 +#: includes/admin/core/class-admin-notices.php:873 msgid "Your Register forms are now locked. You can unlock them in Ultimate Member > Settings > Secure > Lock All Register Forms." msgstr "" -#: includes/admin/core/class-admin-notices.php:890 +#: includes/admin/core/class-admin-notices.php:892 msgid "Mandatory password changes has been enabled. You can disable them in Ultimate Member > Settings > Secure > Display Login form notice to reset passwords." msgstr "" -#: includes/admin/core/class-admin-notices.php:909 +#: includes/admin/core/class-admin-notices.php:911 msgid "Ban for administrative capabilities is enabled. You can disable them in Ultimate Member > Settings > Secure > Enable ban for administrative capabilities." msgstr "" -#: includes/admin/core/class-admin-notices.php:942 +#: includes/admin/core/class-admin-notices.php:944 msgid "The role selected in WordPress native \"Settings > New User Default Role\" setting has Administrative capabilities." msgstr "" -#: includes/admin/core/class-admin-notices.php:968 +#: includes/admin/core/class-admin-notices.php:970 msgid "The role selected in \"Ultimate Member > Settings > Appearance > Registration Form > Registration Default Role\" setting has Administrative capabilities." msgstr "" #. translators: %s are link(s) to the forms. -#: includes/admin/core/class-admin-notices.php:1036 +#: includes/admin/core/class-admin-notices.php:1038 msgid "Register forms have Administrative roles, we recommend that you assign a non-admin roles to secure the forms. %s" msgstr "" -#: includes/admin/core/class-admin-notices.php:1055 +#: includes/admin/core/class-admin-notices.php:1057 msgid "Wrong Data" msgstr "" @@ -4275,126 +4285,126 @@ msgstr "" #. translators: %1$s is an expiry date; %2$s is a renewal link. #. translators: %1$s is a expiry date; %2$s is a renew link. -#: includes/admin/core/class-admin-settings.php:2773 -#: includes/admin/core/class-admin-settings.php:2868 +#: includes/admin/core/class-admin-settings.php:2774 +#: includes/admin/core/class-admin-settings.php:2869 msgid "Your license key expired on %1$s. Please renew your license key." msgstr "" #. translators: %s: support link name. -#: includes/admin/core/class-admin-settings.php:2784 -#: includes/admin/core/class-admin-settings.php:2879 +#: includes/admin/core/class-admin-settings.php:2785 +#: includes/admin/core/class-admin-settings.php:2880 msgid "Your license key has been disabled. Please contact support for more information." msgstr "" #. translators: %s: account page. -#: includes/admin/core/class-admin-settings.php:2794 -#: includes/admin/core/class-admin-settings.php:2889 +#: includes/admin/core/class-admin-settings.php:2795 +#: includes/admin/core/class-admin-settings.php:2890 msgid "Invalid license. Please visit your account page and verify it." msgstr "" #. translators: %1$s is a item name title; %2$s is a account page. -#: includes/admin/core/class-admin-settings.php:2805 -#: includes/admin/core/class-admin-settings.php:2900 +#: includes/admin/core/class-admin-settings.php:2806 +#: includes/admin/core/class-admin-settings.php:2901 msgid "Your %1$s is not active for this URL. Please visit your account page to manage your license key URLs." msgstr "" #. translators: %s: item name. -#: includes/admin/core/class-admin-settings.php:2815 -#: includes/admin/core/class-admin-settings.php:2910 +#: includes/admin/core/class-admin-settings.php:2816 +#: includes/admin/core/class-admin-settings.php:2911 msgid "This appears to be an invalid license key for %s." msgstr "" #. translators: %s: account link. -#: includes/admin/core/class-admin-settings.php:2822 -#: includes/admin/core/class-admin-settings.php:2917 +#: includes/admin/core/class-admin-settings.php:2823 +#: includes/admin/core/class-admin-settings.php:2918 msgid "Your license key has reached its activation limit. View possible upgrades now." msgstr "" -#: includes/admin/core/class-admin-settings.php:2828 -#: includes/admin/core/class-admin-settings.php:2923 +#: includes/admin/core/class-admin-settings.php:2829 +#: includes/admin/core/class-admin-settings.php:2924 msgid "The key you entered belongs to a bundle, please use the product specific license key." msgstr "" -#: includes/admin/core/class-admin-settings.php:2834 -#: includes/admin/core/class-admin-settings.php:2843 -#: includes/admin/core/class-admin-settings.php:2854 +#: includes/admin/core/class-admin-settings.php:2835 +#: includes/admin/core/class-admin-settings.php:2844 +#: includes/admin/core/class-admin-settings.php:2855 msgid "unknown_error" msgstr "" #. translators: %1$s is an error; %2$s is a support link. -#: includes/admin/core/class-admin-settings.php:2836 -#: includes/admin/core/class-admin-settings.php:2845 +#: includes/admin/core/class-admin-settings.php:2837 +#: includes/admin/core/class-admin-settings.php:2846 msgid "There was an error with this license key: %1$s. Please contact our support team." msgstr "" #. translators: %1$s is an error; %2$s is a error data; %3$s is a support link. -#: includes/admin/core/class-admin-settings.php:2857 +#: includes/admin/core/class-admin-settings.php:2858 msgid "There was an error with this license key: %1$s%2$s. Please contact our support team." msgstr "" -#: includes/admin/core/class-admin-settings.php:2936 +#: includes/admin/core/class-admin-settings.php:2937 msgid "License key never expires." msgstr "" #. translators: %1$s is an expiry date; %2$s is a renewal link. -#: includes/admin/core/class-admin-settings.php:2944 +#: includes/admin/core/class-admin-settings.php:2945 msgid "Your license key expires soon! It expires on %1$s. Renew your license key." msgstr "" #. translators: %s: expiry date. -#: includes/admin/core/class-admin-settings.php:2955 +#: includes/admin/core/class-admin-settings.php:2956 msgid "Your license key expires on %s." msgstr "" #. translators: %s: item name. -#: includes/admin/core/class-admin-settings.php:2971 +#: includes/admin/core/class-admin-settings.php:2972 msgid "To receive updates, please enter your valid %s license key." msgstr "" -#: includes/admin/core/class-admin-settings.php:2994 #: includes/admin/core/class-admin-settings.php:2999 +#: includes/admin/core/class-admin-settings.php:3008 msgid "Clear License" msgstr "" -#: includes/admin/core/class-admin-settings.php:2996 +#: includes/admin/core/class-admin-settings.php:3003 msgid "Activate" msgstr "" -#: includes/admin/core/class-admin-settings.php:2998 +#: includes/admin/core/class-admin-settings.php:3007 msgid "Re-Activate" msgstr "" -#: includes/admin/core/class-admin-settings.php:3052 +#: includes/admin/core/class-admin-settings.php:3065 msgid "Re-check templates" msgstr "" #. translators: %s: Last checking templates time. -#: includes/admin/core/class-admin-settings.php:3057 +#: includes/admin/core/class-admin-settings.php:3070 msgid "Last update: %s. You could re-check changes manually." msgstr "" -#: includes/admin/core/class-admin-settings.php:3059 +#: includes/admin/core/class-admin-settings.php:3072 msgid "Templates haven't check yet. You could check changes manually." msgstr "" #. translators: %s: Link to the docs article. -#: includes/admin/core/class-admin-settings.php:3067 +#: includes/admin/core/class-admin-settings.php:3080 msgid "You may get more details about overriding templates here." msgstr "" -#: includes/admin/core/class-admin-settings.php:3156 +#: includes/admin/core/class-admin-settings.php:3169 msgid "Theme version up to date" msgstr "" -#: includes/admin/core/class-admin-settings.php:3159 +#: includes/admin/core/class-admin-settings.php:3172 msgid "Theme version is out of date" msgstr "" -#: includes/admin/core/class-admin-settings.php:3163 +#: includes/admin/core/class-admin-settings.php:3176 msgid "Theme version is empty" msgstr "" -#: includes/admin/core/class-admin-settings.php:3284 +#: includes/admin/core/class-admin-settings.php:3297 msgid "To copy the Install info, click below then press Ctrl + C (PC) or Cmd + C (Mac)." msgstr "" @@ -6349,7 +6359,7 @@ msgstr "" #. translators: %s: The message after registration process based on a role data and user status after registration #. translators: %s: Restricted blog page message. #. translators: %s: Restricted taxonomy message. -#: includes/core/class-access.php:737 +#: includes/core/class-access.php:738 #: includes/core/class-fields.php:1549 #: includes/core/um-actions-account.php:510 #: templates/message.php:23 @@ -6551,6 +6561,10 @@ msgstr "" msgid "Choose a Country" msgstr "" +#: includes/core/class-builtin.php:968 +msgid "X" +msgstr "" + #: includes/core/class-builtin.php:983 #: includes/core/class-builtin.php:986 msgid "LinkedIn" @@ -6701,7 +6715,7 @@ msgid "SoundCloud Profile" msgstr "" #: includes/core/class-builtin.php:1560 -msgid "Twitter URL" +msgid "X (formerly Twitter) URL" msgstr "" #: includes/core/class-builtin.php:1561 From d9d803a235092ffb099a26e69cc4391627cb754d Mon Sep 17 00:00:00 2001 From: yuriinalivaiko Date: Thu, 21 Dec 2023 13:03:39 +0200 Subject: [PATCH 04/43] - fixed text-align property for rtl lenguages --- assets/css/um.rtl.css | 6 +++++- assets/css/um.rtl.min.css | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/assets/css/um.rtl.css b/assets/css/um.rtl.css index cc6febb3..e5bd1f25 100644 --- a/assets/css/um.rtl.css +++ b/assets/css/um.rtl.css @@ -1,8 +1,12 @@ -.um { +.rtl .um { direction: rtl !important; text-align: right; } +.rtl .um:not(.um-admin) { + text-align: right; +} + .um-profile-photo { float: right; margin: 0 30px 0 0; diff --git a/assets/css/um.rtl.min.css b/assets/css/um.rtl.min.css index 608118c7..a1a24de2 100644 --- a/assets/css/um.rtl.min.css +++ b/assets/css/um.rtl.min.css @@ -1 +1 @@ -.um{direction:rtl!important;text-align:right}.um-profile-photo{float:right;margin:0 30px 0 0}.um-profile-photo a.um-profile-photo-img{float:right;left:auto}.um-cover+.um-header .um-profile-photo a.um-profile-photo-img{right:0}div.uimob500 .um-profile-photo a.um-profile-photo-img{right:auto}.um-profile-edit{right:auto;left:0;margin-left:10px;margin-right:0}div.uimob800 .um-header .um-profile-meta,div.uimob960 .um-header .um-profile-meta{padding-left:0!important;padding-right:200px!important}.um-name{float:right;margin-right:0}.um-profile-nav-item a{float:right;padding:6px 28px 6px 10px}.um-profile-nav-item i{left:auto;right:6px}.um-profile-nav-item a{float:right}.um-field-checkbox-state,.um-field-radio-state{right:1px;left:auto}.um-field-checkbox-option,.um-field-radio-option{margin:0 36px 0 0}.um-field-half{float:right}.um-field-half.right{float:left}.um-left{float:right}.um-right{float:left}.um-account-main,.um-account-side{float:right}.um-account-main div.um-account-heading i{margin-right:0;margin-left:10px}.um-account-side li a span.um-account-icon,.um-account-side li a.current span.um-account-icon,.um-account-side li a.current:hover span.um-account-icon{float:right;border-left:1px solid #ccc}.um-account-side li a span.um-account-title{padding-right:20px;float:right}.um-account-side li a span.um-account-arrow{right:auto;left:10px}.um-field-label .um-field-label-icon{float:right;margin:0 0 0 8px}p.um-notice i{right:auto;left:14px}.um-account.uimob340 .um-account-nav a,.um-account.uimob500 .um-account-nav a{padding-left:0;padding-right:40px}.um-account.uimob340 .um-account-nav span.ico,.um-account.uimob500 .um-account-nav span.ico{right:0}.um-account.uimob340 .um-account-nav span.arr,.um-account.uimob500 .um-account-nav span.arr{right:auto;left:0}.select2.select2-container .select2-selection .select2-selection__arrow{right:auto!important}.select2-container[dir=rtl] .select2-selection--single .select2-selection__rendered{padding-right:8px;text-align:right;padding-left:20px}.select2-container--default[dir=rtl] .select2-selection--single .select2-selection__clear{margin-left:4px}.um-single-file-preview a.cancel,.um-single-image-preview a.cancel{left:-15px;right:auto}.select2.select2-container .select2-selection{padding:0 12px 0 0!important}.select2-selection__clear{right:auto;left:1px}.cropper-container{margin:0 auto;left:auto!important}.um-field-label .um-tip{margin:0 8px 0 0}.tipsy-inner{text-align:right!important}.um span.um-req{margin:0 8px 0 0}.um-account-side li a span.um-account-icon,.um-account-side li a.current span.um-account-icon,.um-account-side li a.current:hover span.um-account-icon{border-right:none}.um-field-error .um-field-arrow{left:0;right:10px}.um-single-file-preview a.cancel,.um-single-image-preview a.cancel{left:0}.um-modal-body .um-single-file-preview a.cancel,.um-modal-body .um-single-image-preview a.cancel{left:-15px}.um-item-link{padding-right:0;padding-left:40px} \ No newline at end of file +.rtl .um{direction:rtl!important;text-align:right}.rtl .um:not(.um-admin){text-align:right}.um-profile-photo{float:right;margin:0 30px 0 0}.um-profile-photo a.um-profile-photo-img{float:right;left:auto}.um-cover + .um-header .um-profile-photo a.um-profile-photo-img{right:0}div.uimob500 .um-profile-photo a.um-profile-photo-img{right:auto}.um-profile-edit{right:auto;left:0;margin-left:10px;margin-right:0}div.uimob960 .um-header .um-profile-meta,div.uimob800 .um-header .um-profile-meta{padding-left:0!important;padding-right:200px!important}.um-name{float:right;margin-right:0}.um-profile-nav-item a{float:right;padding:6px 28px 6px 10px}.um-profile-nav-item i{left:auto;right:6px}.um-profile-nav-item a{float:right}.um-field-checkbox-state,.um-field-radio-state{right:1px;left:auto}.um-field-checkbox-option,.um-field-radio-option{margin:0 36px 0 0}.um-field-half{float:right}.um-field-half.right{float:left}.um-left{float:right}.um-right{float:left}.um-account-main,.um-account-side{float:right}.um-account-main div.um-account-heading i{margin-right:0;margin-left:10px}.um-account-side li a span.um-account-icon,.um-account-side li a.current span.um-account-icon,.um-account-side li a.current:hover span.um-account-icon{float:right;border-left:1px solid #ccc}.um-account-side li a span.um-account-title{padding-right:20px;float:right}.um-account-side li a span.um-account-arrow{right:auto;left:10px}.um-field-label .um-field-label-icon{float:right;margin:0 0 0 8px}p.um-notice i{right:auto;left:14px}.um-account.uimob340 .um-account-nav a,.um-account.uimob500 .um-account-nav a{padding-left:0;padding-right:40px}.um-account.uimob340 .um-account-nav span.ico,.um-account.uimob500 .um-account-nav span.ico{right:0}.um-account.uimob340 .um-account-nav span.arr,.um-account.uimob500 .um-account-nav span.arr{right:auto;left:0}.select2.select2-container .select2-selection .select2-selection__arrow{right:auto!important}.select2-container[dir="rtl"] .select2-selection--single .select2-selection__rendered{padding-right:8px;text-align:right;padding-left:20px}.select2-container--default[dir="rtl"] .select2-selection--single .select2-selection__clear{margin-left:4px}.um-single-image-preview a.cancel,.um-single-file-preview a.cancel{left:-15px;right:auto}.select2.select2-container .select2-selection{padding:0 12px 0 0 !important}.select2-selection__clear{right:auto;left:1px}.cropper-container{margin:0 auto;left:auto!important}.um-field-label .um-tip{margin:0 8px 0 0}.tipsy-inner{text-align:right!important}.um span.um-req{margin:0 8px 0 0}.um-account-side li a span.um-account-icon,.um-account-side li a.current span.um-account-icon,.um-account-side li a.current:hover span.um-account-icon{border-right:none}.um-field-error .um-field-arrow{left:0;right:10px}.um-single-image-preview a.cancel,.um-single-file-preview a.cancel{left:0}.um-modal-body .um-single-image-preview a.cancel,.um-modal-body .um-single-file-preview a.cancel{left:-15px}.um-item-link{padding-right:0;padding-left:40px} \ No newline at end of file From 92c46ec93174ec0cfd260f966754b551f5daac5d Mon Sep 17 00:00:00 2001 From: yuriinalivaiko Date: Thu, 21 Dec 2023 20:14:22 +0200 Subject: [PATCH 05/43] - fixed AJAX conflict --- assets/js/common.js | 21 --------------------- assets/js/common.min.js | 2 +- 2 files changed, 1 insertion(+), 22 deletions(-) diff --git a/assets/js/common.js b/assets/js/common.js index 0c8af614..7b8aa0bc 100644 --- a/assets/js/common.js +++ b/assets/js/common.js @@ -116,27 +116,6 @@ UM.common = { } } -jQuery.ajaxSetup({ - beforeSend: function( jqXHR, settings ) { - if ( settings.processData ) { - if ( settings.data !== '' ) { - settings.data += '&um_current_locale=' + um_common_variables.locale; - } else { - settings.data = 'um_current_locale=' + um_common_variables.locale; - } - } else { - settings.data = jQuery.extend( - settings.data, - { - um_current_locale: um_common_variables.locale - } - ); - } - - return true; - } -}); - jQuery(document).on( 'ajaxStart', function() { UM.common.tipsy.hide(); }); diff --git a/assets/js/common.min.js b/assets/js/common.min.js index 8312f3bb..ac914fd9 100644 --- a/assets/js/common.min.js +++ b/assets/js/common.min.js @@ -1 +1 @@ -"object"!=typeof window.UM&&(window.UM={}),"object"!=typeof UM.common&&(UM.common={}),UM.common={tipsy:{init:function(){"function"==typeof jQuery.fn.tipsy&&(jQuery(".um-tip-n").tipsy({gravity:"n",opacity:1,live:"a.live",offset:3}),jQuery(".um-tip-w").tipsy({gravity:"w",opacity:1,live:"a.live",offset:3}),jQuery(".um-tip-e").tipsy({gravity:"e",opacity:1,live:"a.live",offset:3}),jQuery(".um-tip-s").tipsy({gravity:"s",opacity:1,live:"a.live",offset:3}))},hide:function(){"function"==typeof jQuery.fn.tipsy&&(jQuery(".um-tip-n").tipsy("hide"),jQuery(".um-tip-w").tipsy("hide"),jQuery(".um-tip-e").tipsy("hide"),jQuery(".um-tip-s").tipsy("hide"),jQuery(".um .tipsy").remove())}},datetimePicker:{init:function(){jQuery(".um-datepicker:not(.picker__input)").each(function(){e=void 0!==(elem=jQuery(this)).attr("data-disabled_weekdays")&&""!=elem.attr("data-disabled_weekdays")&&JSON.parse(elem.attr("data-disabled_weekdays"));var e,t=null,a=(void 0!==elem.attr("data-years")&&(t=elem.attr("data-years")),elem.attr("data-date_min")),i=elem.attr("data-date_max"),n=[],o=[],a=(void 0!==a&&(n=a.split(",")),void 0!==i&&(o=i.split(",")),n.length?new Date(n):null),i=n.length?new Date(o):null,o=(a&&"Invalid Date"==a.toString()&&3==n.length&&(n=n[1]+"/"+n[2]+"/"+n[0],a=new Date(Date.parse(n))),i&&"Invalid Date"==i.toString()&&3==o.length&&(n=o[1]+"/"+o[2]+"/"+o[0],i=new Date(Date.parse(n))),{disable:e,format:elem.attr("data-format"),formatSubmit:"yyyy/mm/dd",hiddenName:!0,onOpen:function(){elem.blur()},onClose:function(){elem.blur()}});null!==t&&(o.selectYears=t),null!==a&&(o.min=a),null!==i&&(o.max=i),elem.pickadate(o)}),jQuery(".um-timepicker:not(.picker__input)").each(function(){(elem=jQuery(this)).pickatime({format:elem.attr("data-format"),interval:parseInt(elem.attr("data-intervals")),formatSubmit:"HH:i",hiddenName:!0,onOpen:function(){elem.blur()},onClose:function(){elem.blur()}})})}},select:{isSelected:function(e,t){return e===t?' selected="selected"':""}}},jQuery.ajaxSetup({beforeSend:function(e,t){return t.processData?""!==t.data?t.data+="&um_current_locale="+um_common_variables.locale:t.data="um_current_locale="+um_common_variables.locale:t.data=jQuery.extend(t.data,{um_current_locale:um_common_variables.locale}),!0}}),jQuery(document).on("ajaxStart",function(){UM.common.tipsy.hide()}),jQuery(document).on("ajaxSuccess",function(){UM.common.tipsy.init()}),jQuery(document).ready(function(){UM.common.tipsy.init(),UM.common.datetimePicker.init()}); \ No newline at end of file +"object"!=typeof window.UM&&(window.UM={}),"object"!=typeof UM.common&&(UM.common={}),UM.common={tipsy:{init:function(){"function"==typeof jQuery.fn.tipsy&&(jQuery(".um-tip-n").tipsy({gravity:"n",opacity:1,live:"a.live",offset:3}),jQuery(".um-tip-w").tipsy({gravity:"w",opacity:1,live:"a.live",offset:3}),jQuery(".um-tip-e").tipsy({gravity:"e",opacity:1,live:"a.live",offset:3}),jQuery(".um-tip-s").tipsy({gravity:"s",opacity:1,live:"a.live",offset:3}))},hide:function(){"function"==typeof jQuery.fn.tipsy&&(jQuery(".um-tip-n").tipsy("hide"),jQuery(".um-tip-w").tipsy("hide"),jQuery(".um-tip-e").tipsy("hide"),jQuery(".um-tip-s").tipsy("hide"),jQuery(".um .tipsy").remove())}},datetimePicker:{init:function(){jQuery(".um-datepicker:not(.picker__input)").each(function(){elem=jQuery(this),o=void 0!==elem.attr("data-disabled_weekdays")&&""!=elem.attr("data-disabled_weekdays")&&JSON.parse(elem.attr("data-disabled_weekdays"));var e=null;void 0!==elem.attr("data-years")&&(e=elem.attr("data-years"));var t=elem.attr("data-date_min"),i=elem.attr("data-date_max"),a=[],n=[];void 0!==t&&(a=t.split(",")),void 0!==i&&(n=i.split(","));t=a.length?new Date(a):null,i=a.length?new Date(n):null;t&&"Invalid Date"==t.toString()&&3==a.length&&(a=a[1]+"/"+a[2]+"/"+a[0],t=new Date(Date.parse(a))),i&&"Invalid Date"==i.toString()&&3==n.length&&(n=n[1]+"/"+n[2]+"/"+n[0],i=new Date(Date.parse(n)));var o={disable:o,format:elem.attr("data-format"),formatSubmit:"yyyy/mm/dd",hiddenName:!0,onOpen:function(){elem.blur()},onClose:function(){elem.blur()}};null!==e&&(o.selectYears=e),null!==t&&(o.min=t),null!==i&&(o.max=i),elem.pickadate(o)}),jQuery(".um-timepicker:not(.picker__input)").each(function(){elem=jQuery(this),elem.pickatime({format:elem.attr("data-format"),interval:parseInt(elem.attr("data-intervals")),formatSubmit:"HH:i",hiddenName:!0,onOpen:function(){elem.blur()},onClose:function(){elem.blur()}})})}},select:{isSelected:function(e,t){return e===t?' selected="selected"':""}}},jQuery(document).on("ajaxStart",function(){UM.common.tipsy.hide()}),jQuery(document).on("ajaxSuccess",function(){UM.common.tipsy.init()}),jQuery(document).ready(function(){UM.common.tipsy.init(),UM.common.datetimePicker.init()}); \ No newline at end of file From 9899eabf45944f228331621107e78347a6c0916d Mon Sep 17 00:00:00 2001 From: Mykyta Synelnikov Date: Fri, 22 Dec 2023 13:09:18 +0200 Subject: [PATCH 06/43] - used _.debounce when resize; --- assets/js/common-frontend.js | 2 +- assets/js/common-frontend.min.js | 2 +- assets/js/common.min.js | 2 +- assets/js/um-responsive.js | 7 +++++-- assets/js/um-responsive.min.js | 2 +- 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/assets/js/common-frontend.js b/assets/js/common-frontend.js index 767cf64f..fef49375 100644 --- a/assets/js/common-frontend.js +++ b/assets/js/common-frontend.js @@ -91,7 +91,7 @@ UM.frontend = { } }, destroy: function() { - if ( jQuery('.cropper-container').length > 0 ) { + if ( jQuery('.cropper-container').length > 0 && UM.frontend.cropper.obj ) { UM.frontend.cropper.obj.destroy(); // destroy Cropper.JS method UM.frontend.cropper.obj = null; // flush our own object } diff --git a/assets/js/common-frontend.min.js b/assets/js/common-frontend.min.js index 8748e4ea..aae402d3 100644 --- a/assets/js/common-frontend.min.js +++ b/assets/js/common-frontend.min.js @@ -1 +1 @@ -"object"!=typeof window.UM&&(window.UM={}),"object"!=typeof UM.frontend&&(UM.frontend={}),UM.frontend={cropper:{obj:null,init:function(){var o=jQuery(".um-modal .um-single-image-preview img").first();if(o.length&&""!==o.attr("src")){UM.frontend.cropper.obj&&UM.frontend.cropper.destroy();var t=jQuery(".um-modal .um-single-image-preview"),r=o.parent().data("crop"),n=o.parent().data("min_width"),i=o.parent().data("min_height"),a=o.parent().data("ratio"),d=jQuery(".um-modal").find("#um_upload_single").data("ratio"),d=(d&&(a=d.split(":")[0]),jQuery(window).height()-(jQuery(".um-modal-footer a").height()+20)-50-jQuery(".um-modal-header:visible").height());o.css({height:"auto"}),t.css({height:"auto"}),jQuery(window).height()<=400?(t.css({height:d+"px","max-height":d+"px"}),o.css({height:"auto"})):(o.css({height:"auto","max-height":d+"px"}),t.css({height:o.height(),"max-height":d+"px"}));let e;"square"===r?e={minWidth:n,minHeight:i,dragCrop:!1,aspectRatio:1,zoomable:!1,rotatable:!1,dashed:!1}:"cover"===r?(0 Date: Wed, 6 Dec 2023 18:25:13 +0200 Subject: [PATCH 07/43] - added shortcode um_profile_link --- includes/core/class-shortcodes.php | 40 ++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/includes/core/class-shortcodes.php b/includes/core/class-shortcodes.php index 8cb757de..53abbcee 100644 --- a/includes/core/class-shortcodes.php +++ b/includes/core/class-shortcodes.php @@ -74,6 +74,10 @@ if ( ! class_exists( 'um\core\Shortcodes' ) ) { add_shortcode( 'um_show_content', array( &$this, 'um_shortcode_show_content_for_role' ) ); add_shortcode( 'ultimatemember_searchform', array( &$this, 'ultimatemember_searchform' ) ); + if ( ! shortcode_exists( 'um_profile_link' ) ) { + add_shortcode( 'um_profile_link', array( &$this, 'um_profile_link' ) ); + } + add_filter( 'body_class', array( &$this, 'body_class' ), 0 ); add_filter( 'um_shortcode_args_filter', array( &$this, 'display_logout_form' ), 99 ); @@ -459,6 +463,42 @@ if ( ! class_exists( 'um\core\Shortcodes' ) ) { } + /** + * Display profile link. + * + * @since 2.8.0 + * + * Example 1: [um_profile_link] + * Example 2: [um_profile_link title="Go to profile" user_id="29"] + * + * @param array $attr { + * Attributes of the shortcode. + * + * @type string class A link class. + * @type string title A link text. + * @type int user_id User ID. Author ID if empty. + * } + * @return string|void Profile link HTML or profile link URL if the link text is empty. + */ + public function um_profile_link( $attr ) { + + $defaults_atts = array( + 'class' => 'um-link um-profile-link', + 'title' => '', + 'user_id' => is_singular() ? get_post()->post_author : ( is_author() ? get_the_author_meta( 'ID' ) : 0 ), + ); + + $atts = shortcode_atts( $defaults_atts, $attr, 'um_profile_link' ); + + if ( empty( $atts['user_id'] ) ) { + return; + } + $url = um_user_profile_url( $atts['user_id'] ); + + return empty( $atts['title'] ) ? $url : '' . esc_html( $atts['title'] ) . ''; + } + + /** * @param array $args * From 85f056040ed961574b877b1d7ca98e438a6f4f3f Mon Sep 17 00:00:00 2001 From: yuriinalivaiko Date: Mon, 1 Jan 2024 21:17:02 +0200 Subject: [PATCH 08/43] - fixed: the um class removed from the body classes --- includes/core/class-shortcodes.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/core/class-shortcodes.php b/includes/core/class-shortcodes.php index 8cb757de..d8024f0a 100644 --- a/includes/core/class-shortcodes.php +++ b/includes/core/class-shortcodes.php @@ -257,7 +257,7 @@ if ( ! class_exists( 'um\core\Shortcodes' ) ) { foreach ( $array as $slug => $info ) { if ( um_is_core_page( $slug ) ) { - $classes[] = 'um'; + $classes[] = 'um-page'; $classes[] = 'um-page-' . $slug; if ( is_user_logged_in() ) { From 46fc7ba1bc3fc2664a25ce38415be4c862680f09 Mon Sep 17 00:00:00 2001 From: Mykyta Synelnikov Date: Wed, 3 Jan 2024 14:18:22 +0200 Subject: [PATCH 09/43] - increased debounce interval; --- assets/js/um-responsive.js | 2 +- assets/js/um-responsive.min.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/js/um-responsive.js b/assets/js/um-responsive.js index 4eb6f3bf..c753672f 100644 --- a/assets/js/um-responsive.js +++ b/assets/js/um-responsive.js @@ -13,7 +13,7 @@ jQuery(window).on( 'resize', _.debounce( function() { um_responsive(); um_modal_responsive(); -}, 100 ) ); +}, 300 ) ); wp.hooks.addAction( 'um_admin_modal_success_result', 'um_frontend_responsive', function( $adminModal ) { // Make responsive script only when live preview, diff --git a/assets/js/um-responsive.min.js b/assets/js/um-responsive.min.js index 8549ddb2..c05ec19e 100644 --- a/assets/js/um-responsive.min.js +++ b/assets/js/um-responsive.min.js @@ -1 +1 @@ -jQuery(window).on("load",function(){um_responsive(),um_modal_responsive()}),jQuery(window).on("resize",_.debounce(function(){responsive_Modal(),wp.hooks.doAction("um_window_resize"),um_responsive(),um_modal_responsive()},100)),wp.hooks.addAction("um_admin_modal_success_result","um_frontend_responsive",function(o){o.find(".um-admin-modal-body").find(".um").length&&um_responsive()}); \ No newline at end of file +jQuery(window).on("load",function(){um_responsive(),um_modal_responsive()}),jQuery(window).on("resize",_.debounce(function(){responsive_Modal(),wp.hooks.doAction("um_window_resize"),um_responsive(),um_modal_responsive()},300)),wp.hooks.addAction("um_admin_modal_success_result","um_frontend_responsive",function(o){o.find(".um-admin-modal-body").find(".um").length&&um_responsive()}); \ No newline at end of file From a127946e1720d6dd0b18cdfbabc57034aac98bdd Mon Sep 17 00:00:00 2001 From: ashubawork Date: Wed, 3 Jan 2024 14:24:40 +0200 Subject: [PATCH 10/43] - fix the emails background color --- includes/core/class-mail.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/core/class-mail.php b/includes/core/class-mail.php index 8bd1acd7..add641e5 100644 --- a/includes/core/class-mail.php +++ b/includes/core/class-mail.php @@ -305,7 +305,7 @@ if ( ! class_exists( 'um\core\Mail' ) ) { * } * add_filter( 'um_email_template_body_attrs', 'my_email_template_body_attrs', 10, 3 ); */ - $body_attrs = apply_filters( 'um_email_template_body_attrs', 'style="background: #f2f2f2;-webkit-font-smoothing: antialiased;-moz-osx-font-smoothing: grayscale;"', $slug, $args ); + $body_attrs = apply_filters( 'um_email_template_body_attrs', 'style="background: #fff;-webkit-font-smoothing: antialiased;-moz-osx-font-smoothing: grayscale;"', $slug, $args ); ?> > From ceebdb3953a5005008cf30ce609137733238e68f Mon Sep 17 00:00:00 2001 From: Mykyta Synelnikov Date: Wed, 3 Jan 2024 14:43:00 +0200 Subject: [PATCH 11/43] - added class="fusion-lazyload-ignore" to empty images in modal window while upload avatar or cover photo. Avoid the conflict with Fusion Images lazyload functionality; --- includes/core/class-fields.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/includes/core/class-fields.php b/includes/core/class-fields.php index 59cb850a..5aeae98a 100644 --- a/includes/core/class-fields.php +++ b/includes/core/class-fields.php @@ -2963,7 +2963,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) { } else { $img_value = UM()->files()->get_download_link( $this->set_id, $key, um_user( 'ID' ) ); } - $img = ''; + $img = ''; } else { $img = ''; } @@ -2981,7 +2981,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) { if ( empty( $disabled ) ) { $output .= ''; } - $output .= '
'; + $output .= '
'; if ( empty( $disabled ) ) { $output .= '' . esc_html( $data['button_text'] ) . ''; } @@ -3014,7 +3014,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) { } $nonce = wp_create_nonce( 'um_upload_nonce-' . $this->timestamp ); - $output .= '
'; + $output .= '
'; $output .= '
' . esc_html( $data['button_text'] ) . '
'; $output .= '
From dec40f0b1436b9a83d092b4726b35cebaa9eb47b Mon Sep 17 00:00:00 2001 From: Mykyta Synelnikov Date: Wed, 3 Jan 2024 15:36:49 +0200 Subject: [PATCH 12/43] - fixed common tipsy styles; --- assets/css/common.css | 18 ++++++++++++------ assets/css/common.min.css | 2 +- assets/css/common.sass | 3 ++- assets/js/common.min.js | 2 +- 4 files changed, 16 insertions(+), 9 deletions(-) diff --git a/assets/css/common.css b/assets/css/common.css index fccbf7b2..bbe821a6 100644 --- a/assets/css/common.css +++ b/assets/css/common.css @@ -1,9 +1,11 @@ /* Tipsy customizations */ -.um .tipsy { +.um .tipsy, +.um-page .tipsy { z-index: 9999999999; font-size: inherit; } -.um .tipsy-inner { +.um .tipsy-inner, +.um-page .tipsy-inner { background-color: #333333; color: #fff; max-width: 250px; @@ -15,14 +17,18 @@ -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; } -.um .tipsy-arrow-n { +.um .tipsy-arrow-n, +.um-page .tipsy-arrow-n { border-bottom-color: #333; } -.um .tipsy-arrow-s { +.um .tipsy-arrow-s, +.um-page .tipsy-arrow-s { border-top-color: #333; } -.um .tipsy-arrow-e { +.um .tipsy-arrow-e, +.um-page .tipsy-arrow-e { border-left-color: #333; } -.um .tipsy-arrow-w { +.um .tipsy-arrow-w, +.um-page .tipsy-arrow-w { border-right-color: #333; } diff --git a/assets/css/common.min.css b/assets/css/common.min.css index 9647cd95..16241df0 100644 --- a/assets/css/common.min.css +++ b/assets/css/common.min.css @@ -1 +1 @@ -.um .tipsy{z-index:9999999999;font-size:inherit}.um .tipsy-inner{background-color:#333;color:#fff;max-width:250px;padding:6px 10px;text-align:left;font-size:13px;line-height:17px;word-wrap:break-word;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.um .tipsy-arrow-n{border-bottom-color:#333}.um .tipsy-arrow-s{border-top-color:#333}.um .tipsy-arrow-e{border-left-color:#333}.um .tipsy-arrow-w{border-right-color:#333} \ No newline at end of file +.um .tipsy,.um-page .tipsy{z-index:9999999999;font-size:inherit}.um .tipsy-inner,.um-page .tipsy-inner{background-color:#333;color:#fff;max-width:250px;padding:6px 10px;text-align:left;font-size:13px;line-height:17px;word-wrap:break-word;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.um .tipsy-arrow-n,.um-page .tipsy-arrow-n{border-bottom-color:#333}.um .tipsy-arrow-s,.um-page .tipsy-arrow-s{border-top-color:#333}.um .tipsy-arrow-e,.um-page .tipsy-arrow-e{border-left-color:#333}.um .tipsy-arrow-w,.um-page .tipsy-arrow-w{border-right-color:#333} \ No newline at end of file diff --git a/assets/css/common.sass b/assets/css/common.sass index 96611800..f011902f 100644 --- a/assets/css/common.sass +++ b/assets/css/common.sass @@ -1,5 +1,6 @@ /* Tipsy customizations */ -.um +.um, +.um-page .tipsy z-index: 9999999999 font-size: inherit diff --git a/assets/js/common.min.js b/assets/js/common.min.js index ac914fd9..e0cd0ab2 100644 --- a/assets/js/common.min.js +++ b/assets/js/common.min.js @@ -1 +1 @@ -"object"!=typeof window.UM&&(window.UM={}),"object"!=typeof UM.common&&(UM.common={}),UM.common={tipsy:{init:function(){"function"==typeof jQuery.fn.tipsy&&(jQuery(".um-tip-n").tipsy({gravity:"n",opacity:1,live:"a.live",offset:3}),jQuery(".um-tip-w").tipsy({gravity:"w",opacity:1,live:"a.live",offset:3}),jQuery(".um-tip-e").tipsy({gravity:"e",opacity:1,live:"a.live",offset:3}),jQuery(".um-tip-s").tipsy({gravity:"s",opacity:1,live:"a.live",offset:3}))},hide:function(){"function"==typeof jQuery.fn.tipsy&&(jQuery(".um-tip-n").tipsy("hide"),jQuery(".um-tip-w").tipsy("hide"),jQuery(".um-tip-e").tipsy("hide"),jQuery(".um-tip-s").tipsy("hide"),jQuery(".um .tipsy").remove())}},datetimePicker:{init:function(){jQuery(".um-datepicker:not(.picker__input)").each(function(){elem=jQuery(this),o=void 0!==elem.attr("data-disabled_weekdays")&&""!=elem.attr("data-disabled_weekdays")&&JSON.parse(elem.attr("data-disabled_weekdays"));var e=null;void 0!==elem.attr("data-years")&&(e=elem.attr("data-years"));var t=elem.attr("data-date_min"),i=elem.attr("data-date_max"),a=[],n=[];void 0!==t&&(a=t.split(",")),void 0!==i&&(n=i.split(","));t=a.length?new Date(a):null,i=a.length?new Date(n):null;t&&"Invalid Date"==t.toString()&&3==a.length&&(a=a[1]+"/"+a[2]+"/"+a[0],t=new Date(Date.parse(a))),i&&"Invalid Date"==i.toString()&&3==n.length&&(n=n[1]+"/"+n[2]+"/"+n[0],i=new Date(Date.parse(n)));var o={disable:o,format:elem.attr("data-format"),formatSubmit:"yyyy/mm/dd",hiddenName:!0,onOpen:function(){elem.blur()},onClose:function(){elem.blur()}};null!==e&&(o.selectYears=e),null!==t&&(o.min=t),null!==i&&(o.max=i),elem.pickadate(o)}),jQuery(".um-timepicker:not(.picker__input)").each(function(){elem=jQuery(this),elem.pickatime({format:elem.attr("data-format"),interval:parseInt(elem.attr("data-intervals")),formatSubmit:"HH:i",hiddenName:!0,onOpen:function(){elem.blur()},onClose:function(){elem.blur()}})})}},select:{isSelected:function(e,t){return e===t?' selected="selected"':""}}},jQuery(document).on("ajaxStart",function(){UM.common.tipsy.hide()}),jQuery(document).on("ajaxSuccess",function(){UM.common.tipsy.init()}),jQuery(document).ready(function(){UM.common.tipsy.init(),UM.common.datetimePicker.init()}); \ No newline at end of file +"object"!=typeof window.UM&&(window.UM={}),"object"!=typeof UM.common&&(UM.common={}),UM.common={tipsy:{init:function(){"function"==typeof jQuery.fn.tipsy&&(jQuery(".um-tip-n").tipsy({gravity:"n",opacity:1,live:"a.live",offset:3}),jQuery(".um-tip-w").tipsy({gravity:"w",opacity:1,live:"a.live",offset:3}),jQuery(".um-tip-e").tipsy({gravity:"e",opacity:1,live:"a.live",offset:3}),jQuery(".um-tip-s").tipsy({gravity:"s",opacity:1,live:"a.live",offset:3}))},hide:function(){"function"==typeof jQuery.fn.tipsy&&(jQuery(".um-tip-n").tipsy("hide"),jQuery(".um-tip-w").tipsy("hide"),jQuery(".um-tip-e").tipsy("hide"),jQuery(".um-tip-s").tipsy("hide"),jQuery(".um .tipsy").remove())}},datetimePicker:{init:function(){jQuery(".um-datepicker:not(.picker__input)").each(function(){e=void 0!==(elem=jQuery(this)).attr("data-disabled_weekdays")&&""!=elem.attr("data-disabled_weekdays")&&JSON.parse(elem.attr("data-disabled_weekdays"));var e,t=null,i=(void 0!==elem.attr("data-years")&&(t=elem.attr("data-years")),elem.attr("data-date_min")),a=elem.attr("data-date_max"),n=[],o=[],i=(void 0!==i&&(n=i.split(",")),void 0!==a&&(o=a.split(",")),n.length?new Date(n):null),a=n.length?new Date(o):null,o=(i&&"Invalid Date"==i.toString()&&3==n.length&&(n=n[1]+"/"+n[2]+"/"+n[0],i=new Date(Date.parse(n))),a&&"Invalid Date"==a.toString()&&3==o.length&&(n=o[1]+"/"+o[2]+"/"+o[0],a=new Date(Date.parse(n))),{disable:e,format:elem.attr("data-format"),formatSubmit:"yyyy/mm/dd",hiddenName:!0,onOpen:function(){elem.blur()},onClose:function(){elem.blur()}});null!==t&&(o.selectYears=t),null!==i&&(o.min=i),null!==a&&(o.max=a),elem.pickadate(o)}),jQuery(".um-timepicker:not(.picker__input)").each(function(){(elem=jQuery(this)).pickatime({format:elem.attr("data-format"),interval:parseInt(elem.attr("data-intervals")),formatSubmit:"HH:i",hiddenName:!0,onOpen:function(){elem.blur()},onClose:function(){elem.blur()}})})}},select:{isSelected:function(e,t){return e===t?' selected="selected"':""}}},jQuery(document).on("ajaxStart",function(){UM.common.tipsy.hide()}),jQuery(document).on("ajaxSuccess",function(){UM.common.tipsy.init()}),jQuery(document).ready(function(){UM.common.tipsy.init(),UM.common.datetimePicker.init()}); \ No newline at end of file From f4c3f42bb5eaccfe1335bdd59320f2dc44a35fb0 Mon Sep 17 00:00:00 2001 From: Mykyta Synelnikov Date: Wed, 3 Jan 2024 16:20:42 +0200 Subject: [PATCH 13/43] - minified file; --- assets/css/um.rtl.min.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/css/um.rtl.min.css b/assets/css/um.rtl.min.css index a1a24de2..be9d27cd 100644 --- a/assets/css/um.rtl.min.css +++ b/assets/css/um.rtl.min.css @@ -1 +1 @@ -.rtl .um{direction:rtl!important;text-align:right}.rtl .um:not(.um-admin){text-align:right}.um-profile-photo{float:right;margin:0 30px 0 0}.um-profile-photo a.um-profile-photo-img{float:right;left:auto}.um-cover + .um-header .um-profile-photo a.um-profile-photo-img{right:0}div.uimob500 .um-profile-photo a.um-profile-photo-img{right:auto}.um-profile-edit{right:auto;left:0;margin-left:10px;margin-right:0}div.uimob960 .um-header .um-profile-meta,div.uimob800 .um-header .um-profile-meta{padding-left:0!important;padding-right:200px!important}.um-name{float:right;margin-right:0}.um-profile-nav-item a{float:right;padding:6px 28px 6px 10px}.um-profile-nav-item i{left:auto;right:6px}.um-profile-nav-item a{float:right}.um-field-checkbox-state,.um-field-radio-state{right:1px;left:auto}.um-field-checkbox-option,.um-field-radio-option{margin:0 36px 0 0}.um-field-half{float:right}.um-field-half.right{float:left}.um-left{float:right}.um-right{float:left}.um-account-main,.um-account-side{float:right}.um-account-main div.um-account-heading i{margin-right:0;margin-left:10px}.um-account-side li a span.um-account-icon,.um-account-side li a.current span.um-account-icon,.um-account-side li a.current:hover span.um-account-icon{float:right;border-left:1px solid #ccc}.um-account-side li a span.um-account-title{padding-right:20px;float:right}.um-account-side li a span.um-account-arrow{right:auto;left:10px}.um-field-label .um-field-label-icon{float:right;margin:0 0 0 8px}p.um-notice i{right:auto;left:14px}.um-account.uimob340 .um-account-nav a,.um-account.uimob500 .um-account-nav a{padding-left:0;padding-right:40px}.um-account.uimob340 .um-account-nav span.ico,.um-account.uimob500 .um-account-nav span.ico{right:0}.um-account.uimob340 .um-account-nav span.arr,.um-account.uimob500 .um-account-nav span.arr{right:auto;left:0}.select2.select2-container .select2-selection .select2-selection__arrow{right:auto!important}.select2-container[dir="rtl"] .select2-selection--single .select2-selection__rendered{padding-right:8px;text-align:right;padding-left:20px}.select2-container--default[dir="rtl"] .select2-selection--single .select2-selection__clear{margin-left:4px}.um-single-image-preview a.cancel,.um-single-file-preview a.cancel{left:-15px;right:auto}.select2.select2-container .select2-selection{padding:0 12px 0 0 !important}.select2-selection__clear{right:auto;left:1px}.cropper-container{margin:0 auto;left:auto!important}.um-field-label .um-tip{margin:0 8px 0 0}.tipsy-inner{text-align:right!important}.um span.um-req{margin:0 8px 0 0}.um-account-side li a span.um-account-icon,.um-account-side li a.current span.um-account-icon,.um-account-side li a.current:hover span.um-account-icon{border-right:none}.um-field-error .um-field-arrow{left:0;right:10px}.um-single-image-preview a.cancel,.um-single-file-preview a.cancel{left:0}.um-modal-body .um-single-image-preview a.cancel,.um-modal-body .um-single-file-preview a.cancel{left:-15px}.um-item-link{padding-right:0;padding-left:40px} \ No newline at end of file +.rtl .um{direction:rtl!important;text-align:right}.rtl .um:not(.um-admin){text-align:right}.um-profile-photo{float:right;margin:0 30px 0 0}.um-profile-photo a.um-profile-photo-img{float:right;left:auto}.um-cover+.um-header .um-profile-photo a.um-profile-photo-img{right:0}div.uimob500 .um-profile-photo a.um-profile-photo-img{right:auto}.um-profile-edit{right:auto;left:0;margin-left:10px;margin-right:0}div.uimob800 .um-header .um-profile-meta,div.uimob960 .um-header .um-profile-meta{padding-left:0!important;padding-right:200px!important}.um-name{float:right;margin-right:0}.um-profile-nav-item a{float:right;padding:6px 28px 6px 10px}.um-profile-nav-item i{left:auto;right:6px}.um-profile-nav-item a{float:right}.um-field-checkbox-state,.um-field-radio-state{right:1px;left:auto}.um-field-checkbox-option,.um-field-radio-option{margin:0 36px 0 0}.um-field-half{float:right}.um-field-half.right{float:left}.um-left{float:right}.um-right{float:left}.um-account-main,.um-account-side{float:right}.um-account-main div.um-account-heading i{margin-right:0;margin-left:10px}.um-account-side li a span.um-account-icon,.um-account-side li a.current span.um-account-icon,.um-account-side li a.current:hover span.um-account-icon{float:right;border-left:1px solid #ccc}.um-account-side li a span.um-account-title{padding-right:20px;float:right}.um-account-side li a span.um-account-arrow{right:auto;left:10px}.um-field-label .um-field-label-icon{float:right;margin:0 0 0 8px}p.um-notice i{right:auto;left:14px}.um-account.uimob340 .um-account-nav a,.um-account.uimob500 .um-account-nav a{padding-left:0;padding-right:40px}.um-account.uimob340 .um-account-nav span.ico,.um-account.uimob500 .um-account-nav span.ico{right:0}.um-account.uimob340 .um-account-nav span.arr,.um-account.uimob500 .um-account-nav span.arr{right:auto;left:0}.select2.select2-container .select2-selection .select2-selection__arrow{right:auto!important}.select2-container[dir=rtl] .select2-selection--single .select2-selection__rendered{padding-right:8px;text-align:right;padding-left:20px}.select2-container--default[dir=rtl] .select2-selection--single .select2-selection__clear{margin-left:4px}.um-single-file-preview a.cancel,.um-single-image-preview a.cancel{left:-15px;right:auto}.select2.select2-container .select2-selection{padding:0 12px 0 0!important}.select2-selection__clear{right:auto;left:1px}.cropper-container{margin:0 auto;left:auto!important}.um-field-label .um-tip{margin:0 8px 0 0}.tipsy-inner{text-align:right!important}.um span.um-req{margin:0 8px 0 0}.um-account-side li a span.um-account-icon,.um-account-side li a.current span.um-account-icon,.um-account-side li a.current:hover span.um-account-icon{border-right:none}.um-field-error .um-field-arrow{left:0;right:10px}.um-single-file-preview a.cancel,.um-single-image-preview a.cancel{left:0}.um-modal-body .um-single-file-preview a.cancel,.um-modal-body .um-single-image-preview a.cancel{left:-15px}.um-item-link{padding-right:0;padding-left:40px} \ No newline at end of file From fe5bedf0e31985a4e4923f087027acc1b2d806f1 Mon Sep 17 00:00:00 2001 From: Mykyta Synelnikov Date: Wed, 3 Jan 2024 17:03:47 +0200 Subject: [PATCH 14/43] - added the data protocol for embedding base64 encoded logos in emails; --- includes/admin/core/class-admin-settings.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/includes/admin/core/class-admin-settings.php b/includes/admin/core/class-admin-settings.php index d7e1310e..10b60bef 100644 --- a/includes/admin/core/class-admin-settings.php +++ b/includes/admin/core/class-admin-settings.php @@ -3731,19 +3731,18 @@ Use Only Cookies: mail()->get_template_file( 'theme', $template ); if ( ! file_exists( $theme_template_path ) ) { @@ -3751,7 +3750,7 @@ Use Only Cookies: Date: Wed, 3 Jan 2024 17:43:20 +0200 Subject: [PATCH 15/43] - fixed conditional menu handlers for MegaMenu themes (#1334); --- includes/core/um-filters-navmenu.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/includes/core/um-filters-navmenu.php b/includes/core/um-filters-navmenu.php index 9f0572c1..27d53cfe 100644 --- a/includes/core/um-filters-navmenu.php +++ b/includes/core/um-filters-navmenu.php @@ -63,6 +63,8 @@ if ( ! is_admin() ) { //other filter foreach ( $menu_items as $item ) { if ( empty( $item->ID ) ) { + // Left item with empty ID for the cases like in MegaMenu when generated submenu doesn't have the menu item ID. + $filtered_items[] = $item; continue; } From c01254213b738d6f3b22aee7230c9cbe132595c3 Mon Sep 17 00:00:00 2001 From: Mykyta Synelnikov Date: Thu, 4 Jan 2024 00:54:19 +0200 Subject: [PATCH 16/43] - fixed conditional menu handlers for MegaMenu themes (#1334); --- includes/core/um-filters-navmenu.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/includes/core/um-filters-navmenu.php b/includes/core/um-filters-navmenu.php index 27d53cfe..6d463aee 100644 --- a/includes/core/um-filters-navmenu.php +++ b/includes/core/um-filters-navmenu.php @@ -64,7 +64,12 @@ if ( ! is_admin() ) { foreach ( $menu_items as $item ) { if ( empty( $item->ID ) ) { // Left item with empty ID for the cases like in MegaMenu when generated submenu doesn't have the menu item ID. - $filtered_items[] = $item; + if ( ! empty( $item->is_mega_menu ) ) { + if ( isset( $item->menu_item_parent ) && in_array( absint( $item->menu_item_parent ), $hide_children_of, true ) ) { + continue; + } + $filtered_items[] = $item; + } continue; } From c5931289b7f647dd02cdecde2464ea0e0e77cee5 Mon Sep 17 00:00:00 2001 From: Mykyta Synelnikov Date: Thu, 4 Jan 2024 16:48:26 +0200 Subject: [PATCH 17/43] - fixed deregistered select2 styling; --- includes/common/class-enqueue.php | 104 ++++++++++++++++------------ includes/frontend/class-enqueue.php | 7 +- 2 files changed, 63 insertions(+), 48 deletions(-) diff --git a/includes/common/class-enqueue.php b/includes/common/class-enqueue.php index da7b797e..df9aa407 100644 --- a/includes/common/class-enqueue.php +++ b/includes/common/class-enqueue.php @@ -178,6 +178,63 @@ class Enqueue { return apply_filters( 'um_get_pickadate_locale', $locale, $suffix ); } + /** + * Select2 JS and CSS assets register function. + * + * + */ + public function register_select2() { + $suffix = self::get_suffix(); + $libs_url = self::get_url( 'libs' ); + + /** + * Filters marker for dequeue select2.JS library. + * + * @since 2.0.0 + * @hook um_dequeue_select2_scripts + * + * @param {bool} $dequeue_select2 Dequeue select2 assets marker. Set to `true` for dequeue scripts. + * + * @return {bool} Dequeue select2 assets. By default `false`. + * + * @example Dequeue select2 assets. + * function custom_um_dequeue_select2_scripts( $dequeue_select2 ) { + * $dequeue_select2 = true; + * return $dequeue_select2; + * } + * add_filter( 'um_dequeue_select2_scripts', 'custom_um_dequeue_select2_scripts' ); + */ + $dequeue_select2 = apply_filters( 'um_dequeue_select2_scripts', false ); + if ( class_exists( 'WooCommerce' ) || $dequeue_select2 ) { + wp_dequeue_style( 'select2' ); + wp_deregister_style( 'select2' ); + + wp_dequeue_script( 'select2' ); + wp_deregister_script( 'select2' ); + } + wp_register_script( 'select2', $libs_url . 'select2/select2.full' . $suffix . '.js', array( 'jquery' ), '4.0.13', true ); + // Load a localized version for Select2. + $locale = get_locale(); + $base_locale = get_locale(); + if ( $locale ) { + if ( ! file_exists( UM_PATH . 'assets/libs/select2/i18n/' . $locale . '.js' ) ) { + $locale = explode( '_', $base_locale ); + $locale = $locale[0]; + + if ( ! file_exists( UM_PATH . 'assets/libs/select2/i18n/' . $locale . '.js' ) ) { + $locale = explode( '_', $base_locale ); + $locale = implode( '-', $locale ); + } + } + + if ( file_exists( UM_PATH . 'assets/libs/select2/i18n/' . $locale . '.js' ) ) { + wp_register_script( 'um_select2_locale', $libs_url . 'select2/i18n/' . $locale . '.js', array( 'jquery', 'select2' ), '4.0.13', true ); + self::$select2_handle = 'um_select2_locale'; + } + } + wp_register_style( 'select2', $libs_url . 'select2/select2' . $suffix . '.css', array(), '4.0.13' ); + } + /** * Register common JS/CSS libraries. * @@ -204,52 +261,7 @@ class Enqueue { wp_register_style( 'um_fonticons_fa', $libs_url . 'legacy/fonticons/fonticons-fa' . $suffix . '.css', array(), UM_VERSION ); // FontAwesome // Select2 JS. - /** - * Filters marker for dequeue select2.JS library. - * - * @since 2.0.0 - * @hook um_dequeue_select2_scripts - * - * @param {bool} $dequeue_select2 Dequeue select2 assets marker. Set to `true` for dequeue scripts. - * - * @return {bool} Dequeue select2 assets. By default `false`. - * - * @example Dequeue select2 assets. - * function custom_um_dequeue_select2_scripts( $dequeue_select2 ) { - * $dequeue_select2 = true; - * return $dequeue_select2; - * } - * add_filter( 'um_dequeue_select2_scripts', 'custom_um_dequeue_select2_scripts' ); - */ - $dequeue_select2 = apply_filters( 'um_dequeue_select2_scripts', false ); - if ( class_exists( 'WooCommerce' ) || $dequeue_select2 ) { - wp_dequeue_style( self::$select2_handle ); - wp_deregister_style( self::$select2_handle ); - - wp_dequeue_script( self::$select2_handle ); - wp_deregister_script( self::$select2_handle ); - } - wp_register_script( self::$select2_handle, $libs_url . 'select2/select2.full' . $suffix . '.js', array( 'jquery' ), '4.0.13', true ); - // Load a localized version for Select2. - $locale = get_locale(); - $base_locale = get_locale(); - if ( $locale ) { - if ( ! file_exists( UM_PATH . 'assets/libs/select2/i18n/' . $locale . '.js' ) ) { - $locale = explode( '_', $base_locale ); - $locale = $locale[0]; - - if ( ! file_exists( UM_PATH . 'assets/libs/select2/i18n/' . $locale . '.js' ) ) { - $locale = explode( '_', $base_locale ); - $locale = implode( '-', $locale ); - } - } - - if ( file_exists( UM_PATH . 'assets/libs/select2/i18n/' . $locale . '.js' ) ) { - wp_register_script( 'um_select2_locale', $libs_url . 'select2/i18n/' . $locale . '.js', array( 'jquery', self::$select2_handle ), '4.0.13', true ); - self::$select2_handle = 'um_select2_locale'; - } - } - wp_register_style( 'select2', $libs_url . 'select2/select2' . $suffix . '.css', array(), '4.0.13' ); + $this->register_select2(); // Date-time picker (Pickadate.JS) wp_register_script( 'um_datetime', $libs_url . 'pickadate/picker' . $suffix . '.js', array( 'jquery' ), '3.6.2', true ); diff --git a/includes/frontend/class-enqueue.php b/includes/frontend/class-enqueue.php index fcce521e..59e2740f 100644 --- a/includes/frontend/class-enqueue.php +++ b/includes/frontend/class-enqueue.php @@ -186,9 +186,12 @@ final class Enqueue extends \um\common\Enqueue { wp_register_style( 'um_rtl', $css_url . 'um.rtl' . $suffix . '.css', array(), UM_VERSION ); wp_register_style( 'um_default_css', $css_url . 'um-old-default' . $suffix . '.css', array(), UM_VERSION ); wp_register_style( 'um_modal', $css_url . 'um-modal' . $suffix . '.css', array(), UM_VERSION ); - wp_register_style( 'um_responsive', $css_url . 'um-responsive' . $suffix . '.css', array( 'um_profile' ), UM_VERSION ); + wp_register_style( 'um_responsive', $css_url . 'um-responsive' . $suffix . '.css', array(), UM_VERSION ); - wp_register_style( 'um_styles', $css_url . 'um-styles' . $suffix . '.css', array( 'um_ui', 'um_tipsy', 'um_raty', 'um_fonticons_ii', 'um_fonticons_fa', 'select2', 'um_fileupload', 'um_common' ), UM_VERSION ); + // Workaround when select2 deregistered (e.g. Woo + Impreza theme activated). + $this->register_select2(); + + wp_register_style( 'um_styles', $css_url . 'um-styles' . $suffix . '.css', array( 'um_ui', 'um_tipsy', 'um_raty', 'um_fonticons_ii', 'um_fonticons_fa', 'select2', 'um_fileupload', 'um_common', 'um_responsive', 'um_modal' ), UM_VERSION ); wp_register_style( 'um_members', $css_url . 'um-members' . $suffix . '.css', array( 'um_styles' ), UM_VERSION ); // RTL styles. From ae179677a0d3a478f5b2dce9585fe539f87a69cf Mon Sep 17 00:00:00 2001 From: Mykyta Synelnikov Date: Fri, 5 Jan 2024 15:55:02 +0200 Subject: [PATCH 18/43] - added hook `um_access_restricted_post_instance`; - some wpcs ehnancements; --- includes/core/class-access.php | 333 ++++++++++++++++++++------------- 1 file changed, 201 insertions(+), 132 deletions(-) diff --git a/includes/core/class-access.php b/includes/core/class-access.php index 60463bf9..1cafc3b9 100644 --- a/includes/core/class-access.php +++ b/includes/core/class-access.php @@ -1,19 +1,23 @@ singular_page = false; $this->redirect_handler = false; - $this->allow_access = false; + $this->allow_access = false; // NEW HOOKS // Navigation line below the post content, change query to exclude restricted @@ -140,7 +140,7 @@ if ( ! class_exists( 'um\core\Access' ) ) { * * @return array */ - function exclude_posts_array( $force = false, $post_types = false ) { + public function exclude_posts_array( $force = false, $post_types = false ) { if ( $this->ignore_exclude ) { return array(); } @@ -335,16 +335,14 @@ if ( ! class_exists( 'um\core\Access' ) ) { return $exclude_posts; } - - /** * Get array with restricted terms * - * @param \WP_Term_Query $query + * @param WP_Term_Query $query * * @return array */ - function exclude_terms_array( $query ) { + public function exclude_terms_array( $query ) { $exclude = array(); $restricted_taxonomies = UM()->options()->get( 'restricted_access_taxonomy_metabox' ); @@ -415,11 +413,10 @@ if ( ! class_exists( 'um\core\Access' ) ) { return $exclude; } - /** - * @param \WP_Term_Query $query + * @param WP_Term_Query $query */ - function exclude_hidden_terms_query( $query ) { + public function exclude_hidden_terms_query( $query ) { if ( current_user_can( 'administrator' ) || ! empty( $query->query_vars['um_ignore_exclude'] ) ) { return; } @@ -430,11 +427,10 @@ if ( ! class_exists( 'um\core\Access' ) ) { } } - /** - * @param \WP_Query $query + * @param WP_Query $query */ - function exclude_posts( $query ) { + public function exclude_posts( $query ) { if ( current_user_can( 'administrator' ) ) { return; } @@ -472,16 +468,15 @@ if ( ! class_exists( 'um\core\Access' ) ) { } } - /** - * Exclude restricted post from query if there is a single query that exclude post_not_in by default in \WP_Query + * Exclude restricted post from query if there is a single query that exclude post_not_in by default in WP_Query * - * @param string $where - * @param \WP_Query $query + * @param string $where + * @param WP_Query $query * * @return mixed */ - function exclude_posts_where( $where, $query ) { + public function exclude_posts_where( $where, $query ) { if ( current_user_can( 'administrator' ) ) { return $where; } @@ -502,18 +497,17 @@ if ( ! class_exists( 'um\core\Access' ) ) { return $where; } - /** * Change the posts count based on restriction settings * * @param object $counts Post counts - * @param string $type Post type - * @param string $perm The permission to determine if the posts are 'readable' - * by the current user. + * @param string $type Post type + * @param string $perm The permission to determine if the posts are 'readable' + * by the current user. * * @return object */ - function custom_count_posts_handler( $counts, $type = 'post', $perm = '' ) { + public function custom_count_posts_handler( $counts, $type = 'post', $perm = '' ) { if ( current_user_can( 'administrator' ) ) { return $counts; } @@ -565,7 +559,6 @@ if ( ! class_exists( 'um\core\Access' ) ) { return $counts; } - /** * Exclude restricted posts in Recent Posts widget * @@ -573,7 +566,7 @@ if ( ! class_exists( 'um\core\Access' ) ) { * * @return array */ - function exclude_restricted_posts_widget( $array ) { + public function exclude_restricted_posts_widget( $array ) { if ( current_user_can( 'administrator' ) ) { return $array; } @@ -587,7 +580,6 @@ if ( ! class_exists( 'um\core\Access' ) ) { return $array; } - /** * Exclude restricted posts in Recent Posts widget * @@ -595,7 +587,7 @@ if ( ! class_exists( 'um\core\Access' ) ) { * * @return array */ - function exclude_restricted_pages( $array ) { + public function exclude_restricted_pages( $array ) { if ( current_user_can( 'administrator' ) ) { return $array; } @@ -608,16 +600,15 @@ if ( ! class_exists( 'um\core\Access' ) ) { return $array; } - /** * Exclude restricted posts in widgets * * @param string $sql_where - * @param array $parsed_args + * @param array $parsed_args * * @return string */ - function exclude_restricted_posts_archives_widget( $sql_where, $parsed_args = array() ) { + public function exclude_restricted_posts_archives_widget( $sql_where, $parsed_args = array() ) { if ( current_user_can( 'administrator' ) ) { return $sql_where; } @@ -633,7 +624,6 @@ if ( ! class_exists( 'um\core\Access' ) ) { return $sql_where; } - /** * Exclude posts from next, previous navigation * @@ -641,11 +631,11 @@ if ( ! class_exists( 'um\core\Access' ) ) { * @param bool $in_same_term * @param string|array $excluded_terms * @param string $taxonomy - * @param null|\WP_Post $post + * @param null|WP_Post $post * * @return string */ - function exclude_navigation_posts( $where, $in_same_term = false, $excluded_terms = '', $taxonomy = 'category', $post = null ) { + public function exclude_navigation_posts( $where, $in_same_term = false, $excluded_terms = '', $taxonomy = 'category', $post = null ) { if ( current_user_can( 'administrator' ) ) { return $where; } @@ -663,16 +653,15 @@ if ( ! class_exists( 'um\core\Access' ) ) { return $where; } - /** - * Replace titles of restricted posts + * Replace titles of restricted posts. * - * @param string $title - * @param int|null $id + * @param string $title Post title. + * @param int|null $id Post ID. * * @return string */ - function filter_restricted_post_title( $title, $id = null ) { + public function filter_restricted_post_title( $title, $id = null ) { if ( ! UM()->options()->get( 'restricted_post_title_replace' ) ) { return $title; } @@ -689,6 +678,29 @@ if ( ! class_exists( 'um\core\Access' ) ) { $id = absint( $id ); } + /** + * Filters a marker for ignoring restricted post title changes. + * + * @param {bool} $ignore Marker for ignoring restricted post title changes. Default `false`. Set to `true` if you want to ignore and show real title. + * @param {int} $post_id Post ID. + * + * @return {bool} Marker for ignoring restricted post title changes. + * + * @since 2.2.3 + * @hook um_ignore_restricted_title + * + * @example Leave real post titles even they are restricted. By post ID (for ID = 400). + * function change_restricted_title( $ignore, $id ) { + * // your code here + * if ( 400 === $id ) { + * $ignore = true; + * } + * return $ignore; + * } + * add_filter( 'um_ignore_restricted_title', 'change_restricted_title', 10, 2 ); + * @example Leave real post titles even they are restricted. For all posts: site-wide logic. + * add_filter( 'um_ignore_restricted_title', '__return_true' ); + */ $ignore = apply_filters( 'um_ignore_restricted_title', false, $id ); if ( $ignore ) { return $title; @@ -696,21 +708,20 @@ if ( ! class_exists( 'um\core\Access' ) ) { if ( $this->is_restricted( $id ) ) { $restricted_global_title = UM()->options()->get( 'restricted_access_post_title' ); - $title = stripslashes( $restricted_global_title ); + $title = stripslashes( $restricted_global_title ); } return $title; } - /** - * Replace content of restricted posts + * Replace content of restricted posts. * - * @param string $content + * @param string $content Post Content. * * @return string */ - function filter_restricted_post_content( $content ) { + public function filter_restricted_post_content( $content ) { if ( current_user_can( 'administrator' ) ) { return $content; } @@ -720,6 +731,31 @@ if ( ! class_exists( 'um\core\Access' ) ) { return $content; } + /** + * Filters a marker for ignoring restricted post content changes. + * + * Note: Use with caution! You can make your posts not restricted by using this filter hook. + * + * @param {bool} $ignore Marker for ignoring restricted post content changes. Default `false`. Set to `true` if you want to ignore and show real content. + * @param {int} $post_id Post ID. + * + * @return {bool} Marker for ignoring restricted post content changes. + * + * @since 2.2.3 + * @hook um_ignore_restricted_content + * + * @example Leave real post content even they are restricted. By post ID (for ID = 400). + * function change_restricted_content( $ignore, $id ) { + * // your code here + * if ( 400 === $id ) { + * $ignore = true; + * } + * return $ignore; + * } + * add_filter( 'um_ignore_restricted_content', 'change_restricted_content', 10, 2 ); + * @example Leave real post content even they are restricted. For all posts: site-wide logic. + * add_filter( 'um_ignore_restricted_content', '__return_true' ); + */ $ignore = apply_filters( 'um_ignore_restricted_content', false, $id ); if ( $ignore ) { return $content; @@ -741,16 +777,15 @@ if ( ! class_exists( 'um\core\Access' ) ) { return $content; } - /** - * Replace excerpt of restricted posts + * Replace excerpt of restricted posts. * - * @param string $post_excerpt - * @param \WP_Post $post + * @param string $post_excerpt Post Excerpt. + * @param WP_Post $post WP_Post instance. * * @return string */ - function filter_restricted_post_excerpt( $post_excerpt = '', $post = null ) { + public function filter_restricted_post_excerpt( $post_excerpt = '', $post = null ) { if ( empty( $post ) ) { return $post_excerpt; } @@ -759,6 +794,31 @@ if ( ! class_exists( 'um\core\Access' ) ) { return $post_excerpt; } + /** + * Filters a marker for ignoring restricted post excerpt changes. + * + * Note: Use with caution! You can make your posts not restricted by using this filter hook. + * + * @param {bool} $ignore Marker for ignoring restricted post excerpt changes. Default `false`. Set to `true` if you want to ignore and show real content. + * @param {int} $post_id Post ID. + * + * @return {bool} Marker for ignoring restricted post excerpt changes. + * + * @since 2.2.3 + * @hook um_ignore_restricted_excerpt + * + * @example Leave real post excerpt even they are restricted. By post ID (for ID = 400). + * function change_restricted_excerpt( $ignore, $id ) { + * // your code here + * if ( 400 === $id ) { + * $ignore = true; + * } + * return $ignore; + * } + * add_filter( 'um_ignore_restricted_excerpt', 'change_restricted_excerpt', 10, 2 ); + * @example Leave real post excerpt even they are restricted. For all posts: site-wide logic. + * add_filter( 'um_ignore_restricted_excerpt', '__return_true' ); + */ $ignore = apply_filters( 'um_ignore_restricted_excerpt', false, $post->ID ); if ( $ignore ) { return $post_excerpt; @@ -771,16 +831,15 @@ if ( ! class_exists( 'um\core\Access' ) ) { return $post_excerpt; } - /** * Hide attachment if the post is restricted * * @param string $url - * @param int $attachment_id + * @param int $attachment_id * * @return boolean|string */ - function filter_attachment( $url, $attachment_id ) { + public function filter_attachment( $url, $attachment_id ) { if ( current_user_can( 'administrator' ) ) { return $url; } @@ -788,7 +847,6 @@ if ( ! class_exists( 'um\core\Access' ) ) { return ( $attachment_id && $this->is_restricted( $attachment_id ) ) ? false : $url; } - /** * Hide attachment if the post is restricted * @@ -798,7 +856,7 @@ if ( ! class_exists( 'um\core\Access' ) ) { * * @return bool */ - function filter_post_thumbnail( $has_thumbnail, $post = null, $thumbnail_id = false ) { + public function filter_post_thumbnail( $has_thumbnail, $post = null, $thumbnail_id = false ) { if ( empty( $thumbnail_id ) ) { return $has_thumbnail; } @@ -825,14 +883,12 @@ if ( ! class_exists( 'um\core\Access' ) ) { return $has_thumbnail; } - - /** * Exclude comments from restricted posts in widgets * - * @param \WP_Comment_Query $query + * @param WP_Comment_Query $query */ - function exclude_posts_comments( $query ) { + public function exclude_posts_comments( $query ) { if ( current_user_can( 'administrator' ) ) { return; } @@ -862,11 +918,10 @@ if ( ! class_exists( 'um\core\Access' ) ) { } } - /** * @return array */ - function get_available_comments_post_types() { + public function get_available_comments_post_types() { global $wp_taxonomies, $wpdb; $restricted_posts = UM()->options()->get( 'restricted_access_post_metabox' ); @@ -907,16 +962,15 @@ if ( ! class_exists( 'um\core\Access' ) ) { return $restricted_posts; } - /** * Exclude comments from comments feed * - * @param string $where - * @param \WP_Query $query + * @param string $where + * @param WP_Query $query * * @return string */ - function exclude_posts_comments_feed( $where, $query ) { + public function exclude_posts_comments_feed( $where, $query ) { if ( current_user_can( 'administrator' ) ) { return $where; } @@ -924,20 +978,19 @@ if ( ! class_exists( 'um\core\Access' ) ) { $exclude_posts = $this->exclude_posts_array( true, $this->get_available_comments_post_types() ); if ( ! empty( $exclude_posts ) ) { $exclude_string = implode( ',', $exclude_posts ); - $where .= ' AND comment_post_ID NOT IN ( ' . $exclude_string . ' )'; + $where .= ' AND comment_post_ID NOT IN ( ' . $exclude_string . ' )'; } return $where; } - /** * @param array|object $stats * @param int $post_id Post ID. Can be 0 for the whole website * * @return object */ - function custom_comments_count_handler( $stats = array(), $post_id = 0 ) { + public function custom_comments_count_handler( $stats = array(), $post_id = 0 ) { if ( ! empty( $stats ) || current_user_can( 'administrator' ) ) { return $stats; } @@ -963,14 +1016,13 @@ if ( ! class_exists( 'um\core\Access' ) ) { return $stats_object; } - /** * @param int $post_id * @param array $exclude_posts * * @return array */ - function get_comment_count( $post_id = 0, $exclude_posts = array() ) { + public function get_comment_count( $post_id = 0, $exclude_posts = array() ) { static $cache = array(); if ( isset( $cache[ $post_id ] ) ) { @@ -1044,15 +1096,15 @@ if ( ! class_exists( 'um\core\Access' ) ) { return $comment_count; } - /** * Disable comments if user has not permission to access this post * * @param mixed $open * @param int $post_id - * @return boolean + * + * @return bool */ - function disable_comments_open( $open, $post_id ) { + public function disable_comments_open( $open, $post_id ) { if ( current_user_can( 'administrator' ) ) { return $open; } @@ -1074,15 +1126,15 @@ if ( ! class_exists( 'um\core\Access' ) ) { return $open; } - /** * Disable comments if user has not permission to access this post * * @param int $count * @param int $post_id - * @return boolean + * + * @return bool */ - function disable_comments_open_number( $count, $post_id = 0 ) { + public function disable_comments_open_number( $count, $post_id = 0 ) { if ( current_user_can( 'administrator' ) ) { return $count; } @@ -1104,15 +1156,15 @@ if ( ! class_exists( 'um\core\Access' ) ) { return $count; } - /** * Protect Post Types in menu query * Restrict content new logic * @param array $menu_items * @param array $args + * * @return array */ - function filter_menu( $menu_items, $args = array() ) { + public function filter_menu( $menu_items, $args = array() ) { //if empty if ( empty( $menu_items ) ) { return $menu_items; @@ -1159,14 +1211,13 @@ if ( ! class_exists( 'um\core\Access' ) ) { return $filtered_items; } - /** * @param $block_content * @param $block * * @return string */ - function restrict_blocks( $block_content, $block ) { + public function restrict_blocks( $block_content, $block ) { if ( is_admin() ) { return $block_content; } @@ -1246,13 +1297,12 @@ if ( ! class_exists( 'um\core\Access' ) ) { return $block_content; } - /** - * @param \WP_Post $post + * @param WP_Post $post * - * @return \WP_Post + * @return WP_Post */ - function maybe_replace_title( $post ) { + public function maybe_replace_title( $post ) { if ( ! UM()->options()->get( 'restricted_post_title_replace' ) ) { return $post; } @@ -1261,28 +1311,28 @@ if ( ! class_exists( 'um\core\Access' ) ) { return $post; } - if ( ! is_a( $post, '\WP_Post' ) ) { + if ( ! is_a( $post, WP_Post::class ) ) { return $post; } + /** This filter is documented in includes/core/class-access.php */ $ignore = apply_filters( 'um_ignore_restricted_title', false, $post->ID ); if ( $ignore ) { return $post; } $restricted_global_title = UM()->options()->get( 'restricted_access_post_title' ); - $post->post_title = stripslashes( $restricted_global_title ); + $post->post_title = stripslashes( $restricted_global_title ); return $post; } - /** - * @param \WP_Post $nav_item + * @param WP_Post $nav_item * - * @return \WP_Post + * @return WP_Post */ - function maybe_replace_nav_menu_title( $nav_item ) { + public function maybe_replace_nav_menu_title( $nav_item ) { if ( ! UM()->options()->get( 'restricted_post_title_replace' ) ) { return $nav_item; } @@ -1291,7 +1341,7 @@ if ( ! class_exists( 'um\core\Access' ) ) { return $nav_item; } - if ( ! is_a( $nav_item, '\WP_Post' ) ) { + if ( ! is_a( $nav_item, WP_Post::class ) ) { return $nav_item; } @@ -1306,21 +1356,21 @@ if ( ! class_exists( 'um\core\Access' ) ) { return $nav_item; } - /** * Protect Post Types in query * Restrict content new logic * - * @param array $posts - * @param array|\WP_Query $query + * @param array $posts Posts query result. + * @param array|WP_Query $query WP_Query instance. + * * @return array */ - function filter_protected_posts( $posts, $query ) { + public function filter_protected_posts( $posts, $query ) { if ( current_user_can( 'administrator' ) ) { return $posts; } - //Woocommerce AJAX fixes....remove filtration on wc-ajax which goes to Front Page + // Woocommerce AJAX fixes....remove filtration on wc-ajax which goes to Front Page. if ( ! empty( $_GET['wc-ajax'] ) && defined( 'WC_DOING_AJAX' ) && WC_DOING_AJAX ) { return $posts; } @@ -1336,8 +1386,8 @@ if ( ! class_exists( 'um\core\Access' ) ) { $is_singular = ! empty( $query->is_singular ) ? true : false; } - if ( is_object( $query ) && is_a( $query, '\WP_Query' ) && - ( $query->is_main_query() || ! empty( $query->query_vars['um_main_query'] ) ) ) { + if ( is_object( $query ) && is_a( $query, WP_Query::class ) && + ( $query->is_main_query() || ! empty( $query->query_vars['um_main_query'] ) ) ) { if ( $is_singular ) { if ( ! UM()->options()->get( 'disable_restriction_pre_queries' ) && $this->is_restricted( $posts[0]->ID ) ) { $content_restriction = $this->get_post_privacy_settings( $posts[0]->ID ); @@ -1394,7 +1444,30 @@ if ( ! class_exists( 'um\core\Access' ) ) { */ do_action( 'um_access_fix_external_post_content' ); - $filtered_posts[] = $this->maybe_replace_title( $post ); + $filtered_post = $this->maybe_replace_title( $post ); + /** + * Filters restricted via Ultimate Member settings post instance. + * + * @param {object} $filtered_post Restricted `WP_Post` instance. + * @param {object} $post Base `WP_Post` instance before restriction settings apply. + * @param {object} $query `WP_Query` for getting posts. + * + * @return {object} Restricted `WP_Post` instance. + * + * @since 2.8.2 + * @hook um_access_restricted_post_instance + * + * @example Change restricted post title to custom one. + * function restricted_post_instance( $filtered_post, $original_post, $query ) { + * // your code here + * $filtered_post->post_title = 'This post is restricted'; + * return $filtered_post; + * } + * add_filter( 'um_access_restricted_post_instance', 'restricted_post_instance', 10, 3 ); + */ + $filtered_post = apply_filters( 'um_access_restricted_post_instance', $filtered_post, $post, $query ); + + $filtered_posts[] = $filtered_post; continue; } } elseif ( '1' == $restriction['_um_noaccess_action'] ) { @@ -1417,7 +1490,11 @@ if ( ! class_exists( 'um\core\Access' ) ) { } } else { if ( empty( $restriction['_um_access_hide_from_queries'] ) || UM()->options()->get( 'disable_restriction_pre_queries' ) ) { - $filtered_posts[] = $this->maybe_replace_title( $post ); + $filtered_post = $this->maybe_replace_title( $post ); + /** This filter is documented in includes/core/class-access.php */ + $filtered_post = apply_filters( 'um_access_restricted_post_instance', $filtered_post, $post, $query ); + + $filtered_posts[] = $filtered_post; continue; } } @@ -1427,13 +1504,12 @@ if ( ! class_exists( 'um\core\Access' ) ) { return $filtered_posts; } - /** * Set custom access actions and redirection * * Old global restrict content logic */ - function template_redirect() { + public function template_redirect() { global $post, $wp_query; //if we logged by administrator it can access to all content @@ -1532,11 +1608,10 @@ if ( ! class_exists( 'um\core\Access' ) ) { $this->check_access(); } - /** * Check Blog page Content Restriction settings */ - function um_access_check_blog_page_settings() { + public function um_access_check_blog_page_settings() { global $wp_query; if ( ! empty( $wp_query->is_home ) && ! empty( $wp_query->is_posts_page ) ) { @@ -1574,7 +1649,7 @@ if ( ! class_exists( 'um\core\Access' ) ) { /** * Check individual term Content Restriction settings */ - function um_access_check_individual_term_settings() { + public function um_access_check_individual_term_settings() { //check only tax|tags|categories - skip archive, author, and date lists if ( ! ( is_tax() || is_tag() || is_category() ) ) { return; @@ -1627,7 +1702,6 @@ if ( ! class_exists( 'um\core\Access' ) ) { } } - /** * @param $template * @param $type @@ -1635,7 +1709,7 @@ if ( ! class_exists( 'um\core\Access' ) ) { * * @return string */ - function taxonomy_message( $template, $type, $templates ) { + public function taxonomy_message( $template, $type, $templates ) { return UM()->locate_template( 'restricted-taxonomy.php' ); } @@ -1646,15 +1720,14 @@ if ( ! class_exists( 'um\core\Access' ) ) { * * @return string */ - function blog_message( $template, $type, $templates ) { + public function blog_message( $template, $type, $templates ) { return UM()->locate_template( 'restricted-blog.php' ); } - /** * Check global accessible settings */ - function um_access_check_global_settings() { + public function um_access_check_global_settings() { global $post; $curr = UM()->permalinks()->get_current_url(); @@ -1776,13 +1849,12 @@ if ( ! class_exists( 'um\core\Access' ) ) { } } - /** * Check access * * @return bool */ - function check_access() { + public function check_access() { if ( $this->allow_access === true ) { return true; } @@ -1795,7 +1867,6 @@ if ( ! class_exists( 'um\core\Access' ) ) { return false; } - /** * Sends a HTTP header to limit rendering of pages to same origin iframes when loading sensitive pages. * @@ -1812,7 +1883,6 @@ if ( ! class_exists( 'um\core\Access' ) ) { } } - /** * Sets a custom access referer in a redirect URL * @@ -1821,7 +1891,7 @@ if ( ! class_exists( 'um\core\Access' ) ) { * * @return string */ - function set_referer( $url, $referer ) { + public function set_referer( $url, $referer ) { /** * UM hook @@ -1852,13 +1922,13 @@ if ( ! class_exists( 'um\core\Access' ) ) { return $url; } - /** * Get privacy settings for post * return false if post is not private * Restrict content new logic * - * @param \WP_Post|int $post Post ID or object + * @param WP_Post|int $post Post ID or object + * * @return bool|array */ public function get_post_privacy_settings( $post ) { @@ -1867,7 +1937,7 @@ if ( ! class_exists( 'um\core\Access' ) ) { return false; } - if ( ! is_numeric( $post ) && ! is_a( $post, \WP_Post::class ) ) { + if ( ! is_numeric( $post ) && ! is_a( $post, WP_Post::class ) ) { return false; } @@ -2014,15 +2084,15 @@ if ( ! class_exists( 'um\core\Access' ) ) { return false; } - /** * Helper for checking if the user can some of the roles array * * @param $user_id * @param $roles + * * @return bool */ - function user_can( $user_id, $roles ) { + public function user_can( $user_id, $roles ) { $user_can = false; if ( ! empty( $roles ) ) { @@ -2037,7 +2107,6 @@ if ( ! class_exists( 'um\core\Access' ) ) { return $user_can; } - /** * Helper for 3rd-party integrations with content restriction settings * @@ -2045,7 +2114,7 @@ if ( ! class_exists( 'um\core\Access' ) ) { * * @return bool */ - function um_custom_restriction( $restriction ) { + public function um_custom_restriction( $restriction ) { /** * UM hook * @@ -2070,16 +2139,16 @@ if ( ! class_exists( 'um\core\Access' ) ) { return apply_filters( 'um_custom_restriction', true, $restriction ); } - /** * Is post restricted? * * @param int $post_id * @param bool $on_single_page * @param bool $ignore_cache + * * @return bool */ - function is_restricted( $post_id, $on_single_page = false, $ignore_cache = false ) { + public function is_restricted( $post_id, $on_single_page = false, $ignore_cache = false ) { // break for incorrect post if ( empty( $post_id ) ) { return false; @@ -2169,16 +2238,16 @@ if ( ! class_exists( 'um\core\Access' ) ) { return $restricted; } - /** * Is term restricted? * * @param int $term_id * @param bool $on_term_page * @param bool $ignore_cache + * * @return bool */ - function is_restricted_term( $term_id, $on_term_page = false, $ignore_cache = false ) { + public function is_restricted_term( $term_id, $on_term_page = false, $ignore_cache = false ) { static $cache = array(); if ( isset( $cache[ $term_id ] ) && ! $ignore_cache ) { From fb8e4648e3052303a1119530a637b8a2bc5103e8 Mon Sep 17 00:00:00 2001 From: ashubawork Date: Fri, 5 Jan 2024 16:52:05 +0200 Subject: [PATCH 19/43] - extend nav menu for extensions --- includes/admin/core/class-admin-navmenu.php | 27 ++++++++++++++++----- 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/includes/admin/core/class-admin-navmenu.php b/includes/admin/core/class-admin-navmenu.php index 37ca9824..d994a594 100644 --- a/includes/admin/core/class-admin-navmenu.php +++ b/includes/admin/core/class-admin-navmenu.php @@ -22,7 +22,7 @@ if ( ! class_exists( 'um\admin\core\Admin_Navmenu' ) ) { /** * Admin_Navmenu constructor. */ - function __construct() { + public function __construct() { self::$fields = array( 'um_nav_public' => __( 'Display Mode', 'ultimate-member' ), 'um_nav_roles' => __( 'By Role', 'ultimate-member' ), @@ -47,9 +47,9 @@ if ( ! class_exists( 'um\admin\core\Admin_Navmenu' ) ) { */ public function wp_nav_menu_item_custom_fields( $item_id, $item, $depth, $args, $id = null ) { - $um_nav_public = get_post_meta( $item->ID, 'menu-item-um_nav_public', true ); + $um_nav_public = get_post_meta( $item->ID, 'menu-item-um_nav_public', true ); $_nav_roles_meta = get_post_meta( $item->ID, 'menu-item-um_nav_roles', true ); - $um_nav_roles = array(); + $um_nav_roles = array(); if ( $_nav_roles_meta ) { foreach ( $_nav_roles_meta as $key => $value ) { if ( is_int( $key ) ) { @@ -95,9 +95,11 @@ if ( ! class_exists( 'um\admin\core\Admin_Navmenu' ) ) { $html .= ''; $i++; } + echo $html; ?>

+
$label ) { $key = sprintf( 'menu-item-%s', $_key ); @@ -132,11 +137,21 @@ if ( ! class_exists( 'um\admin\core\Admin_Navmenu' ) ) { // Sanitize if ( ! empty( $_POST[ $key ][ $menu_item_db_id ] ) ) { // Do some checks here... - $value = is_array( $_POST[ $key ][ $menu_item_db_id ] ) ? - array_map( 'sanitize_key', array_keys( $_POST[ $key ][ $menu_item_db_id ] ) ) : (int) $_POST[ $key ][ $menu_item_db_id ]; + if ( is_array( $_POST[ $key ][ $menu_item_db_id ] ) ) { + $value = $_POST[ $key ][ $menu_item_db_id ]; + $sanitized_keys = array_map( 'sanitize_key', array_keys( $value ) ); + $value = $sanitized_keys; + } else { + if ( 'on' === $_POST[ $key ][ $menu_item_db_id ] ) { + $value = 1; + } else { + $value = (int) $_POST[ $key ][ $menu_item_db_id ]; + } + } } else { $value = null; } + // phpcs:enable WordPress.Security.NonceVerification // Update if ( ! is_null( $value ) ) { From 6b1c0d22a59ad89d03d02c635d7dd00e79237291 Mon Sep 17 00:00:00 2001 From: ashubawork Date: Mon, 8 Jan 2024 11:49:54 +0200 Subject: [PATCH 20/43] - fix wpcs --- includes/admin/core/class-admin-navmenu.php | 27 +++++++++++---------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/includes/admin/core/class-admin-navmenu.php b/includes/admin/core/class-admin-navmenu.php index d994a594..d5948b73 100644 --- a/includes/admin/core/class-admin-navmenu.php +++ b/includes/admin/core/class-admin-navmenu.php @@ -61,35 +61,36 @@ if ( ! class_exists( 'um\admin\core\Admin_Navmenu' ) ) { ?>
-

+

-

>
+

>
'; foreach ( $section_fields_per_page as $k => $title ) { - $id_attr = ' id="edit-menu-item-um_nav_roles-' . $item_id . '_' . $k . '" '; - $for_attr = ' for="edit-menu-item-um_nav_roles-' . $item_id . '_' . $k . '" '; - $checked_attr = checked( in_array($k,$um_nav_roles), true, false ); - $html .= ""; + $id_attr = ' id="edit-menu-item-um_nav_roles-' . $item_id . '_' . $k . '" '; + $for_attr = ' for="edit-menu-item-um_nav_roles-' . $item_id . '_' . $k . '" '; + $checked_attr = checked( in_array( $k, $um_nav_roles, true ), true, false ); + $html .= ""; } $html .= ''; From 1491f47fb8b2762a59d4e714c5b4e33195b815aa Mon Sep 17 00:00:00 2001 From: ashubawork Date: Mon, 8 Jan 2024 12:45:42 +0200 Subject: [PATCH 21/43] - fix hook params --- includes/admin/core/class-admin-navmenu.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/admin/core/class-admin-navmenu.php b/includes/admin/core/class-admin-navmenu.php index d5948b73..611e9636 100644 --- a/includes/admin/core/class-admin-navmenu.php +++ b/includes/admin/core/class-admin-navmenu.php @@ -100,7 +100,7 @@ if ( ! class_exists( 'um\admin\core\Admin_Navmenu' ) ) { echo $html; ?>

- +
Date: Mon, 8 Jan 2024 23:40:17 +0200 Subject: [PATCH 22/43] - #1420 issue fix; --- templates/profile/posts-single.php | 31 +++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/templates/profile/posts-single.php b/templates/profile/posts-single.php index 571fa944..ac81db3a 100644 --- a/templates/profile/posts-single.php +++ b/templates/profile/posts-single.php @@ -6,7 +6,7 @@ * * Page: "Profile" * - * @version 2.7.0 + * @version 2.8.2 * * @var object $post */ @@ -34,21 +34,26 @@ if ( ! defined( 'ABSPATH' ) ) { } $unix_published_date = get_post_datetime( $post, 'date', 'gmt' ); + $categories_list = get_the_category_list( ', ', '', $post->ID ); ?>
- - getTimestamp() ) ) ); - ?> - - - ID ) ), UM()->get_allowed_html( 'templates' ) ); - ?> - + + + getTimestamp() ) ) ); + ?> + + + + + get_allowed_html( 'templates' ) ); + ?> + + Date: Tue, 9 Jan 2024 10:44:26 +0200 Subject: [PATCH 23/43] - #1420 issue fix; --- assets/css/admin/builder.css | 3 +++ assets/css/admin/builder.min.css | 2 +- assets/css/admin/builder.sass | 3 +++ assets/css/admin/common.css | 28 +++++++++++++++++++++++ assets/css/admin/common.min.css | 2 +- assets/css/admin/common.sass | 29 ++++++++++++++++++++++++ assets/css/admin/forms.css | 8 +++---- assets/css/admin/forms.min.css | 2 +- assets/css/admin/forms.sass | 4 ++-- assets/js/admin/forms.js | 2 ++ assets/js/admin/forms.min.js | 2 +- assets/js/common.js | 7 +++++- assets/js/common.min.js | 2 +- includes/core/class-member-directory.php | 6 ++--- 14 files changed, 85 insertions(+), 15 deletions(-) diff --git a/assets/css/admin/builder.css b/assets/css/admin/builder.css index f83d4243..c34e6978 100644 --- a/assets/css/admin/builder.css +++ b/assets/css/admin/builder.css @@ -110,6 +110,9 @@ float: right; } .um-admin-half p:first-child { margin-top: 0; } + .um-admin-half .um { + opacity: 1; + margin-bottom: 0 !important; } .um-admin-tri { float: left; diff --git a/assets/css/admin/builder.min.css b/assets/css/admin/builder.min.css index 51a4e8ef..281a1785 100644 --- a/assets/css/admin/builder.min.css +++ b/assets/css/admin/builder.min.css @@ -1 +1 @@ -@-webkit-keyframes um-ajax-spinning{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@-moz-keyframes um-ajax-spinning{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@-ms-keyframes um-ajax-spinning{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes um-ajax-spinning{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}.um-admin-row-loading{position:absolute;width:100%;height:calc(100% + 30px);top:-30px;left:0;background:rgba(241,241,241,.6);z-index:999;display:none}.um-admin-row-loading>span{display:block;-webkit-transition:.1s opacity;-moz-transition:.1s opacity;-ms-transition:.1s opacity;-o-transition:.1s opacity;transition:.1s opacity;color:#c6c6c6!important;-webkit-animation:um-ajax-spinning 1.1s infinite linear;animation:um-ajax-spinning 1.1s infinite linear;border-top:.2em solid #000;border-right:.2em solid #000;border-bottom:.2em solid #000;border-left:.2em solid #c6c6c6;font-size:1.75em;-ms-transform:translateZ(0);transform:translateZ(0);border-radius:50%;width:40px;height:40px;margin:-20px 0 0 -20px;outline:0;padding:0;vertical-align:baseline;position:absolute;left:50%;top:50%}.um-admin-boxed-links{width:100%;text-align:center}.um-admin-boxed-links a{width:33.3%;float:left;border-left:1px solid #fff;border-right:1px solid #fff;padding:30px 25px!important;background:#f8f8f8;text-align:center;display:inline-block!important;font-size:14px;transition:all .2s linear;text-decoration:none;color:#666;margin:0!important;box-sizing:border-box!important;border-radius:2px;font-weight:600}.um-admin-boxed-links a:hover{background:#eee}.um-admin-boxed-links a.um-admin-activebg{background:#0085ba;color:#fff}.um-admin-boxed-links a.um-admin-activebg:hover{background:#0085ba;color:#fff}.um-admin-boxed-links i{font-size:28px;vertical-align:middle;margin:0 10px 0 0}.um-admin-half{float:left;width:48%}.um-admin-half select{box-sizing:border-box}.um-admin-half.um-admin-right{float:right}.um-admin-half p:first-child{margin-top:0}.um-admin-tri{float:left;width:33%;position:relative}.um-admin-error-block,.um-admin-success-block{display:none;width:100%;background:#c74a4a;border-radius:3px;color:#fff;box-sizing:border-box;position:relative;padding:12px;font-size:13px;line-height:1em!important;margin:0 0 16px 0}.um-admin-success-block{background:#7acf58}.um-admin-cur-condition-template{display:none}.dynamic-mce-content{display:none}.um-admin-btns{line-height:1.5em;margin:0 0 5px 0;display:flex;flex-direction:row;justify-content:flex-start;align-items:baseline;flex-wrap:wrap}.um-admin-btns .um-no-custom-fields{margin:0}.um-admin-btns a{margin:0 3px 8px 0!important;font-size:12px!important;display:flex;flex-direction:row;justify-content:flex-start;align-items:center;flex-wrap:nowrap;display:flex!important}.um-admin-btns a.with-icon span{color:#aaa;font-size:15px!important;padding-left:5px;height:auto;width:auto}.um-admin-btns a.with-icon:hover span{color:#cb3838}.um-admin-btn-toggle{padding:10px 0}.um-admin-btn-toggle p{margin:0 5px 0 0!important}.um-admin-btn-toggle p.um-admin-reset-conditions a{margin-bottom:5px}.um-admin-btn-toggle a{text-decoration:none;color:#999}.um-admin-btn-toggle a.um-admin-new-condition{margin-bottom:5px}.um-admin-btn-toggle a.active{color:#0085ba}.um-admin-btn-toggle a.active:hover{color:#0085ba}.um-admin-btn-toggle i{margin:0 5px 0 0!important;height:100%;color:#666;position:relative;top:1px}.um-admin-btn-content{display:none;padding:5px 0 0 0}.um-admin-btn-content p{float:left;margin-right:10px!important;padding:0!important}.um-admin-btn-content p.um-admin-conditions-notice{width:100%;margin:0 0 9px 0!important}.um-admin-btn-content .um-admin-cur-condition:not(:last-child){margin:0 0 5px 0}.um-admin-builder i{font-size:15px!important;height:100%!important;line-height:100%!important;margin:0 5px 0 0!important}.um-admin-builder .um-admin-drag{margin-top:40px}.um-admin-drag-add-field{display:block;width:100%;height:30px;line-height:30px;text-align:center;color:#aaa;text-decoration:none}.um-admin-drag-add-field:hover{color:#0085ba}.um-admin-drag-add-field i{font-size:23px!important;margin:0!important}.um-admin-drag-ctrls{position:absolute;top:-30px;left:0}.um-admin-drag-ctrls.um-admin-drag-ctrls-demo{position:absolute;right:7px;top:-30px;left:auto}.um-admin-drag-ctrls a{float:left;margin:0 5px 0 0;height:30px;line-height:30px;background:#eee;color:#888;padding:0 8px;text-decoration:none;border-radius:2px 2px 0 0}.um-admin-drag-ctrls a:hover{background-color:#e5e5e5}.um-admin-drag-ctrls a.active,.um-admin-drag-ctrls a.active:hover{background-color:#0085ba;color:#fff}.um-admin-drag-ctrls.columns a{width:30px!important;background-image:url(../../img/builder/1-column.gif);background-repeat:no-repeat;background-position:center}.um-admin-drag-ctrls.columns a:nth-child(2){background-image:url(../../img/builder/2-columns.gif)}.um-admin-drag-ctrls.columns a:last-child{background-image:url(../../img/builder/3-columns.gif)}.um-admin-drag-ctrls.columns a.active{background-image:url(../../img/builder/1-column-active.gif)}.um-admin-drag-ctrls.columns a.active:nth-child(2){background-image:url(../../img/builder/2-columns-active.gif)}.um-admin-drag-ctrls.columns a.active:last-child{background-image:url(../../img/builder/3-columns-active.gif)}.um-admin-drag{width:100%;background:#f1f1f1;box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;position:relative;padding:60px 20px 20px 20px}.um-admin-drag-row{width:100%;background:#fefefe;box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;position:relative;padding:60px 20px 20px 20px;margin:0 0 60px 0}.um-admin-drag-row:last-child{margin-bottom:0}.um-admin-drag-row-icons{position:absolute;right:0;top:-30px;height:30px}.um-admin-drag-row-icons a{text-decoration:none;color:#fff;width:40px;height:30px;line-height:30px;text-align:center;display:block!important;float:left;background:#0085ba;padding:0 4px;transition:all .2s linear;border-left:1px solid #379dd5}.um-admin-drag-row-icons a:hover{background:#008ec2}.um-admin-drag-row-icons span{cursor:move!important;text-decoration:none;color:#fff;width:40px;height:30px;line-height:30px;text-align:center;display:block!important;float:left;background:#0085ba;padding:0 4px;transition:all .2s linear;border-left:1px solid #379dd5}.um-admin-drag-row-icons span:hover{background:#008ec2}.um-admin-drag-row-icons i{font-size:18px!important;margin:0!important;top:2px;position:relative}.um-admin-drag-rowsub{position:relative;box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;background:#f1f1f1;padding:20px;margin:0 0 60px 0}.um-admin-drag-rowsub:last-child{margin-bottom:0}.um-admin-drag-rowsub-icons{position:absolute;right:0;top:-30px;height:30px}.um-admin-drag-rowsub-icons a{text-decoration:none;color:#fff;width:40px;height:30px;line-height:30px;text-align:center;display:block!important;float:left;background:#0085ba;padding:0 4px;transition:all .2s linear;border-left:1px solid #379dd5}.um-admin-drag-rowsub-icons a:hover{background:#008ec2}.um-admin-drag-rowsub-icons span{cursor:move!important;text-decoration:none;color:#fff;width:40px;height:30px;line-height:30px;text-align:center;display:block!important;float:left;background:#0085ba;padding:0 4px;transition:all .2s linear;border-left:1px solid #379dd5}.um-admin-drag-rowsub-icons span:hover{background:#008ec2}.um-admin-drag-rowsub-icons i{font-size:18px!important;margin:0!important;top:2px;position:relative}.um-admin-drag-col{float:left;width:100%;background:#fff;border:1px dashed #bbb;box-sizing:border-box;padding:20px}.um-admin-drag-col.cols-3{width:32%}.um-admin-drag-col.cols-3.cols-last{width:32%}.um-admin-drag-col.cols-3.cols-middle{width:32%;margin:0 2%}.um-admin-drag-col.cols-3 .um-admin-drag-fld-title{height:auto;line-height:18px;margin:10px;margin-bottom:0}.um-admin-drag-col.cols-3 .um-admin-drag-fld-type{height:auto;line-height:18px;margin:0 0 10px 0}.um-admin-drag-col.cols-3 .um-admin-drag-fld-icons{float:none;position:absolute;bottom:0;right:0;height:30px;display:none}.um-admin-drag-col.cols-3 .um-admin-drag-fld-icons.um-field-type-group{float:left;position:relative;bottom:auto;right:auto;height:30px;display:block}.um-admin-drag-col.cols-3 .um-admin-drag-fld:hover .um-admin-drag-fld-icons{display:block}.um-admin-drag-col.cols-1{width:100%}.um-admin-drag-col.cols-1.cols-last{width:100%}.um-admin-drag-col.cols-2{width:49%;margin:0 1% 0 0}.um-admin-drag-col.cols-2.cols-last{width:49%;margin:0 0 0 1%}.um-admin-drag-col>.um-admin-drag-fld:last-of-type{margin-bottom:20px}.um-admin-drag-addrow{text-align:center;font-size:14px;color:#888;cursor:pointer;border:1px dashed #bbb;padding:10px 0;margin:20px 0 0 0}.um-admin-drag-addrow i{font-size:23px!important;margin:0!important}.um-admin-drag-addrow:hover{color:#0085ba}.um-admin-drag-fld{display:block;position:relative;border:1px solid #ddd;margin:0 0 15px 0;background:#f5f5f5;cursor:move!important}.um-admin-drag-fld.um-field-type-group{background:#555;border:0}.um-admin-drag-fld-title{float:left;font-weight:700;font-size:13px;color:#666;height:30px;line-height:30px;margin:0 0 0 20px}.um-admin-drag-fld-title.um-field-type-group{color:#fff}.um-admin-drag-fld-title i{width:24px;display:inline-block;text-align:center}.um-admin-drag-group{background:#fcfcfc;cursor:default;padding:20px;border:1px dashed #bbb}.um-admin-drag-fld-type{float:left;font-size:13px;height:30px;line-height:30px;margin:0 0 0 20px;font-weight:400;color:#999}.um-admin-drag-fld-type.um-field-type-group{color:#fff}.um-admin-drag-fld-icons{float:right}.um-admin-drag-fld-icons a{text-decoration:none;color:#fff;width:40px;height:30px;line-height:30px;text-align:center;display:block!important;float:left;background:#0085ba;padding:0 4px;transition:all .2s linear;border-left:1px solid #379dd5}.um-admin-drag-fld-icons a:hover{background:#008ec2}.um-admin-drag-fld-icons i{font-size:18px!important;margin:0!important;top:2px;position:relative}.um-admin-drag-fld-icons.um-field-type-group a.um_admin_duplicate_field{display:none!important}.um-row-placeholder{width:100%;border:2px dashed #aaa;box-sizing:border-box}.um-rowsub-placeholder{width:100%;border:2px dashed #ccc;box-sizing:border-box;display:block}.um-fld-placeholder{display:block;border:1px dashed #ddd;background:#fff;box-sizing:border-box;width:100%}.um-admin-modal #UM_preview_form .um-admin-modal-body{position:relative}.um-admin-modal #UM_preview_form .um-admin-modal-body .um-admin-preview-overlay{position:absolute;top:0;bottom:0;left:0;right:0;background-color:rgba(255,255,255,0);z-index:100} \ No newline at end of file +@-webkit-keyframes um-ajax-spinning{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@-moz-keyframes um-ajax-spinning{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@-ms-keyframes um-ajax-spinning{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes um-ajax-spinning{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}.um-admin-row-loading{position:absolute;width:100%;height:calc(100% + 30px);top:-30px;left:0;background:rgba(241,241,241,.6);z-index:999;display:none}.um-admin-row-loading>span{display:block;-webkit-transition:.1s opacity;-moz-transition:.1s opacity;-ms-transition:.1s opacity;-o-transition:.1s opacity;transition:.1s opacity;color:#c6c6c6!important;-webkit-animation:um-ajax-spinning 1.1s infinite linear;animation:um-ajax-spinning 1.1s infinite linear;border-top:.2em solid #000;border-right:.2em solid #000;border-bottom:.2em solid #000;border-left:.2em solid #c6c6c6;font-size:1.75em;-ms-transform:translateZ(0);transform:translateZ(0);border-radius:50%;width:40px;height:40px;margin:-20px 0 0 -20px;outline:0;padding:0;vertical-align:baseline;position:absolute;left:50%;top:50%}.um-admin-boxed-links{width:100%;text-align:center}.um-admin-boxed-links a{width:33.3%;float:left;border-left:1px solid #fff;border-right:1px solid #fff;padding:30px 25px!important;background:#f8f8f8;text-align:center;display:inline-block!important;font-size:14px;transition:all .2s linear;text-decoration:none;color:#666;margin:0!important;box-sizing:border-box!important;border-radius:2px;font-weight:600}.um-admin-boxed-links a:hover{background:#eee}.um-admin-boxed-links a.um-admin-activebg{background:#0085ba;color:#fff}.um-admin-boxed-links a.um-admin-activebg:hover{background:#0085ba;color:#fff}.um-admin-boxed-links i{font-size:28px;vertical-align:middle;margin:0 10px 0 0}.um-admin-half{float:left;width:48%}.um-admin-half select{box-sizing:border-box}.um-admin-half.um-admin-right{float:right}.um-admin-half p:first-child{margin-top:0}.um-admin-half .um{opacity:1;margin-bottom:0!important}.um-admin-tri{float:left;width:33%;position:relative}.um-admin-error-block,.um-admin-success-block{display:none;width:100%;background:#c74a4a;border-radius:3px;color:#fff;box-sizing:border-box;position:relative;padding:12px;font-size:13px;line-height:1em!important;margin:0 0 16px 0}.um-admin-success-block{background:#7acf58}.um-admin-cur-condition-template{display:none}.dynamic-mce-content{display:none}.um-admin-btns{line-height:1.5em;margin:0 0 5px 0;display:flex;flex-direction:row;justify-content:flex-start;align-items:baseline;flex-wrap:wrap}.um-admin-btns .um-no-custom-fields{margin:0}.um-admin-btns a{margin:0 3px 8px 0!important;font-size:12px!important;display:flex;flex-direction:row;justify-content:flex-start;align-items:center;flex-wrap:nowrap;display:flex!important}.um-admin-btns a.with-icon span{color:#aaa;font-size:15px!important;padding-left:5px;height:auto;width:auto}.um-admin-btns a.with-icon:hover span{color:#cb3838}.um-admin-btn-toggle{padding:10px 0}.um-admin-btn-toggle p{margin:0 5px 0 0!important}.um-admin-btn-toggle p.um-admin-reset-conditions a{margin-bottom:5px}.um-admin-btn-toggle a{text-decoration:none;color:#999}.um-admin-btn-toggle a.um-admin-new-condition{margin-bottom:5px}.um-admin-btn-toggle a.active{color:#0085ba}.um-admin-btn-toggle a.active:hover{color:#0085ba}.um-admin-btn-toggle i{margin:0 5px 0 0!important;height:100%;color:#666;position:relative;top:1px}.um-admin-btn-content{display:none;padding:5px 0 0 0}.um-admin-btn-content p{float:left;margin-right:10px!important;padding:0!important}.um-admin-btn-content p.um-admin-conditions-notice{width:100%;margin:0 0 9px 0!important}.um-admin-btn-content .um-admin-cur-condition:not(:last-child){margin:0 0 5px 0}.um-admin-builder i{font-size:15px!important;height:100%!important;line-height:100%!important;margin:0 5px 0 0!important}.um-admin-builder .um-admin-drag{margin-top:40px}.um-admin-drag-add-field{display:block;width:100%;height:30px;line-height:30px;text-align:center;color:#aaa;text-decoration:none}.um-admin-drag-add-field:hover{color:#0085ba}.um-admin-drag-add-field i{font-size:23px!important;margin:0!important}.um-admin-drag-ctrls{position:absolute;top:-30px;left:0}.um-admin-drag-ctrls.um-admin-drag-ctrls-demo{position:absolute;right:7px;top:-30px;left:auto}.um-admin-drag-ctrls a{float:left;margin:0 5px 0 0;height:30px;line-height:30px;background:#eee;color:#888;padding:0 8px;text-decoration:none;border-radius:2px 2px 0 0}.um-admin-drag-ctrls a:hover{background-color:#e5e5e5}.um-admin-drag-ctrls a.active,.um-admin-drag-ctrls a.active:hover{background-color:#0085ba;color:#fff}.um-admin-drag-ctrls.columns a{width:30px!important;background-image:url(../../img/builder/1-column.gif);background-repeat:no-repeat;background-position:center}.um-admin-drag-ctrls.columns a:nth-child(2){background-image:url(../../img/builder/2-columns.gif)}.um-admin-drag-ctrls.columns a:last-child{background-image:url(../../img/builder/3-columns.gif)}.um-admin-drag-ctrls.columns a.active{background-image:url(../../img/builder/1-column-active.gif)}.um-admin-drag-ctrls.columns a.active:nth-child(2){background-image:url(../../img/builder/2-columns-active.gif)}.um-admin-drag-ctrls.columns a.active:last-child{background-image:url(../../img/builder/3-columns-active.gif)}.um-admin-drag{width:100%;background:#f1f1f1;box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;position:relative;padding:60px 20px 20px 20px}.um-admin-drag-row{width:100%;background:#fefefe;box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;position:relative;padding:60px 20px 20px 20px;margin:0 0 60px 0}.um-admin-drag-row:last-child{margin-bottom:0}.um-admin-drag-row-icons{position:absolute;right:0;top:-30px;height:30px}.um-admin-drag-row-icons a{text-decoration:none;color:#fff;width:40px;height:30px;line-height:30px;text-align:center;display:block!important;float:left;background:#0085ba;padding:0 4px;transition:all .2s linear;border-left:1px solid #379dd5}.um-admin-drag-row-icons a:hover{background:#008ec2}.um-admin-drag-row-icons span{cursor:move!important;text-decoration:none;color:#fff;width:40px;height:30px;line-height:30px;text-align:center;display:block!important;float:left;background:#0085ba;padding:0 4px;transition:all .2s linear;border-left:1px solid #379dd5}.um-admin-drag-row-icons span:hover{background:#008ec2}.um-admin-drag-row-icons i{font-size:18px!important;margin:0!important;top:2px;position:relative}.um-admin-drag-rowsub{position:relative;box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;background:#f1f1f1;padding:20px;margin:0 0 60px 0}.um-admin-drag-rowsub:last-child{margin-bottom:0}.um-admin-drag-rowsub-icons{position:absolute;right:0;top:-30px;height:30px}.um-admin-drag-rowsub-icons a{text-decoration:none;color:#fff;width:40px;height:30px;line-height:30px;text-align:center;display:block!important;float:left;background:#0085ba;padding:0 4px;transition:all .2s linear;border-left:1px solid #379dd5}.um-admin-drag-rowsub-icons a:hover{background:#008ec2}.um-admin-drag-rowsub-icons span{cursor:move!important;text-decoration:none;color:#fff;width:40px;height:30px;line-height:30px;text-align:center;display:block!important;float:left;background:#0085ba;padding:0 4px;transition:all .2s linear;border-left:1px solid #379dd5}.um-admin-drag-rowsub-icons span:hover{background:#008ec2}.um-admin-drag-rowsub-icons i{font-size:18px!important;margin:0!important;top:2px;position:relative}.um-admin-drag-col{float:left;width:100%;background:#fff;border:1px dashed #bbb;box-sizing:border-box;padding:20px}.um-admin-drag-col.cols-3{width:32%}.um-admin-drag-col.cols-3.cols-last{width:32%}.um-admin-drag-col.cols-3.cols-middle{width:32%;margin:0 2%}.um-admin-drag-col.cols-3 .um-admin-drag-fld-title{height:auto;line-height:18px;margin:10px;margin-bottom:0}.um-admin-drag-col.cols-3 .um-admin-drag-fld-type{height:auto;line-height:18px;margin:0 0 10px 0}.um-admin-drag-col.cols-3 .um-admin-drag-fld-icons{float:none;position:absolute;bottom:0;right:0;height:30px;display:none}.um-admin-drag-col.cols-3 .um-admin-drag-fld-icons.um-field-type-group{float:left;position:relative;bottom:auto;right:auto;height:30px;display:block}.um-admin-drag-col.cols-3 .um-admin-drag-fld:hover .um-admin-drag-fld-icons{display:block}.um-admin-drag-col.cols-1{width:100%}.um-admin-drag-col.cols-1.cols-last{width:100%}.um-admin-drag-col.cols-2{width:49%;margin:0 1% 0 0}.um-admin-drag-col.cols-2.cols-last{width:49%;margin:0 0 0 1%}.um-admin-drag-col>.um-admin-drag-fld:last-of-type{margin-bottom:20px}.um-admin-drag-addrow{text-align:center;font-size:14px;color:#888;cursor:pointer;border:1px dashed #bbb;padding:10px 0;margin:20px 0 0 0}.um-admin-drag-addrow i{font-size:23px!important;margin:0!important}.um-admin-drag-addrow:hover{color:#0085ba}.um-admin-drag-fld{display:block;position:relative;border:1px solid #ddd;margin:0 0 15px 0;background:#f5f5f5;cursor:move!important}.um-admin-drag-fld.um-field-type-group{background:#555;border:0}.um-admin-drag-fld-title{float:left;font-weight:700;font-size:13px;color:#666;height:30px;line-height:30px;margin:0 0 0 20px}.um-admin-drag-fld-title.um-field-type-group{color:#fff}.um-admin-drag-fld-title i{width:24px;display:inline-block;text-align:center}.um-admin-drag-group{background:#fcfcfc;cursor:default;padding:20px;border:1px dashed #bbb}.um-admin-drag-fld-type{float:left;font-size:13px;height:30px;line-height:30px;margin:0 0 0 20px;font-weight:400;color:#999}.um-admin-drag-fld-type.um-field-type-group{color:#fff}.um-admin-drag-fld-icons{float:right}.um-admin-drag-fld-icons a{text-decoration:none;color:#fff;width:40px;height:30px;line-height:30px;text-align:center;display:block!important;float:left;background:#0085ba;padding:0 4px;transition:all .2s linear;border-left:1px solid #379dd5}.um-admin-drag-fld-icons a:hover{background:#008ec2}.um-admin-drag-fld-icons i{font-size:18px!important;margin:0!important;top:2px;position:relative}.um-admin-drag-fld-icons.um-field-type-group a.um_admin_duplicate_field{display:none!important}.um-row-placeholder{width:100%;border:2px dashed #aaa;box-sizing:border-box}.um-rowsub-placeholder{width:100%;border:2px dashed #ccc;box-sizing:border-box;display:block}.um-fld-placeholder{display:block;border:1px dashed #ddd;background:#fff;box-sizing:border-box;width:100%}.um-admin-modal #UM_preview_form .um-admin-modal-body{position:relative}.um-admin-modal #UM_preview_form .um-admin-modal-body .um-admin-preview-overlay{position:absolute;top:0;bottom:0;left:0;right:0;background-color:rgba(255,255,255,0);z-index:100} \ No newline at end of file diff --git a/assets/css/admin/builder.sass b/assets/css/admin/builder.sass index 3e92d73d..65cfa093 100644 --- a/assets/css/admin/builder.sass +++ b/assets/css/admin/builder.sass @@ -91,6 +91,9 @@ float: right p:first-child margin-top: 0 + .um + opacity: 1 + margin-bottom: 0 !important .#{$prefix}admin-tri float: left width: 33% diff --git a/assets/css/admin/common.css b/assets/css/admin/common.css index 1010ead6..2dbef9c5 100644 --- a/assets/css/admin/common.css +++ b/assets/css/admin/common.css @@ -85,3 +85,31 @@ body.um-admin-modal-open { height: 200px; } .um-admin-metabox textarea.um-admin-error { border-color: #c74a4a !important; } + +.um .picker__box, +.um .picker__nav--prev:hover, +.um .picker__nav--next:hover { + background: #0085ba; } + +.um .picker__footer, +.um .picker__header, +.um .picker__day--infocus:hover, +.um .picker__day--outfocus:hover, +.um .picker__day--highlighted:hover, +.um .picker--focused .picker__day--highlighted, +.um .picker__list-item:hover, +.um .picker__list-item--highlighted:hover, +.um .picker--focused .picker__list-item--highlighted, +.um .picker__list-item--selected, +.um .picker__list-item--selected:hover, +.um .picker--focused .picker__list-item--selected { + background: #008ec2; } + +body.um .picker .picker__frame { + top: 32px; } + +body.um .picker .picker__footer > button:not(:disabled):not(.button) { + color: #fff; } + +body.um .picker .picker__footer > button.picker__button--close { + margin-top: 5px; } diff --git a/assets/css/admin/common.min.css b/assets/css/admin/common.min.css index f9d342f9..a70d4cc7 100644 --- a/assets/css/admin/common.min.css +++ b/assets/css/admin/common.min.css @@ -1 +1 @@ -.um-adm-ico{font-size:18px;width:18px;text-align:center;display:inline-block;color:#7acf58}.um-adm-ico.inactive{color:#c74a4a}.um-adm-ico.pointer{cursor:pointer}body.um-admin-modal-open{overflow:hidden}.um-admin #major-publishing-actions{background-color:#fff!important;border-top:0}.um-admin a.button i,.um-admin a.button-primary i{font-size:15px!important;height:15px!important;width:15px!important;text-align:center!important;margin:0 5px 0 0!important;display:inline-block}.um-admin a.button i:before,.um-admin a.button-primary i:before{position:relative;top:1px}.um-admin-metabox h6{font-size:14px;margin:12px 0 0 0}.um-admin-metabox h3{padding-left:0!important}.um-admin-metabox h4{font-size:14px;background:#f5f5f5;padding:8px 4px;color:#333}.um-admin-metabox p{margin:10px 0 0 0}.um-admin-metabox label{display:block;cursor:default;padding:0!important;font-size:13px;color:#666}.um-admin-metabox input[type=text]{height:auto!important;width:100%;max-width:100%;display:block;box-sizing:border-box!important;font-size:13px!important;line-height:1.4em!important;padding:4px 10px!important}.um-admin-metabox input[type=text]:disabled{opacity:.7!important;color:#aaa!important}.um-admin-metabox input[type=text].small{width:54px}.um-admin-metabox input[type=text].um-admin-error{border-color:#c74a4a!important}.um-admin-metabox textarea{width:100%;max-width:100%;display:block;box-sizing:border-box!important;font-size:13px!important;line-height:1.4em!important;padding:8px!important;color:#888!important;min-height:100px;height:100px}.um-admin-metabox textarea.tall{min-height:200px;height:200px}.um-admin-metabox textarea.um-admin-error{border-color:#c74a4a!important} \ No newline at end of file +.um-adm-ico{font-size:18px;width:18px;text-align:center;display:inline-block;color:#7acf58}.um-adm-ico.inactive{color:#c74a4a}.um-adm-ico.pointer{cursor:pointer}body.um-admin-modal-open{overflow:hidden}.um-admin #major-publishing-actions{background-color:#fff!important;border-top:0}.um-admin a.button i,.um-admin a.button-primary i{font-size:15px!important;height:15px!important;width:15px!important;text-align:center!important;margin:0 5px 0 0!important;display:inline-block}.um-admin a.button i:before,.um-admin a.button-primary i:before{position:relative;top:1px}.um-admin-metabox h6{font-size:14px;margin:12px 0 0 0}.um-admin-metabox h3{padding-left:0!important}.um-admin-metabox h4{font-size:14px;background:#f5f5f5;padding:8px 4px;color:#333}.um-admin-metabox p{margin:10px 0 0 0}.um-admin-metabox label{display:block;cursor:default;padding:0!important;font-size:13px;color:#666}.um-admin-metabox input[type=text]{height:auto!important;width:100%;max-width:100%;display:block;box-sizing:border-box!important;font-size:13px!important;line-height:1.4em!important;padding:4px 10px!important}.um-admin-metabox input[type=text]:disabled{opacity:.7!important;color:#aaa!important}.um-admin-metabox input[type=text].small{width:54px}.um-admin-metabox input[type=text].um-admin-error{border-color:#c74a4a!important}.um-admin-metabox textarea{width:100%;max-width:100%;display:block;box-sizing:border-box!important;font-size:13px!important;line-height:1.4em!important;padding:8px!important;color:#888!important;min-height:100px;height:100px}.um-admin-metabox textarea.tall{min-height:200px;height:200px}.um-admin-metabox textarea.um-admin-error{border-color:#c74a4a!important}.um .picker__box,.um .picker__nav--next:hover,.um .picker__nav--prev:hover{background:#0085ba}.um .picker--focused .picker__day--highlighted,.um .picker--focused .picker__list-item--highlighted,.um .picker--focused .picker__list-item--selected,.um .picker__day--highlighted:hover,.um .picker__day--infocus:hover,.um .picker__day--outfocus:hover,.um .picker__footer,.um .picker__header,.um .picker__list-item--highlighted:hover,.um .picker__list-item--selected,.um .picker__list-item--selected:hover,.um .picker__list-item:hover{background:#008ec2}body.um .picker .picker__frame{top:32px}body.um .picker .picker__footer>button:not(:disabled):not(.button){color:#fff}body.um .picker .picker__footer>button.picker__button--close{margin-top:5px} \ No newline at end of file diff --git a/assets/css/admin/common.sass b/assets/css/admin/common.sass index 1c47c459..8eaa35aa 100644 --- a/assets/css/admin/common.sass +++ b/assets/css/admin/common.sass @@ -85,3 +85,32 @@ body.#{$prefix}admin-modal-open height: 200px &.#{$prefix}admin-error border-color: #{$admin-warning} !important + +.um + .picker__box, + .picker__nav--prev:hover, + .picker__nav--next:hover + background: #{$um-base} + .picker__footer, + .picker__header, + .picker__day--infocus:hover, + .picker__day--outfocus:hover, + .picker__day--highlighted:hover, + .picker--focused .picker__day--highlighted, + .picker__list-item:hover, + .picker__list-item--highlighted:hover, + .picker--focused .picker__list-item--highlighted, + .picker__list-item--selected, + .picker__list-item--selected:hover, + .picker--focused .picker__list-item--selected + background: #{$um-base-hover} + +body.um + .picker + .picker__frame + top: 32px + .picker__footer + & > button:not(:disabled):not(.button) + color: #fff + & > button.picker__button--close + margin-top: 5px diff --git a/assets/css/admin/forms.css b/assets/css/admin/forms.css index 77ebdea2..40f2862c 100644 --- a/assets/css/admin/forms.css +++ b/assets/css/admin/forms.css @@ -158,16 +158,16 @@ input[type="number"].um-forms-field { background: #44b0ec; border: 1px solid #44b0ec !important; margin-top: -1px; } - .um-md-default-filters-option-line .um-field-wrapper2 select { + .um-md-default-filters-option-line .um-field-wrapper2 > select { width: 100%; float: left; } - .um-md-default-filters-option-line .um-field-wrapper2 input { + .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 { + .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; } - .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 { + .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; } .um-md-default-filters-option-line .um-field-wrapper2 .um-slider { margin: 5px 9px 0 9px; diff --git a/assets/css/admin/forms.min.css b/assets/css/admin/forms.min.css index 125ae377..c7df2078 100644 --- a/assets/css/admin/forms.min.css +++ b/assets/css/admin/forms.min.css @@ -1 +1 @@ -.um-form-table .um-forms-line[data-conditional]{display:none}.um-form-table .um-forms-line[data-field_type=checkbox] td label{font-style:italic}.um-form-table .um-forms-line label .um-req{color:#a00;margin:0 0 0 3px;font-weight:400}.um-form-table .um-forms-line .um-text-delete{color:#a00;float:left}.um-form-table .um-forms-line .um-text-delete:hover{color:red}.um-form-table .um-forms-line .um-multi-text-add-option{margin-bottom:14px}.um-form-table .um-forms-line .icon_preview{display:none;max-width:200px;max-height:200px;padding:5px;cursor:pointer;border:1px solid #e3e3e3;background:#f7f7f7;border-radius:3px;height:auto;width:auto!important}.um-form-table .um-forms-line td .um-same-page-update-wrapper{display:none;margin:7px 0 0 0}.um-form-table .um-forms-line td .um-same-page-update-wrapper input.um-admin-form-same-page-update{margin:7px 0 0 0}.um-form-table .um-forms-line td .um-same-page-update-wrapper .upgrade_log{margin:7px 0 0 0;width:100%;height:150px;overflow:auto;border:1px solid #a1a1a1}.um-form-table .um-forms-line[data-field_type=same_page_update]{vertical-align:baseline}.um-form-table .um-forms-line[data-field_type=same_page_update] td,.um-form-table .um-forms-line[data-field_type=same_page_update] th{vertical-align:baseline}.um-form-table.um-third-column .um-forms-line th{width:33%}.um-form-table.um-half-column .um-forms-line th{width:50%}.um-form-table.um-two-thirds-column .um-forms-line th{width:83%}.um-form-table.um-top-label .um-forms-line td{padding:0 0 15px 0}.um-form-table.um-top-label .um-forms-line td label{margin:0 0 5px 0;display:inline-block}.um-form-table.um-top-label .um-forms-line[data-field_type=icon] td label{width:100%;display:block;margin:0 0 5px 0}.um-form-table .description{font-style:italic;clear:both}.um_admin_fonticon_wrapper{display:flex;flex-direction:row;justify-content:flex-start;align-items:center;flex-wrap:nowrap}.um_admin_fonticon_wrapper .um-admin-icon-value{line-height:1}.um_admin_fonticon_wrapper .um-admin-icon-value i{top:0}input[type=date].um-forms-field,input[type=number].um-forms-field,input[type=password].um-forms-field,input[type=text].um-forms-field,input[type=time].um-forms-field,input[type=url].um-forms-field,select.um-forms-field,textarea.um-forms-field{box-sizing:border-box}input[type=date].um-forms-field.um-long-field,input[type=number].um-forms-field.um-long-field,input[type=password].um-forms-field.um-long-field,input[type=text].um-forms-field.um-long-field,input[type=time].um-forms-field.um-long-field,input[type=url].um-forms-field.um-long-field,select.um-forms-field.um-long-field,textarea.um-forms-field.um-long-field{width:100%!important}input[type=date].um-forms-field.um-medium-field,input[type=number].um-forms-field.um-medium-field,input[type=password].um-forms-field.um-medium-field,input[type=text].um-forms-field.um-medium-field,input[type=time].um-forms-field.um-medium-field,input[type=url].um-forms-field.um-medium-field,select.um-forms-field.um-medium-field,textarea.um-forms-field.um-medium-field{width:50%!important}input[type=date].um-forms-field.um-small-field,input[type=number].um-forms-field.um-small-field,input[type=password].um-forms-field.um-small-field,input[type=text].um-forms-field.um-small-field,input[type=time].um-forms-field.um-small-field,input[type=url].um-forms-field.um-small-field,select.um-forms-field.um-small-field,textarea.um-forms-field.um-small-field{width:25%!important}input[type=number].um-forms-field{padding-right:0}.um-md-default-filters-list,.um-multi-selects-list,.um-multi-text-list{float:left;width:100%;margin:0 0 10px 0}.um-hidden-md-default-filters,.um-hidden-multi-selects,.um-hidden-multi-text{display:none!important}.um-md-default-filters-option-line{float:left;width:100%;clear:both;border-bottom:1px solid #eee;padding:0 0 5px 0;margin:5px 0 0 0}.um-md-default-filters-option-line .um-field-wrapper{float:left;width:calc(100% - 60px);line-height:30px;box-sizing:border-box}.um-md-default-filters-option-line .um-field-wrapper2{float:left;width:calc(100% - 60px);line-height:30px;box-sizing:border-box}.um-md-default-filters-option-line .um-field-wrapper2.um{margin:5px 0 0 0}.um-md-default-filters-option-line .um-field-wrapper2 .ui-slider-range.ui-widget-header{background:#44b0ec;border:1px solid #44b0ec!important;margin-top:-1px}.um-md-default-filters-option-line .um-field-wrapper2 select{width:100%;float:left}.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-datepicker-filter,.um-md-default-filters-option-line .um-field-wrapper2 input.um-timepicker-filter{width:calc(50% - 7px)!important;float:left}.um-md-default-filters-option-line .um-field-wrapper2 input.um-datepicker-filter:first-child,.um-md-default-filters-option-line .um-field-wrapper2 input.um-timepicker-filter:first-child{margin-right:11px}.um-md-default-filters-option-line .um-field-wrapper2 .um-slider{margin:5px 9px 0 9px;width:calc(100% - 18px);box-sizing:border-box;display:block}.um-md-default-filters-option-line .um-field-control{float:left;width:60px;line-height:30px;padding:0 10px;box-sizing:border-box}.um-multi-selects-option-line{float:left;width:100%;padding:0;clear:both;margin:0 0 5px 0}.um-multi-selects-option-line.um-admin-drag-fld{display:flex;flex-direction:row;justify-content:flex-start;align-items:center;flex-wrap:nowrap;background:0 0;border:none}.um-multi-selects-option-line.um-admin-drag-fld .um-field-wrapper{width:calc(100% - 90px)}.um-multi-selects-option-line.um-admin-drag-fld .um-field-icon{float:left;width:20px;text-align:left;line-height:30px}.um-multi-selects-option-line .um-field-wrapper{float:left;width:calc(100% - 60px);line-height:30px;box-sizing:border-box}.um-multi-selects-option-line .um-field-wrapper.um-custom-order-fields{margin:5px 0 0 0}.um-multi-selects-option-line .um-field-wrapper.um-custom-order-fields label{float:left;width:100%;line-height:30px;box-sizing:border-box;margin:0!important;padding:0!important;font-weight:700;display:flex;flex-direction:row;justify-content:space-beetween;align-items:baseline;flex-wrap:nowrap}.um-multi-selects-option-line .um-field-wrapper.um-custom-order-fields label input[type=text],.um-multi-selects-option-line .um-field-wrapper.um-custom-order-fields label select{width:auto;display:inline;font-weight:400;max-width:70%;flex:.9}.um-multi-selects-option-line .um-field-wrapper input,.um-multi-selects-option-line .um-field-wrapper select{float:left;width:100%;margin:0}.um-multi-selects-option-line .um-field-control{float:left;width:60px;line-height:30px;padding:0 10px;box-sizing:border-box}.um-multi-text-option-line{float:left;width:100%;padding:0;clear:both;margin:0 0 5px 0}.um-multi-text-option-line .um-field-wrapper{float:left;width:calc(100% - 90px);line-height:30px;box-sizing:border-box}.um-multi-text-option-line .um-field-wrapper input,.um-multi-text-option-line .um-field-wrapper select{float:left;width:100%;margin:0}.um-multi-text-option-line .um-field-control{float:left;width:60px;line-height:30px;padding:0 10px;box-sizing:border-box}.um-form-fields-section{float:left;clear:none;margin:0;padding:0 10px 0 0;box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box}.um-form-fields-section label{float:left;width:100%;margin:0;padding:0}.um-form-fields-section label input{float:left;margin-top:0}.um-form-fields-section label span{float:left;width:calc(100% - 20px)}@media screen and (max-width:782px){input[type=text].um-forms-field.um-medium-field,select.um-forms-field.um-medium-field,textarea.um-forms-field.um-medium-field{width:100%!important}input[type=text].um-forms-field.um-small-field,select.um-forms-field.um-small-field,textarea.um-forms-field.um-small-field{width:50%!important}.um-form-fields-section{width:100%!important}.um-admin-metabox .um-form-fields-section label{line-height:22px!important;margin:0 0 12px 0!important}.um-admin-metabox .um-form-fields-section label span{width:calc(100% - 30px)}.um-multi-selects-option-line,.um-multi-text-option-line{margin:0 0 6px 0}.um-forms-line label{float:left;width:100%}.um-form-table.um-half-column .um-forms-line th,.um-form-table.um-third-column .um-forms-line th,.um-form-table.um-two-thirds-column .um-forms-line th{float:left;width:100%;margin-bottom:5px}.um-form-table.um-half-column .um-forms-line th label,.um-form-table.um-third-column .um-forms-line th label,.um-form-table.um-two-thirds-column .um-forms-line th label{float:left;width:100%}.um-form-table.um-half-column .um-forms-line td,.um-form-table.um-third-column .um-forms-line td,.um-form-table.um-two-thirds-column .um-forms-line td{float:left;width:100%}}.um-sortable-items-field .um-sortable-item{cursor:move!important;padding:5px;box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;border:1px solid #7e8993;border-radius:4px;-moz-border-radius:4px;background:#fff;height:42px;line-height:28px;display:flex;flex-direction:row;justify-content:flex-start;align-items:center;flex-wrap:nowrap}.um-sortable-items-field .um-sortable-item.um-hidden-item{display:none}.um-sortable-items-field .um-sortable-item .um-field-icon{width:20px;text-align:left;margin:0 10px 0 0}.wp-picker-container input.wp-color-picker[type=text]{width:68px!important;float:left!important;padding:2px 4px!important;border-width:1px!important}span.um-admin-icon-value{margin:0 10px;font-size:13px}span.um-admin-icon-value i{font-size:28px;color:#0085ba;position:relative;top:5px}span.um-admin-icon-clear{display:none;cursor:pointer;position:relative;color:#ccc}span.um-admin-icon-clear.show{display:inline-block}span.um-admin-icon-clear:hover{color:#777}span.um-admin-icon-clear i{font-size:20px;vertical-align:middle} \ No newline at end of file +.um-form-table .um-forms-line[data-conditional]{display:none}.um-form-table .um-forms-line[data-field_type=checkbox] td label{font-style:italic}.um-form-table .um-forms-line label .um-req{color:#a00;margin:0 0 0 3px;font-weight:400}.um-form-table .um-forms-line .um-text-delete{color:#a00;float:left}.um-form-table .um-forms-line .um-text-delete:hover{color:red}.um-form-table .um-forms-line .um-multi-text-add-option{margin-bottom:14px}.um-form-table .um-forms-line .icon_preview{display:none;max-width:200px;max-height:200px;padding:5px;cursor:pointer;border:1px solid #e3e3e3;background:#f7f7f7;border-radius:3px;height:auto;width:auto!important}.um-form-table .um-forms-line td .um-same-page-update-wrapper{display:none;margin:7px 0 0 0}.um-form-table .um-forms-line td .um-same-page-update-wrapper input.um-admin-form-same-page-update{margin:7px 0 0 0}.um-form-table .um-forms-line td .um-same-page-update-wrapper .upgrade_log{margin:7px 0 0 0;width:100%;height:150px;overflow:auto;border:1px solid #a1a1a1}.um-form-table .um-forms-line[data-field_type=same_page_update]{vertical-align:baseline}.um-form-table .um-forms-line[data-field_type=same_page_update] td,.um-form-table .um-forms-line[data-field_type=same_page_update] th{vertical-align:baseline}.um-form-table.um-third-column .um-forms-line th{width:33%}.um-form-table.um-half-column .um-forms-line th{width:50%}.um-form-table.um-two-thirds-column .um-forms-line th{width:83%}.um-form-table.um-top-label .um-forms-line td{padding:0 0 15px 0}.um-form-table.um-top-label .um-forms-line td label{margin:0 0 5px 0;display:inline-block}.um-form-table.um-top-label .um-forms-line[data-field_type=icon] td label{width:100%;display:block;margin:0 0 5px 0}.um-form-table .description{font-style:italic;clear:both}.um_admin_fonticon_wrapper{display:flex;flex-direction:row;justify-content:flex-start;align-items:center;flex-wrap:nowrap}.um_admin_fonticon_wrapper .um-admin-icon-value{line-height:1}.um_admin_fonticon_wrapper .um-admin-icon-value i{top:0}input[type=date].um-forms-field,input[type=number].um-forms-field,input[type=password].um-forms-field,input[type=text].um-forms-field,input[type=time].um-forms-field,input[type=url].um-forms-field,select.um-forms-field,textarea.um-forms-field{box-sizing:border-box}input[type=date].um-forms-field.um-long-field,input[type=number].um-forms-field.um-long-field,input[type=password].um-forms-field.um-long-field,input[type=text].um-forms-field.um-long-field,input[type=time].um-forms-field.um-long-field,input[type=url].um-forms-field.um-long-field,select.um-forms-field.um-long-field,textarea.um-forms-field.um-long-field{width:100%!important}input[type=date].um-forms-field.um-medium-field,input[type=number].um-forms-field.um-medium-field,input[type=password].um-forms-field.um-medium-field,input[type=text].um-forms-field.um-medium-field,input[type=time].um-forms-field.um-medium-field,input[type=url].um-forms-field.um-medium-field,select.um-forms-field.um-medium-field,textarea.um-forms-field.um-medium-field{width:50%!important}input[type=date].um-forms-field.um-small-field,input[type=number].um-forms-field.um-small-field,input[type=password].um-forms-field.um-small-field,input[type=text].um-forms-field.um-small-field,input[type=time].um-forms-field.um-small-field,input[type=url].um-forms-field.um-small-field,select.um-forms-field.um-small-field,textarea.um-forms-field.um-small-field{width:25%!important}input[type=number].um-forms-field{padding-right:0}.um-md-default-filters-list,.um-multi-selects-list,.um-multi-text-list{float:left;width:100%;margin:0 0 10px 0}.um-hidden-md-default-filters,.um-hidden-multi-selects,.um-hidden-multi-text{display:none!important}.um-md-default-filters-option-line{float:left;width:100%;clear:both;border-bottom:1px solid #eee;padding:0 0 5px 0;margin:5px 0 0 0}.um-md-default-filters-option-line .um-field-wrapper{float:left;width:calc(100% - 60px);line-height:30px;box-sizing:border-box}.um-md-default-filters-option-line .um-field-wrapper2{float:left;width:calc(100% - 60px);line-height:30px;box-sizing:border-box}.um-md-default-filters-option-line .um-field-wrapper2.um{margin:5px 0 0 0}.um-md-default-filters-option-line .um-field-wrapper2 .ui-slider-range.ui-widget-header{background:#44b0ec;border:1px solid #44b0ec!important;margin-top:-1px}.um-md-default-filters-option-line .um-field-wrapper2>select{width:100%;float:left}.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-datepicker-filter,.um-md-default-filters-option-line .um-field-wrapper2>input.um-timepicker-filter{width:calc(50% - 7px)!important;float:left}.um-md-default-filters-option-line .um-field-wrapper2>input.um-datepicker-filter:first-child,.um-md-default-filters-option-line .um-field-wrapper2>input.um-timepicker-filter:first-child{margin-right:11px}.um-md-default-filters-option-line .um-field-wrapper2 .um-slider{margin:5px 9px 0 9px;width:calc(100% - 18px);box-sizing:border-box;display:block}.um-md-default-filters-option-line .um-field-control{float:left;width:60px;line-height:30px;padding:0 10px;box-sizing:border-box}.um-multi-selects-option-line{float:left;width:100%;padding:0;clear:both;margin:0 0 5px 0}.um-multi-selects-option-line.um-admin-drag-fld{display:flex;flex-direction:row;justify-content:flex-start;align-items:center;flex-wrap:nowrap;background:0 0;border:none}.um-multi-selects-option-line.um-admin-drag-fld .um-field-wrapper{width:calc(100% - 90px)}.um-multi-selects-option-line.um-admin-drag-fld .um-field-icon{float:left;width:20px;text-align:left;line-height:30px}.um-multi-selects-option-line .um-field-wrapper{float:left;width:calc(100% - 60px);line-height:30px;box-sizing:border-box}.um-multi-selects-option-line .um-field-wrapper.um-custom-order-fields{margin:5px 0 0 0}.um-multi-selects-option-line .um-field-wrapper.um-custom-order-fields label{float:left;width:100%;line-height:30px;box-sizing:border-box;margin:0!important;padding:0!important;font-weight:700;display:flex;flex-direction:row;justify-content:space-beetween;align-items:baseline;flex-wrap:nowrap}.um-multi-selects-option-line .um-field-wrapper.um-custom-order-fields label input[type=text],.um-multi-selects-option-line .um-field-wrapper.um-custom-order-fields label select{width:auto;display:inline;font-weight:400;max-width:70%;flex:.9}.um-multi-selects-option-line .um-field-wrapper input,.um-multi-selects-option-line .um-field-wrapper select{float:left;width:100%;margin:0}.um-multi-selects-option-line .um-field-control{float:left;width:60px;line-height:30px;padding:0 10px;box-sizing:border-box}.um-multi-text-option-line{float:left;width:100%;padding:0;clear:both;margin:0 0 5px 0}.um-multi-text-option-line .um-field-wrapper{float:left;width:calc(100% - 90px);line-height:30px;box-sizing:border-box}.um-multi-text-option-line .um-field-wrapper input,.um-multi-text-option-line .um-field-wrapper select{float:left;width:100%;margin:0}.um-multi-text-option-line .um-field-control{float:left;width:60px;line-height:30px;padding:0 10px;box-sizing:border-box}.um-form-fields-section{float:left;clear:none;margin:0;padding:0 10px 0 0;box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box}.um-form-fields-section label{float:left;width:100%;margin:0;padding:0}.um-form-fields-section label input{float:left;margin-top:0}.um-form-fields-section label span{float:left;width:calc(100% - 20px)}@media screen and (max-width:782px){input[type=text].um-forms-field.um-medium-field,select.um-forms-field.um-medium-field,textarea.um-forms-field.um-medium-field{width:100%!important}input[type=text].um-forms-field.um-small-field,select.um-forms-field.um-small-field,textarea.um-forms-field.um-small-field{width:50%!important}.um-form-fields-section{width:100%!important}.um-admin-metabox .um-form-fields-section label{line-height:22px!important;margin:0 0 12px 0!important}.um-admin-metabox .um-form-fields-section label span{width:calc(100% - 30px)}.um-multi-selects-option-line,.um-multi-text-option-line{margin:0 0 6px 0}.um-forms-line label{float:left;width:100%}.um-form-table.um-half-column .um-forms-line th,.um-form-table.um-third-column .um-forms-line th,.um-form-table.um-two-thirds-column .um-forms-line th{float:left;width:100%;margin-bottom:5px}.um-form-table.um-half-column .um-forms-line th label,.um-form-table.um-third-column .um-forms-line th label,.um-form-table.um-two-thirds-column .um-forms-line th label{float:left;width:100%}.um-form-table.um-half-column .um-forms-line td,.um-form-table.um-third-column .um-forms-line td,.um-form-table.um-two-thirds-column .um-forms-line td{float:left;width:100%}}.um-sortable-items-field .um-sortable-item{cursor:move!important;padding:5px;box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;border:1px solid #7e8993;border-radius:4px;-moz-border-radius:4px;background:#fff;height:42px;line-height:28px;display:flex;flex-direction:row;justify-content:flex-start;align-items:center;flex-wrap:nowrap}.um-sortable-items-field .um-sortable-item.um-hidden-item{display:none}.um-sortable-items-field .um-sortable-item .um-field-icon{width:20px;text-align:left;margin:0 10px 0 0}.wp-picker-container input.wp-color-picker[type=text]{width:68px!important;float:left!important;padding:2px 4px!important;border-width:1px!important}span.um-admin-icon-value{margin:0 10px;font-size:13px}span.um-admin-icon-value i{font-size:28px;color:#0085ba;position:relative;top:5px}span.um-admin-icon-clear{display:none;cursor:pointer;position:relative;color:#ccc}span.um-admin-icon-clear.show{display:inline-block}span.um-admin-icon-clear:hover{color:#777}span.um-admin-icon-clear i{font-size:20px;vertical-align:middle} \ No newline at end of file diff --git a/assets/css/admin/forms.sass b/assets/css/admin/forms.sass index cb510702..d7f37f03 100644 --- a/assets/css/admin/forms.sass +++ b/assets/css/admin/forms.sass @@ -162,10 +162,10 @@ input[type="number"] background: #44b0ec border: 1px solid #44b0ec !important margin-top: -1px - select + & > select width: 100% float: left - input + & > input width: 100% float: left &.#{$prefix}timepicker-filter, diff --git a/assets/js/admin/forms.js b/assets/js/admin/forms.js index 196f58ec..e97d52e1 100644 --- a/assets/js/admin/forms.js +++ b/assets/js/admin/forms.js @@ -442,6 +442,7 @@ jQuery(document).ready( function() { hiddenName: true, onOpen: function() { elem.blur(); + elem.siblings('.picker').find('.picker__button--close').addClass('button'); }, onClose: function() { elem.blur(); @@ -550,6 +551,7 @@ jQuery(document).ready( function() { hiddenName: true, onOpen: function() { elem.blur(); + elem.siblings('.picker').find('.picker__button--close').addClass('button'); }, onClose: function() { elem.blur(); diff --git a/assets/js/admin/forms.min.js b/assets/js/admin/forms.min.js index c42ec467..7a60235d 100644 --- a/assets/js/admin/forms.min.js +++ b/assets/js/admin/forms.min.js @@ -1 +1 @@ -function um_admin_init_users_select(){function e(a){var t;if(!a.id)return a.text;if(void 0!==a.img)t=jQuery(' '+a.text+"");else{let e;t=(e=void 0!==a.element&&void 0!==a.element.attributes["data-img"]?a.element.attributes["data-img"].value:e)?jQuery(' '+a.text+""):jQuery(""+a.text+"")}return t}var a,t;jQuery(".um-user-select-field:visible:not(.um-select2-inited)").length&&(a={ajax:{url:wp.ajax.settings.url,dataType:"json",delay:250,data:function(e){var a={action:"um_get_users",search:e.term,page:e.page||1,nonce:um_admin_scripts.nonce};return jQuery.each(jQuery(this)[0].attributes,function(){var e;this.specified&&-1!==this.name.indexOf("data-ajax-args-")&&(e=this.name.replace("data-ajax-args-","").trim(),a[e]=this.value)}),a},processResults:function(e,a){a.page=a.page||1;var t=[];return e.data.users&&jQuery.each(e.data.users,function(e,a){void 0!==a.img?t.push({id:a.ID,text:a.user_login+" (#"+a.ID+")",img:a.img}):t.push({id:a.ID,text:a.user_login+" (#"+a.ID+")"})}),{results:t,pagination:{more:20*a.page")}function um_same_page_wrong_ajax(e){um_add_same_page_log(e,wp.i18n.__("Wrong AJAX response...","ultimate-member")),um_add_same_page_log(e,wp.i18n.__("Your upgrade was crashed, please contact with support","ultimate-member"))}function um_same_page_something_wrong(e){um_add_same_page_log(e,wp.i18n.__("Something went wrong with AJAX request...","ultimate-member")),um_add_same_page_log(e,wp.i18n.__("Your upgrade was crashed, please contact with support","ultimate-member"))}jQuery(document).ready(function(){um_admin_init_users_select(),jQuery(document.body).on("click",".um-forms-field[data-log-object]",function(){var e=jQuery(this).data("log-object");jQuery(this).is(":checked")?jQuery(this).siblings(".um-same-page-update-"+e).show():jQuery(this).siblings(".um-same-page-update-"+e).hide()}),jQuery(document.body).on("click",".um-admin-form-same-page-update",function(){var t,a,i,s=jQuery(this).data("upgrade_cb");jQuery(this).prop("disabled",!0),um_add_same_page_log(s,wp.i18n.__("Upgrade Process Started...","ultimate-member")),"sync_metatable"===s?(t=0,a=500,jQuery.ajax({url:wp.ajax.settings.url,type:"POST",dataType:"json",data:{action:"um_same_page_update",cb_func:"um_usermeta_fields",nonce:um_admin_scripts.nonce},success:function(e){i=1,um_add_same_page_log(s,wp.i18n.__("Getting metadata","ultimate-member")),jQuery.ajax({url:wp.ajax.settings.url,type:"POST",dataType:"json",data:{action:"um_same_page_update",cb_func:"um_get_metadata",nonce:um_admin_scripts.nonce},success:function(e){void 0!==e.data.count?(um_add_same_page_log(s,wp.i18n.__("There are ","ultimate-member")+e.data.count+wp.i18n.__(" metadata rows...","ultimate-member")),um_add_same_page_log(s,wp.i18n.__("Start metadata upgrading...","ultimate-member")),t=Math.ceil(e.data.count/a),function a(){i<=t?jQuery.ajax({url:wp.ajax.settings.url,type:"POST",dataType:"json",data:{action:"um_same_page_update",cb_func:"um_update_metadata_per_page",page:i,nonce:um_admin_scripts.nonce},success:function(e){void 0!==e.data?(um_add_same_page_log(s,e.data.message),i++,a()):um_same_page_wrong_ajax(s)},error:function(){um_same_page_something_wrong(s)}}):window.location=um_forms_data.successfully_redirect}()):um_same_page_wrong_ajax(s)},error:function(){um_same_page_something_wrong(s)}})},error:function(){um_same_page_something_wrong(s)}})):wp.hooks.doAction("um_same_page_upgrade",s)}),jQuery(".um-sortable-items-field").sortable({items:".um-sortable-item",connectWith:".um-admin-drag-col,.um-admin-drag-group",forcePlaceholderSize:!0,update:function(e,a){var t=[];jQuery(this).find("li").each(function(){jQuery(this).hasClass("um-hidden-item")||t.push(jQuery(this).data("tab-id"))}),jQuery(this).siblings(".um-sortable-items-value").val(t.join(","))}}),jQuery(".um-multi-selects-list.um-sortable-multi-selects").sortable({items:".um-admin-drag-fld",connectWith:".um-admin-drag-col,.um-admin-drag-group",forcePlaceholderSize:!0}),jQuery('.um-multi-selects-list[data-field_id="_um_sorting_fields"] li').each(function(){"other"===jQuery(this).find(".um-field-wrapper:not(.um-custom-order-fields) select").val()?jQuery(this).find(".um-field-wrapper.um-custom-order-fields").show():jQuery(this).find(".um-field-wrapper.um-custom-order-fields").hide()}),jQuery('.um-forms-line[data-field_type="md_sorting_fields"] .um-multi-selects-add-option').on("click",function(){var e=jQuery(this).siblings("ul.um-multi-selects-list"),a=e.hasClass("um-sortable-multi-selects"),t=(e.data("field_id"),0),i=(0").append(e.siblings(".um-hidden-multi-selects").clone()).html()),s='
  • ';a&&(s+='');let l="";jQuery.each(um_forms_data.md_sorting_data_types,function(e,a){l+='"}),s+=''+i+''+wp.i18n.__("Remove","ultimate-member")+'
    • ',e.append(s),e.find("li:last .um-hidden-multi-selects").attr("name",jQuery(this).data("name")).addClass("um-forms-field um-long-field").removeClass("um-hidden-multi-selects").attr("id",e.data("id_attr")+"-"+t).trigger("change"),jQuery("#"+e.data("id_attr")+"-"+t).parents("li").find('.um-field-wrapper.um-custom-order-fields input[name="meta_key"]').attr("name","um_metadata[_um_sorting_fields][other_data]["+t+"][meta_key]"),jQuery("#"+e.data("id_attr")+"-"+t).parents("li").find('.um-field-wrapper.um-custom-order-fields input[name="label"]').attr("name","um_metadata[_um_sorting_fields][other_data]["+t+"][label]"),jQuery("#"+e.data("id_attr")+"-"+t).parents("li").find('.um-field-wrapper.um-custom-order-fields select[name="data_type"]').attr("name","um_metadata[_um_sorting_fields][other_data]["+t+"][data_type]"),jQuery("#"+e.data("id_attr")+"-"+t).parents("li").find('.um-field-wrapper.um-custom-order-fields select[name="order"]').attr("name","um_metadata[_um_sorting_fields][other_data]["+t+"][order]")}),jQuery(document.body).on("change",'.um-multi-selects-list[data-field_id="_um_sorting_fields"] .um-field-wrapper:not(.um-custom-order-fields) select',function(){"other"===jQuery(this).val()?jQuery(this).parents("li").find(".um-field-wrapper.um-custom-order-fields").show():jQuery(this).parents("li").find(".um-field-wrapper.um-custom-order-fields").hide()}),jQuery(document.body).on("click",".um-multi-selects-option-line .um-select-delete",function(){jQuery(this).parents("li.um-multi-selects-option-line").remove()}),jQuery(document.body).on("click",".um-md-default-filters-option-line .um-select-delete",function(){jQuery(this).parents("li.um-md-default-filters-option-line").remove()}),jQuery(".um-multi-selects-add-option").on("click",function(){var e,a,t,i;jQuery(this).parents('.um-forms-line[data-field_type="md_sorting_fields"]').length||(a=(e=jQuery(this).siblings("ul.um-multi-selects-list")).hasClass("um-sortable-multi-selects"),e.data("field_id"),(t=0)',a&&(i+=''),i+=''+jQuery("
    ").append(e.siblings(".um-hidden-multi-selects").clone()).html()+''+wp.i18n.__("Remove","ultimate-member")+"",e.append(i),e.find("li:last .um-hidden-multi-selects").attr("name",jQuery(this).data("name")).addClass("um-forms-field um-long-field").removeClass("um-hidden-multi-selects").attr("id",e.data("id_attr")+"-"+t))});var t,e=-(new Date).getTimezoneOffset()/60,i=(jQuery('input[name="um-gmt-offset"]').val(e),jQuery(".um-admin-metabox").find(".um-slider").each(function(){var e=jQuery(this),a=parseInt(e.data("min")),t=parseInt(e.data("max")),a=[a=void 0!==jQuery("#"+e.data("field_name")+"_min").val()?jQuery("#"+e.data("field_name")+"_min").val():a,t=void 0!==jQuery("#"+e.data("field_name")+"_max").val()?jQuery("#"+e.data("field_name")+"_max").val():t];e.slider({range:!0,min:parseInt(e.data("min")),max:parseInt(e.data("max")),values:a,create:function(e,a){},step:1,slide:function(e,a){s(jQuery(this),a)},stop:function(e,a){}}),s(e)}),jQuery(".um-admin-metabox").find(".um-datepicker-filter").each(function(){var e=jQuery(this),a=new Date(1e3*e.data("date_min")),t=new Date(1e3*e.data("date_max"));e.pickadate({selectYears:!0,min:a,max:t,formatSubmit:"yyyy/mm/dd",hiddenName:!0,onOpen:function(){e.blur()},onClose:function(){e.blur()},onSet:function(e){}}).pickadate("picker").set("select",1e3*e.data("value"))}),jQuery(".um-admin-metabox").find(".um-timepicker-filter").each(function(){var e=jQuery(this),a=e.data("min"),t=e.data("max"),a=a.split(":"),t=t.split(":");e.pickatime({format:e.data("format"),interval:parseInt(e.data("intervals")),min:[a[0],a[1]],max:[t[0],t[1]],formatSubmit:"HH:i",hiddenName:!0,onOpen:function(){e.blur()},onClose:function(){e.blur()},onSet:function(e){}})}),!1);function s(e,a){var t,i="",s=e.siblings(".um-slider-range").data("placeholder-s"),l=e.siblings(".um-slider-range").data("placeholder-p"),a=a?(i=(a.values[0]===a.values[1]?s.replace("{value}",a.values[0]):l.replace("{min_range}",a.values[0]).replace("{max_range}",a.values[1])).replace("{field_label}",e.siblings(".um-slider-range").data("label")),t=a.values[0],a.values[1]):(i=(e.slider("values",0)===e.slider("values",1)?s.replace("{value}",e.slider("values",0)):l.replace("{min_range}",e.slider("values",0)).replace("{max_range}",e.slider("values",1))).replace("{field_label}",e.siblings(".um-slider-range").data("label")),t=e.slider("values",0),e.slider("values",1));e.siblings(".um-slider-range").html(i),e.siblings(".um_range_min").val(t),e.siblings(".um_range_max").val(a)}function a(){jQuery(".um-forms-line").removeClass("um-forms-line-conditioned").each(function(){void 0===jQuery(this).data("conditional")||jQuery(this).hasClass("um-forms-line-conditioned")||(!function i(e){e.addClass("um-forms-line-conditioned");var a=e.data("conditional");var t=a[1];var s=a[2];var l=e.data("prefix");var n=!0;{var r,u;"="===t||"!="===t?-1===a[0].indexOf("||")&&void 0!==(u=jQuery("#"+l+"_"+a[0])).parents(".um-forms-line").data("conditional")&&(n=i(u.parents(".um-forms-line"))):"~"===t?(m=a[0].split("|"),r=[],jQuery.each(m,function(e){r.push(jQuery("#"+l+"_"+m[e]))}),void 0!==r[0].parents(".um-forms-line").data("conditional")&&(n=i(r[0].parents(".um-forms-line")))):"><"===t&&void 0!==(u=jQuery("#"+l+"_"+a[0]+"_"+a[2])).parents(".um-forms-line").data("conditional")&&(n=i(u.parents(".um-forms-line")))}var d=!1;{var m,o,c,p,f,_,h,g;if("="===t)return-1!==a[0].indexOf("||")?(m=a[0].split("||"),o=!1,jQuery.each(m,function(e){var a,e=jQuery("#"+l+"_"+m[e]),t=(n=!(d=!1),void 0!==e.parents(".um-forms-line").data("conditional")&&(n=i(e.parents(".um-forms-line"))),e.prop("tagName").toLowerCase());"input"===t?(a=e.attr("type"),d="checkbox"===a?"1"==s?e.is(":checked"):!e.is(":checked"):Array.isArray(s)?-1!==s.indexOf(e.val()):e.val()==s):"select"===t&&(d=Array.isArray(s)?-1!==s.indexOf(e.val()):e.val()==s),d&&n&&(o=!0)}),o):("input"==(h=u.prop("tagName").toLowerCase())?(g=u.attr("type"),d="checkbox"==g?"1"==s?u.is(":checked"):!u.is(":checked"):Array.isArray(s)?-1!==s.indexOf(u.val()):u.val()==s):"select"==h&&(d=Array.isArray(s)?-1!==s.indexOf(u.val()):u.val()==s),d&&n);if("!="===t)return-1!==a[0].indexOf("||")?(m=a[0].split("||"),o=!1,jQuery.each(m,function(e){var a,e=jQuery("#"+l+"_"+m[e]),t=(n=!(d=!1),void 0!==e.parents(".um-forms-line").data("conditional")&&(n=i(e.parents(".um-forms-line"))),e.prop("tagName").toLowerCase());"input"===t?(a=e.attr("type"),d="checkbox"===a?"1"==s?!e.is(":checked"):e.is(":checked"):e.val()!=s):"select"===t&&(d=e.val()!=s),d&&n&&(o=!0)}),o):("input"==(h=u.prop("tagName").toLowerCase())?(g=u.attr("type"),d="checkbox"==g?"1"==s?!u.is(":checked"):u.is(":checked"):u.val()!=s):"select"==h&&(d=u.val()!=s),d&&n);if("~"===t)return p=[],"sortable_items"===e.data("field_type")?(c=e.find(".um-sortable-items-value").data("field_id"),jQuery.each(r,function(e){var e=r[e],a=e.prop("tagName").toLowerCase();"input"===a?"checkbox"===e.attr("type")&&"1"==s&&e.is(":checked")&&p.push(e.data("fill_"+c)):"select"==a&&!s&&e.val()&&(p=(p=p.concat(e.val())).filter(y))}),f=jQuery('[data-field_id="'+c+'"]'),p.length?(f.siblings(".um-sortable-items-field").find("li").addClass("um-hidden-item"),jQuery.each(p,function(e){f.siblings(".um-sortable-items-field").find('li[data-tab-id="'+p[e]+'"]').removeClass("um-hidden-item")}),_=[],f.siblings(".um-sortable-items-field").find("li").each(function(){jQuery(this).hasClass("um-hidden-item")||_.push(jQuery(this).data("tab-id"))}),f.val(_.join(",")),f.siblings(".um-sortable-items-field").sortable("refresh"),d=!0):f.val(null)):(c=e.find(e.data("field_type")).data("field_id"),jQuery.each(r,function(e){var e=r[e],a=e.prop("tagName").toLowerCase();"input"===a?"checkbox"===e.attr("type")&&"1"==s&&e.is(":checked")&&p.push(e.data("fill_"+c)):"select"==a&&!s&&e.val()&&(p=(p=p.concat(e.val())).filter(y))}),f=jQuery('[data-field_id="'+c+'"]'),p.length?(f.find("option").hide(),jQuery.each(p,function(e){f.find('option[value="'+p[e]+'"]').show()}),-1===p.indexOf(f.val())&&(f.val(p[0]),f.find("option").attr("selected",!1).prop("selected",!1),f.find('option[value="'+p[0]+'"]').attr("selected",!0).prop("selected",!0)),d=!0):(f.val(null),f.find("option").attr("selected",!1).prop("selected",!1))),d&&n;if("><"===t)return h=u.prop("tagName").toLowerCase(),(d="input"==h&&"checkbox"==(g=u.attr("type"))?u.is(":checked"):d)&&n}return!1}(jQuery(this))?jQuery(this).hide():(jQuery(this).show(),um_admin_init_users_select()))})}function y(e,a,t){return t.indexOf(e)===a}jQuery(document.body).on("change",".um-md-default-filters-option-line .um-field-wrapper select",function(){var t,e,a;i||(e=(t=jQuery(this)).val(),a=t.data("member_directory"),i=!0,wp.ajax.send("um_member_directory_default_filter_settings",{data:{key:e,directory_id:a,nonce:um_admin_scripts.nonce},success:function(e){var a=t.parents(".um-md-default-filters-option-line").find(".um-field-wrapper2");a.html(e.field_html),i=!1,a.find(".um-slider").each(function(){var e=jQuery(this),a=[parseInt(e.data("min")),parseInt(e.data("max"))];e.slider({range:!0,min:parseInt(e.data("min")),max:parseInt(e.data("max")),values:a,create:function(e,a){},step:1,slide:function(e,a){s(jQuery(this),a)},stop:function(e,a){}}),s(e)}),a.find(".um-datepicker-filter").each(function(){var e=jQuery(this),a=new Date(1e3*e.data("date_min")),t=new Date(1e3*e.data("date_max"));e.pickadate({selectYears:!0,min:a,max:t,formatSubmit:"yyyy/mm/dd",hiddenName:!0,onOpen:function(){e.blur()},onClose:function(){e.blur()},onSet:function(e){}})}),a.find(".um-timepicker-filter").each(function(){var e=jQuery(this),a=e.data("min"),t=e.data("max"),a=a.split(":"),t=t.split(":");e.pickatime({format:e.data("format"),interval:parseInt(e.data("intervals")),min:[a[0],a[1]],max:[t[0],t[1]],formatSubmit:"HH:i",hiddenName:!0,onOpen:function(){e.blur()},onClose:function(){e.blur()},onSet:function(e){}})})},error:function(e){return!1}}))}),jQuery(".um-md-default-filters-add-option").on("click",function(){var e,a,t;i||((e=jQuery(this).siblings("ul.um-md-default-filters-list")).data("field_id"),(a=0)").append(e.siblings(".um-hidden-md-default-filters").clone()).html(),e.append('
  • '+t+''+wp.i18n.__("Remove","ultimate-member")+'
    • '),e.find("li:last .um-hidden-md-default-filters").attr("name",jQuery(this).data("name")).addClass("um-forms-field um-long-field").removeClass("um-hidden-md-default-filters").attr("id",e.data("id_attr")+"-"+a),e.find("li:last .um-field-wrapper select").trigger("change"))}),jQuery(document.body).on("click",".um-text-delete",function(){jQuery(this).parents("li.um-multi-text-option-line").remove()}),jQuery(".um-multi-text-add-option").on("click",function(){var e=jQuery(this).siblings("ul.um-multi-text-list"),a=0,t=(0").append(e.siblings(".um-hidden-multi-text").clone()).html()),i=e.data("item_class");e.append('
  • '+t+''+wp.i18n.__("Remove","ultimate-member")+"
    • "),e.find("li:last .um-hidden-multi-text").attr("name",jQuery(this).data("name")).addClass("um-forms-field um-long-field").removeClass("um-hidden-multi-text").attr("id",e.data("id_attr")+"-"+a)}),jQuery(".um-media-upload").each(function(){var e=jQuery(this).find(".um-forms-field"),a=e.data("default");""!=e.val()&&e.val()!=a?(e.siblings(".um-set-image").hide(),e.siblings(".um-clear-image").show(),e.siblings(".icon_preview").show()):(e.val()==a&&e.siblings(".icon_preview").show(),e.siblings(".um-set-image").show(),e.siblings(".um-clear-image").hide())}),"undefined"!=typeof wp&&wp.media&&wp.media.editor&&(jQuery(".um-set-image").on("click",function(e){var a=jQuery(this);e.preventDefault(),t&&t.remove(),(t=wp.media({title:a.data("upload_frame"),button:{text:wp.i18n.__("Select","ultimate-member")},multiple:!1})).on("select",function(){var e=t.state().get("selection").first().toJSON();a.siblings(".icon_preview").attr("src",e.url).show(),a.siblings(".um-forms-field").val(e.url),a.siblings(".um-media-upload-data-id").val(e.id),a.siblings(".um-media-upload-data-width").val(e.width),a.siblings(".um-media-upload-data-height").val(e.height),a.siblings(".um-media-upload-data-thumbnail").val(e.thumbnail),a.siblings(".um-media-upload-data-url").trigger("change"),a.siblings(".um-media-upload-url").val(e.url),a.siblings(".um-clear-image").show(),a.hide(),jQuery(document).trigger("um_media_upload_select",[a,e])}),t.open()}),jQuery(".icon_preview").on("click",function(e){jQuery(this).siblings(".um-set-image").trigger("click")}),jQuery(".um-clear-image").on("click",function(e){var a=jQuery(this),t=a.siblings(".um-forms-field").data("default");a.siblings(".um-set-image").show(),a.hide(),a.siblings(".icon_preview").attr("src",t),a.siblings(".um-media-upload-data-id").val(""),a.siblings(".um-media-upload-data-width").val(""),a.siblings(".um-media-upload-data-height").val(""),a.siblings(".um-media-upload-data-thumbnail").val(""),a.siblings(".um-forms-field").val(t),a.siblings(".um-media-upload-data-url").trigger("change"),a.siblings(".um-media-upload-url").val(t),jQuery(document).trigger("um_media_upload_clear",a)})),jQuery(document.body).on("change",".um-forms-field",function(){(0 '+a.text+"");else{let e;t=(e=void 0!==a.element&&void 0!==a.element.attributes["data-img"]?a.element.attributes["data-img"].value:e)?jQuery(' '+a.text+""):jQuery(""+a.text+"")}return t}var a,t;jQuery(".um-user-select-field:visible:not(.um-select2-inited)").length&&(a={ajax:{url:wp.ajax.settings.url,dataType:"json",delay:250,data:function(e){var a={action:"um_get_users",search:e.term,page:e.page||1,nonce:um_admin_scripts.nonce};return jQuery.each(jQuery(this)[0].attributes,function(){var e;this.specified&&-1!==this.name.indexOf("data-ajax-args-")&&(e=this.name.replace("data-ajax-args-","").trim(),a[e]=this.value)}),a},processResults:function(e,a){a.page=a.page||1;var t=[];return e.data.users&&jQuery.each(e.data.users,function(e,a){void 0!==a.img?t.push({id:a.ID,text:a.user_login+" (#"+a.ID+")",img:a.img}):t.push({id:a.ID,text:a.user_login+" (#"+a.ID+")"})}),{results:t,pagination:{more:20*a.page")}function um_same_page_wrong_ajax(e){um_add_same_page_log(e,wp.i18n.__("Wrong AJAX response...","ultimate-member")),um_add_same_page_log(e,wp.i18n.__("Your upgrade was crashed, please contact with support","ultimate-member"))}function um_same_page_something_wrong(e){um_add_same_page_log(e,wp.i18n.__("Something went wrong with AJAX request...","ultimate-member")),um_add_same_page_log(e,wp.i18n.__("Your upgrade was crashed, please contact with support","ultimate-member"))}jQuery(document).ready(function(){um_admin_init_users_select(),jQuery(document.body).on("click",".um-forms-field[data-log-object]",function(){var e=jQuery(this).data("log-object");jQuery(this).is(":checked")?jQuery(this).siblings(".um-same-page-update-"+e).show():jQuery(this).siblings(".um-same-page-update-"+e).hide()}),jQuery(document.body).on("click",".um-admin-form-same-page-update",function(){var t,a,i,s=jQuery(this).data("upgrade_cb");jQuery(this).prop("disabled",!0),um_add_same_page_log(s,wp.i18n.__("Upgrade Process Started...","ultimate-member")),"sync_metatable"===s?(t=0,a=500,jQuery.ajax({url:wp.ajax.settings.url,type:"POST",dataType:"json",data:{action:"um_same_page_update",cb_func:"um_usermeta_fields",nonce:um_admin_scripts.nonce},success:function(e){i=1,um_add_same_page_log(s,wp.i18n.__("Getting metadata","ultimate-member")),jQuery.ajax({url:wp.ajax.settings.url,type:"POST",dataType:"json",data:{action:"um_same_page_update",cb_func:"um_get_metadata",nonce:um_admin_scripts.nonce},success:function(e){void 0!==e.data.count?(um_add_same_page_log(s,wp.i18n.__("There are ","ultimate-member")+e.data.count+wp.i18n.__(" metadata rows...","ultimate-member")),um_add_same_page_log(s,wp.i18n.__("Start metadata upgrading...","ultimate-member")),t=Math.ceil(e.data.count/a),function a(){i<=t?jQuery.ajax({url:wp.ajax.settings.url,type:"POST",dataType:"json",data:{action:"um_same_page_update",cb_func:"um_update_metadata_per_page",page:i,nonce:um_admin_scripts.nonce},success:function(e){void 0!==e.data?(um_add_same_page_log(s,e.data.message),i++,a()):um_same_page_wrong_ajax(s)},error:function(){um_same_page_something_wrong(s)}}):window.location=um_forms_data.successfully_redirect}()):um_same_page_wrong_ajax(s)},error:function(){um_same_page_something_wrong(s)}})},error:function(){um_same_page_something_wrong(s)}})):wp.hooks.doAction("um_same_page_upgrade",s)}),jQuery(".um-sortable-items-field").sortable({items:".um-sortable-item",connectWith:".um-admin-drag-col,.um-admin-drag-group",forcePlaceholderSize:!0,update:function(e,a){var t=[];jQuery(this).find("li").each(function(){jQuery(this).hasClass("um-hidden-item")||t.push(jQuery(this).data("tab-id"))}),jQuery(this).siblings(".um-sortable-items-value").val(t.join(","))}}),jQuery(".um-multi-selects-list.um-sortable-multi-selects").sortable({items:".um-admin-drag-fld",connectWith:".um-admin-drag-col,.um-admin-drag-group",forcePlaceholderSize:!0}),jQuery('.um-multi-selects-list[data-field_id="_um_sorting_fields"] li').each(function(){"other"===jQuery(this).find(".um-field-wrapper:not(.um-custom-order-fields) select").val()?jQuery(this).find(".um-field-wrapper.um-custom-order-fields").show():jQuery(this).find(".um-field-wrapper.um-custom-order-fields").hide()}),jQuery('.um-forms-line[data-field_type="md_sorting_fields"] .um-multi-selects-add-option').on("click",function(){var e=jQuery(this).siblings("ul.um-multi-selects-list"),a=e.hasClass("um-sortable-multi-selects"),t=(e.data("field_id"),0),i=(0").append(e.siblings(".um-hidden-multi-selects").clone()).html()),s='
  • ';a&&(s+='');let l="";jQuery.each(um_forms_data.md_sorting_data_types,function(e,a){l+='"}),s+=''+i+''+wp.i18n.__("Remove","ultimate-member")+'
    • ',e.append(s),e.find("li:last .um-hidden-multi-selects").attr("name",jQuery(this).data("name")).addClass("um-forms-field um-long-field").removeClass("um-hidden-multi-selects").attr("id",e.data("id_attr")+"-"+t).trigger("change"),jQuery("#"+e.data("id_attr")+"-"+t).parents("li").find('.um-field-wrapper.um-custom-order-fields input[name="meta_key"]').attr("name","um_metadata[_um_sorting_fields][other_data]["+t+"][meta_key]"),jQuery("#"+e.data("id_attr")+"-"+t).parents("li").find('.um-field-wrapper.um-custom-order-fields input[name="label"]').attr("name","um_metadata[_um_sorting_fields][other_data]["+t+"][label]"),jQuery("#"+e.data("id_attr")+"-"+t).parents("li").find('.um-field-wrapper.um-custom-order-fields select[name="data_type"]').attr("name","um_metadata[_um_sorting_fields][other_data]["+t+"][data_type]"),jQuery("#"+e.data("id_attr")+"-"+t).parents("li").find('.um-field-wrapper.um-custom-order-fields select[name="order"]').attr("name","um_metadata[_um_sorting_fields][other_data]["+t+"][order]")}),jQuery(document.body).on("change",'.um-multi-selects-list[data-field_id="_um_sorting_fields"] .um-field-wrapper:not(.um-custom-order-fields) select',function(){"other"===jQuery(this).val()?jQuery(this).parents("li").find(".um-field-wrapper.um-custom-order-fields").show():jQuery(this).parents("li").find(".um-field-wrapper.um-custom-order-fields").hide()}),jQuery(document.body).on("click",".um-multi-selects-option-line .um-select-delete",function(){jQuery(this).parents("li.um-multi-selects-option-line").remove()}),jQuery(document.body).on("click",".um-md-default-filters-option-line .um-select-delete",function(){jQuery(this).parents("li.um-md-default-filters-option-line").remove()}),jQuery(".um-multi-selects-add-option").on("click",function(){var e,a,t,i;jQuery(this).parents('.um-forms-line[data-field_type="md_sorting_fields"]').length||(a=(e=jQuery(this).siblings("ul.um-multi-selects-list")).hasClass("um-sortable-multi-selects"),e.data("field_id"),(t=0)',a&&(i+=''),i+=''+jQuery("
    ").append(e.siblings(".um-hidden-multi-selects").clone()).html()+''+wp.i18n.__("Remove","ultimate-member")+"",e.append(i),e.find("li:last .um-hidden-multi-selects").attr("name",jQuery(this).data("name")).addClass("um-forms-field um-long-field").removeClass("um-hidden-multi-selects").attr("id",e.data("id_attr")+"-"+t))});var t,e=-(new Date).getTimezoneOffset()/60,i=(jQuery('input[name="um-gmt-offset"]').val(e),jQuery(".um-admin-metabox").find(".um-slider").each(function(){var e=jQuery(this),a=parseInt(e.data("min")),t=parseInt(e.data("max")),a=[a=void 0!==jQuery("#"+e.data("field_name")+"_min").val()?jQuery("#"+e.data("field_name")+"_min").val():a,t=void 0!==jQuery("#"+e.data("field_name")+"_max").val()?jQuery("#"+e.data("field_name")+"_max").val():t];e.slider({range:!0,min:parseInt(e.data("min")),max:parseInt(e.data("max")),values:a,create:function(e,a){},step:1,slide:function(e,a){s(jQuery(this),a)},stop:function(e,a){}}),s(e)}),jQuery(".um-admin-metabox").find(".um-datepicker-filter").each(function(){var e=jQuery(this),a=new Date(1e3*e.data("date_min")),t=new Date(1e3*e.data("date_max"));e.pickadate({selectYears:!0,min:a,max:t,formatSubmit:"yyyy/mm/dd",hiddenName:!0,onOpen:function(){e.blur(),e.siblings(".picker").find(".picker__button--close").addClass("button")},onClose:function(){e.blur()},onSet:function(e){}}).pickadate("picker").set("select",1e3*e.data("value"))}),jQuery(".um-admin-metabox").find(".um-timepicker-filter").each(function(){var e=jQuery(this),a=e.data("min"),t=e.data("max"),a=a.split(":"),t=t.split(":");e.pickatime({format:e.data("format"),interval:parseInt(e.data("intervals")),min:[a[0],a[1]],max:[t[0],t[1]],formatSubmit:"HH:i",hiddenName:!0,onOpen:function(){e.blur()},onClose:function(){e.blur()},onSet:function(e){}})}),!1);function s(e,a){var t,i="",s=e.siblings(".um-slider-range").data("placeholder-s"),l=e.siblings(".um-slider-range").data("placeholder-p"),a=a?(i=(a.values[0]===a.values[1]?s.replace("{value}",a.values[0]):l.replace("{min_range}",a.values[0]).replace("{max_range}",a.values[1])).replace("{field_label}",e.siblings(".um-slider-range").data("label")),t=a.values[0],a.values[1]):(i=(e.slider("values",0)===e.slider("values",1)?s.replace("{value}",e.slider("values",0)):l.replace("{min_range}",e.slider("values",0)).replace("{max_range}",e.slider("values",1))).replace("{field_label}",e.siblings(".um-slider-range").data("label")),t=e.slider("values",0),e.slider("values",1));e.siblings(".um-slider-range").html(i),e.siblings(".um_range_min").val(t),e.siblings(".um_range_max").val(a)}function a(){jQuery(".um-forms-line").removeClass("um-forms-line-conditioned").each(function(){void 0===jQuery(this).data("conditional")||jQuery(this).hasClass("um-forms-line-conditioned")||(!function i(e){e.addClass("um-forms-line-conditioned");var a=e.data("conditional");var t=a[1];var s=a[2];var l=e.data("prefix");var n=!0;{var r,u;"="===t||"!="===t?-1===a[0].indexOf("||")&&void 0!==(u=jQuery("#"+l+"_"+a[0])).parents(".um-forms-line").data("conditional")&&(n=i(u.parents(".um-forms-line"))):"~"===t?(m=a[0].split("|"),r=[],jQuery.each(m,function(e){r.push(jQuery("#"+l+"_"+m[e]))}),void 0!==r[0].parents(".um-forms-line").data("conditional")&&(n=i(r[0].parents(".um-forms-line")))):"><"===t&&void 0!==(u=jQuery("#"+l+"_"+a[0]+"_"+a[2])).parents(".um-forms-line").data("conditional")&&(n=i(u.parents(".um-forms-line")))}var d=!1;{var m,o,c,p,f,_,h,g;if("="===t)return-1!==a[0].indexOf("||")?(m=a[0].split("||"),o=!1,jQuery.each(m,function(e){var a,e=jQuery("#"+l+"_"+m[e]),t=(n=!(d=!1),void 0!==e.parents(".um-forms-line").data("conditional")&&(n=i(e.parents(".um-forms-line"))),e.prop("tagName").toLowerCase());"input"===t?(a=e.attr("type"),d="checkbox"===a?"1"==s?e.is(":checked"):!e.is(":checked"):Array.isArray(s)?-1!==s.indexOf(e.val()):e.val()==s):"select"===t&&(d=Array.isArray(s)?-1!==s.indexOf(e.val()):e.val()==s),d&&n&&(o=!0)}),o):("input"==(h=u.prop("tagName").toLowerCase())?(g=u.attr("type"),d="checkbox"==g?"1"==s?u.is(":checked"):!u.is(":checked"):Array.isArray(s)?-1!==s.indexOf(u.val()):u.val()==s):"select"==h&&(d=Array.isArray(s)?-1!==s.indexOf(u.val()):u.val()==s),d&&n);if("!="===t)return-1!==a[0].indexOf("||")?(m=a[0].split("||"),o=!1,jQuery.each(m,function(e){var a,e=jQuery("#"+l+"_"+m[e]),t=(n=!(d=!1),void 0!==e.parents(".um-forms-line").data("conditional")&&(n=i(e.parents(".um-forms-line"))),e.prop("tagName").toLowerCase());"input"===t?(a=e.attr("type"),d="checkbox"===a?"1"==s?!e.is(":checked"):e.is(":checked"):e.val()!=s):"select"===t&&(d=e.val()!=s),d&&n&&(o=!0)}),o):("input"==(h=u.prop("tagName").toLowerCase())?(g=u.attr("type"),d="checkbox"==g?"1"==s?!u.is(":checked"):u.is(":checked"):u.val()!=s):"select"==h&&(d=u.val()!=s),d&&n);if("~"===t)return p=[],"sortable_items"===e.data("field_type")?(c=e.find(".um-sortable-items-value").data("field_id"),jQuery.each(r,function(e){var e=r[e],a=e.prop("tagName").toLowerCase();"input"===a?"checkbox"===e.attr("type")&&"1"==s&&e.is(":checked")&&p.push(e.data("fill_"+c)):"select"==a&&!s&&e.val()&&(p=(p=p.concat(e.val())).filter(y))}),f=jQuery('[data-field_id="'+c+'"]'),p.length?(f.siblings(".um-sortable-items-field").find("li").addClass("um-hidden-item"),jQuery.each(p,function(e){f.siblings(".um-sortable-items-field").find('li[data-tab-id="'+p[e]+'"]').removeClass("um-hidden-item")}),_=[],f.siblings(".um-sortable-items-field").find("li").each(function(){jQuery(this).hasClass("um-hidden-item")||_.push(jQuery(this).data("tab-id"))}),f.val(_.join(",")),f.siblings(".um-sortable-items-field").sortable("refresh"),d=!0):f.val(null)):(c=e.find(e.data("field_type")).data("field_id"),jQuery.each(r,function(e){var e=r[e],a=e.prop("tagName").toLowerCase();"input"===a?"checkbox"===e.attr("type")&&"1"==s&&e.is(":checked")&&p.push(e.data("fill_"+c)):"select"==a&&!s&&e.val()&&(p=(p=p.concat(e.val())).filter(y))}),f=jQuery('[data-field_id="'+c+'"]'),p.length?(f.find("option").hide(),jQuery.each(p,function(e){f.find('option[value="'+p[e]+'"]').show()}),-1===p.indexOf(f.val())&&(f.val(p[0]),f.find("option").attr("selected",!1).prop("selected",!1),f.find('option[value="'+p[0]+'"]').attr("selected",!0).prop("selected",!0)),d=!0):(f.val(null),f.find("option").attr("selected",!1).prop("selected",!1))),d&&n;if("><"===t)return h=u.prop("tagName").toLowerCase(),(d="input"==h&&"checkbox"==(g=u.attr("type"))?u.is(":checked"):d)&&n}return!1}(jQuery(this))?jQuery(this).hide():(jQuery(this).show(),um_admin_init_users_select()))})}function y(e,a,t){return t.indexOf(e)===a}jQuery(document.body).on("change",".um-md-default-filters-option-line .um-field-wrapper select",function(){var t,e,a;i||(e=(t=jQuery(this)).val(),a=t.data("member_directory"),i=!0,wp.ajax.send("um_member_directory_default_filter_settings",{data:{key:e,directory_id:a,nonce:um_admin_scripts.nonce},success:function(e){var a=t.parents(".um-md-default-filters-option-line").find(".um-field-wrapper2");a.html(e.field_html),i=!1,a.find(".um-slider").each(function(){var e=jQuery(this),a=[parseInt(e.data("min")),parseInt(e.data("max"))];e.slider({range:!0,min:parseInt(e.data("min")),max:parseInt(e.data("max")),values:a,create:function(e,a){},step:1,slide:function(e,a){s(jQuery(this),a)},stop:function(e,a){}}),s(e)}),a.find(".um-datepicker-filter").each(function(){var e=jQuery(this),a=new Date(1e3*e.data("date_min")),t=new Date(1e3*e.data("date_max"));e.pickadate({selectYears:!0,min:a,max:t,formatSubmit:"yyyy/mm/dd",hiddenName:!0,onOpen:function(){e.blur(),e.siblings(".picker").find(".picker__button--close").addClass("button")},onClose:function(){e.blur()},onSet:function(e){}})}),a.find(".um-timepicker-filter").each(function(){var e=jQuery(this),a=e.data("min"),t=e.data("max"),a=a.split(":"),t=t.split(":");e.pickatime({format:e.data("format"),interval:parseInt(e.data("intervals")),min:[a[0],a[1]],max:[t[0],t[1]],formatSubmit:"HH:i",hiddenName:!0,onOpen:function(){e.blur()},onClose:function(){e.blur()},onSet:function(e){}})})},error:function(e){return!1}}))}),jQuery(".um-md-default-filters-add-option").on("click",function(){var e,a,t;i||((e=jQuery(this).siblings("ul.um-md-default-filters-list")).data("field_id"),(a=0)").append(e.siblings(".um-hidden-md-default-filters").clone()).html(),e.append('
  • '+t+''+wp.i18n.__("Remove","ultimate-member")+'
    • '),e.find("li:last .um-hidden-md-default-filters").attr("name",jQuery(this).data("name")).addClass("um-forms-field um-long-field").removeClass("um-hidden-md-default-filters").attr("id",e.data("id_attr")+"-"+a),e.find("li:last .um-field-wrapper select").trigger("change"))}),jQuery(document.body).on("click",".um-text-delete",function(){jQuery(this).parents("li.um-multi-text-option-line").remove()}),jQuery(".um-multi-text-add-option").on("click",function(){var e=jQuery(this).siblings("ul.um-multi-text-list"),a=0,t=(0").append(e.siblings(".um-hidden-multi-text").clone()).html()),i=e.data("item_class");e.append('
  • '+t+''+wp.i18n.__("Remove","ultimate-member")+"
    • "),e.find("li:last .um-hidden-multi-text").attr("name",jQuery(this).data("name")).addClass("um-forms-field um-long-field").removeClass("um-hidden-multi-text").attr("id",e.data("id_attr")+"-"+a)}),jQuery(".um-media-upload").each(function(){var e=jQuery(this).find(".um-forms-field"),a=e.data("default");""!=e.val()&&e.val()!=a?(e.siblings(".um-set-image").hide(),e.siblings(".um-clear-image").show(),e.siblings(".icon_preview").show()):(e.val()==a&&e.siblings(".icon_preview").show(),e.siblings(".um-set-image").show(),e.siblings(".um-clear-image").hide())}),"undefined"!=typeof wp&&wp.media&&wp.media.editor&&(jQuery(".um-set-image").on("click",function(e){var a=jQuery(this);e.preventDefault(),t&&t.remove(),(t=wp.media({title:a.data("upload_frame"),button:{text:wp.i18n.__("Select","ultimate-member")},multiple:!1})).on("select",function(){var e=t.state().get("selection").first().toJSON();a.siblings(".icon_preview").attr("src",e.url).show(),a.siblings(".um-forms-field").val(e.url),a.siblings(".um-media-upload-data-id").val(e.id),a.siblings(".um-media-upload-data-width").val(e.width),a.siblings(".um-media-upload-data-height").val(e.height),a.siblings(".um-media-upload-data-thumbnail").val(e.thumbnail),a.siblings(".um-media-upload-data-url").trigger("change"),a.siblings(".um-media-upload-url").val(e.url),a.siblings(".um-clear-image").show(),a.hide(),jQuery(document).trigger("um_media_upload_select",[a,e])}),t.open()}),jQuery(".icon_preview").on("click",function(e){jQuery(this).siblings(".um-set-image").trigger("click")}),jQuery(".um-clear-image").on("click",function(e){var a=jQuery(this),t=a.siblings(".um-forms-field").data("default");a.siblings(".um-set-image").show(),a.hide(),a.siblings(".icon_preview").attr("src",t),a.siblings(".um-media-upload-data-id").val(""),a.siblings(".um-media-upload-data-width").val(""),a.siblings(".um-media-upload-data-height").val(""),a.siblings(".um-media-upload-data-thumbnail").val(""),a.siblings(".um-forms-field").val(t),a.siblings(".um-media-upload-data-url").trigger("change"),a.siblings(".um-media-upload-url").val(t),jQuery(document).trigger("um_media_upload_clear",a)})),jQuery(document.body).on("change",".um-forms-field",function(){(0 Date: Tue, 9 Jan 2024 10:44:26 +0200 Subject: [PATCH 24/43] - #1407 issue fix; --- assets/css/admin/builder.css | 3 +++ assets/css/admin/builder.min.css | 2 +- assets/css/admin/builder.sass | 3 +++ assets/css/admin/common.css | 28 +++++++++++++++++++++++ assets/css/admin/common.min.css | 2 +- assets/css/admin/common.sass | 29 ++++++++++++++++++++++++ assets/css/admin/forms.css | 8 +++---- assets/css/admin/forms.min.css | 2 +- assets/css/admin/forms.sass | 4 ++-- assets/js/admin/forms.js | 2 ++ assets/js/admin/forms.min.js | 2 +- assets/js/common.js | 7 +++++- assets/js/common.min.js | 2 +- includes/core/class-member-directory.php | 6 ++--- 14 files changed, 85 insertions(+), 15 deletions(-) diff --git a/assets/css/admin/builder.css b/assets/css/admin/builder.css index f83d4243..c34e6978 100644 --- a/assets/css/admin/builder.css +++ b/assets/css/admin/builder.css @@ -110,6 +110,9 @@ float: right; } .um-admin-half p:first-child { margin-top: 0; } + .um-admin-half .um { + opacity: 1; + margin-bottom: 0 !important; } .um-admin-tri { float: left; diff --git a/assets/css/admin/builder.min.css b/assets/css/admin/builder.min.css index 51a4e8ef..281a1785 100644 --- a/assets/css/admin/builder.min.css +++ b/assets/css/admin/builder.min.css @@ -1 +1 @@ -@-webkit-keyframes um-ajax-spinning{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@-moz-keyframes um-ajax-spinning{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@-ms-keyframes um-ajax-spinning{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes um-ajax-spinning{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}.um-admin-row-loading{position:absolute;width:100%;height:calc(100% + 30px);top:-30px;left:0;background:rgba(241,241,241,.6);z-index:999;display:none}.um-admin-row-loading>span{display:block;-webkit-transition:.1s opacity;-moz-transition:.1s opacity;-ms-transition:.1s opacity;-o-transition:.1s opacity;transition:.1s opacity;color:#c6c6c6!important;-webkit-animation:um-ajax-spinning 1.1s infinite linear;animation:um-ajax-spinning 1.1s infinite linear;border-top:.2em solid #000;border-right:.2em solid #000;border-bottom:.2em solid #000;border-left:.2em solid #c6c6c6;font-size:1.75em;-ms-transform:translateZ(0);transform:translateZ(0);border-radius:50%;width:40px;height:40px;margin:-20px 0 0 -20px;outline:0;padding:0;vertical-align:baseline;position:absolute;left:50%;top:50%}.um-admin-boxed-links{width:100%;text-align:center}.um-admin-boxed-links a{width:33.3%;float:left;border-left:1px solid #fff;border-right:1px solid #fff;padding:30px 25px!important;background:#f8f8f8;text-align:center;display:inline-block!important;font-size:14px;transition:all .2s linear;text-decoration:none;color:#666;margin:0!important;box-sizing:border-box!important;border-radius:2px;font-weight:600}.um-admin-boxed-links a:hover{background:#eee}.um-admin-boxed-links a.um-admin-activebg{background:#0085ba;color:#fff}.um-admin-boxed-links a.um-admin-activebg:hover{background:#0085ba;color:#fff}.um-admin-boxed-links i{font-size:28px;vertical-align:middle;margin:0 10px 0 0}.um-admin-half{float:left;width:48%}.um-admin-half select{box-sizing:border-box}.um-admin-half.um-admin-right{float:right}.um-admin-half p:first-child{margin-top:0}.um-admin-tri{float:left;width:33%;position:relative}.um-admin-error-block,.um-admin-success-block{display:none;width:100%;background:#c74a4a;border-radius:3px;color:#fff;box-sizing:border-box;position:relative;padding:12px;font-size:13px;line-height:1em!important;margin:0 0 16px 0}.um-admin-success-block{background:#7acf58}.um-admin-cur-condition-template{display:none}.dynamic-mce-content{display:none}.um-admin-btns{line-height:1.5em;margin:0 0 5px 0;display:flex;flex-direction:row;justify-content:flex-start;align-items:baseline;flex-wrap:wrap}.um-admin-btns .um-no-custom-fields{margin:0}.um-admin-btns a{margin:0 3px 8px 0!important;font-size:12px!important;display:flex;flex-direction:row;justify-content:flex-start;align-items:center;flex-wrap:nowrap;display:flex!important}.um-admin-btns a.with-icon span{color:#aaa;font-size:15px!important;padding-left:5px;height:auto;width:auto}.um-admin-btns a.with-icon:hover span{color:#cb3838}.um-admin-btn-toggle{padding:10px 0}.um-admin-btn-toggle p{margin:0 5px 0 0!important}.um-admin-btn-toggle p.um-admin-reset-conditions a{margin-bottom:5px}.um-admin-btn-toggle a{text-decoration:none;color:#999}.um-admin-btn-toggle a.um-admin-new-condition{margin-bottom:5px}.um-admin-btn-toggle a.active{color:#0085ba}.um-admin-btn-toggle a.active:hover{color:#0085ba}.um-admin-btn-toggle i{margin:0 5px 0 0!important;height:100%;color:#666;position:relative;top:1px}.um-admin-btn-content{display:none;padding:5px 0 0 0}.um-admin-btn-content p{float:left;margin-right:10px!important;padding:0!important}.um-admin-btn-content p.um-admin-conditions-notice{width:100%;margin:0 0 9px 0!important}.um-admin-btn-content .um-admin-cur-condition:not(:last-child){margin:0 0 5px 0}.um-admin-builder i{font-size:15px!important;height:100%!important;line-height:100%!important;margin:0 5px 0 0!important}.um-admin-builder .um-admin-drag{margin-top:40px}.um-admin-drag-add-field{display:block;width:100%;height:30px;line-height:30px;text-align:center;color:#aaa;text-decoration:none}.um-admin-drag-add-field:hover{color:#0085ba}.um-admin-drag-add-field i{font-size:23px!important;margin:0!important}.um-admin-drag-ctrls{position:absolute;top:-30px;left:0}.um-admin-drag-ctrls.um-admin-drag-ctrls-demo{position:absolute;right:7px;top:-30px;left:auto}.um-admin-drag-ctrls a{float:left;margin:0 5px 0 0;height:30px;line-height:30px;background:#eee;color:#888;padding:0 8px;text-decoration:none;border-radius:2px 2px 0 0}.um-admin-drag-ctrls a:hover{background-color:#e5e5e5}.um-admin-drag-ctrls a.active,.um-admin-drag-ctrls a.active:hover{background-color:#0085ba;color:#fff}.um-admin-drag-ctrls.columns a{width:30px!important;background-image:url(../../img/builder/1-column.gif);background-repeat:no-repeat;background-position:center}.um-admin-drag-ctrls.columns a:nth-child(2){background-image:url(../../img/builder/2-columns.gif)}.um-admin-drag-ctrls.columns a:last-child{background-image:url(../../img/builder/3-columns.gif)}.um-admin-drag-ctrls.columns a.active{background-image:url(../../img/builder/1-column-active.gif)}.um-admin-drag-ctrls.columns a.active:nth-child(2){background-image:url(../../img/builder/2-columns-active.gif)}.um-admin-drag-ctrls.columns a.active:last-child{background-image:url(../../img/builder/3-columns-active.gif)}.um-admin-drag{width:100%;background:#f1f1f1;box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;position:relative;padding:60px 20px 20px 20px}.um-admin-drag-row{width:100%;background:#fefefe;box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;position:relative;padding:60px 20px 20px 20px;margin:0 0 60px 0}.um-admin-drag-row:last-child{margin-bottom:0}.um-admin-drag-row-icons{position:absolute;right:0;top:-30px;height:30px}.um-admin-drag-row-icons a{text-decoration:none;color:#fff;width:40px;height:30px;line-height:30px;text-align:center;display:block!important;float:left;background:#0085ba;padding:0 4px;transition:all .2s linear;border-left:1px solid #379dd5}.um-admin-drag-row-icons a:hover{background:#008ec2}.um-admin-drag-row-icons span{cursor:move!important;text-decoration:none;color:#fff;width:40px;height:30px;line-height:30px;text-align:center;display:block!important;float:left;background:#0085ba;padding:0 4px;transition:all .2s linear;border-left:1px solid #379dd5}.um-admin-drag-row-icons span:hover{background:#008ec2}.um-admin-drag-row-icons i{font-size:18px!important;margin:0!important;top:2px;position:relative}.um-admin-drag-rowsub{position:relative;box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;background:#f1f1f1;padding:20px;margin:0 0 60px 0}.um-admin-drag-rowsub:last-child{margin-bottom:0}.um-admin-drag-rowsub-icons{position:absolute;right:0;top:-30px;height:30px}.um-admin-drag-rowsub-icons a{text-decoration:none;color:#fff;width:40px;height:30px;line-height:30px;text-align:center;display:block!important;float:left;background:#0085ba;padding:0 4px;transition:all .2s linear;border-left:1px solid #379dd5}.um-admin-drag-rowsub-icons a:hover{background:#008ec2}.um-admin-drag-rowsub-icons span{cursor:move!important;text-decoration:none;color:#fff;width:40px;height:30px;line-height:30px;text-align:center;display:block!important;float:left;background:#0085ba;padding:0 4px;transition:all .2s linear;border-left:1px solid #379dd5}.um-admin-drag-rowsub-icons span:hover{background:#008ec2}.um-admin-drag-rowsub-icons i{font-size:18px!important;margin:0!important;top:2px;position:relative}.um-admin-drag-col{float:left;width:100%;background:#fff;border:1px dashed #bbb;box-sizing:border-box;padding:20px}.um-admin-drag-col.cols-3{width:32%}.um-admin-drag-col.cols-3.cols-last{width:32%}.um-admin-drag-col.cols-3.cols-middle{width:32%;margin:0 2%}.um-admin-drag-col.cols-3 .um-admin-drag-fld-title{height:auto;line-height:18px;margin:10px;margin-bottom:0}.um-admin-drag-col.cols-3 .um-admin-drag-fld-type{height:auto;line-height:18px;margin:0 0 10px 0}.um-admin-drag-col.cols-3 .um-admin-drag-fld-icons{float:none;position:absolute;bottom:0;right:0;height:30px;display:none}.um-admin-drag-col.cols-3 .um-admin-drag-fld-icons.um-field-type-group{float:left;position:relative;bottom:auto;right:auto;height:30px;display:block}.um-admin-drag-col.cols-3 .um-admin-drag-fld:hover .um-admin-drag-fld-icons{display:block}.um-admin-drag-col.cols-1{width:100%}.um-admin-drag-col.cols-1.cols-last{width:100%}.um-admin-drag-col.cols-2{width:49%;margin:0 1% 0 0}.um-admin-drag-col.cols-2.cols-last{width:49%;margin:0 0 0 1%}.um-admin-drag-col>.um-admin-drag-fld:last-of-type{margin-bottom:20px}.um-admin-drag-addrow{text-align:center;font-size:14px;color:#888;cursor:pointer;border:1px dashed #bbb;padding:10px 0;margin:20px 0 0 0}.um-admin-drag-addrow i{font-size:23px!important;margin:0!important}.um-admin-drag-addrow:hover{color:#0085ba}.um-admin-drag-fld{display:block;position:relative;border:1px solid #ddd;margin:0 0 15px 0;background:#f5f5f5;cursor:move!important}.um-admin-drag-fld.um-field-type-group{background:#555;border:0}.um-admin-drag-fld-title{float:left;font-weight:700;font-size:13px;color:#666;height:30px;line-height:30px;margin:0 0 0 20px}.um-admin-drag-fld-title.um-field-type-group{color:#fff}.um-admin-drag-fld-title i{width:24px;display:inline-block;text-align:center}.um-admin-drag-group{background:#fcfcfc;cursor:default;padding:20px;border:1px dashed #bbb}.um-admin-drag-fld-type{float:left;font-size:13px;height:30px;line-height:30px;margin:0 0 0 20px;font-weight:400;color:#999}.um-admin-drag-fld-type.um-field-type-group{color:#fff}.um-admin-drag-fld-icons{float:right}.um-admin-drag-fld-icons a{text-decoration:none;color:#fff;width:40px;height:30px;line-height:30px;text-align:center;display:block!important;float:left;background:#0085ba;padding:0 4px;transition:all .2s linear;border-left:1px solid #379dd5}.um-admin-drag-fld-icons a:hover{background:#008ec2}.um-admin-drag-fld-icons i{font-size:18px!important;margin:0!important;top:2px;position:relative}.um-admin-drag-fld-icons.um-field-type-group a.um_admin_duplicate_field{display:none!important}.um-row-placeholder{width:100%;border:2px dashed #aaa;box-sizing:border-box}.um-rowsub-placeholder{width:100%;border:2px dashed #ccc;box-sizing:border-box;display:block}.um-fld-placeholder{display:block;border:1px dashed #ddd;background:#fff;box-sizing:border-box;width:100%}.um-admin-modal #UM_preview_form .um-admin-modal-body{position:relative}.um-admin-modal #UM_preview_form .um-admin-modal-body .um-admin-preview-overlay{position:absolute;top:0;bottom:0;left:0;right:0;background-color:rgba(255,255,255,0);z-index:100} \ No newline at end of file +@-webkit-keyframes um-ajax-spinning{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@-moz-keyframes um-ajax-spinning{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@-ms-keyframes um-ajax-spinning{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes um-ajax-spinning{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}.um-admin-row-loading{position:absolute;width:100%;height:calc(100% + 30px);top:-30px;left:0;background:rgba(241,241,241,.6);z-index:999;display:none}.um-admin-row-loading>span{display:block;-webkit-transition:.1s opacity;-moz-transition:.1s opacity;-ms-transition:.1s opacity;-o-transition:.1s opacity;transition:.1s opacity;color:#c6c6c6!important;-webkit-animation:um-ajax-spinning 1.1s infinite linear;animation:um-ajax-spinning 1.1s infinite linear;border-top:.2em solid #000;border-right:.2em solid #000;border-bottom:.2em solid #000;border-left:.2em solid #c6c6c6;font-size:1.75em;-ms-transform:translateZ(0);transform:translateZ(0);border-radius:50%;width:40px;height:40px;margin:-20px 0 0 -20px;outline:0;padding:0;vertical-align:baseline;position:absolute;left:50%;top:50%}.um-admin-boxed-links{width:100%;text-align:center}.um-admin-boxed-links a{width:33.3%;float:left;border-left:1px solid #fff;border-right:1px solid #fff;padding:30px 25px!important;background:#f8f8f8;text-align:center;display:inline-block!important;font-size:14px;transition:all .2s linear;text-decoration:none;color:#666;margin:0!important;box-sizing:border-box!important;border-radius:2px;font-weight:600}.um-admin-boxed-links a:hover{background:#eee}.um-admin-boxed-links a.um-admin-activebg{background:#0085ba;color:#fff}.um-admin-boxed-links a.um-admin-activebg:hover{background:#0085ba;color:#fff}.um-admin-boxed-links i{font-size:28px;vertical-align:middle;margin:0 10px 0 0}.um-admin-half{float:left;width:48%}.um-admin-half select{box-sizing:border-box}.um-admin-half.um-admin-right{float:right}.um-admin-half p:first-child{margin-top:0}.um-admin-half .um{opacity:1;margin-bottom:0!important}.um-admin-tri{float:left;width:33%;position:relative}.um-admin-error-block,.um-admin-success-block{display:none;width:100%;background:#c74a4a;border-radius:3px;color:#fff;box-sizing:border-box;position:relative;padding:12px;font-size:13px;line-height:1em!important;margin:0 0 16px 0}.um-admin-success-block{background:#7acf58}.um-admin-cur-condition-template{display:none}.dynamic-mce-content{display:none}.um-admin-btns{line-height:1.5em;margin:0 0 5px 0;display:flex;flex-direction:row;justify-content:flex-start;align-items:baseline;flex-wrap:wrap}.um-admin-btns .um-no-custom-fields{margin:0}.um-admin-btns a{margin:0 3px 8px 0!important;font-size:12px!important;display:flex;flex-direction:row;justify-content:flex-start;align-items:center;flex-wrap:nowrap;display:flex!important}.um-admin-btns a.with-icon span{color:#aaa;font-size:15px!important;padding-left:5px;height:auto;width:auto}.um-admin-btns a.with-icon:hover span{color:#cb3838}.um-admin-btn-toggle{padding:10px 0}.um-admin-btn-toggle p{margin:0 5px 0 0!important}.um-admin-btn-toggle p.um-admin-reset-conditions a{margin-bottom:5px}.um-admin-btn-toggle a{text-decoration:none;color:#999}.um-admin-btn-toggle a.um-admin-new-condition{margin-bottom:5px}.um-admin-btn-toggle a.active{color:#0085ba}.um-admin-btn-toggle a.active:hover{color:#0085ba}.um-admin-btn-toggle i{margin:0 5px 0 0!important;height:100%;color:#666;position:relative;top:1px}.um-admin-btn-content{display:none;padding:5px 0 0 0}.um-admin-btn-content p{float:left;margin-right:10px!important;padding:0!important}.um-admin-btn-content p.um-admin-conditions-notice{width:100%;margin:0 0 9px 0!important}.um-admin-btn-content .um-admin-cur-condition:not(:last-child){margin:0 0 5px 0}.um-admin-builder i{font-size:15px!important;height:100%!important;line-height:100%!important;margin:0 5px 0 0!important}.um-admin-builder .um-admin-drag{margin-top:40px}.um-admin-drag-add-field{display:block;width:100%;height:30px;line-height:30px;text-align:center;color:#aaa;text-decoration:none}.um-admin-drag-add-field:hover{color:#0085ba}.um-admin-drag-add-field i{font-size:23px!important;margin:0!important}.um-admin-drag-ctrls{position:absolute;top:-30px;left:0}.um-admin-drag-ctrls.um-admin-drag-ctrls-demo{position:absolute;right:7px;top:-30px;left:auto}.um-admin-drag-ctrls a{float:left;margin:0 5px 0 0;height:30px;line-height:30px;background:#eee;color:#888;padding:0 8px;text-decoration:none;border-radius:2px 2px 0 0}.um-admin-drag-ctrls a:hover{background-color:#e5e5e5}.um-admin-drag-ctrls a.active,.um-admin-drag-ctrls a.active:hover{background-color:#0085ba;color:#fff}.um-admin-drag-ctrls.columns a{width:30px!important;background-image:url(../../img/builder/1-column.gif);background-repeat:no-repeat;background-position:center}.um-admin-drag-ctrls.columns a:nth-child(2){background-image:url(../../img/builder/2-columns.gif)}.um-admin-drag-ctrls.columns a:last-child{background-image:url(../../img/builder/3-columns.gif)}.um-admin-drag-ctrls.columns a.active{background-image:url(../../img/builder/1-column-active.gif)}.um-admin-drag-ctrls.columns a.active:nth-child(2){background-image:url(../../img/builder/2-columns-active.gif)}.um-admin-drag-ctrls.columns a.active:last-child{background-image:url(../../img/builder/3-columns-active.gif)}.um-admin-drag{width:100%;background:#f1f1f1;box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;position:relative;padding:60px 20px 20px 20px}.um-admin-drag-row{width:100%;background:#fefefe;box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;position:relative;padding:60px 20px 20px 20px;margin:0 0 60px 0}.um-admin-drag-row:last-child{margin-bottom:0}.um-admin-drag-row-icons{position:absolute;right:0;top:-30px;height:30px}.um-admin-drag-row-icons a{text-decoration:none;color:#fff;width:40px;height:30px;line-height:30px;text-align:center;display:block!important;float:left;background:#0085ba;padding:0 4px;transition:all .2s linear;border-left:1px solid #379dd5}.um-admin-drag-row-icons a:hover{background:#008ec2}.um-admin-drag-row-icons span{cursor:move!important;text-decoration:none;color:#fff;width:40px;height:30px;line-height:30px;text-align:center;display:block!important;float:left;background:#0085ba;padding:0 4px;transition:all .2s linear;border-left:1px solid #379dd5}.um-admin-drag-row-icons span:hover{background:#008ec2}.um-admin-drag-row-icons i{font-size:18px!important;margin:0!important;top:2px;position:relative}.um-admin-drag-rowsub{position:relative;box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;background:#f1f1f1;padding:20px;margin:0 0 60px 0}.um-admin-drag-rowsub:last-child{margin-bottom:0}.um-admin-drag-rowsub-icons{position:absolute;right:0;top:-30px;height:30px}.um-admin-drag-rowsub-icons a{text-decoration:none;color:#fff;width:40px;height:30px;line-height:30px;text-align:center;display:block!important;float:left;background:#0085ba;padding:0 4px;transition:all .2s linear;border-left:1px solid #379dd5}.um-admin-drag-rowsub-icons a:hover{background:#008ec2}.um-admin-drag-rowsub-icons span{cursor:move!important;text-decoration:none;color:#fff;width:40px;height:30px;line-height:30px;text-align:center;display:block!important;float:left;background:#0085ba;padding:0 4px;transition:all .2s linear;border-left:1px solid #379dd5}.um-admin-drag-rowsub-icons span:hover{background:#008ec2}.um-admin-drag-rowsub-icons i{font-size:18px!important;margin:0!important;top:2px;position:relative}.um-admin-drag-col{float:left;width:100%;background:#fff;border:1px dashed #bbb;box-sizing:border-box;padding:20px}.um-admin-drag-col.cols-3{width:32%}.um-admin-drag-col.cols-3.cols-last{width:32%}.um-admin-drag-col.cols-3.cols-middle{width:32%;margin:0 2%}.um-admin-drag-col.cols-3 .um-admin-drag-fld-title{height:auto;line-height:18px;margin:10px;margin-bottom:0}.um-admin-drag-col.cols-3 .um-admin-drag-fld-type{height:auto;line-height:18px;margin:0 0 10px 0}.um-admin-drag-col.cols-3 .um-admin-drag-fld-icons{float:none;position:absolute;bottom:0;right:0;height:30px;display:none}.um-admin-drag-col.cols-3 .um-admin-drag-fld-icons.um-field-type-group{float:left;position:relative;bottom:auto;right:auto;height:30px;display:block}.um-admin-drag-col.cols-3 .um-admin-drag-fld:hover .um-admin-drag-fld-icons{display:block}.um-admin-drag-col.cols-1{width:100%}.um-admin-drag-col.cols-1.cols-last{width:100%}.um-admin-drag-col.cols-2{width:49%;margin:0 1% 0 0}.um-admin-drag-col.cols-2.cols-last{width:49%;margin:0 0 0 1%}.um-admin-drag-col>.um-admin-drag-fld:last-of-type{margin-bottom:20px}.um-admin-drag-addrow{text-align:center;font-size:14px;color:#888;cursor:pointer;border:1px dashed #bbb;padding:10px 0;margin:20px 0 0 0}.um-admin-drag-addrow i{font-size:23px!important;margin:0!important}.um-admin-drag-addrow:hover{color:#0085ba}.um-admin-drag-fld{display:block;position:relative;border:1px solid #ddd;margin:0 0 15px 0;background:#f5f5f5;cursor:move!important}.um-admin-drag-fld.um-field-type-group{background:#555;border:0}.um-admin-drag-fld-title{float:left;font-weight:700;font-size:13px;color:#666;height:30px;line-height:30px;margin:0 0 0 20px}.um-admin-drag-fld-title.um-field-type-group{color:#fff}.um-admin-drag-fld-title i{width:24px;display:inline-block;text-align:center}.um-admin-drag-group{background:#fcfcfc;cursor:default;padding:20px;border:1px dashed #bbb}.um-admin-drag-fld-type{float:left;font-size:13px;height:30px;line-height:30px;margin:0 0 0 20px;font-weight:400;color:#999}.um-admin-drag-fld-type.um-field-type-group{color:#fff}.um-admin-drag-fld-icons{float:right}.um-admin-drag-fld-icons a{text-decoration:none;color:#fff;width:40px;height:30px;line-height:30px;text-align:center;display:block!important;float:left;background:#0085ba;padding:0 4px;transition:all .2s linear;border-left:1px solid #379dd5}.um-admin-drag-fld-icons a:hover{background:#008ec2}.um-admin-drag-fld-icons i{font-size:18px!important;margin:0!important;top:2px;position:relative}.um-admin-drag-fld-icons.um-field-type-group a.um_admin_duplicate_field{display:none!important}.um-row-placeholder{width:100%;border:2px dashed #aaa;box-sizing:border-box}.um-rowsub-placeholder{width:100%;border:2px dashed #ccc;box-sizing:border-box;display:block}.um-fld-placeholder{display:block;border:1px dashed #ddd;background:#fff;box-sizing:border-box;width:100%}.um-admin-modal #UM_preview_form .um-admin-modal-body{position:relative}.um-admin-modal #UM_preview_form .um-admin-modal-body .um-admin-preview-overlay{position:absolute;top:0;bottom:0;left:0;right:0;background-color:rgba(255,255,255,0);z-index:100} \ No newline at end of file diff --git a/assets/css/admin/builder.sass b/assets/css/admin/builder.sass index 3e92d73d..65cfa093 100644 --- a/assets/css/admin/builder.sass +++ b/assets/css/admin/builder.sass @@ -91,6 +91,9 @@ float: right p:first-child margin-top: 0 + .um + opacity: 1 + margin-bottom: 0 !important .#{$prefix}admin-tri float: left width: 33% diff --git a/assets/css/admin/common.css b/assets/css/admin/common.css index 1010ead6..2dbef9c5 100644 --- a/assets/css/admin/common.css +++ b/assets/css/admin/common.css @@ -85,3 +85,31 @@ body.um-admin-modal-open { height: 200px; } .um-admin-metabox textarea.um-admin-error { border-color: #c74a4a !important; } + +.um .picker__box, +.um .picker__nav--prev:hover, +.um .picker__nav--next:hover { + background: #0085ba; } + +.um .picker__footer, +.um .picker__header, +.um .picker__day--infocus:hover, +.um .picker__day--outfocus:hover, +.um .picker__day--highlighted:hover, +.um .picker--focused .picker__day--highlighted, +.um .picker__list-item:hover, +.um .picker__list-item--highlighted:hover, +.um .picker--focused .picker__list-item--highlighted, +.um .picker__list-item--selected, +.um .picker__list-item--selected:hover, +.um .picker--focused .picker__list-item--selected { + background: #008ec2; } + +body.um .picker .picker__frame { + top: 32px; } + +body.um .picker .picker__footer > button:not(:disabled):not(.button) { + color: #fff; } + +body.um .picker .picker__footer > button.picker__button--close { + margin-top: 5px; } diff --git a/assets/css/admin/common.min.css b/assets/css/admin/common.min.css index f9d342f9..a70d4cc7 100644 --- a/assets/css/admin/common.min.css +++ b/assets/css/admin/common.min.css @@ -1 +1 @@ -.um-adm-ico{font-size:18px;width:18px;text-align:center;display:inline-block;color:#7acf58}.um-adm-ico.inactive{color:#c74a4a}.um-adm-ico.pointer{cursor:pointer}body.um-admin-modal-open{overflow:hidden}.um-admin #major-publishing-actions{background-color:#fff!important;border-top:0}.um-admin a.button i,.um-admin a.button-primary i{font-size:15px!important;height:15px!important;width:15px!important;text-align:center!important;margin:0 5px 0 0!important;display:inline-block}.um-admin a.button i:before,.um-admin a.button-primary i:before{position:relative;top:1px}.um-admin-metabox h6{font-size:14px;margin:12px 0 0 0}.um-admin-metabox h3{padding-left:0!important}.um-admin-metabox h4{font-size:14px;background:#f5f5f5;padding:8px 4px;color:#333}.um-admin-metabox p{margin:10px 0 0 0}.um-admin-metabox label{display:block;cursor:default;padding:0!important;font-size:13px;color:#666}.um-admin-metabox input[type=text]{height:auto!important;width:100%;max-width:100%;display:block;box-sizing:border-box!important;font-size:13px!important;line-height:1.4em!important;padding:4px 10px!important}.um-admin-metabox input[type=text]:disabled{opacity:.7!important;color:#aaa!important}.um-admin-metabox input[type=text].small{width:54px}.um-admin-metabox input[type=text].um-admin-error{border-color:#c74a4a!important}.um-admin-metabox textarea{width:100%;max-width:100%;display:block;box-sizing:border-box!important;font-size:13px!important;line-height:1.4em!important;padding:8px!important;color:#888!important;min-height:100px;height:100px}.um-admin-metabox textarea.tall{min-height:200px;height:200px}.um-admin-metabox textarea.um-admin-error{border-color:#c74a4a!important} \ No newline at end of file +.um-adm-ico{font-size:18px;width:18px;text-align:center;display:inline-block;color:#7acf58}.um-adm-ico.inactive{color:#c74a4a}.um-adm-ico.pointer{cursor:pointer}body.um-admin-modal-open{overflow:hidden}.um-admin #major-publishing-actions{background-color:#fff!important;border-top:0}.um-admin a.button i,.um-admin a.button-primary i{font-size:15px!important;height:15px!important;width:15px!important;text-align:center!important;margin:0 5px 0 0!important;display:inline-block}.um-admin a.button i:before,.um-admin a.button-primary i:before{position:relative;top:1px}.um-admin-metabox h6{font-size:14px;margin:12px 0 0 0}.um-admin-metabox h3{padding-left:0!important}.um-admin-metabox h4{font-size:14px;background:#f5f5f5;padding:8px 4px;color:#333}.um-admin-metabox p{margin:10px 0 0 0}.um-admin-metabox label{display:block;cursor:default;padding:0!important;font-size:13px;color:#666}.um-admin-metabox input[type=text]{height:auto!important;width:100%;max-width:100%;display:block;box-sizing:border-box!important;font-size:13px!important;line-height:1.4em!important;padding:4px 10px!important}.um-admin-metabox input[type=text]:disabled{opacity:.7!important;color:#aaa!important}.um-admin-metabox input[type=text].small{width:54px}.um-admin-metabox input[type=text].um-admin-error{border-color:#c74a4a!important}.um-admin-metabox textarea{width:100%;max-width:100%;display:block;box-sizing:border-box!important;font-size:13px!important;line-height:1.4em!important;padding:8px!important;color:#888!important;min-height:100px;height:100px}.um-admin-metabox textarea.tall{min-height:200px;height:200px}.um-admin-metabox textarea.um-admin-error{border-color:#c74a4a!important}.um .picker__box,.um .picker__nav--next:hover,.um .picker__nav--prev:hover{background:#0085ba}.um .picker--focused .picker__day--highlighted,.um .picker--focused .picker__list-item--highlighted,.um .picker--focused .picker__list-item--selected,.um .picker__day--highlighted:hover,.um .picker__day--infocus:hover,.um .picker__day--outfocus:hover,.um .picker__footer,.um .picker__header,.um .picker__list-item--highlighted:hover,.um .picker__list-item--selected,.um .picker__list-item--selected:hover,.um .picker__list-item:hover{background:#008ec2}body.um .picker .picker__frame{top:32px}body.um .picker .picker__footer>button:not(:disabled):not(.button){color:#fff}body.um .picker .picker__footer>button.picker__button--close{margin-top:5px} \ No newline at end of file diff --git a/assets/css/admin/common.sass b/assets/css/admin/common.sass index 1c47c459..8eaa35aa 100644 --- a/assets/css/admin/common.sass +++ b/assets/css/admin/common.sass @@ -85,3 +85,32 @@ body.#{$prefix}admin-modal-open height: 200px &.#{$prefix}admin-error border-color: #{$admin-warning} !important + +.um + .picker__box, + .picker__nav--prev:hover, + .picker__nav--next:hover + background: #{$um-base} + .picker__footer, + .picker__header, + .picker__day--infocus:hover, + .picker__day--outfocus:hover, + .picker__day--highlighted:hover, + .picker--focused .picker__day--highlighted, + .picker__list-item:hover, + .picker__list-item--highlighted:hover, + .picker--focused .picker__list-item--highlighted, + .picker__list-item--selected, + .picker__list-item--selected:hover, + .picker--focused .picker__list-item--selected + background: #{$um-base-hover} + +body.um + .picker + .picker__frame + top: 32px + .picker__footer + & > button:not(:disabled):not(.button) + color: #fff + & > button.picker__button--close + margin-top: 5px diff --git a/assets/css/admin/forms.css b/assets/css/admin/forms.css index 77ebdea2..40f2862c 100644 --- a/assets/css/admin/forms.css +++ b/assets/css/admin/forms.css @@ -158,16 +158,16 @@ input[type="number"].um-forms-field { background: #44b0ec; border: 1px solid #44b0ec !important; margin-top: -1px; } - .um-md-default-filters-option-line .um-field-wrapper2 select { + .um-md-default-filters-option-line .um-field-wrapper2 > select { width: 100%; float: left; } - .um-md-default-filters-option-line .um-field-wrapper2 input { + .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 { + .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; } - .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 { + .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; } .um-md-default-filters-option-line .um-field-wrapper2 .um-slider { margin: 5px 9px 0 9px; diff --git a/assets/css/admin/forms.min.css b/assets/css/admin/forms.min.css index 125ae377..c7df2078 100644 --- a/assets/css/admin/forms.min.css +++ b/assets/css/admin/forms.min.css @@ -1 +1 @@ -.um-form-table .um-forms-line[data-conditional]{display:none}.um-form-table .um-forms-line[data-field_type=checkbox] td label{font-style:italic}.um-form-table .um-forms-line label .um-req{color:#a00;margin:0 0 0 3px;font-weight:400}.um-form-table .um-forms-line .um-text-delete{color:#a00;float:left}.um-form-table .um-forms-line .um-text-delete:hover{color:red}.um-form-table .um-forms-line .um-multi-text-add-option{margin-bottom:14px}.um-form-table .um-forms-line .icon_preview{display:none;max-width:200px;max-height:200px;padding:5px;cursor:pointer;border:1px solid #e3e3e3;background:#f7f7f7;border-radius:3px;height:auto;width:auto!important}.um-form-table .um-forms-line td .um-same-page-update-wrapper{display:none;margin:7px 0 0 0}.um-form-table .um-forms-line td .um-same-page-update-wrapper input.um-admin-form-same-page-update{margin:7px 0 0 0}.um-form-table .um-forms-line td .um-same-page-update-wrapper .upgrade_log{margin:7px 0 0 0;width:100%;height:150px;overflow:auto;border:1px solid #a1a1a1}.um-form-table .um-forms-line[data-field_type=same_page_update]{vertical-align:baseline}.um-form-table .um-forms-line[data-field_type=same_page_update] td,.um-form-table .um-forms-line[data-field_type=same_page_update] th{vertical-align:baseline}.um-form-table.um-third-column .um-forms-line th{width:33%}.um-form-table.um-half-column .um-forms-line th{width:50%}.um-form-table.um-two-thirds-column .um-forms-line th{width:83%}.um-form-table.um-top-label .um-forms-line td{padding:0 0 15px 0}.um-form-table.um-top-label .um-forms-line td label{margin:0 0 5px 0;display:inline-block}.um-form-table.um-top-label .um-forms-line[data-field_type=icon] td label{width:100%;display:block;margin:0 0 5px 0}.um-form-table .description{font-style:italic;clear:both}.um_admin_fonticon_wrapper{display:flex;flex-direction:row;justify-content:flex-start;align-items:center;flex-wrap:nowrap}.um_admin_fonticon_wrapper .um-admin-icon-value{line-height:1}.um_admin_fonticon_wrapper .um-admin-icon-value i{top:0}input[type=date].um-forms-field,input[type=number].um-forms-field,input[type=password].um-forms-field,input[type=text].um-forms-field,input[type=time].um-forms-field,input[type=url].um-forms-field,select.um-forms-field,textarea.um-forms-field{box-sizing:border-box}input[type=date].um-forms-field.um-long-field,input[type=number].um-forms-field.um-long-field,input[type=password].um-forms-field.um-long-field,input[type=text].um-forms-field.um-long-field,input[type=time].um-forms-field.um-long-field,input[type=url].um-forms-field.um-long-field,select.um-forms-field.um-long-field,textarea.um-forms-field.um-long-field{width:100%!important}input[type=date].um-forms-field.um-medium-field,input[type=number].um-forms-field.um-medium-field,input[type=password].um-forms-field.um-medium-field,input[type=text].um-forms-field.um-medium-field,input[type=time].um-forms-field.um-medium-field,input[type=url].um-forms-field.um-medium-field,select.um-forms-field.um-medium-field,textarea.um-forms-field.um-medium-field{width:50%!important}input[type=date].um-forms-field.um-small-field,input[type=number].um-forms-field.um-small-field,input[type=password].um-forms-field.um-small-field,input[type=text].um-forms-field.um-small-field,input[type=time].um-forms-field.um-small-field,input[type=url].um-forms-field.um-small-field,select.um-forms-field.um-small-field,textarea.um-forms-field.um-small-field{width:25%!important}input[type=number].um-forms-field{padding-right:0}.um-md-default-filters-list,.um-multi-selects-list,.um-multi-text-list{float:left;width:100%;margin:0 0 10px 0}.um-hidden-md-default-filters,.um-hidden-multi-selects,.um-hidden-multi-text{display:none!important}.um-md-default-filters-option-line{float:left;width:100%;clear:both;border-bottom:1px solid #eee;padding:0 0 5px 0;margin:5px 0 0 0}.um-md-default-filters-option-line .um-field-wrapper{float:left;width:calc(100% - 60px);line-height:30px;box-sizing:border-box}.um-md-default-filters-option-line .um-field-wrapper2{float:left;width:calc(100% - 60px);line-height:30px;box-sizing:border-box}.um-md-default-filters-option-line .um-field-wrapper2.um{margin:5px 0 0 0}.um-md-default-filters-option-line .um-field-wrapper2 .ui-slider-range.ui-widget-header{background:#44b0ec;border:1px solid #44b0ec!important;margin-top:-1px}.um-md-default-filters-option-line .um-field-wrapper2 select{width:100%;float:left}.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-datepicker-filter,.um-md-default-filters-option-line .um-field-wrapper2 input.um-timepicker-filter{width:calc(50% - 7px)!important;float:left}.um-md-default-filters-option-line .um-field-wrapper2 input.um-datepicker-filter:first-child,.um-md-default-filters-option-line .um-field-wrapper2 input.um-timepicker-filter:first-child{margin-right:11px}.um-md-default-filters-option-line .um-field-wrapper2 .um-slider{margin:5px 9px 0 9px;width:calc(100% - 18px);box-sizing:border-box;display:block}.um-md-default-filters-option-line .um-field-control{float:left;width:60px;line-height:30px;padding:0 10px;box-sizing:border-box}.um-multi-selects-option-line{float:left;width:100%;padding:0;clear:both;margin:0 0 5px 0}.um-multi-selects-option-line.um-admin-drag-fld{display:flex;flex-direction:row;justify-content:flex-start;align-items:center;flex-wrap:nowrap;background:0 0;border:none}.um-multi-selects-option-line.um-admin-drag-fld .um-field-wrapper{width:calc(100% - 90px)}.um-multi-selects-option-line.um-admin-drag-fld .um-field-icon{float:left;width:20px;text-align:left;line-height:30px}.um-multi-selects-option-line .um-field-wrapper{float:left;width:calc(100% - 60px);line-height:30px;box-sizing:border-box}.um-multi-selects-option-line .um-field-wrapper.um-custom-order-fields{margin:5px 0 0 0}.um-multi-selects-option-line .um-field-wrapper.um-custom-order-fields label{float:left;width:100%;line-height:30px;box-sizing:border-box;margin:0!important;padding:0!important;font-weight:700;display:flex;flex-direction:row;justify-content:space-beetween;align-items:baseline;flex-wrap:nowrap}.um-multi-selects-option-line .um-field-wrapper.um-custom-order-fields label input[type=text],.um-multi-selects-option-line .um-field-wrapper.um-custom-order-fields label select{width:auto;display:inline;font-weight:400;max-width:70%;flex:.9}.um-multi-selects-option-line .um-field-wrapper input,.um-multi-selects-option-line .um-field-wrapper select{float:left;width:100%;margin:0}.um-multi-selects-option-line .um-field-control{float:left;width:60px;line-height:30px;padding:0 10px;box-sizing:border-box}.um-multi-text-option-line{float:left;width:100%;padding:0;clear:both;margin:0 0 5px 0}.um-multi-text-option-line .um-field-wrapper{float:left;width:calc(100% - 90px);line-height:30px;box-sizing:border-box}.um-multi-text-option-line .um-field-wrapper input,.um-multi-text-option-line .um-field-wrapper select{float:left;width:100%;margin:0}.um-multi-text-option-line .um-field-control{float:left;width:60px;line-height:30px;padding:0 10px;box-sizing:border-box}.um-form-fields-section{float:left;clear:none;margin:0;padding:0 10px 0 0;box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box}.um-form-fields-section label{float:left;width:100%;margin:0;padding:0}.um-form-fields-section label input{float:left;margin-top:0}.um-form-fields-section label span{float:left;width:calc(100% - 20px)}@media screen and (max-width:782px){input[type=text].um-forms-field.um-medium-field,select.um-forms-field.um-medium-field,textarea.um-forms-field.um-medium-field{width:100%!important}input[type=text].um-forms-field.um-small-field,select.um-forms-field.um-small-field,textarea.um-forms-field.um-small-field{width:50%!important}.um-form-fields-section{width:100%!important}.um-admin-metabox .um-form-fields-section label{line-height:22px!important;margin:0 0 12px 0!important}.um-admin-metabox .um-form-fields-section label span{width:calc(100% - 30px)}.um-multi-selects-option-line,.um-multi-text-option-line{margin:0 0 6px 0}.um-forms-line label{float:left;width:100%}.um-form-table.um-half-column .um-forms-line th,.um-form-table.um-third-column .um-forms-line th,.um-form-table.um-two-thirds-column .um-forms-line th{float:left;width:100%;margin-bottom:5px}.um-form-table.um-half-column .um-forms-line th label,.um-form-table.um-third-column .um-forms-line th label,.um-form-table.um-two-thirds-column .um-forms-line th label{float:left;width:100%}.um-form-table.um-half-column .um-forms-line td,.um-form-table.um-third-column .um-forms-line td,.um-form-table.um-two-thirds-column .um-forms-line td{float:left;width:100%}}.um-sortable-items-field .um-sortable-item{cursor:move!important;padding:5px;box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;border:1px solid #7e8993;border-radius:4px;-moz-border-radius:4px;background:#fff;height:42px;line-height:28px;display:flex;flex-direction:row;justify-content:flex-start;align-items:center;flex-wrap:nowrap}.um-sortable-items-field .um-sortable-item.um-hidden-item{display:none}.um-sortable-items-field .um-sortable-item .um-field-icon{width:20px;text-align:left;margin:0 10px 0 0}.wp-picker-container input.wp-color-picker[type=text]{width:68px!important;float:left!important;padding:2px 4px!important;border-width:1px!important}span.um-admin-icon-value{margin:0 10px;font-size:13px}span.um-admin-icon-value i{font-size:28px;color:#0085ba;position:relative;top:5px}span.um-admin-icon-clear{display:none;cursor:pointer;position:relative;color:#ccc}span.um-admin-icon-clear.show{display:inline-block}span.um-admin-icon-clear:hover{color:#777}span.um-admin-icon-clear i{font-size:20px;vertical-align:middle} \ No newline at end of file +.um-form-table .um-forms-line[data-conditional]{display:none}.um-form-table .um-forms-line[data-field_type=checkbox] td label{font-style:italic}.um-form-table .um-forms-line label .um-req{color:#a00;margin:0 0 0 3px;font-weight:400}.um-form-table .um-forms-line .um-text-delete{color:#a00;float:left}.um-form-table .um-forms-line .um-text-delete:hover{color:red}.um-form-table .um-forms-line .um-multi-text-add-option{margin-bottom:14px}.um-form-table .um-forms-line .icon_preview{display:none;max-width:200px;max-height:200px;padding:5px;cursor:pointer;border:1px solid #e3e3e3;background:#f7f7f7;border-radius:3px;height:auto;width:auto!important}.um-form-table .um-forms-line td .um-same-page-update-wrapper{display:none;margin:7px 0 0 0}.um-form-table .um-forms-line td .um-same-page-update-wrapper input.um-admin-form-same-page-update{margin:7px 0 0 0}.um-form-table .um-forms-line td .um-same-page-update-wrapper .upgrade_log{margin:7px 0 0 0;width:100%;height:150px;overflow:auto;border:1px solid #a1a1a1}.um-form-table .um-forms-line[data-field_type=same_page_update]{vertical-align:baseline}.um-form-table .um-forms-line[data-field_type=same_page_update] td,.um-form-table .um-forms-line[data-field_type=same_page_update] th{vertical-align:baseline}.um-form-table.um-third-column .um-forms-line th{width:33%}.um-form-table.um-half-column .um-forms-line th{width:50%}.um-form-table.um-two-thirds-column .um-forms-line th{width:83%}.um-form-table.um-top-label .um-forms-line td{padding:0 0 15px 0}.um-form-table.um-top-label .um-forms-line td label{margin:0 0 5px 0;display:inline-block}.um-form-table.um-top-label .um-forms-line[data-field_type=icon] td label{width:100%;display:block;margin:0 0 5px 0}.um-form-table .description{font-style:italic;clear:both}.um_admin_fonticon_wrapper{display:flex;flex-direction:row;justify-content:flex-start;align-items:center;flex-wrap:nowrap}.um_admin_fonticon_wrapper .um-admin-icon-value{line-height:1}.um_admin_fonticon_wrapper .um-admin-icon-value i{top:0}input[type=date].um-forms-field,input[type=number].um-forms-field,input[type=password].um-forms-field,input[type=text].um-forms-field,input[type=time].um-forms-field,input[type=url].um-forms-field,select.um-forms-field,textarea.um-forms-field{box-sizing:border-box}input[type=date].um-forms-field.um-long-field,input[type=number].um-forms-field.um-long-field,input[type=password].um-forms-field.um-long-field,input[type=text].um-forms-field.um-long-field,input[type=time].um-forms-field.um-long-field,input[type=url].um-forms-field.um-long-field,select.um-forms-field.um-long-field,textarea.um-forms-field.um-long-field{width:100%!important}input[type=date].um-forms-field.um-medium-field,input[type=number].um-forms-field.um-medium-field,input[type=password].um-forms-field.um-medium-field,input[type=text].um-forms-field.um-medium-field,input[type=time].um-forms-field.um-medium-field,input[type=url].um-forms-field.um-medium-field,select.um-forms-field.um-medium-field,textarea.um-forms-field.um-medium-field{width:50%!important}input[type=date].um-forms-field.um-small-field,input[type=number].um-forms-field.um-small-field,input[type=password].um-forms-field.um-small-field,input[type=text].um-forms-field.um-small-field,input[type=time].um-forms-field.um-small-field,input[type=url].um-forms-field.um-small-field,select.um-forms-field.um-small-field,textarea.um-forms-field.um-small-field{width:25%!important}input[type=number].um-forms-field{padding-right:0}.um-md-default-filters-list,.um-multi-selects-list,.um-multi-text-list{float:left;width:100%;margin:0 0 10px 0}.um-hidden-md-default-filters,.um-hidden-multi-selects,.um-hidden-multi-text{display:none!important}.um-md-default-filters-option-line{float:left;width:100%;clear:both;border-bottom:1px solid #eee;padding:0 0 5px 0;margin:5px 0 0 0}.um-md-default-filters-option-line .um-field-wrapper{float:left;width:calc(100% - 60px);line-height:30px;box-sizing:border-box}.um-md-default-filters-option-line .um-field-wrapper2{float:left;width:calc(100% - 60px);line-height:30px;box-sizing:border-box}.um-md-default-filters-option-line .um-field-wrapper2.um{margin:5px 0 0 0}.um-md-default-filters-option-line .um-field-wrapper2 .ui-slider-range.ui-widget-header{background:#44b0ec;border:1px solid #44b0ec!important;margin-top:-1px}.um-md-default-filters-option-line .um-field-wrapper2>select{width:100%;float:left}.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-datepicker-filter,.um-md-default-filters-option-line .um-field-wrapper2>input.um-timepicker-filter{width:calc(50% - 7px)!important;float:left}.um-md-default-filters-option-line .um-field-wrapper2>input.um-datepicker-filter:first-child,.um-md-default-filters-option-line .um-field-wrapper2>input.um-timepicker-filter:first-child{margin-right:11px}.um-md-default-filters-option-line .um-field-wrapper2 .um-slider{margin:5px 9px 0 9px;width:calc(100% - 18px);box-sizing:border-box;display:block}.um-md-default-filters-option-line .um-field-control{float:left;width:60px;line-height:30px;padding:0 10px;box-sizing:border-box}.um-multi-selects-option-line{float:left;width:100%;padding:0;clear:both;margin:0 0 5px 0}.um-multi-selects-option-line.um-admin-drag-fld{display:flex;flex-direction:row;justify-content:flex-start;align-items:center;flex-wrap:nowrap;background:0 0;border:none}.um-multi-selects-option-line.um-admin-drag-fld .um-field-wrapper{width:calc(100% - 90px)}.um-multi-selects-option-line.um-admin-drag-fld .um-field-icon{float:left;width:20px;text-align:left;line-height:30px}.um-multi-selects-option-line .um-field-wrapper{float:left;width:calc(100% - 60px);line-height:30px;box-sizing:border-box}.um-multi-selects-option-line .um-field-wrapper.um-custom-order-fields{margin:5px 0 0 0}.um-multi-selects-option-line .um-field-wrapper.um-custom-order-fields label{float:left;width:100%;line-height:30px;box-sizing:border-box;margin:0!important;padding:0!important;font-weight:700;display:flex;flex-direction:row;justify-content:space-beetween;align-items:baseline;flex-wrap:nowrap}.um-multi-selects-option-line .um-field-wrapper.um-custom-order-fields label input[type=text],.um-multi-selects-option-line .um-field-wrapper.um-custom-order-fields label select{width:auto;display:inline;font-weight:400;max-width:70%;flex:.9}.um-multi-selects-option-line .um-field-wrapper input,.um-multi-selects-option-line .um-field-wrapper select{float:left;width:100%;margin:0}.um-multi-selects-option-line .um-field-control{float:left;width:60px;line-height:30px;padding:0 10px;box-sizing:border-box}.um-multi-text-option-line{float:left;width:100%;padding:0;clear:both;margin:0 0 5px 0}.um-multi-text-option-line .um-field-wrapper{float:left;width:calc(100% - 90px);line-height:30px;box-sizing:border-box}.um-multi-text-option-line .um-field-wrapper input,.um-multi-text-option-line .um-field-wrapper select{float:left;width:100%;margin:0}.um-multi-text-option-line .um-field-control{float:left;width:60px;line-height:30px;padding:0 10px;box-sizing:border-box}.um-form-fields-section{float:left;clear:none;margin:0;padding:0 10px 0 0;box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box}.um-form-fields-section label{float:left;width:100%;margin:0;padding:0}.um-form-fields-section label input{float:left;margin-top:0}.um-form-fields-section label span{float:left;width:calc(100% - 20px)}@media screen and (max-width:782px){input[type=text].um-forms-field.um-medium-field,select.um-forms-field.um-medium-field,textarea.um-forms-field.um-medium-field{width:100%!important}input[type=text].um-forms-field.um-small-field,select.um-forms-field.um-small-field,textarea.um-forms-field.um-small-field{width:50%!important}.um-form-fields-section{width:100%!important}.um-admin-metabox .um-form-fields-section label{line-height:22px!important;margin:0 0 12px 0!important}.um-admin-metabox .um-form-fields-section label span{width:calc(100% - 30px)}.um-multi-selects-option-line,.um-multi-text-option-line{margin:0 0 6px 0}.um-forms-line label{float:left;width:100%}.um-form-table.um-half-column .um-forms-line th,.um-form-table.um-third-column .um-forms-line th,.um-form-table.um-two-thirds-column .um-forms-line th{float:left;width:100%;margin-bottom:5px}.um-form-table.um-half-column .um-forms-line th label,.um-form-table.um-third-column .um-forms-line th label,.um-form-table.um-two-thirds-column .um-forms-line th label{float:left;width:100%}.um-form-table.um-half-column .um-forms-line td,.um-form-table.um-third-column .um-forms-line td,.um-form-table.um-two-thirds-column .um-forms-line td{float:left;width:100%}}.um-sortable-items-field .um-sortable-item{cursor:move!important;padding:5px;box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;border:1px solid #7e8993;border-radius:4px;-moz-border-radius:4px;background:#fff;height:42px;line-height:28px;display:flex;flex-direction:row;justify-content:flex-start;align-items:center;flex-wrap:nowrap}.um-sortable-items-field .um-sortable-item.um-hidden-item{display:none}.um-sortable-items-field .um-sortable-item .um-field-icon{width:20px;text-align:left;margin:0 10px 0 0}.wp-picker-container input.wp-color-picker[type=text]{width:68px!important;float:left!important;padding:2px 4px!important;border-width:1px!important}span.um-admin-icon-value{margin:0 10px;font-size:13px}span.um-admin-icon-value i{font-size:28px;color:#0085ba;position:relative;top:5px}span.um-admin-icon-clear{display:none;cursor:pointer;position:relative;color:#ccc}span.um-admin-icon-clear.show{display:inline-block}span.um-admin-icon-clear:hover{color:#777}span.um-admin-icon-clear i{font-size:20px;vertical-align:middle} \ No newline at end of file diff --git a/assets/css/admin/forms.sass b/assets/css/admin/forms.sass index cb510702..d7f37f03 100644 --- a/assets/css/admin/forms.sass +++ b/assets/css/admin/forms.sass @@ -162,10 +162,10 @@ input[type="number"] background: #44b0ec border: 1px solid #44b0ec !important margin-top: -1px - select + & > select width: 100% float: left - input + & > input width: 100% float: left &.#{$prefix}timepicker-filter, diff --git a/assets/js/admin/forms.js b/assets/js/admin/forms.js index 196f58ec..e97d52e1 100644 --- a/assets/js/admin/forms.js +++ b/assets/js/admin/forms.js @@ -442,6 +442,7 @@ jQuery(document).ready( function() { hiddenName: true, onOpen: function() { elem.blur(); + elem.siblings('.picker').find('.picker__button--close').addClass('button'); }, onClose: function() { elem.blur(); @@ -550,6 +551,7 @@ jQuery(document).ready( function() { hiddenName: true, onOpen: function() { elem.blur(); + elem.siblings('.picker').find('.picker__button--close').addClass('button'); }, onClose: function() { elem.blur(); diff --git a/assets/js/admin/forms.min.js b/assets/js/admin/forms.min.js index c42ec467..7a60235d 100644 --- a/assets/js/admin/forms.min.js +++ b/assets/js/admin/forms.min.js @@ -1 +1 @@ -function um_admin_init_users_select(){function e(a){var t;if(!a.id)return a.text;if(void 0!==a.img)t=jQuery(' '+a.text+"");else{let e;t=(e=void 0!==a.element&&void 0!==a.element.attributes["data-img"]?a.element.attributes["data-img"].value:e)?jQuery(' '+a.text+""):jQuery(""+a.text+"")}return t}var a,t;jQuery(".um-user-select-field:visible:not(.um-select2-inited)").length&&(a={ajax:{url:wp.ajax.settings.url,dataType:"json",delay:250,data:function(e){var a={action:"um_get_users",search:e.term,page:e.page||1,nonce:um_admin_scripts.nonce};return jQuery.each(jQuery(this)[0].attributes,function(){var e;this.specified&&-1!==this.name.indexOf("data-ajax-args-")&&(e=this.name.replace("data-ajax-args-","").trim(),a[e]=this.value)}),a},processResults:function(e,a){a.page=a.page||1;var t=[];return e.data.users&&jQuery.each(e.data.users,function(e,a){void 0!==a.img?t.push({id:a.ID,text:a.user_login+" (#"+a.ID+")",img:a.img}):t.push({id:a.ID,text:a.user_login+" (#"+a.ID+")"})}),{results:t,pagination:{more:20*a.page")}function um_same_page_wrong_ajax(e){um_add_same_page_log(e,wp.i18n.__("Wrong AJAX response...","ultimate-member")),um_add_same_page_log(e,wp.i18n.__("Your upgrade was crashed, please contact with support","ultimate-member"))}function um_same_page_something_wrong(e){um_add_same_page_log(e,wp.i18n.__("Something went wrong with AJAX request...","ultimate-member")),um_add_same_page_log(e,wp.i18n.__("Your upgrade was crashed, please contact with support","ultimate-member"))}jQuery(document).ready(function(){um_admin_init_users_select(),jQuery(document.body).on("click",".um-forms-field[data-log-object]",function(){var e=jQuery(this).data("log-object");jQuery(this).is(":checked")?jQuery(this).siblings(".um-same-page-update-"+e).show():jQuery(this).siblings(".um-same-page-update-"+e).hide()}),jQuery(document.body).on("click",".um-admin-form-same-page-update",function(){var t,a,i,s=jQuery(this).data("upgrade_cb");jQuery(this).prop("disabled",!0),um_add_same_page_log(s,wp.i18n.__("Upgrade Process Started...","ultimate-member")),"sync_metatable"===s?(t=0,a=500,jQuery.ajax({url:wp.ajax.settings.url,type:"POST",dataType:"json",data:{action:"um_same_page_update",cb_func:"um_usermeta_fields",nonce:um_admin_scripts.nonce},success:function(e){i=1,um_add_same_page_log(s,wp.i18n.__("Getting metadata","ultimate-member")),jQuery.ajax({url:wp.ajax.settings.url,type:"POST",dataType:"json",data:{action:"um_same_page_update",cb_func:"um_get_metadata",nonce:um_admin_scripts.nonce},success:function(e){void 0!==e.data.count?(um_add_same_page_log(s,wp.i18n.__("There are ","ultimate-member")+e.data.count+wp.i18n.__(" metadata rows...","ultimate-member")),um_add_same_page_log(s,wp.i18n.__("Start metadata upgrading...","ultimate-member")),t=Math.ceil(e.data.count/a),function a(){i<=t?jQuery.ajax({url:wp.ajax.settings.url,type:"POST",dataType:"json",data:{action:"um_same_page_update",cb_func:"um_update_metadata_per_page",page:i,nonce:um_admin_scripts.nonce},success:function(e){void 0!==e.data?(um_add_same_page_log(s,e.data.message),i++,a()):um_same_page_wrong_ajax(s)},error:function(){um_same_page_something_wrong(s)}}):window.location=um_forms_data.successfully_redirect}()):um_same_page_wrong_ajax(s)},error:function(){um_same_page_something_wrong(s)}})},error:function(){um_same_page_something_wrong(s)}})):wp.hooks.doAction("um_same_page_upgrade",s)}),jQuery(".um-sortable-items-field").sortable({items:".um-sortable-item",connectWith:".um-admin-drag-col,.um-admin-drag-group",forcePlaceholderSize:!0,update:function(e,a){var t=[];jQuery(this).find("li").each(function(){jQuery(this).hasClass("um-hidden-item")||t.push(jQuery(this).data("tab-id"))}),jQuery(this).siblings(".um-sortable-items-value").val(t.join(","))}}),jQuery(".um-multi-selects-list.um-sortable-multi-selects").sortable({items:".um-admin-drag-fld",connectWith:".um-admin-drag-col,.um-admin-drag-group",forcePlaceholderSize:!0}),jQuery('.um-multi-selects-list[data-field_id="_um_sorting_fields"] li').each(function(){"other"===jQuery(this).find(".um-field-wrapper:not(.um-custom-order-fields) select").val()?jQuery(this).find(".um-field-wrapper.um-custom-order-fields").show():jQuery(this).find(".um-field-wrapper.um-custom-order-fields").hide()}),jQuery('.um-forms-line[data-field_type="md_sorting_fields"] .um-multi-selects-add-option').on("click",function(){var e=jQuery(this).siblings("ul.um-multi-selects-list"),a=e.hasClass("um-sortable-multi-selects"),t=(e.data("field_id"),0),i=(0").append(e.siblings(".um-hidden-multi-selects").clone()).html()),s='
  • ';a&&(s+='');let l="";jQuery.each(um_forms_data.md_sorting_data_types,function(e,a){l+='"}),s+=''+i+''+wp.i18n.__("Remove","ultimate-member")+'
    • ',e.append(s),e.find("li:last .um-hidden-multi-selects").attr("name",jQuery(this).data("name")).addClass("um-forms-field um-long-field").removeClass("um-hidden-multi-selects").attr("id",e.data("id_attr")+"-"+t).trigger("change"),jQuery("#"+e.data("id_attr")+"-"+t).parents("li").find('.um-field-wrapper.um-custom-order-fields input[name="meta_key"]').attr("name","um_metadata[_um_sorting_fields][other_data]["+t+"][meta_key]"),jQuery("#"+e.data("id_attr")+"-"+t).parents("li").find('.um-field-wrapper.um-custom-order-fields input[name="label"]').attr("name","um_metadata[_um_sorting_fields][other_data]["+t+"][label]"),jQuery("#"+e.data("id_attr")+"-"+t).parents("li").find('.um-field-wrapper.um-custom-order-fields select[name="data_type"]').attr("name","um_metadata[_um_sorting_fields][other_data]["+t+"][data_type]"),jQuery("#"+e.data("id_attr")+"-"+t).parents("li").find('.um-field-wrapper.um-custom-order-fields select[name="order"]').attr("name","um_metadata[_um_sorting_fields][other_data]["+t+"][order]")}),jQuery(document.body).on("change",'.um-multi-selects-list[data-field_id="_um_sorting_fields"] .um-field-wrapper:not(.um-custom-order-fields) select',function(){"other"===jQuery(this).val()?jQuery(this).parents("li").find(".um-field-wrapper.um-custom-order-fields").show():jQuery(this).parents("li").find(".um-field-wrapper.um-custom-order-fields").hide()}),jQuery(document.body).on("click",".um-multi-selects-option-line .um-select-delete",function(){jQuery(this).parents("li.um-multi-selects-option-line").remove()}),jQuery(document.body).on("click",".um-md-default-filters-option-line .um-select-delete",function(){jQuery(this).parents("li.um-md-default-filters-option-line").remove()}),jQuery(".um-multi-selects-add-option").on("click",function(){var e,a,t,i;jQuery(this).parents('.um-forms-line[data-field_type="md_sorting_fields"]').length||(a=(e=jQuery(this).siblings("ul.um-multi-selects-list")).hasClass("um-sortable-multi-selects"),e.data("field_id"),(t=0)',a&&(i+=''),i+=''+jQuery("
    ").append(e.siblings(".um-hidden-multi-selects").clone()).html()+''+wp.i18n.__("Remove","ultimate-member")+"",e.append(i),e.find("li:last .um-hidden-multi-selects").attr("name",jQuery(this).data("name")).addClass("um-forms-field um-long-field").removeClass("um-hidden-multi-selects").attr("id",e.data("id_attr")+"-"+t))});var t,e=-(new Date).getTimezoneOffset()/60,i=(jQuery('input[name="um-gmt-offset"]').val(e),jQuery(".um-admin-metabox").find(".um-slider").each(function(){var e=jQuery(this),a=parseInt(e.data("min")),t=parseInt(e.data("max")),a=[a=void 0!==jQuery("#"+e.data("field_name")+"_min").val()?jQuery("#"+e.data("field_name")+"_min").val():a,t=void 0!==jQuery("#"+e.data("field_name")+"_max").val()?jQuery("#"+e.data("field_name")+"_max").val():t];e.slider({range:!0,min:parseInt(e.data("min")),max:parseInt(e.data("max")),values:a,create:function(e,a){},step:1,slide:function(e,a){s(jQuery(this),a)},stop:function(e,a){}}),s(e)}),jQuery(".um-admin-metabox").find(".um-datepicker-filter").each(function(){var e=jQuery(this),a=new Date(1e3*e.data("date_min")),t=new Date(1e3*e.data("date_max"));e.pickadate({selectYears:!0,min:a,max:t,formatSubmit:"yyyy/mm/dd",hiddenName:!0,onOpen:function(){e.blur()},onClose:function(){e.blur()},onSet:function(e){}}).pickadate("picker").set("select",1e3*e.data("value"))}),jQuery(".um-admin-metabox").find(".um-timepicker-filter").each(function(){var e=jQuery(this),a=e.data("min"),t=e.data("max"),a=a.split(":"),t=t.split(":");e.pickatime({format:e.data("format"),interval:parseInt(e.data("intervals")),min:[a[0],a[1]],max:[t[0],t[1]],formatSubmit:"HH:i",hiddenName:!0,onOpen:function(){e.blur()},onClose:function(){e.blur()},onSet:function(e){}})}),!1);function s(e,a){var t,i="",s=e.siblings(".um-slider-range").data("placeholder-s"),l=e.siblings(".um-slider-range").data("placeholder-p"),a=a?(i=(a.values[0]===a.values[1]?s.replace("{value}",a.values[0]):l.replace("{min_range}",a.values[0]).replace("{max_range}",a.values[1])).replace("{field_label}",e.siblings(".um-slider-range").data("label")),t=a.values[0],a.values[1]):(i=(e.slider("values",0)===e.slider("values",1)?s.replace("{value}",e.slider("values",0)):l.replace("{min_range}",e.slider("values",0)).replace("{max_range}",e.slider("values",1))).replace("{field_label}",e.siblings(".um-slider-range").data("label")),t=e.slider("values",0),e.slider("values",1));e.siblings(".um-slider-range").html(i),e.siblings(".um_range_min").val(t),e.siblings(".um_range_max").val(a)}function a(){jQuery(".um-forms-line").removeClass("um-forms-line-conditioned").each(function(){void 0===jQuery(this).data("conditional")||jQuery(this).hasClass("um-forms-line-conditioned")||(!function i(e){e.addClass("um-forms-line-conditioned");var a=e.data("conditional");var t=a[1];var s=a[2];var l=e.data("prefix");var n=!0;{var r,u;"="===t||"!="===t?-1===a[0].indexOf("||")&&void 0!==(u=jQuery("#"+l+"_"+a[0])).parents(".um-forms-line").data("conditional")&&(n=i(u.parents(".um-forms-line"))):"~"===t?(m=a[0].split("|"),r=[],jQuery.each(m,function(e){r.push(jQuery("#"+l+"_"+m[e]))}),void 0!==r[0].parents(".um-forms-line").data("conditional")&&(n=i(r[0].parents(".um-forms-line")))):"><"===t&&void 0!==(u=jQuery("#"+l+"_"+a[0]+"_"+a[2])).parents(".um-forms-line").data("conditional")&&(n=i(u.parents(".um-forms-line")))}var d=!1;{var m,o,c,p,f,_,h,g;if("="===t)return-1!==a[0].indexOf("||")?(m=a[0].split("||"),o=!1,jQuery.each(m,function(e){var a,e=jQuery("#"+l+"_"+m[e]),t=(n=!(d=!1),void 0!==e.parents(".um-forms-line").data("conditional")&&(n=i(e.parents(".um-forms-line"))),e.prop("tagName").toLowerCase());"input"===t?(a=e.attr("type"),d="checkbox"===a?"1"==s?e.is(":checked"):!e.is(":checked"):Array.isArray(s)?-1!==s.indexOf(e.val()):e.val()==s):"select"===t&&(d=Array.isArray(s)?-1!==s.indexOf(e.val()):e.val()==s),d&&n&&(o=!0)}),o):("input"==(h=u.prop("tagName").toLowerCase())?(g=u.attr("type"),d="checkbox"==g?"1"==s?u.is(":checked"):!u.is(":checked"):Array.isArray(s)?-1!==s.indexOf(u.val()):u.val()==s):"select"==h&&(d=Array.isArray(s)?-1!==s.indexOf(u.val()):u.val()==s),d&&n);if("!="===t)return-1!==a[0].indexOf("||")?(m=a[0].split("||"),o=!1,jQuery.each(m,function(e){var a,e=jQuery("#"+l+"_"+m[e]),t=(n=!(d=!1),void 0!==e.parents(".um-forms-line").data("conditional")&&(n=i(e.parents(".um-forms-line"))),e.prop("tagName").toLowerCase());"input"===t?(a=e.attr("type"),d="checkbox"===a?"1"==s?!e.is(":checked"):e.is(":checked"):e.val()!=s):"select"===t&&(d=e.val()!=s),d&&n&&(o=!0)}),o):("input"==(h=u.prop("tagName").toLowerCase())?(g=u.attr("type"),d="checkbox"==g?"1"==s?!u.is(":checked"):u.is(":checked"):u.val()!=s):"select"==h&&(d=u.val()!=s),d&&n);if("~"===t)return p=[],"sortable_items"===e.data("field_type")?(c=e.find(".um-sortable-items-value").data("field_id"),jQuery.each(r,function(e){var e=r[e],a=e.prop("tagName").toLowerCase();"input"===a?"checkbox"===e.attr("type")&&"1"==s&&e.is(":checked")&&p.push(e.data("fill_"+c)):"select"==a&&!s&&e.val()&&(p=(p=p.concat(e.val())).filter(y))}),f=jQuery('[data-field_id="'+c+'"]'),p.length?(f.siblings(".um-sortable-items-field").find("li").addClass("um-hidden-item"),jQuery.each(p,function(e){f.siblings(".um-sortable-items-field").find('li[data-tab-id="'+p[e]+'"]').removeClass("um-hidden-item")}),_=[],f.siblings(".um-sortable-items-field").find("li").each(function(){jQuery(this).hasClass("um-hidden-item")||_.push(jQuery(this).data("tab-id"))}),f.val(_.join(",")),f.siblings(".um-sortable-items-field").sortable("refresh"),d=!0):f.val(null)):(c=e.find(e.data("field_type")).data("field_id"),jQuery.each(r,function(e){var e=r[e],a=e.prop("tagName").toLowerCase();"input"===a?"checkbox"===e.attr("type")&&"1"==s&&e.is(":checked")&&p.push(e.data("fill_"+c)):"select"==a&&!s&&e.val()&&(p=(p=p.concat(e.val())).filter(y))}),f=jQuery('[data-field_id="'+c+'"]'),p.length?(f.find("option").hide(),jQuery.each(p,function(e){f.find('option[value="'+p[e]+'"]').show()}),-1===p.indexOf(f.val())&&(f.val(p[0]),f.find("option").attr("selected",!1).prop("selected",!1),f.find('option[value="'+p[0]+'"]').attr("selected",!0).prop("selected",!0)),d=!0):(f.val(null),f.find("option").attr("selected",!1).prop("selected",!1))),d&&n;if("><"===t)return h=u.prop("tagName").toLowerCase(),(d="input"==h&&"checkbox"==(g=u.attr("type"))?u.is(":checked"):d)&&n}return!1}(jQuery(this))?jQuery(this).hide():(jQuery(this).show(),um_admin_init_users_select()))})}function y(e,a,t){return t.indexOf(e)===a}jQuery(document.body).on("change",".um-md-default-filters-option-line .um-field-wrapper select",function(){var t,e,a;i||(e=(t=jQuery(this)).val(),a=t.data("member_directory"),i=!0,wp.ajax.send("um_member_directory_default_filter_settings",{data:{key:e,directory_id:a,nonce:um_admin_scripts.nonce},success:function(e){var a=t.parents(".um-md-default-filters-option-line").find(".um-field-wrapper2");a.html(e.field_html),i=!1,a.find(".um-slider").each(function(){var e=jQuery(this),a=[parseInt(e.data("min")),parseInt(e.data("max"))];e.slider({range:!0,min:parseInt(e.data("min")),max:parseInt(e.data("max")),values:a,create:function(e,a){},step:1,slide:function(e,a){s(jQuery(this),a)},stop:function(e,a){}}),s(e)}),a.find(".um-datepicker-filter").each(function(){var e=jQuery(this),a=new Date(1e3*e.data("date_min")),t=new Date(1e3*e.data("date_max"));e.pickadate({selectYears:!0,min:a,max:t,formatSubmit:"yyyy/mm/dd",hiddenName:!0,onOpen:function(){e.blur()},onClose:function(){e.blur()},onSet:function(e){}})}),a.find(".um-timepicker-filter").each(function(){var e=jQuery(this),a=e.data("min"),t=e.data("max"),a=a.split(":"),t=t.split(":");e.pickatime({format:e.data("format"),interval:parseInt(e.data("intervals")),min:[a[0],a[1]],max:[t[0],t[1]],formatSubmit:"HH:i",hiddenName:!0,onOpen:function(){e.blur()},onClose:function(){e.blur()},onSet:function(e){}})})},error:function(e){return!1}}))}),jQuery(".um-md-default-filters-add-option").on("click",function(){var e,a,t;i||((e=jQuery(this).siblings("ul.um-md-default-filters-list")).data("field_id"),(a=0)").append(e.siblings(".um-hidden-md-default-filters").clone()).html(),e.append('
  • '+t+''+wp.i18n.__("Remove","ultimate-member")+'
    • '),e.find("li:last .um-hidden-md-default-filters").attr("name",jQuery(this).data("name")).addClass("um-forms-field um-long-field").removeClass("um-hidden-md-default-filters").attr("id",e.data("id_attr")+"-"+a),e.find("li:last .um-field-wrapper select").trigger("change"))}),jQuery(document.body).on("click",".um-text-delete",function(){jQuery(this).parents("li.um-multi-text-option-line").remove()}),jQuery(".um-multi-text-add-option").on("click",function(){var e=jQuery(this).siblings("ul.um-multi-text-list"),a=0,t=(0").append(e.siblings(".um-hidden-multi-text").clone()).html()),i=e.data("item_class");e.append('
  • '+t+''+wp.i18n.__("Remove","ultimate-member")+"
    • "),e.find("li:last .um-hidden-multi-text").attr("name",jQuery(this).data("name")).addClass("um-forms-field um-long-field").removeClass("um-hidden-multi-text").attr("id",e.data("id_attr")+"-"+a)}),jQuery(".um-media-upload").each(function(){var e=jQuery(this).find(".um-forms-field"),a=e.data("default");""!=e.val()&&e.val()!=a?(e.siblings(".um-set-image").hide(),e.siblings(".um-clear-image").show(),e.siblings(".icon_preview").show()):(e.val()==a&&e.siblings(".icon_preview").show(),e.siblings(".um-set-image").show(),e.siblings(".um-clear-image").hide())}),"undefined"!=typeof wp&&wp.media&&wp.media.editor&&(jQuery(".um-set-image").on("click",function(e){var a=jQuery(this);e.preventDefault(),t&&t.remove(),(t=wp.media({title:a.data("upload_frame"),button:{text:wp.i18n.__("Select","ultimate-member")},multiple:!1})).on("select",function(){var e=t.state().get("selection").first().toJSON();a.siblings(".icon_preview").attr("src",e.url).show(),a.siblings(".um-forms-field").val(e.url),a.siblings(".um-media-upload-data-id").val(e.id),a.siblings(".um-media-upload-data-width").val(e.width),a.siblings(".um-media-upload-data-height").val(e.height),a.siblings(".um-media-upload-data-thumbnail").val(e.thumbnail),a.siblings(".um-media-upload-data-url").trigger("change"),a.siblings(".um-media-upload-url").val(e.url),a.siblings(".um-clear-image").show(),a.hide(),jQuery(document).trigger("um_media_upload_select",[a,e])}),t.open()}),jQuery(".icon_preview").on("click",function(e){jQuery(this).siblings(".um-set-image").trigger("click")}),jQuery(".um-clear-image").on("click",function(e){var a=jQuery(this),t=a.siblings(".um-forms-field").data("default");a.siblings(".um-set-image").show(),a.hide(),a.siblings(".icon_preview").attr("src",t),a.siblings(".um-media-upload-data-id").val(""),a.siblings(".um-media-upload-data-width").val(""),a.siblings(".um-media-upload-data-height").val(""),a.siblings(".um-media-upload-data-thumbnail").val(""),a.siblings(".um-forms-field").val(t),a.siblings(".um-media-upload-data-url").trigger("change"),a.siblings(".um-media-upload-url").val(t),jQuery(document).trigger("um_media_upload_clear",a)})),jQuery(document.body).on("change",".um-forms-field",function(){(0 '+a.text+"");else{let e;t=(e=void 0!==a.element&&void 0!==a.element.attributes["data-img"]?a.element.attributes["data-img"].value:e)?jQuery(' '+a.text+""):jQuery(""+a.text+"")}return t}var a,t;jQuery(".um-user-select-field:visible:not(.um-select2-inited)").length&&(a={ajax:{url:wp.ajax.settings.url,dataType:"json",delay:250,data:function(e){var a={action:"um_get_users",search:e.term,page:e.page||1,nonce:um_admin_scripts.nonce};return jQuery.each(jQuery(this)[0].attributes,function(){var e;this.specified&&-1!==this.name.indexOf("data-ajax-args-")&&(e=this.name.replace("data-ajax-args-","").trim(),a[e]=this.value)}),a},processResults:function(e,a){a.page=a.page||1;var t=[];return e.data.users&&jQuery.each(e.data.users,function(e,a){void 0!==a.img?t.push({id:a.ID,text:a.user_login+" (#"+a.ID+")",img:a.img}):t.push({id:a.ID,text:a.user_login+" (#"+a.ID+")"})}),{results:t,pagination:{more:20*a.page")}function um_same_page_wrong_ajax(e){um_add_same_page_log(e,wp.i18n.__("Wrong AJAX response...","ultimate-member")),um_add_same_page_log(e,wp.i18n.__("Your upgrade was crashed, please contact with support","ultimate-member"))}function um_same_page_something_wrong(e){um_add_same_page_log(e,wp.i18n.__("Something went wrong with AJAX request...","ultimate-member")),um_add_same_page_log(e,wp.i18n.__("Your upgrade was crashed, please contact with support","ultimate-member"))}jQuery(document).ready(function(){um_admin_init_users_select(),jQuery(document.body).on("click",".um-forms-field[data-log-object]",function(){var e=jQuery(this).data("log-object");jQuery(this).is(":checked")?jQuery(this).siblings(".um-same-page-update-"+e).show():jQuery(this).siblings(".um-same-page-update-"+e).hide()}),jQuery(document.body).on("click",".um-admin-form-same-page-update",function(){var t,a,i,s=jQuery(this).data("upgrade_cb");jQuery(this).prop("disabled",!0),um_add_same_page_log(s,wp.i18n.__("Upgrade Process Started...","ultimate-member")),"sync_metatable"===s?(t=0,a=500,jQuery.ajax({url:wp.ajax.settings.url,type:"POST",dataType:"json",data:{action:"um_same_page_update",cb_func:"um_usermeta_fields",nonce:um_admin_scripts.nonce},success:function(e){i=1,um_add_same_page_log(s,wp.i18n.__("Getting metadata","ultimate-member")),jQuery.ajax({url:wp.ajax.settings.url,type:"POST",dataType:"json",data:{action:"um_same_page_update",cb_func:"um_get_metadata",nonce:um_admin_scripts.nonce},success:function(e){void 0!==e.data.count?(um_add_same_page_log(s,wp.i18n.__("There are ","ultimate-member")+e.data.count+wp.i18n.__(" metadata rows...","ultimate-member")),um_add_same_page_log(s,wp.i18n.__("Start metadata upgrading...","ultimate-member")),t=Math.ceil(e.data.count/a),function a(){i<=t?jQuery.ajax({url:wp.ajax.settings.url,type:"POST",dataType:"json",data:{action:"um_same_page_update",cb_func:"um_update_metadata_per_page",page:i,nonce:um_admin_scripts.nonce},success:function(e){void 0!==e.data?(um_add_same_page_log(s,e.data.message),i++,a()):um_same_page_wrong_ajax(s)},error:function(){um_same_page_something_wrong(s)}}):window.location=um_forms_data.successfully_redirect}()):um_same_page_wrong_ajax(s)},error:function(){um_same_page_something_wrong(s)}})},error:function(){um_same_page_something_wrong(s)}})):wp.hooks.doAction("um_same_page_upgrade",s)}),jQuery(".um-sortable-items-field").sortable({items:".um-sortable-item",connectWith:".um-admin-drag-col,.um-admin-drag-group",forcePlaceholderSize:!0,update:function(e,a){var t=[];jQuery(this).find("li").each(function(){jQuery(this).hasClass("um-hidden-item")||t.push(jQuery(this).data("tab-id"))}),jQuery(this).siblings(".um-sortable-items-value").val(t.join(","))}}),jQuery(".um-multi-selects-list.um-sortable-multi-selects").sortable({items:".um-admin-drag-fld",connectWith:".um-admin-drag-col,.um-admin-drag-group",forcePlaceholderSize:!0}),jQuery('.um-multi-selects-list[data-field_id="_um_sorting_fields"] li').each(function(){"other"===jQuery(this).find(".um-field-wrapper:not(.um-custom-order-fields) select").val()?jQuery(this).find(".um-field-wrapper.um-custom-order-fields").show():jQuery(this).find(".um-field-wrapper.um-custom-order-fields").hide()}),jQuery('.um-forms-line[data-field_type="md_sorting_fields"] .um-multi-selects-add-option').on("click",function(){var e=jQuery(this).siblings("ul.um-multi-selects-list"),a=e.hasClass("um-sortable-multi-selects"),t=(e.data("field_id"),0),i=(0").append(e.siblings(".um-hidden-multi-selects").clone()).html()),s='
  • ';a&&(s+='');let l="";jQuery.each(um_forms_data.md_sorting_data_types,function(e,a){l+='"}),s+=''+i+''+wp.i18n.__("Remove","ultimate-member")+'
    • ',e.append(s),e.find("li:last .um-hidden-multi-selects").attr("name",jQuery(this).data("name")).addClass("um-forms-field um-long-field").removeClass("um-hidden-multi-selects").attr("id",e.data("id_attr")+"-"+t).trigger("change"),jQuery("#"+e.data("id_attr")+"-"+t).parents("li").find('.um-field-wrapper.um-custom-order-fields input[name="meta_key"]').attr("name","um_metadata[_um_sorting_fields][other_data]["+t+"][meta_key]"),jQuery("#"+e.data("id_attr")+"-"+t).parents("li").find('.um-field-wrapper.um-custom-order-fields input[name="label"]').attr("name","um_metadata[_um_sorting_fields][other_data]["+t+"][label]"),jQuery("#"+e.data("id_attr")+"-"+t).parents("li").find('.um-field-wrapper.um-custom-order-fields select[name="data_type"]').attr("name","um_metadata[_um_sorting_fields][other_data]["+t+"][data_type]"),jQuery("#"+e.data("id_attr")+"-"+t).parents("li").find('.um-field-wrapper.um-custom-order-fields select[name="order"]').attr("name","um_metadata[_um_sorting_fields][other_data]["+t+"][order]")}),jQuery(document.body).on("change",'.um-multi-selects-list[data-field_id="_um_sorting_fields"] .um-field-wrapper:not(.um-custom-order-fields) select',function(){"other"===jQuery(this).val()?jQuery(this).parents("li").find(".um-field-wrapper.um-custom-order-fields").show():jQuery(this).parents("li").find(".um-field-wrapper.um-custom-order-fields").hide()}),jQuery(document.body).on("click",".um-multi-selects-option-line .um-select-delete",function(){jQuery(this).parents("li.um-multi-selects-option-line").remove()}),jQuery(document.body).on("click",".um-md-default-filters-option-line .um-select-delete",function(){jQuery(this).parents("li.um-md-default-filters-option-line").remove()}),jQuery(".um-multi-selects-add-option").on("click",function(){var e,a,t,i;jQuery(this).parents('.um-forms-line[data-field_type="md_sorting_fields"]').length||(a=(e=jQuery(this).siblings("ul.um-multi-selects-list")).hasClass("um-sortable-multi-selects"),e.data("field_id"),(t=0)',a&&(i+=''),i+=''+jQuery("
    ").append(e.siblings(".um-hidden-multi-selects").clone()).html()+''+wp.i18n.__("Remove","ultimate-member")+"",e.append(i),e.find("li:last .um-hidden-multi-selects").attr("name",jQuery(this).data("name")).addClass("um-forms-field um-long-field").removeClass("um-hidden-multi-selects").attr("id",e.data("id_attr")+"-"+t))});var t,e=-(new Date).getTimezoneOffset()/60,i=(jQuery('input[name="um-gmt-offset"]').val(e),jQuery(".um-admin-metabox").find(".um-slider").each(function(){var e=jQuery(this),a=parseInt(e.data("min")),t=parseInt(e.data("max")),a=[a=void 0!==jQuery("#"+e.data("field_name")+"_min").val()?jQuery("#"+e.data("field_name")+"_min").val():a,t=void 0!==jQuery("#"+e.data("field_name")+"_max").val()?jQuery("#"+e.data("field_name")+"_max").val():t];e.slider({range:!0,min:parseInt(e.data("min")),max:parseInt(e.data("max")),values:a,create:function(e,a){},step:1,slide:function(e,a){s(jQuery(this),a)},stop:function(e,a){}}),s(e)}),jQuery(".um-admin-metabox").find(".um-datepicker-filter").each(function(){var e=jQuery(this),a=new Date(1e3*e.data("date_min")),t=new Date(1e3*e.data("date_max"));e.pickadate({selectYears:!0,min:a,max:t,formatSubmit:"yyyy/mm/dd",hiddenName:!0,onOpen:function(){e.blur(),e.siblings(".picker").find(".picker__button--close").addClass("button")},onClose:function(){e.blur()},onSet:function(e){}}).pickadate("picker").set("select",1e3*e.data("value"))}),jQuery(".um-admin-metabox").find(".um-timepicker-filter").each(function(){var e=jQuery(this),a=e.data("min"),t=e.data("max"),a=a.split(":"),t=t.split(":");e.pickatime({format:e.data("format"),interval:parseInt(e.data("intervals")),min:[a[0],a[1]],max:[t[0],t[1]],formatSubmit:"HH:i",hiddenName:!0,onOpen:function(){e.blur()},onClose:function(){e.blur()},onSet:function(e){}})}),!1);function s(e,a){var t,i="",s=e.siblings(".um-slider-range").data("placeholder-s"),l=e.siblings(".um-slider-range").data("placeholder-p"),a=a?(i=(a.values[0]===a.values[1]?s.replace("{value}",a.values[0]):l.replace("{min_range}",a.values[0]).replace("{max_range}",a.values[1])).replace("{field_label}",e.siblings(".um-slider-range").data("label")),t=a.values[0],a.values[1]):(i=(e.slider("values",0)===e.slider("values",1)?s.replace("{value}",e.slider("values",0)):l.replace("{min_range}",e.slider("values",0)).replace("{max_range}",e.slider("values",1))).replace("{field_label}",e.siblings(".um-slider-range").data("label")),t=e.slider("values",0),e.slider("values",1));e.siblings(".um-slider-range").html(i),e.siblings(".um_range_min").val(t),e.siblings(".um_range_max").val(a)}function a(){jQuery(".um-forms-line").removeClass("um-forms-line-conditioned").each(function(){void 0===jQuery(this).data("conditional")||jQuery(this).hasClass("um-forms-line-conditioned")||(!function i(e){e.addClass("um-forms-line-conditioned");var a=e.data("conditional");var t=a[1];var s=a[2];var l=e.data("prefix");var n=!0;{var r,u;"="===t||"!="===t?-1===a[0].indexOf("||")&&void 0!==(u=jQuery("#"+l+"_"+a[0])).parents(".um-forms-line").data("conditional")&&(n=i(u.parents(".um-forms-line"))):"~"===t?(m=a[0].split("|"),r=[],jQuery.each(m,function(e){r.push(jQuery("#"+l+"_"+m[e]))}),void 0!==r[0].parents(".um-forms-line").data("conditional")&&(n=i(r[0].parents(".um-forms-line")))):"><"===t&&void 0!==(u=jQuery("#"+l+"_"+a[0]+"_"+a[2])).parents(".um-forms-line").data("conditional")&&(n=i(u.parents(".um-forms-line")))}var d=!1;{var m,o,c,p,f,_,h,g;if("="===t)return-1!==a[0].indexOf("||")?(m=a[0].split("||"),o=!1,jQuery.each(m,function(e){var a,e=jQuery("#"+l+"_"+m[e]),t=(n=!(d=!1),void 0!==e.parents(".um-forms-line").data("conditional")&&(n=i(e.parents(".um-forms-line"))),e.prop("tagName").toLowerCase());"input"===t?(a=e.attr("type"),d="checkbox"===a?"1"==s?e.is(":checked"):!e.is(":checked"):Array.isArray(s)?-1!==s.indexOf(e.val()):e.val()==s):"select"===t&&(d=Array.isArray(s)?-1!==s.indexOf(e.val()):e.val()==s),d&&n&&(o=!0)}),o):("input"==(h=u.prop("tagName").toLowerCase())?(g=u.attr("type"),d="checkbox"==g?"1"==s?u.is(":checked"):!u.is(":checked"):Array.isArray(s)?-1!==s.indexOf(u.val()):u.val()==s):"select"==h&&(d=Array.isArray(s)?-1!==s.indexOf(u.val()):u.val()==s),d&&n);if("!="===t)return-1!==a[0].indexOf("||")?(m=a[0].split("||"),o=!1,jQuery.each(m,function(e){var a,e=jQuery("#"+l+"_"+m[e]),t=(n=!(d=!1),void 0!==e.parents(".um-forms-line").data("conditional")&&(n=i(e.parents(".um-forms-line"))),e.prop("tagName").toLowerCase());"input"===t?(a=e.attr("type"),d="checkbox"===a?"1"==s?!e.is(":checked"):e.is(":checked"):e.val()!=s):"select"===t&&(d=e.val()!=s),d&&n&&(o=!0)}),o):("input"==(h=u.prop("tagName").toLowerCase())?(g=u.attr("type"),d="checkbox"==g?"1"==s?!u.is(":checked"):u.is(":checked"):u.val()!=s):"select"==h&&(d=u.val()!=s),d&&n);if("~"===t)return p=[],"sortable_items"===e.data("field_type")?(c=e.find(".um-sortable-items-value").data("field_id"),jQuery.each(r,function(e){var e=r[e],a=e.prop("tagName").toLowerCase();"input"===a?"checkbox"===e.attr("type")&&"1"==s&&e.is(":checked")&&p.push(e.data("fill_"+c)):"select"==a&&!s&&e.val()&&(p=(p=p.concat(e.val())).filter(y))}),f=jQuery('[data-field_id="'+c+'"]'),p.length?(f.siblings(".um-sortable-items-field").find("li").addClass("um-hidden-item"),jQuery.each(p,function(e){f.siblings(".um-sortable-items-field").find('li[data-tab-id="'+p[e]+'"]').removeClass("um-hidden-item")}),_=[],f.siblings(".um-sortable-items-field").find("li").each(function(){jQuery(this).hasClass("um-hidden-item")||_.push(jQuery(this).data("tab-id"))}),f.val(_.join(",")),f.siblings(".um-sortable-items-field").sortable("refresh"),d=!0):f.val(null)):(c=e.find(e.data("field_type")).data("field_id"),jQuery.each(r,function(e){var e=r[e],a=e.prop("tagName").toLowerCase();"input"===a?"checkbox"===e.attr("type")&&"1"==s&&e.is(":checked")&&p.push(e.data("fill_"+c)):"select"==a&&!s&&e.val()&&(p=(p=p.concat(e.val())).filter(y))}),f=jQuery('[data-field_id="'+c+'"]'),p.length?(f.find("option").hide(),jQuery.each(p,function(e){f.find('option[value="'+p[e]+'"]').show()}),-1===p.indexOf(f.val())&&(f.val(p[0]),f.find("option").attr("selected",!1).prop("selected",!1),f.find('option[value="'+p[0]+'"]').attr("selected",!0).prop("selected",!0)),d=!0):(f.val(null),f.find("option").attr("selected",!1).prop("selected",!1))),d&&n;if("><"===t)return h=u.prop("tagName").toLowerCase(),(d="input"==h&&"checkbox"==(g=u.attr("type"))?u.is(":checked"):d)&&n}return!1}(jQuery(this))?jQuery(this).hide():(jQuery(this).show(),um_admin_init_users_select()))})}function y(e,a,t){return t.indexOf(e)===a}jQuery(document.body).on("change",".um-md-default-filters-option-line .um-field-wrapper select",function(){var t,e,a;i||(e=(t=jQuery(this)).val(),a=t.data("member_directory"),i=!0,wp.ajax.send("um_member_directory_default_filter_settings",{data:{key:e,directory_id:a,nonce:um_admin_scripts.nonce},success:function(e){var a=t.parents(".um-md-default-filters-option-line").find(".um-field-wrapper2");a.html(e.field_html),i=!1,a.find(".um-slider").each(function(){var e=jQuery(this),a=[parseInt(e.data("min")),parseInt(e.data("max"))];e.slider({range:!0,min:parseInt(e.data("min")),max:parseInt(e.data("max")),values:a,create:function(e,a){},step:1,slide:function(e,a){s(jQuery(this),a)},stop:function(e,a){}}),s(e)}),a.find(".um-datepicker-filter").each(function(){var e=jQuery(this),a=new Date(1e3*e.data("date_min")),t=new Date(1e3*e.data("date_max"));e.pickadate({selectYears:!0,min:a,max:t,formatSubmit:"yyyy/mm/dd",hiddenName:!0,onOpen:function(){e.blur(),e.siblings(".picker").find(".picker__button--close").addClass("button")},onClose:function(){e.blur()},onSet:function(e){}})}),a.find(".um-timepicker-filter").each(function(){var e=jQuery(this),a=e.data("min"),t=e.data("max"),a=a.split(":"),t=t.split(":");e.pickatime({format:e.data("format"),interval:parseInt(e.data("intervals")),min:[a[0],a[1]],max:[t[0],t[1]],formatSubmit:"HH:i",hiddenName:!0,onOpen:function(){e.blur()},onClose:function(){e.blur()},onSet:function(e){}})})},error:function(e){return!1}}))}),jQuery(".um-md-default-filters-add-option").on("click",function(){var e,a,t;i||((e=jQuery(this).siblings("ul.um-md-default-filters-list")).data("field_id"),(a=0)").append(e.siblings(".um-hidden-md-default-filters").clone()).html(),e.append('
  • '+t+''+wp.i18n.__("Remove","ultimate-member")+'
    • '),e.find("li:last .um-hidden-md-default-filters").attr("name",jQuery(this).data("name")).addClass("um-forms-field um-long-field").removeClass("um-hidden-md-default-filters").attr("id",e.data("id_attr")+"-"+a),e.find("li:last .um-field-wrapper select").trigger("change"))}),jQuery(document.body).on("click",".um-text-delete",function(){jQuery(this).parents("li.um-multi-text-option-line").remove()}),jQuery(".um-multi-text-add-option").on("click",function(){var e=jQuery(this).siblings("ul.um-multi-text-list"),a=0,t=(0").append(e.siblings(".um-hidden-multi-text").clone()).html()),i=e.data("item_class");e.append('
  • '+t+''+wp.i18n.__("Remove","ultimate-member")+"
    • "),e.find("li:last .um-hidden-multi-text").attr("name",jQuery(this).data("name")).addClass("um-forms-field um-long-field").removeClass("um-hidden-multi-text").attr("id",e.data("id_attr")+"-"+a)}),jQuery(".um-media-upload").each(function(){var e=jQuery(this).find(".um-forms-field"),a=e.data("default");""!=e.val()&&e.val()!=a?(e.siblings(".um-set-image").hide(),e.siblings(".um-clear-image").show(),e.siblings(".icon_preview").show()):(e.val()==a&&e.siblings(".icon_preview").show(),e.siblings(".um-set-image").show(),e.siblings(".um-clear-image").hide())}),"undefined"!=typeof wp&&wp.media&&wp.media.editor&&(jQuery(".um-set-image").on("click",function(e){var a=jQuery(this);e.preventDefault(),t&&t.remove(),(t=wp.media({title:a.data("upload_frame"),button:{text:wp.i18n.__("Select","ultimate-member")},multiple:!1})).on("select",function(){var e=t.state().get("selection").first().toJSON();a.siblings(".icon_preview").attr("src",e.url).show(),a.siblings(".um-forms-field").val(e.url),a.siblings(".um-media-upload-data-id").val(e.id),a.siblings(".um-media-upload-data-width").val(e.width),a.siblings(".um-media-upload-data-height").val(e.height),a.siblings(".um-media-upload-data-thumbnail").val(e.thumbnail),a.siblings(".um-media-upload-data-url").trigger("change"),a.siblings(".um-media-upload-url").val(e.url),a.siblings(".um-clear-image").show(),a.hide(),jQuery(document).trigger("um_media_upload_select",[a,e])}),t.open()}),jQuery(".icon_preview").on("click",function(e){jQuery(this).siblings(".um-set-image").trigger("click")}),jQuery(".um-clear-image").on("click",function(e){var a=jQuery(this),t=a.siblings(".um-forms-field").data("default");a.siblings(".um-set-image").show(),a.hide(),a.siblings(".icon_preview").attr("src",t),a.siblings(".um-media-upload-data-id").val(""),a.siblings(".um-media-upload-data-width").val(""),a.siblings(".um-media-upload-data-height").val(""),a.siblings(".um-media-upload-data-thumbnail").val(""),a.siblings(".um-forms-field").val(t),a.siblings(".um-media-upload-data-url").trigger("change"),a.siblings(".um-media-upload-url").val(t),jQuery(document).trigger("um_media_upload_clear",a)})),jQuery(document.body).on("change",".um-forms-field",function(){(0 Date: Tue, 9 Jan 2024 15:27:09 +0200 Subject: [PATCH 25/43] - reviewed admin nav-menu functionality; --- includes/admin/core/class-admin-navmenu.php | 41 +++++++++++++++------ 1 file changed, 30 insertions(+), 11 deletions(-) diff --git a/includes/admin/core/class-admin-navmenu.php b/includes/admin/core/class-admin-navmenu.php index 611e9636..d4a423e7 100644 --- a/includes/admin/core/class-admin-navmenu.php +++ b/includes/admin/core/class-admin-navmenu.php @@ -32,6 +32,8 @@ if ( ! class_exists( 'um\admin\core\Admin_Navmenu' ) ) { add_action( 'wp_update_nav_menu_item', array( &$this, '_save' ), 10, 3 ); add_action( 'wp_nav_menu_item_custom_fields', array( $this, 'wp_nav_menu_item_custom_fields' ), 20, 5 ); + // @todo Appearance > Customize > Menus section without UM settings + // add_action( 'wp_nav_menu_item_custom_fields_customize_template', array( $this, 'wp_nav_menu_item_custom_fields_customize_template' ), 20, 5 ); } @@ -106,6 +108,29 @@ if ( ! class_exists( 'um\admin\core\Admin_Navmenu' ) ) { Customize > Menus section without UM settings + * @return void + */ + public function wp_nav_menu_item_custom_fields_customize_template() { + ?> +
    + +

    + +

    + +

    + From 9c4f9644b1435b836e364ee918299f4c77c69416 Mon Sep 17 00:00:00 2001 From: Mykyta Synelnikov Date: Wed, 10 Jan 2024 01:58:20 +0200 Subject: [PATCH 26/43] - updated readme; --- README.md | 2 +- readme.txt | 19 +++++++++++++++++-- ultimate-member.php | 2 +- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index b186db35..734786ff 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,7 @@ GNU Version 2 or Any Later Version ### IMPORTANT: PLEASE UPDATE THE PLUGIN TO AT LEAST VERSION 2.6.7 IMMEDIATELY. VERSION 2.6.7 PATCHES SECURITY PRIVILEGE ESCALATION VULNERABILITY. PLEASE SEE [THIS ARTICLE](https://docs.ultimatemember.com/article/1866-security-incident-update-and-recommended-actions) FOR MORE INFORMATION -[Official Release Version: 2.8.1](https://github.com/ultimatemember/ultimatemember/releases/tag/2.8.1). +[Official Release Version: 2.8.2](https://github.com/ultimatemember/ultimatemember/releases/tag/2.8.2). ## Changelog diff --git a/readme.txt b/readme.txt index 1ea2ff79..8a39b823 100644 --- a/readme.txt +++ b/readme.txt @@ -7,7 +7,7 @@ Tags: community, member, membership, user-profile, user-registration Requires PHP: 5.6 Requires at least: 5.5 Tested up to: 6.4 -Stable tag: 2.8.1 +Stable tag: 2.8.2 License: GNU Version 2 or Any Later Version License URI: http://www.gnu.org/licenses/gpl-3.0.txt @@ -166,10 +166,25 @@ No specific extensions are needed. But we highly recommended keep active these P IMPORTANT: PLEASE UPDATE THE PLUGIN TO AT LEAST VERSION 2.6.7 IMMEDIATELY. VERSION 2.6.7 PATCHES SECURITY PRIVILEGE ESCALATION VULNERABILITY. PLEASE SEE [THIS ARTICLE](https://docs.ultimatemember.com/article/1866-security-incident-update-and-recommended-actions) FOR MORE INFORMATION -= 2.8.2: January xx, 2024 = += 2.8.2: January 11, 2024 = +* Enhancements: + - Added: The `data` protocol for embedding base64 encoded logos in emails + - Added: Hook `um_access_restricted_post_instance` for filtering the restricted post instance + - Updated: Using underscore.js native debounce method for resize handler + - Updated: Texts spelling +* Bugfixes: + + - Fixed: AJAX requests conflict with `um_current_locale` attribute + - Fixed: Pickadate styling (Date & Time fields) in wp-admin screen + - Fixed: RTL styling and removed `um` class from UM frontend predefined pages + - Fixed: select2 conflict with Impreza theme + - Fixed: cropper conflict with Avada theme and active Fusion Image lazyload + - Fixed: MegaMenu conflict with nav menu items conditional settings (e.g. Newsletter theme) + +* Cached and optimized/minified assets(JS/CSS) must be flushed/re-generated after upgrade = 2.8.1: December 20, 2023 = diff --git a/ultimate-member.php b/ultimate-member.php index 5d1faa76..608bd39a 100644 --- a/ultimate-member.php +++ b/ultimate-member.php @@ -3,7 +3,7 @@ * Plugin Name: Ultimate Member * Plugin URI: http://ultimatemember.com/ * Description: The easiest way to create powerful online communities and beautiful user profiles with WordPress - * Version: 2.8.2-alpha + * Version: 2.8.2 * Author: Ultimate Member * Author URI: http://ultimatemember.com/ * Text Domain: ultimate-member From 697f509d0ca990f0e13899ecc8f559994d9b3c4f Mon Sep 17 00:00:00 2001 From: Mykyta Synelnikov Date: Wed, 10 Jan 2024 13:49:07 +0200 Subject: [PATCH 27/43] - fixed Member Directory grid rendering for debounce resize; --- assets/js/um-members.js | 9 ++++++--- assets/js/um-members.min.js | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/assets/js/um-members.js b/assets/js/um-members.js index fc643a77..ab6aeeca 100644 --- a/assets/js/um-members.js +++ b/assets/js/um-members.js @@ -383,9 +383,12 @@ function um_build_template( directory, data ) { directory.addClass('um-loaded'); - if (directory.find('.um-members.um-members-grid').length) { - UM_Member_Grid(directory.find('.um-members.um-members-grid')); - } + // It's made via hook because resize is triggered with debounce delay. + wp.hooks.addAction( 'um_window_resize', 'um_members', function() { + if (directory.find('.um-members.um-members-grid').length) { + UM_Member_Grid(directory.find('.um-members.um-members-grid')); + } + }); jQuery(document).trigger('um_build_template', [directory, data]); jQuery(window).trigger('resize'); diff --git a/assets/js/um-members.min.js b/assets/js/um-members.min.js index edee9ff0..96ce97a0 100644 --- a/assets/js/um-members.min.js +++ b/assets/js/um-members.min.js @@ -1 +1 @@ -var um_members_directory_busy=[],um_member_directories=[],um_member_directory_last_data=[];function um_parse_current_url(){var r={},t=window.location.search.substring(1).split("&");return jQuery.each(t,function(e){e=t[e].split("=");r[e[0]]=e[1]}),r}function um_get_data_for_directory(e,r){var t=um_members_get_hash(e),a={},i=um_parse_current_url();if(jQuery.each(i,function(e){-1!==e.indexOf("_"+t)&&""!==i[e]&&(a[e.replace("_"+t,"")]=i[e])}),r){if(void 0!==a[r])try{a[r]=decodeURIComponent(a[r])}catch(e){console.error(e)}return a[r]}return a}function um_set_url_from_data(e,r,t){var a=um_members_get_hash(e),i=um_get_data_for_directory(e),m={},d=(Array.isArray(t)?(jQuery.each(t,function(e){t[e]=encodeURIComponent(t[e])}),t=t.join("||")):jQuery.isNumeric(t)||(t=t.split("||"),jQuery.each(t,function(e){t[e]=encodeURIComponent(t[e])}),t=t.join("||")),""!==t&&(m[r+"_"+a]=t),jQuery.each(i,function(e){r===e?""!==t&&(m[e+"_"+a]=t):m[e+"_"+a]=i[e]}),jQuery.each(um_member_directories,function(e){var r,t=um_member_directories[e];t!==a&&(r=um_get_data_for_directory(jQuery('.um-directory[data-hash="'+t+'"]')),jQuery.each(r,function(e){m[e+"_"+t]=r[e]}))}),[]),e=(jQuery.each(m,function(e){d.push(e+"="+m[e])}),"?"+(d=wp.hooks.applyFilters("um_member_directory_url_attrs",d)).join("&"));"?"===e&&(e=""),window.history.pushState("string","UM Member Directory",window.location.origin+window.location.pathname+e)}function um_members_get_hash(e){return e.data("hash")}function um_is_directory_busy(e){e=um_members_get_hash(e);return void 0!==um_members_directory_busy[e]&&um_members_directory_busy[e]}function um_members_show_preloader(e){um_members_directory_busy[um_members_get_hash(e)]=!0,e.find(".um-members-overlay").show()}function um_members_hide_preloader(e){um_members_directory_busy[um_members_get_hash(e)]=!1,e.find(".um-members-overlay").hide()}function um_set_range_label(e,r){var t,a="",i=e.siblings(".um-slider-range").data("placeholder-s"),m=e.siblings(".um-slider-range").data("placeholder-p"),r=r?(a=(r.values[0]===r.values[1]?i.replace("{value}",r.values[0]):m.replace("{min_range}",r.values[0]).replace("{max_range}",r.values[1])).replace("{field_label}",e.siblings(".um-slider-range").data("label")),t=r.values[0],r.values[1]):(a=(e.slider("values",0)===e.slider("values",1)?i.replace("{value}",e.slider("values",0)):m.replace("{min_range}",e.slider("values",0)).replace("{max_range}",e.slider("values",1))).replace("{field_label}",e.siblings(".um-slider-range").data("label")),t=e.slider("values",0),e.slider("values",1));e.siblings(".um-slider-range").html(a),e.siblings(".um_range_min").val(t),e.siblings(".um_range_max").val(r)}function um_get_search(e){return e.find(".um-search-line").length?e.find(".um-search-line").val():""}function um_get_sort(e){return e.data("sorting")}function um_get_current_page(e){e=e.data("page");return e=e&&void 0!==e?e:1}function um_time_convert(e,r){var t=Math.floor(e/60),e=e%60;return(t=60<=e&&(e=0,24<=(t+=1))?0:t)+":"+(e=e<10?"0"+e:e)}function um_ajax_get_members(_,e){var r,t,a,i,s,m=um_members_get_hash(_);wp.hooks.applyFilters("um_member_directory_get_members_allow",!0,m,_)?(r=um_get_current_page(_),t=um_get_search(_),a=um_get_sort(_),i=-(new Date).getTimezoneOffset()/60,s={directory_id:m,page:r,search:t,sorting:a,gmt_offset:i,post_refferer:_.data("base-post"),nonce:um_scripts.nonce},_.find(".um-search-filter").length&&_.find(".um-search-filter").each(function(){var e,r,t,a,i,m,d,u=jQuery(this);u.find(".um-slider").length?(m=u.find(".um-slider").data("field_name"),r=um_get_data_for_directory(_,"filter_"+m+"_from"),e=um_get_data_for_directory(_,"filter_"+m+"_to"),void 0===r&&void 0===e||(s[m]=[r,e])):u.find(".um-datepicker-filter").length?(m=u.find(".um-datepicker-filter").data("filter_name"),r=um_get_data_for_directory(_,"filter_"+m+"_from"),e=um_get_data_for_directory(_,"filter_"+m+"_to"),void 0===r&&void 0===e||(s[m]=[r,e])):u.find(".um-timepicker-filter").length?(m=u.find(".um-timepicker-filter").data("filter_name"),r=um_get_data_for_directory(_,"filter_"+m+"_from"),e=um_get_data_for_directory(_,"filter_"+m+"_to"),void 0!==r&&(r=(i=(i=+(r=r.split(":"))[0])<10?"0"+i:i)+":"+(a=(a=+r[1])<10?"0"+a:a)+":00"),void 0!==e&&(a=+(t=e.split(":"))[1],e=(i=(i=+t[0])<10?"0"+i:i)+":"+(a=a<10?"0"+a:a)+":59"),void 0===r&&void 0===e||(s[m]=[r,e])):u.find("select").length?(m=u.find("select").attr("name"),void 0!==(d=um_get_data_for_directory(_,"filter_"+m))&&(d=um_unsanitize_value(d),s[m]=d.split("||"))):u.hasClass("um-text-filter-type")&&u.find('input[type="text"]').length?(m=u.find('input[type="text"]').attr("name"),void 0!==(d=um_get_data_for_directory(_,"filter_"+m))&&(d=um_unsanitize_value(d),s[m]=d)):s=wp.hooks.applyFilters("um_member_directory_custom_filter_handler",s,u,_)}),s=wp.hooks.applyFilters("um_member_directory_filter_request",s),wp.ajax.send("um_get_members",{data:s,success:function(e){um_member_directory_last_data[m]=e,um_build_template(_,e);var r=wp.template("um-members-pagination");_.find(".um-members-pagination-box").html(r(e)),_.data("total_pages",e.pagination.total_pages),e.pagination.total_pages?(_.find(".um-member-directory-sorting-options").prop("disabled",!1),_.find(".um-member-directory-view-type").removeClass("um-disabled")):(_.find(".um-member-directory-sorting-options").prop("disabled",!0),_.find(".um-member-directory-view-type").addClass("um-disabled")),wp.hooks.doAction("um_member_directory_loaded",_,e),um_init_new_dropdown(),um_members_hide_preloader(_)},error:function(e){console.log(e),um_members_hide_preloader(_)}})):setTimeout(um_ajax_get_members,600,_,e)}function um_build_template(e,r){var t,a=e.data("view_type"),a=wp.template("um-member-"+a+"-"+um_members_get_hash(e));jQuery(".um-"+um_members_get_hash(e)).length&&(e.find(".um-members-grid, .um-members-list").remove(),e.find(".um-members-wrapper").prepend(a(r.users)),a=wp.template("um-members-header"),e.find(".um-members-intro").remove(),t=wp.hooks.applyFilters("um_member_directory_generate_header",!1,e),(void 0!==r.is_search&&r.is_search||t)&&e.find(".um-members-wrapper").prepend(a(r)),e.addClass("um-loaded"),e.find(".um-members.um-members-grid").length&&UM_Member_Grid(e.find(".um-members.um-members-grid")),jQuery(document).trigger("um_build_template",[e,r]),jQuery(window).trigger("resize"),UM.common.tipsy.init())}function UM_Member_Grid(r){r.find(".um-member").length&&r.imagesLoaded(function(){var e=wp.hooks.applyFilters("um_member_directory_grid_masonry_attrs",{itemSelector:".um-member",columnWidth:".um-member",gutter:".um-gutter-sizer"},r);r.masonry(e).on("layoutComplete",function(e,r){jQuery(document).trigger("um_grid_initialized",[e,r])})})}function um_get_filters_data(_){var s=[];return _.find(".um-search-filter").each(function(){var d,t,a,i,e,r,m,u=jQuery(this);u.find("input.um-datepicker-filter").length?(d="datepicker",u.find("input.um-datepicker-filter").each(function(){var e,r,t,a,i,m;"to"!==jQuery(this).data("range")&&(e=jQuery(this).data("filter_name"),r=um_get_data_for_directory(_,"filter_"+e+"_from"),t=um_get_data_for_directory(_,"filter_"+e+"_to"),void 0!==r||void 0!==t)&&((a=jQuery(this).val())===(i=_.find('input.um-datepicker-filter[data-range="to"][data-filter_name="'+e+'"]').val())?m=i:""!==a&&""!==i?m=a+" - "+i:""===a?m="before "+i:""===i&&(m="since "+a),s.push({name:e,label:jQuery(this).data("filter-label"),value_label:m,value:[r,t],type:d}))})):u.find("input.um-timepicker-filter").length?(d="timepicker",u.find("input.um-timepicker-filter").each(function(){var e,r,t,a,i,m;"to"!==jQuery(this).data("range")&&(e=jQuery(this).data("filter_name"),r=um_get_data_for_directory(_,"filter_"+e+"_from"),t=um_get_data_for_directory(_,"filter_"+e+"_to"),void 0!==r||void 0!==t)&&((a=jQuery(this).val())===(i=_.find('input.um-timepicker-filter[data-range="to"][data-filter_name="'+e+'"]').val())?m=i:""!==a&&""!==i?m=a+" - "+i:""===a?m="before "+i:""===i&&(m="since "+a),s.push({name:e,label:jQuery(this).data("filter-label"),value_label:m,value:[r,t],type:d}))})):u.find("select").length?(d="select",t=u.find("select").attr("name"),a=u.find("select").data("placeholder"),i=void 0===(i=um_get_data_for_directory(_,"filter_"+t))?[]:(i=um_unsanitize_value(i)).split("||"),jQuery.each(i,function(e){var r=u.find('select option[value="'+i[e]+'"]').data("value_label");s.push({name:t,label:a,value_label:r,value:i[e],type:d})})):u.hasClass("um-text-filter-type")&&u.find('input[type="text"]').length?(d="text",t=u.find('input[type="text"]').attr("name"),a=u.find('input[type="text"]').attr("placeholder"),""!=(i=void 0===(i=um_get_data_for_directory(_,"filter_"+t))?"":i)&&s.push({name:t,label:a,value_label:i,value:i,type:d})):u.find("div.ui-slider").length?(d="slider",t=u.find("div.ui-slider").data("field_name"),e=um_get_data_for_directory(_,"filter_"+t+"_from"),r=um_get_data_for_directory(_,"filter_"+t+"_to"),void 0===e&&void 0===r||(m=(e===r?u.find("div.um-slider-range").data("placeholder-s").replace("{value}",e):u.find("div.um-slider-range").data("placeholder-p").replace("{min_range}",e).replace("{max_range}",r)).replace("{field_label}",u.find("div.um-slider-range").data("label")),a=u.find("div.um-slider-range").data("label"),s.push({name:t,label:a,value_label:m,value:[e,r],type:d}))):s=wp.hooks.applyFilters("um_member_directory_get_filter_data",s,_,u)}),s}function um_change_tag(e){var r,t=um_get_filters_data(e),a=(e.find(".um-members-filter-tag").remove(),e.find(".um-filtered-line"));a.length&&(r=wp.template("um-members-filtered-line"),a.prepend(r({filters:t})),0===e.find(".um-members-filter-remove").length?(e.find(".um-clear-filters").hide(),e.find(".um-clear-filters").parents(".um-member-directory-header-row").addClass("um-header-row-invisible")):(e.find(".um-clear-filters").show(),e.find(".um-clear-filters").parents(".um-member-directory-header-row").removeClass("um-header-row-invisible")))}function um_run_search(e){if(!um_is_directory_busy(e)){um_members_show_preloader(e);var r=um_get_data_for_directory(e,"search"),t=um_sanitize_value(e.find(".um-search-line").val());if(t===r||""===t&&void 0===r)um_members_hide_preloader(e);else{e.data("general_search",t),um_set_url_from_data(e,"search",t),e.data("page",1),um_set_url_from_data(e,"page","");if(!wp.hooks.applyFilters("um_member_directory_ignore_after_search",!1,e)){r=e.data("must-search");if(1===r&&(t=um_get_search(e),0===e.find(".um-members-filter-remove").length)&&!t)return e.data("searched",0),e.find(".um-members-grid, .um-members-list, .um-members-intro").remove(),e.find(".um-member-directory-sorting-options").prop("disabled",!0),e.find(".um-member-directory-view-type").addClass("um-disabled"),wp.hooks.doAction("um_member_directory_clear_not_searched",e),void um_members_hide_preloader(e)}e.data("searched",1),e.find(".um-member-directory-sorting-options").prop("disabled",!1),e.find(".um-member-directory-view-type").removeClass("um-disabled"),um_ajax_get_members(e)}}}function um_slider_filter_init(e){e.find(".um-slider").each(function(){var e=jQuery(this),t=e.parents(".um-directory"),a=e.data("field_name"),r=um_get_data_for_directory(t,"filter_"+a+"_from"),i=um_get_data_for_directory(t,"filter_"+a+"_to"),r=[r=void 0===r?parseInt(e.data("min")):r,i=void 0===i?parseInt(e.data("max")):i];e.slider({range:!0,min:parseInt(e.data("min")),max:parseInt(e.data("max")),values:r,create:function(e,r){},step:1,slide:function(e,r){um_set_range_label(jQuery(this),r)},stop:function(e,r){um_is_directory_busy(t)||(um_members_show_preloader(t),um_set_url_from_data(t,"filter_"+a+"_from",r.values[0]),um_set_url_from_data(t,"filter_"+a+"_to",r.values[1]),t.data("page",1),um_set_url_from_data(t,"page",""),um_ajax_get_members(t),um_change_tag(t),t.data("searched",1),t.find(".um-member-directory-sorting-options").prop("disabled",!1),t.find(".um-member-directory-view-type").removeClass("um-disabled"))}}),um_set_range_label(e)})}function um_datepicker_filter_init(e){e.find(".um-datepicker-filter").each(function(){var d=jQuery(this),u=new Date(1e3*d.data("date_min")),_=new Date(1e3*d.data("date_max")),e=d.pickadate({selectYears:!0,min:u,max:_,formatSubmit:"yyyy/mm/dd",hiddenName:!0,onOpen:function(){d.blur()},onClose:function(){d.blur()},onSet:function(e){var r,t,a,i,m;!e.select||um_is_directory_busy(r=d.parents(".um-directory"))||(um_members_show_preloader(r),t=d.data("filter_name"),a=d.data("range"),i=um_get_data_for_directory(r,"filter_"+t+"_from"),m=um_get_data_for_directory(r,"filter_"+t+"_to"),void 0===i&&(i=u/1e3),void 0===m&&(m=_/1e3),e=e.select/1e3,d.val(),"from"===a?i=e:"to"===a&&(m=e),um_set_url_from_data(r,"filter_"+t+"_from",i),um_set_url_from_data(r,"filter_"+t+"_to",m),r.data("page",1),um_set_url_from_data(r,"page",""),um_ajax_get_members(r),um_change_tag(r),r.data("searched",1),r.find(".um-member-directory-sorting-options").prop("disabled",!1),r.find(".um-member-directory-view-type").removeClass("um-disabled"))}}).pickadate("picker"),r=d.data("filter_name"),t=d.data("range"),r=um_get_data_for_directory(d.parents(".um-directory"),"filter_"+r+"_"+t);void 0!==r&&e.set("select",1e3*r)})}function um_timepicker_filter_init(e){e.find(".um-timepicker-filter").each(function(){var d=jQuery(this),u=d.attr("id"),_=d.data("filter_name"),s=d.attr("data-min"),o=d.attr("data-max"),e=s.split(":"),r=o.split(":"),e=d.pickatime({format:d.data("format"),interval:parseInt(d.data("intervals")),min:[e[0],e[1]],max:[r[0],r[1]],formatSubmit:"HH:i",hiddenName:!0,onOpen:function(){d.blur()},onClose:function(){d.blur()},onSet:function(e){var r,t,a,i,m;!e.select||um_is_directory_busy(r=d.parents(".um-directory"))||(um_members_show_preloader(r),t=d.data("filter_name"),a=d.data("range"),i=um_get_data_for_directory(r,"filter_"+t+"_from"),m=um_get_data_for_directory(r,"filter_"+t+"_to"),void 0===i&&(i=s),void 0===m&&(m=o),void 0!==e.select?(e=um_time_convert(e.select,a),"from"===a?i=e:"to"===a&&(m=e)):"from"===a?i=s:"to"===a&&(m=o),e=jQuery("#"+u).val(),"from"===d.data("range")?jQuery("#"+_+"_to").pickatime("picker").set("min",e):jQuery("#"+_+"_from").pickatime("picker").set("max",e),um_set_url_from_data(r,"filter_"+t+"_from",i),um_set_url_from_data(r,"filter_"+t+"_to",m),r.data("page",1),um_set_url_from_data(r,"page",""),um_ajax_get_members(r),um_change_tag(r),r.data("searched",1),r.find(".um-member-directory-sorting-options").prop("disabled",!1),r.find(".um-member-directory-view-type").removeClass("um-disabled"))}}).pickatime("picker"),r=d.data("filter_name"),t=d.data("range"),r=um_get_data_for_directory(d.parents(".um-directory"),"filter_"+r+"_"+t);void 0!==r&&(t=r.split(":"),e.set("select",60*t[0]+ +t[1]))})}jQuery(document.body).ready(function(){jQuery(".um-directory .um-search-filter select").each(function(){1===jQuery(this).find("option:not(:disabled)").length&&jQuery(this).prop("disabled",!0);var e=jQuery(this);e.select2("destroy").select2({dropdownParent:e.parent()})}),jQuery(document.body).on("mouseover",".um-directory .um-member-directory-view-type",function(){var e;jQuery(this).hasClass("um-disabled")||((e=jQuery(this).find(".um-member-directory-view-type-a:visible")).hide(),(e.next().length?e.next():jQuery(this).find(".um-member-directory-view-type-a:first")).show().tipsy("show"))}).on("mouseout",".um-directory .um-member-directory-view-type",function(){jQuery(this).hasClass("um-disabled")||(jQuery(this).find(".um-member-directory-view-type-a").hide().tipsy("hide"),jQuery(this).find('.um-member-directory-view-type-a[data-type="'+jQuery(this).parents(".um-directory").data("view_type")+'"]').show())}),jQuery(document.body).on("click",".um-directory .um-member-directory-view-type-a",function(){var e=jQuery(this).parents(".um-directory");if(um_is_directory_busy(e))return!1;var r,t=jQuery(this),a=t.parents(".um-member-directory-view-type");a.hasClass("um-disabled")||(um_members_show_preloader(e),(r=a.find(".um-member-directory-view-type-a:visible")).hide(),(r.next().length?r.next():a.find(".um-member-directory-view-type-a:first")).show().tipsy("show"),null!==(r=um_member_directory_last_data[um_members_get_hash(e)])&&(um_set_url_from_data(e,"view_type",a=t.data("type")),e.data("view_type",a),um_build_template(e,r),um_init_new_dropdown()),um_members_hide_preloader(e))}),jQuery(document.body).on("click",".um-directory .um-do-search",function(){um_run_search(jQuery(this).parents(".um-directory"))}),jQuery(document.body).on("keypress",".um-directory .um-search-line",function(e){13===e.which&&um_run_search(jQuery(this).parents(".um-directory"))}),jQuery(document.body).on("click",'.um-new-dropdown[data-element=".um-member-directory-sorting-a"] li a',function(){var e,r,t;1===jQuery(this).data("selected")||(e=jQuery(this).data("directory-hash"),um_is_directory_busy(e=jQuery('.um-directory[data-hash="'+e+'"]')))||(um_members_show_preloader(e),r=jQuery(this).html(),t=jQuery(this).data("value"),e.data("sorting",t),um_set_url_from_data(e,"sort",t),um_ajax_get_members(e),e.find('.um-new-dropdown[data-element=".um-member-directory-sorting-a"]').find("a").data("selected",0).prop("data-selected",0).attr("data-selected",0),e.find('.um-new-dropdown[data-element=".um-member-directory-sorting-a"] a[data-value="'+t+'"]').data("selected",1).prop("data-selected",1).attr("data-selected",1),e.find(".um-member-directory-sorting-a").find("> a").html(r))}),jQuery(document.body).on("click",".um-directory .pagi:not(.current)",function(){var e,r;jQuery(this).hasClass("disabled")||um_is_directory_busy(e=jQuery(this).parents(".um-directory"))||(um_members_show_preloader(e),(1===(r="first"===jQuery(this).data("page")?1:"prev"===jQuery(this).data("page")?+e.data("page")-1:"next"===jQuery(this).data("page")?+e.data("page")+1:"last"===jQuery(this).data("page")?parseInt(e.data("total_pages")):parseInt(jQuery(this).data("page")))?(e.find('.pagi[data-page="first"], .pagi[data-page="prev"]').addClass("disabled"),e.find('.pagi[data-page="prev"], .pagi[data-page="last"]')):(r===parseInt(e.data("total_pages"))?e.find('.pagi[data-page="prev"], .pagi[data-page="last"]').addClass("disabled"):e.find('.pagi[data-page="prev"], .pagi[data-page="last"]').removeClass("disabled"),e.find('.pagi[data-page="first"], .pagi[data-page="prev"]'))).removeClass("disabled"),e.find(".pagi").removeClass("current"),e.find('.pagi[data-page="'+r+'"]').addClass("current"),e.data("page",r),um_set_url_from_data(e,"page",1===r?"":r),um_ajax_get_members(e))}),jQuery(document.body).on("change",".um-directory .um-members-pagi-dropdown",function(){var e,r=jQuery(this).parents(".um-directory");um_is_directory_busy(r)||(um_members_show_preloader(r),e=jQuery(this).val(),r.find(".pagi").removeClass("current"),r.find('.pagi[data-page="'+e+'"]').addClass("current"),r.data("page",e),um_set_url_from_data(r,"page",1===e?"":e),um_ajax_get_members(r))}),jQuery(document.body).on("click",".um-directory .um-members.um-members-list .um-member-more a",function(e){e.preventDefault();e=jQuery(this).parents(".um-member");return e.find(".um-member-more").hide(),e.find(".um-member-meta-main").slideDown(),e.find(".um-member-less").fadeIn(),!1}),jQuery(document.body).on("click",".um-directory .um-members.um-members-list .um-member-less a",function(e){e.preventDefault();e=jQuery(this).parents(".um-member");return e.find(".um-member-less").hide(),e.find(".um-member-meta-main").slideUp(),e.find(".um-member-more").fadeIn(),!1}),jQuery(document.body).on("click",".um-directory .um-members.um-members-grid .um-member-more a",function(e){e.preventDefault();var e=jQuery(this).parents(".um-member"),r=jQuery(this).parents(".um-members");return e.find(".um-member-more").hide(),e.find(".um-member-meta").slideDown(function(){UM_Member_Grid(r)}),e.find(".um-member-less").fadeIn(),setTimeout(function(){UM_Member_Grid(r)},100),!1}),jQuery(document.body).on("click",".um-directory .um-members.um-members-grid .um-member-less a",function(e){e.preventDefault();var r=jQuery(this).parents(".um-member"),t=jQuery(this).parents(".um-members");return r.find(".um-member-less").hide(),r.find(".um-member-meta").slideUp(function(){r.find(".um-member-more").fadeIn(),UM_Member_Grid(t)}),!1}),jQuery(".um-member-directory-filters-a").on("click",function(){var e=jQuery(this),r=e.parents(".um-directory").find(".um-search");r.is(":visible")?r.slideUp(250,function(){e.toggleClass("um-member-directory-filters-visible"),r.parents(".um-member-directory-header-row").toggleClass("um-header-row-invisible")}):r.slideDown({duration:250,start:function(){jQuery(this).css({display:"grid"}),e.toggleClass("um-member-directory-filters-visible"),r.parents(".um-member-directory-header-row").toggleClass("um-header-row-invisible")}})}),jQuery(document.body).on("change",".um-directory .um-search-filter select",function(){var e,r,t,a=jQuery(this).val(),i=um_sanitize_value(a);""===i||um_is_directory_busy(e=jQuery(this).parents(".um-directory"))||(um_members_show_preloader(e),t=void 0===(t=um_get_data_for_directory(e,"filter_"+(r=jQuery(this).prop("name"))))?[]:t.split("||"),-1===jQuery.inArray(i,t)&&(t.push(i),um_set_url_from_data(e,"filter_"+r,t=t.join("||")),e.data("page",1),um_set_url_from_data(e,"page","")),jQuery(this).find('option[value="'+a+'"]').prop("disabled",!0).hide(),1===jQuery(this).find("option:not(:disabled)").length&&jQuery(this).prop("disabled",!0),(i=jQuery(this)).select2("destroy").select2({dropdownParent:i.parent()}),i.val("").trigger("change"),um_ajax_get_members(e),um_change_tag(e),e.data("searched",1),e.find(".um-member-directory-sorting-options").prop("disabled",!1),e.find(".um-member-directory-view-type").removeClass("um-disabled"))}),jQuery(document.body).on("blur",'.um-directory .um-search-filter.um-text-filter-type input[type="text"]',function(){var e,r,t,a=jQuery(this).parents(".um-directory");um_is_directory_busy(a)||(e=um_sanitize_value(jQuery(this).val()))!==(t=void 0===(t=um_get_data_for_directory(a,"filter_"+(r=jQuery(this).prop("name"))))?"":t)&&(um_members_show_preloader(a),um_set_url_from_data(a,"filter_"+r,e),a.data("page",1),um_set_url_from_data(a,"page",""),um_ajax_get_members(a),um_change_tag(a),a.data("searched",1),a.find(".um-member-directory-sorting-options").prop("disabled",!1),a.find(".um-member-directory-view-type").removeClass("um-disabled"))}),jQuery(document.body).on("keypress",'.um-directory .um-search-filter.um-text-filter-type input[type="text"]',function(e){var r,t,a;13!==e.which||um_is_directory_busy(e=jQuery(this).parents(".um-directory"))||(r=um_sanitize_value(jQuery(this).val()))!==(a=void 0===(a=um_get_data_for_directory(e,"filter_"+(t=jQuery(this).prop("name"))))?"":a)&&(um_members_show_preloader(e),um_set_url_from_data(e,"filter_"+t,r),e.data("page",1),um_set_url_from_data(e,"page",""),um_ajax_get_members(e),um_change_tag(e),e.data("searched",1),e.find(".um-member-directory-sorting-options").prop("disabled",!1),e.find(".um-member-directory-view-type").removeClass("um-disabled"))}),jQuery(document.body).on("click",".um-directory .um-members-filter-remove",function(){var e=jQuery(this).parents(".um-directory");if(!um_is_directory_busy(e)&&e){um_members_show_preloader(e);var r=jQuery(this).data("value"),t=jQuery(this).data("name"),a=jQuery(this).data("type"),i=("text"===a?(um_set_url_from_data(e,"filter_"+t,""),jQuery('.um-search-filter input[name="'+t+'"]').val("")):"select"===a?(m=void 0===(m=um_get_data_for_directory(e,"filter_"+t))?[]:(m=um_unsanitize_value(m)).split("||"),um_set_url_from_data(e,"filter_"+t,m=(m=-1!==jQuery.inArray(r.toString(),m)?jQuery.grep(m,function(e){return e!==r.toString()}):m).length?m:""),(m=jQuery('.um-search-filter select[name="'+t+'"]')).find('option[value="'+r+'"]').prop("disabled",!1).show(),1a.data("total_pages")&&(t=a.data("total_pages")),a.data("page",t).attr("data-page",t),a.find(".um-member-directory-sorting").length&&(void 0===(t=um_get_data_for_directory(a,"sort"))&&(t=a.find('.um-new-dropdown[data-element=".um-member-directory-sorting-a"]').find('a[data-default="1"]').data("value")),a.data("sorting",t),(e=a.find('.um-new-dropdown[data-element=".um-member-directory-sorting-a"]')).find("a").data("selected",0).prop("data-selected",0).attr("data-selected",0),e.find('a[data-value="'+t+'"]').data("selected",1).prop("data-selected",1).attr("data-selected",1),a.find(".um-member-directory-sorting-a").find("> a").html(e.find('a[data-value="'+t+'"]').html())),a.find(".um-member-directory-view-type").length&&(void 0===(e=um_get_data_for_directory(a,"view_type"))&&(e=a.find('.um-member-directory-view-type-a[data-default="1"]').data("type")),a.data("view_type",e),a.find(".um-member-directory-view-type .um-member-directory-view-type-a").hide(),a.find('.um-member-directory-view-type .um-member-directory-view-type-a[data-type="'+e+'"]').show()),a.find(".um-datepicker-filter").each(function(){var e=jQuery(this),r=e.pickadate("picker"),t=e.data("filter_name"),e=e.data("range"),t=um_get_data_for_directory(a,"filter_"+t+"_"+e);void 0!==t?r.set("select",1e3*t):r.clear()}),a.find(".um-slider").each(function(){var e=jQuery(this),r=e.data("field_name"),t=um_get_data_for_directory(a,"filter_"+r+"_from"),r=um_get_data_for_directory(a,"filter_"+r+"_to");void 0===t&&(t=e.data("min")),t=parseInt(t),void 0===r&&(r=e.data("max")),r=parseInt(r),e.slider("values",[t,r]),um_set_range_label(e)}),a.find(".um-timepicker-filter").each(function(){var e=jQuery(this),r=e.pickatime("picker"),t=e.data("filter_name"),e=e.data("range"),t=um_get_data_for_directory(a,"filter_"+t+"_"+e);void 0!==t?(e=t.split(":"),r.set("select",60*e[0])):r.clear()}),wp.hooks.applyFilters("um_member_directory_ignore_after_search",!1,a));if(!t&&1===a.data("must-search")){var i=um_get_search(a);if(!um_get_filters_data(a).length&&!i)return a.data("searched",0),void um_members_hide_preloader(a);a.data("searched",1)}wp.hooks.applyFilters("um_member_directory_prevent_default_first_loading",!1,a,r)||(um_ajax_get_members(a),um_change_tag(a))})})}); \ No newline at end of file +var um_members_directory_busy=[],um_member_directories=[],um_member_directory_last_data=[];function um_parse_current_url(){var r={},t=window.location.search.substring(1).split("&");return jQuery.each(t,function(e){e=t[e].split("=");r[e[0]]=e[1]}),r}function um_get_data_for_directory(e,r){var t=um_members_get_hash(e),a={},i=um_parse_current_url();if(jQuery.each(i,function(e){-1!==e.indexOf("_"+t)&&""!==i[e]&&(a[e.replace("_"+t,"")]=i[e])}),r){if(void 0!==a[r])try{a[r]=decodeURIComponent(a[r])}catch(e){console.error(e)}return a[r]}return a}function um_set_url_from_data(e,r,t){var a=um_members_get_hash(e),i=um_get_data_for_directory(e),m={},d=(Array.isArray(t)?(jQuery.each(t,function(e){t[e]=encodeURIComponent(t[e])}),t=t.join("||")):jQuery.isNumeric(t)||(t=t.split("||"),jQuery.each(t,function(e){t[e]=encodeURIComponent(t[e])}),t=t.join("||")),""!==t&&(m[r+"_"+a]=t),jQuery.each(i,function(e){r===e?""!==t&&(m[e+"_"+a]=t):m[e+"_"+a]=i[e]}),jQuery.each(um_member_directories,function(e){var r,t=um_member_directories[e];t!==a&&(r=um_get_data_for_directory(jQuery('.um-directory[data-hash="'+t+'"]')),jQuery.each(r,function(e){m[e+"_"+t]=r[e]}))}),[]),e=(jQuery.each(m,function(e){d.push(e+"="+m[e])}),"?"+(d=wp.hooks.applyFilters("um_member_directory_url_attrs",d)).join("&"));"?"===e&&(e=""),window.history.pushState("string","UM Member Directory",window.location.origin+window.location.pathname+e)}function um_members_get_hash(e){return e.data("hash")}function um_is_directory_busy(e){e=um_members_get_hash(e);return void 0!==um_members_directory_busy[e]&&um_members_directory_busy[e]}function um_members_show_preloader(e){um_members_directory_busy[um_members_get_hash(e)]=!0,e.find(".um-members-overlay").show()}function um_members_hide_preloader(e){um_members_directory_busy[um_members_get_hash(e)]=!1,e.find(".um-members-overlay").hide()}function um_set_range_label(e,r){var t,a="",i=e.siblings(".um-slider-range").data("placeholder-s"),m=e.siblings(".um-slider-range").data("placeholder-p"),r=r?(a=(r.values[0]===r.values[1]?i.replace("{value}",r.values[0]):m.replace("{min_range}",r.values[0]).replace("{max_range}",r.values[1])).replace("{field_label}",e.siblings(".um-slider-range").data("label")),t=r.values[0],r.values[1]):(a=(e.slider("values",0)===e.slider("values",1)?i.replace("{value}",e.slider("values",0)):m.replace("{min_range}",e.slider("values",0)).replace("{max_range}",e.slider("values",1))).replace("{field_label}",e.siblings(".um-slider-range").data("label")),t=e.slider("values",0),e.slider("values",1));e.siblings(".um-slider-range").html(a),e.siblings(".um_range_min").val(t),e.siblings(".um_range_max").val(r)}function um_get_search(e){return e.find(".um-search-line").length?e.find(".um-search-line").val():""}function um_get_sort(e){return e.data("sorting")}function um_get_current_page(e){e=e.data("page");return e=e&&void 0!==e?e:1}function um_time_convert(e,r){var t=Math.floor(e/60),e=e%60;return(t=60<=e&&(e=0,24<=(t+=1))?0:t)+":"+(e=e<10?"0"+e:e)}function um_ajax_get_members(_,e){var r,t,a,i,s,m=um_members_get_hash(_);wp.hooks.applyFilters("um_member_directory_get_members_allow",!0,m,_)?(r=um_get_current_page(_),t=um_get_search(_),a=um_get_sort(_),i=-(new Date).getTimezoneOffset()/60,s={directory_id:m,page:r,search:t,sorting:a,gmt_offset:i,post_refferer:_.data("base-post"),nonce:um_scripts.nonce},_.find(".um-search-filter").length&&_.find(".um-search-filter").each(function(){var e,r,t,a,i,m,d,u=jQuery(this);u.find(".um-slider").length?(m=u.find(".um-slider").data("field_name"),r=um_get_data_for_directory(_,"filter_"+m+"_from"),e=um_get_data_for_directory(_,"filter_"+m+"_to"),void 0===r&&void 0===e||(s[m]=[r,e])):u.find(".um-datepicker-filter").length?(m=u.find(".um-datepicker-filter").data("filter_name"),r=um_get_data_for_directory(_,"filter_"+m+"_from"),e=um_get_data_for_directory(_,"filter_"+m+"_to"),void 0===r&&void 0===e||(s[m]=[r,e])):u.find(".um-timepicker-filter").length?(m=u.find(".um-timepicker-filter").data("filter_name"),r=um_get_data_for_directory(_,"filter_"+m+"_from"),e=um_get_data_for_directory(_,"filter_"+m+"_to"),void 0!==r&&(r=(i=(i=+(r=r.split(":"))[0])<10?"0"+i:i)+":"+(a=(a=+r[1])<10?"0"+a:a)+":00"),void 0!==e&&(a=+(t=e.split(":"))[1],e=(i=(i=+t[0])<10?"0"+i:i)+":"+(a=a<10?"0"+a:a)+":59"),void 0===r&&void 0===e||(s[m]=[r,e])):u.find("select").length?(m=u.find("select").attr("name"),void 0!==(d=um_get_data_for_directory(_,"filter_"+m))&&(d=um_unsanitize_value(d),s[m]=d.split("||"))):u.hasClass("um-text-filter-type")&&u.find('input[type="text"]').length?(m=u.find('input[type="text"]').attr("name"),void 0!==(d=um_get_data_for_directory(_,"filter_"+m))&&(d=um_unsanitize_value(d),s[m]=d)):s=wp.hooks.applyFilters("um_member_directory_custom_filter_handler",s,u,_)}),s=wp.hooks.applyFilters("um_member_directory_filter_request",s),wp.ajax.send("um_get_members",{data:s,success:function(e){um_member_directory_last_data[m]=e,um_build_template(_,e);var r=wp.template("um-members-pagination");_.find(".um-members-pagination-box").html(r(e)),_.data("total_pages",e.pagination.total_pages),e.pagination.total_pages?(_.find(".um-member-directory-sorting-options").prop("disabled",!1),_.find(".um-member-directory-view-type").removeClass("um-disabled")):(_.find(".um-member-directory-sorting-options").prop("disabled",!0),_.find(".um-member-directory-view-type").addClass("um-disabled")),wp.hooks.doAction("um_member_directory_loaded",_,e),um_init_new_dropdown(),um_members_hide_preloader(_)},error:function(e){console.log(e),um_members_hide_preloader(_)}})):setTimeout(um_ajax_get_members,600,_,e)}function um_build_template(e,r){var t,a=e.data("view_type"),a=wp.template("um-member-"+a+"-"+um_members_get_hash(e));jQuery(".um-"+um_members_get_hash(e)).length&&(e.find(".um-members-grid, .um-members-list").remove(),e.find(".um-members-wrapper").prepend(a(r.users)),a=wp.template("um-members-header"),e.find(".um-members-intro").remove(),t=wp.hooks.applyFilters("um_member_directory_generate_header",!1,e),(void 0!==r.is_search&&r.is_search||t)&&e.find(".um-members-wrapper").prepend(a(r)),e.addClass("um-loaded"),wp.hooks.addAction("um_window_resize","um_members",function(){e.find(".um-members.um-members-grid").length&&UM_Member_Grid(e.find(".um-members.um-members-grid"))}),jQuery(document).trigger("um_build_template",[e,r]),jQuery(window).trigger("resize"),UM.common.tipsy.init())}function UM_Member_Grid(r){r.find(".um-member").length&&r.imagesLoaded(function(){var e=wp.hooks.applyFilters("um_member_directory_grid_masonry_attrs",{itemSelector:".um-member",columnWidth:".um-member",gutter:".um-gutter-sizer"},r);r.masonry(e).on("layoutComplete",function(e,r){jQuery(document).trigger("um_grid_initialized",[e,r])})})}function um_get_filters_data(_){var s=[];return _.find(".um-search-filter").each(function(){var d,t,a,i,e,r,m,u=jQuery(this);u.find("input.um-datepicker-filter").length?(d="datepicker",u.find("input.um-datepicker-filter").each(function(){var e,r,t,a,i,m;"to"!==jQuery(this).data("range")&&(e=jQuery(this).data("filter_name"),r=um_get_data_for_directory(_,"filter_"+e+"_from"),t=um_get_data_for_directory(_,"filter_"+e+"_to"),void 0!==r||void 0!==t)&&((a=jQuery(this).val())===(i=_.find('input.um-datepicker-filter[data-range="to"][data-filter_name="'+e+'"]').val())?m=i:""!==a&&""!==i?m=a+" - "+i:""===a?m="before "+i:""===i&&(m="since "+a),s.push({name:e,label:jQuery(this).data("filter-label"),value_label:m,value:[r,t],type:d}))})):u.find("input.um-timepicker-filter").length?(d="timepicker",u.find("input.um-timepicker-filter").each(function(){var e,r,t,a,i,m;"to"!==jQuery(this).data("range")&&(e=jQuery(this).data("filter_name"),r=um_get_data_for_directory(_,"filter_"+e+"_from"),t=um_get_data_for_directory(_,"filter_"+e+"_to"),void 0!==r||void 0!==t)&&((a=jQuery(this).val())===(i=_.find('input.um-timepicker-filter[data-range="to"][data-filter_name="'+e+'"]').val())?m=i:""!==a&&""!==i?m=a+" - "+i:""===a?m="before "+i:""===i&&(m="since "+a),s.push({name:e,label:jQuery(this).data("filter-label"),value_label:m,value:[r,t],type:d}))})):u.find("select").length?(d="select",t=u.find("select").attr("name"),a=u.find("select").data("placeholder"),i=void 0===(i=um_get_data_for_directory(_,"filter_"+t))?[]:(i=um_unsanitize_value(i)).split("||"),jQuery.each(i,function(e){var r=u.find('select option[value="'+i[e]+'"]').data("value_label");s.push({name:t,label:a,value_label:r,value:i[e],type:d})})):u.hasClass("um-text-filter-type")&&u.find('input[type="text"]').length?(d="text",t=u.find('input[type="text"]').attr("name"),a=u.find('input[type="text"]').attr("placeholder"),""!=(i=void 0===(i=um_get_data_for_directory(_,"filter_"+t))?"":i)&&s.push({name:t,label:a,value_label:i,value:i,type:d})):u.find("div.ui-slider").length?(d="slider",t=u.find("div.ui-slider").data("field_name"),e=um_get_data_for_directory(_,"filter_"+t+"_from"),r=um_get_data_for_directory(_,"filter_"+t+"_to"),void 0===e&&void 0===r||(m=(e===r?u.find("div.um-slider-range").data("placeholder-s").replace("{value}",e):u.find("div.um-slider-range").data("placeholder-p").replace("{min_range}",e).replace("{max_range}",r)).replace("{field_label}",u.find("div.um-slider-range").data("label")),a=u.find("div.um-slider-range").data("label"),s.push({name:t,label:a,value_label:m,value:[e,r],type:d}))):s=wp.hooks.applyFilters("um_member_directory_get_filter_data",s,_,u)}),s}function um_change_tag(e){var r,t=um_get_filters_data(e),a=(e.find(".um-members-filter-tag").remove(),e.find(".um-filtered-line"));a.length&&(r=wp.template("um-members-filtered-line"),a.prepend(r({filters:t})),0===e.find(".um-members-filter-remove").length?(e.find(".um-clear-filters").hide(),e.find(".um-clear-filters").parents(".um-member-directory-header-row").addClass("um-header-row-invisible")):(e.find(".um-clear-filters").show(),e.find(".um-clear-filters").parents(".um-member-directory-header-row").removeClass("um-header-row-invisible")))}function um_run_search(e){if(!um_is_directory_busy(e)){um_members_show_preloader(e);var r=um_get_data_for_directory(e,"search"),t=um_sanitize_value(e.find(".um-search-line").val());if(t===r||""===t&&void 0===r)um_members_hide_preloader(e);else{e.data("general_search",t),um_set_url_from_data(e,"search",t),e.data("page",1),um_set_url_from_data(e,"page","");if(!wp.hooks.applyFilters("um_member_directory_ignore_after_search",!1,e)){r=e.data("must-search");if(1===r&&(t=um_get_search(e),0===e.find(".um-members-filter-remove").length)&&!t)return e.data("searched",0),e.find(".um-members-grid, .um-members-list, .um-members-intro").remove(),e.find(".um-member-directory-sorting-options").prop("disabled",!0),e.find(".um-member-directory-view-type").addClass("um-disabled"),wp.hooks.doAction("um_member_directory_clear_not_searched",e),void um_members_hide_preloader(e)}e.data("searched",1),e.find(".um-member-directory-sorting-options").prop("disabled",!1),e.find(".um-member-directory-view-type").removeClass("um-disabled"),um_ajax_get_members(e)}}}function um_slider_filter_init(e){e.find(".um-slider").each(function(){var e=jQuery(this),t=e.parents(".um-directory"),a=e.data("field_name"),r=um_get_data_for_directory(t,"filter_"+a+"_from"),i=um_get_data_for_directory(t,"filter_"+a+"_to"),r=[r=void 0===r?parseInt(e.data("min")):r,i=void 0===i?parseInt(e.data("max")):i];e.slider({range:!0,min:parseInt(e.data("min")),max:parseInt(e.data("max")),values:r,create:function(e,r){},step:1,slide:function(e,r){um_set_range_label(jQuery(this),r)},stop:function(e,r){um_is_directory_busy(t)||(um_members_show_preloader(t),um_set_url_from_data(t,"filter_"+a+"_from",r.values[0]),um_set_url_from_data(t,"filter_"+a+"_to",r.values[1]),t.data("page",1),um_set_url_from_data(t,"page",""),um_ajax_get_members(t),um_change_tag(t),t.data("searched",1),t.find(".um-member-directory-sorting-options").prop("disabled",!1),t.find(".um-member-directory-view-type").removeClass("um-disabled"))}}),um_set_range_label(e)})}function um_datepicker_filter_init(e){e.find(".um-datepicker-filter").each(function(){var d=jQuery(this),u=new Date(1e3*d.data("date_min")),_=new Date(1e3*d.data("date_max")),e=d.pickadate({selectYears:!0,min:u,max:_,formatSubmit:"yyyy/mm/dd",hiddenName:!0,onOpen:function(){d.blur()},onClose:function(){d.blur()},onSet:function(e){var r,t,a,i,m;!e.select||um_is_directory_busy(r=d.parents(".um-directory"))||(um_members_show_preloader(r),t=d.data("filter_name"),a=d.data("range"),i=um_get_data_for_directory(r,"filter_"+t+"_from"),m=um_get_data_for_directory(r,"filter_"+t+"_to"),void 0===i&&(i=u/1e3),void 0===m&&(m=_/1e3),e=e.select/1e3,d.val(),"from"===a?i=e:"to"===a&&(m=e),um_set_url_from_data(r,"filter_"+t+"_from",i),um_set_url_from_data(r,"filter_"+t+"_to",m),r.data("page",1),um_set_url_from_data(r,"page",""),um_ajax_get_members(r),um_change_tag(r),r.data("searched",1),r.find(".um-member-directory-sorting-options").prop("disabled",!1),r.find(".um-member-directory-view-type").removeClass("um-disabled"))}}).pickadate("picker"),r=d.data("filter_name"),t=d.data("range"),r=um_get_data_for_directory(d.parents(".um-directory"),"filter_"+r+"_"+t);void 0!==r&&e.set("select",1e3*r)})}function um_timepicker_filter_init(e){e.find(".um-timepicker-filter").each(function(){var d=jQuery(this),u=d.attr("id"),_=d.data("filter_name"),s=d.attr("data-min"),o=d.attr("data-max"),e=s.split(":"),r=o.split(":"),e=d.pickatime({format:d.data("format"),interval:parseInt(d.data("intervals")),min:[e[0],e[1]],max:[r[0],r[1]],formatSubmit:"HH:i",hiddenName:!0,onOpen:function(){d.blur()},onClose:function(){d.blur()},onSet:function(e){var r,t,a,i,m;!e.select||um_is_directory_busy(r=d.parents(".um-directory"))||(um_members_show_preloader(r),t=d.data("filter_name"),a=d.data("range"),i=um_get_data_for_directory(r,"filter_"+t+"_from"),m=um_get_data_for_directory(r,"filter_"+t+"_to"),void 0===i&&(i=s),void 0===m&&(m=o),void 0!==e.select?(e=um_time_convert(e.select,a),"from"===a?i=e:"to"===a&&(m=e)):"from"===a?i=s:"to"===a&&(m=o),e=jQuery("#"+u).val(),"from"===d.data("range")?jQuery("#"+_+"_to").pickatime("picker").set("min",e):jQuery("#"+_+"_from").pickatime("picker").set("max",e),um_set_url_from_data(r,"filter_"+t+"_from",i),um_set_url_from_data(r,"filter_"+t+"_to",m),r.data("page",1),um_set_url_from_data(r,"page",""),um_ajax_get_members(r),um_change_tag(r),r.data("searched",1),r.find(".um-member-directory-sorting-options").prop("disabled",!1),r.find(".um-member-directory-view-type").removeClass("um-disabled"))}}).pickatime("picker"),r=d.data("filter_name"),t=d.data("range"),r=um_get_data_for_directory(d.parents(".um-directory"),"filter_"+r+"_"+t);void 0!==r&&(t=r.split(":"),e.set("select",60*t[0]+ +t[1]))})}jQuery(document.body).ready(function(){jQuery(".um-directory .um-search-filter select").each(function(){1===jQuery(this).find("option:not(:disabled)").length&&jQuery(this).prop("disabled",!0);var e=jQuery(this);e.select2("destroy").select2({dropdownParent:e.parent()})}),jQuery(document.body).on("mouseover",".um-directory .um-member-directory-view-type",function(){var e;jQuery(this).hasClass("um-disabled")||((e=jQuery(this).find(".um-member-directory-view-type-a:visible")).hide(),(e.next().length?e.next():jQuery(this).find(".um-member-directory-view-type-a:first")).show().tipsy("show"))}).on("mouseout",".um-directory .um-member-directory-view-type",function(){jQuery(this).hasClass("um-disabled")||(jQuery(this).find(".um-member-directory-view-type-a").hide().tipsy("hide"),jQuery(this).find('.um-member-directory-view-type-a[data-type="'+jQuery(this).parents(".um-directory").data("view_type")+'"]').show())}),jQuery(document.body).on("click",".um-directory .um-member-directory-view-type-a",function(){var e=jQuery(this).parents(".um-directory");if(um_is_directory_busy(e))return!1;var r,t=jQuery(this),a=t.parents(".um-member-directory-view-type");a.hasClass("um-disabled")||(um_members_show_preloader(e),(r=a.find(".um-member-directory-view-type-a:visible")).hide(),(r.next().length?r.next():a.find(".um-member-directory-view-type-a:first")).show().tipsy("show"),null!==(r=um_member_directory_last_data[um_members_get_hash(e)])&&(um_set_url_from_data(e,"view_type",a=t.data("type")),e.data("view_type",a),um_build_template(e,r),um_init_new_dropdown()),um_members_hide_preloader(e))}),jQuery(document.body).on("click",".um-directory .um-do-search",function(){um_run_search(jQuery(this).parents(".um-directory"))}),jQuery(document.body).on("keypress",".um-directory .um-search-line",function(e){13===e.which&&um_run_search(jQuery(this).parents(".um-directory"))}),jQuery(document.body).on("click",'.um-new-dropdown[data-element=".um-member-directory-sorting-a"] li a',function(){var e,r,t;1===jQuery(this).data("selected")||(e=jQuery(this).data("directory-hash"),um_is_directory_busy(e=jQuery('.um-directory[data-hash="'+e+'"]')))||(um_members_show_preloader(e),r=jQuery(this).html(),t=jQuery(this).data("value"),e.data("sorting",t),um_set_url_from_data(e,"sort",t),um_ajax_get_members(e),e.find('.um-new-dropdown[data-element=".um-member-directory-sorting-a"]').find("a").data("selected",0).prop("data-selected",0).attr("data-selected",0),e.find('.um-new-dropdown[data-element=".um-member-directory-sorting-a"] a[data-value="'+t+'"]').data("selected",1).prop("data-selected",1).attr("data-selected",1),e.find(".um-member-directory-sorting-a").find("> a").html(r))}),jQuery(document.body).on("click",".um-directory .pagi:not(.current)",function(){var e,r;jQuery(this).hasClass("disabled")||um_is_directory_busy(e=jQuery(this).parents(".um-directory"))||(um_members_show_preloader(e),(1===(r="first"===jQuery(this).data("page")?1:"prev"===jQuery(this).data("page")?+e.data("page")-1:"next"===jQuery(this).data("page")?+e.data("page")+1:"last"===jQuery(this).data("page")?parseInt(e.data("total_pages")):parseInt(jQuery(this).data("page")))?(e.find('.pagi[data-page="first"], .pagi[data-page="prev"]').addClass("disabled"),e.find('.pagi[data-page="prev"], .pagi[data-page="last"]')):(r===parseInt(e.data("total_pages"))?e.find('.pagi[data-page="prev"], .pagi[data-page="last"]').addClass("disabled"):e.find('.pagi[data-page="prev"], .pagi[data-page="last"]').removeClass("disabled"),e.find('.pagi[data-page="first"], .pagi[data-page="prev"]'))).removeClass("disabled"),e.find(".pagi").removeClass("current"),e.find('.pagi[data-page="'+r+'"]').addClass("current"),e.data("page",r),um_set_url_from_data(e,"page",1===r?"":r),um_ajax_get_members(e))}),jQuery(document.body).on("change",".um-directory .um-members-pagi-dropdown",function(){var e,r=jQuery(this).parents(".um-directory");um_is_directory_busy(r)||(um_members_show_preloader(r),e=jQuery(this).val(),r.find(".pagi").removeClass("current"),r.find('.pagi[data-page="'+e+'"]').addClass("current"),r.data("page",e),um_set_url_from_data(r,"page",1===e?"":e),um_ajax_get_members(r))}),jQuery(document.body).on("click",".um-directory .um-members.um-members-list .um-member-more a",function(e){e.preventDefault();e=jQuery(this).parents(".um-member");return e.find(".um-member-more").hide(),e.find(".um-member-meta-main").slideDown(),e.find(".um-member-less").fadeIn(),!1}),jQuery(document.body).on("click",".um-directory .um-members.um-members-list .um-member-less a",function(e){e.preventDefault();e=jQuery(this).parents(".um-member");return e.find(".um-member-less").hide(),e.find(".um-member-meta-main").slideUp(),e.find(".um-member-more").fadeIn(),!1}),jQuery(document.body).on("click",".um-directory .um-members.um-members-grid .um-member-more a",function(e){e.preventDefault();var e=jQuery(this).parents(".um-member"),r=jQuery(this).parents(".um-members");return e.find(".um-member-more").hide(),e.find(".um-member-meta").slideDown(function(){UM_Member_Grid(r)}),e.find(".um-member-less").fadeIn(),setTimeout(function(){UM_Member_Grid(r)},100),!1}),jQuery(document.body).on("click",".um-directory .um-members.um-members-grid .um-member-less a",function(e){e.preventDefault();var r=jQuery(this).parents(".um-member"),t=jQuery(this).parents(".um-members");return r.find(".um-member-less").hide(),r.find(".um-member-meta").slideUp(function(){r.find(".um-member-more").fadeIn(),UM_Member_Grid(t)}),!1}),jQuery(".um-member-directory-filters-a").on("click",function(){var e=jQuery(this),r=e.parents(".um-directory").find(".um-search");r.is(":visible")?r.slideUp(250,function(){e.toggleClass("um-member-directory-filters-visible"),r.parents(".um-member-directory-header-row").toggleClass("um-header-row-invisible")}):r.slideDown({duration:250,start:function(){jQuery(this).css({display:"grid"}),e.toggleClass("um-member-directory-filters-visible"),r.parents(".um-member-directory-header-row").toggleClass("um-header-row-invisible")}})}),jQuery(document.body).on("change",".um-directory .um-search-filter select",function(){var e,r,t,a=jQuery(this).val(),i=um_sanitize_value(a);""===i||um_is_directory_busy(e=jQuery(this).parents(".um-directory"))||(um_members_show_preloader(e),t=void 0===(t=um_get_data_for_directory(e,"filter_"+(r=jQuery(this).prop("name"))))?[]:t.split("||"),-1===jQuery.inArray(i,t)&&(t.push(i),um_set_url_from_data(e,"filter_"+r,t=t.join("||")),e.data("page",1),um_set_url_from_data(e,"page","")),jQuery(this).find('option[value="'+a+'"]').prop("disabled",!0).hide(),1===jQuery(this).find("option:not(:disabled)").length&&jQuery(this).prop("disabled",!0),(i=jQuery(this)).select2("destroy").select2({dropdownParent:i.parent()}),i.val("").trigger("change"),um_ajax_get_members(e),um_change_tag(e),e.data("searched",1),e.find(".um-member-directory-sorting-options").prop("disabled",!1),e.find(".um-member-directory-view-type").removeClass("um-disabled"))}),jQuery(document.body).on("blur",'.um-directory .um-search-filter.um-text-filter-type input[type="text"]',function(){var e,r,t,a=jQuery(this).parents(".um-directory");um_is_directory_busy(a)||(e=um_sanitize_value(jQuery(this).val()))!==(t=void 0===(t=um_get_data_for_directory(a,"filter_"+(r=jQuery(this).prop("name"))))?"":t)&&(um_members_show_preloader(a),um_set_url_from_data(a,"filter_"+r,e),a.data("page",1),um_set_url_from_data(a,"page",""),um_ajax_get_members(a),um_change_tag(a),a.data("searched",1),a.find(".um-member-directory-sorting-options").prop("disabled",!1),a.find(".um-member-directory-view-type").removeClass("um-disabled"))}),jQuery(document.body).on("keypress",'.um-directory .um-search-filter.um-text-filter-type input[type="text"]',function(e){var r,t,a;13!==e.which||um_is_directory_busy(e=jQuery(this).parents(".um-directory"))||(r=um_sanitize_value(jQuery(this).val()))!==(a=void 0===(a=um_get_data_for_directory(e,"filter_"+(t=jQuery(this).prop("name"))))?"":a)&&(um_members_show_preloader(e),um_set_url_from_data(e,"filter_"+t,r),e.data("page",1),um_set_url_from_data(e,"page",""),um_ajax_get_members(e),um_change_tag(e),e.data("searched",1),e.find(".um-member-directory-sorting-options").prop("disabled",!1),e.find(".um-member-directory-view-type").removeClass("um-disabled"))}),jQuery(document.body).on("click",".um-directory .um-members-filter-remove",function(){var e=jQuery(this).parents(".um-directory");if(!um_is_directory_busy(e)&&e){um_members_show_preloader(e);var r=jQuery(this).data("value"),t=jQuery(this).data("name"),a=jQuery(this).data("type"),i=("text"===a?(um_set_url_from_data(e,"filter_"+t,""),jQuery('.um-search-filter input[name="'+t+'"]').val("")):"select"===a?(m=void 0===(m=um_get_data_for_directory(e,"filter_"+t))?[]:(m=um_unsanitize_value(m)).split("||"),um_set_url_from_data(e,"filter_"+t,m=(m=-1!==jQuery.inArray(r.toString(),m)?jQuery.grep(m,function(e){return e!==r.toString()}):m).length?m:""),(m=jQuery('.um-search-filter select[name="'+t+'"]')).find('option[value="'+r+'"]').prop("disabled",!1).show(),1a.data("total_pages")&&(t=a.data("total_pages")),a.data("page",t).attr("data-page",t),a.find(".um-member-directory-sorting").length&&(void 0===(t=um_get_data_for_directory(a,"sort"))&&(t=a.find('.um-new-dropdown[data-element=".um-member-directory-sorting-a"]').find('a[data-default="1"]').data("value")),a.data("sorting",t),(e=a.find('.um-new-dropdown[data-element=".um-member-directory-sorting-a"]')).find("a").data("selected",0).prop("data-selected",0).attr("data-selected",0),e.find('a[data-value="'+t+'"]').data("selected",1).prop("data-selected",1).attr("data-selected",1),a.find(".um-member-directory-sorting-a").find("> a").html(e.find('a[data-value="'+t+'"]').html())),a.find(".um-member-directory-view-type").length&&(void 0===(e=um_get_data_for_directory(a,"view_type"))&&(e=a.find('.um-member-directory-view-type-a[data-default="1"]').data("type")),a.data("view_type",e),a.find(".um-member-directory-view-type .um-member-directory-view-type-a").hide(),a.find('.um-member-directory-view-type .um-member-directory-view-type-a[data-type="'+e+'"]').show()),a.find(".um-datepicker-filter").each(function(){var e=jQuery(this),r=e.pickadate("picker"),t=e.data("filter_name"),e=e.data("range"),t=um_get_data_for_directory(a,"filter_"+t+"_"+e);void 0!==t?r.set("select",1e3*t):r.clear()}),a.find(".um-slider").each(function(){var e=jQuery(this),r=e.data("field_name"),t=um_get_data_for_directory(a,"filter_"+r+"_from"),r=um_get_data_for_directory(a,"filter_"+r+"_to");void 0===t&&(t=e.data("min")),t=parseInt(t),void 0===r&&(r=e.data("max")),r=parseInt(r),e.slider("values",[t,r]),um_set_range_label(e)}),a.find(".um-timepicker-filter").each(function(){var e=jQuery(this),r=e.pickatime("picker"),t=e.data("filter_name"),e=e.data("range"),t=um_get_data_for_directory(a,"filter_"+t+"_"+e);void 0!==t?(e=t.split(":"),r.set("select",60*e[0])):r.clear()}),wp.hooks.applyFilters("um_member_directory_ignore_after_search",!1,a));if(!t&&1===a.data("must-search")){var i=um_get_search(a);if(!um_get_filters_data(a).length&&!i)return a.data("searched",0),void um_members_hide_preloader(a);a.data("searched",1)}wp.hooks.applyFilters("um_member_directory_prevent_default_first_loading",!1,a,r)||(um_ajax_get_members(a),um_change_tag(a))})})}); \ No newline at end of file From 9561084abaaa7ab7bf451fd33445f9f69b9f3517 Mon Sep 17 00:00:00 2001 From: ashubawork Date: Wed, 10 Jan 2024 14:38:34 +0200 Subject: [PATCH 28/43] - fixed stripslashes in tagline --- includes/core/um-filters-fields.php | 30 +++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/includes/core/um-filters-fields.php b/includes/core/um-filters-fields.php index 457b827a..744df5f9 100644 --- a/includes/core/um-filters-fields.php +++ b/includes/core/um-filters-fields.php @@ -851,39 +851,39 @@ add_filter( 'um_profile_field_filter_hook__multiselect','um_profile_field__selec */ function um_profile_field_filter_xss_validation( $value, $data, $type = '' ) { if ( ! empty( $value ) && is_string( $value ) ) { - $value = stripslashes( $value ); + $value = stripslashes( $value ); $data['validate'] = isset( $data['validate'] ) ? $data['validate'] : ''; - if ( 'text' == $type && ! in_array( $data['validate'], array( 'unique_email' ) ) || 'password' == $type ) { + if ( 'text' === $type && ! in_array( $data['validate'], array( 'unique_email' ), true ) || 'password' === $type ) { $value = esc_attr( $value ); - } elseif ( $type == 'url' ) { + } elseif ( 'url' === $type ) { $value = esc_url( $value ); - } elseif ( 'textarea' == $type ) { + } elseif ( 'textarea' === $type ) { if ( empty( $data['html'] ) ) { $value = wp_kses_post( $value ); } - } elseif ( 'rating' == $type ) { + } elseif ( 'rating' === $type ) { if ( ! is_numeric( $value ) ) { $value = 0; } else { - if ( $data['number'] == 5 ) { - if ( ! in_array( $value, range( 1, 5 ) ) ) { + if ( 5 === absint( $data['number'] ) ) { + if ( ! in_array( $value, range( 1, 5 ), true ) ) { $value = 0; } - } elseif ( $data['number'] == 10 ) { - if ( ! in_array( $value, range( 1, 10 ) ) ) { + } elseif ( 10 === $data['number'] ) { + if ( ! in_array( $value, range( 1, 10 ), true ) ) { $value = 0; } } } - } elseif ( 'select' == $type || 'radio' == $type ) { + } elseif ( 'select' === $type || 'radio' === $type ) { /** This filter is documented in includes/core/class-fields.php */ $option_pairs = apply_filters( 'um_select_options_pair', null, $data ); $array = empty( $data['options'] ) ? array() : $data['options']; - if ( $data['metakey'] == 'country' && empty( $array ) ) { + if ( 'country' === $data['metakey'] && empty( $array ) ) { $array = UM()->builtin()->get( 'countries' ); } @@ -893,6 +893,8 @@ function um_profile_field_filter_xss_validation( $value, $data, $type = '' ) { $arr = $array; } + $arr = array_map( 'stripslashes', $arr ); + if ( ! empty( $arr ) && ! in_array( $value, array_map( 'trim', $arr ) ) && empty( $data['custom_dropdown_options_source'] ) ) { $value = ''; } else { @@ -902,7 +904,7 @@ function um_profile_field_filter_xss_validation( $value, $data, $type = '' ) { } } } elseif ( ! empty( $value ) && is_array( $value ) ) { - if ( 'multiselect' == $type || 'checkbox' == $type ) { + if ( 'multiselect' === $type || 'checkbox' === $type ) { /** This filter is documented in includes/core/class-fields.php */ $option_pairs = apply_filters( 'um_select_options_pair', null, $data ); @@ -913,8 +915,8 @@ function um_profile_field_filter_xss_validation( $value, $data, $type = '' ) { } if ( ! empty( $arr ) && empty( $data['custom_dropdown_options_source'] ) ) { - $arr = wp_unslash( $arr ); - $arr = wp_slash( array_map( 'trim', $arr ) ); + $arr = wp_unslash( $arr ); + $arr = wp_slash( array_map( 'trim', $arr ) ); $value = array_intersect( $value, $arr ); } From 7eeee21d7c558f20c3827184cb93e45c8cedb0a0 Mon Sep 17 00:00:00 2001 From: Mykyta Synelnikov Date: Wed, 10 Jan 2024 15:10:44 +0200 Subject: [PATCH 29/43] - wpcs enhancements; --- includes/core/um-filters-fields.php | 35 ++++++++++++++--------------- 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/includes/core/um-filters-fields.php b/includes/core/um-filters-fields.php index 744df5f9..94423d43 100644 --- a/includes/core/um-filters-fields.php +++ b/includes/core/um-filters-fields.php @@ -811,42 +811,42 @@ add_filter('um_profile_field_filter_hook__multiselect','um_option_match_callback add_filter('um_field_select_default_value','um_option_match_callback_view_field', 10, 2); add_filter('um_field_multiselect_default_value','um_option_match_callback_view_field', 10, 2); - /** * Apply textdomain in select/multi-select options * - * @param $value string - * @param $data array + * @param string $value + * @param array $data + * * @return string * @uses hook filters: um_profile_field_filter_hook__select, um_profile_field_filter_hook__multiselect */ - function um_profile_field__select_translate( $value, $data ) { + if ( empty( $value ) ) { + return $value; + } - if ( empty( $value ) ) return $value; + $options = explode( ', ', $value ); - $options = explode(", ", $value ); $arr_options = array(); - if( is_array( $options ) ){ + if ( is_array( $options ) ) { foreach ( $options as $item ) { $arr_options[] = __( $item, 'ultimate-member' ); } } - $value = implode(", ", $arr_options); - - return $value; + return implode( ', ', $arr_options ); } add_filter( 'um_profile_field_filter_hook__select','um_profile_field__select_translate', 10, 2 ); add_filter( 'um_profile_field_filter_hook__multiselect','um_profile_field__select_translate', 10, 2 ); - /** - * Cleaning on XSS injection - * @param $value string - * @param $data array - * @param string $type - * @return string $value + * Cleaning on XSS injection. + * + * @param int|string|array $value + * @param array $data + * @param string $type + * + * @return int|string * @uses hook filters: um_profile_field_filter_hook__ */ function um_profile_field_filter_xss_validation( $value, $data, $type = '' ) { @@ -854,7 +854,7 @@ function um_profile_field_filter_xss_validation( $value, $data, $type = '' ) { $value = stripslashes( $value ); $data['validate'] = isset( $data['validate'] ) ? $data['validate'] : ''; - if ( 'text' === $type && ! in_array( $data['validate'], array( 'unique_email' ), true ) || 'password' === $type ) { + if ( ( 'text' === $type && 'unique_email' !== $data['validate'] ) || 'password' === $type ) { $value = esc_attr( $value ); } elseif ( 'url' === $type ) { $value = esc_url( $value ); @@ -932,7 +932,6 @@ function um_profile_field_filter_xss_validation( $value, $data, $type = '' ) { } add_filter( 'um_profile_field_filter_hook__', 'um_profile_field_filter_xss_validation', 10, 3 ); - /** * Trim All form POST submitted data * From 621e5d6abd00ad45804cf083d3c1ccd3fa935bcb Mon Sep 17 00:00:00 2001 From: Mykyta Synelnikov Date: Wed, 10 Jan 2024 15:39:38 +0200 Subject: [PATCH 30/43] - updated readme.txt; --- readme.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/readme.txt b/readme.txt index 8a39b823..72b9e875 100644 --- a/readme.txt +++ b/readme.txt @@ -183,6 +183,11 @@ IMPORTANT: PLEASE UPDATE THE PLUGIN TO AT LEAST VERSION 2.6.7 IMMEDIATELY. VERSI - Fixed: select2 conflict with Impreza theme - Fixed: cropper conflict with Avada theme and active Fusion Image lazyload - Fixed: MegaMenu conflict with nav menu items conditional settings (e.g. Newsletter theme) + - Fixed: PHP Fatal error when there isn't a proper WP_Post object in UM User Profile > Posts loop + +* Templates required update: + + - profile/posts-single.php * Cached and optimized/minified assets(JS/CSS) must be flushed/re-generated after upgrade From ce153ffa58939007876c5afc0d49e95bc87b90bf Mon Sep 17 00:00:00 2001 From: Mykyta Synelnikov Date: Fri, 12 Jan 2024 16:10:26 +0200 Subject: [PATCH 31/43] - fixed Account page styles; --- assets/css/um-account.css | 14 ++++++++++++-- assets/css/um-account.min.css | 2 +- readme.txt | 3 ++- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/assets/css/um-account.css b/assets/css/um-account.css index b17f3dc5..4e9036d9 100644 --- a/assets/css/um-account.css +++ b/assets/css/um-account.css @@ -62,6 +62,15 @@ color: #555; } +div.uimob340 .um-account-main div.um-account-heading.uimob340-hide, +div.uimob500 .um-account-main div.um-account-heading.uimob500-hide { + display:none; +} + +.um-account-side .um-account-link { + box-sizing: content-box; +} + .um-account-main div.um-account-heading i { margin-right: 10px; font-size: 26px; @@ -193,8 +202,9 @@ border-right: 1px solid #ccc; color: #444; float: left; - padding: 0px 15px; + padding: 0 15px; font-weight: normal !important; + box-sizing: content-box; } .um-account-side li a span.um-account-icon i { @@ -244,4 +254,4 @@ background-color: #44b0ec; color: #fff; text-decoration: none; -} \ No newline at end of file +} diff --git a/assets/css/um-account.min.css b/assets/css/um-account.min.css index 15b43505..ccac22c0 100644 --- a/assets/css/um-account.min.css +++ b/assets/css/um-account.min.css @@ -1 +1 @@ -.um-account i{vertical-align:baseline!important}.um-account p.um-notice{margin:0 0 20px 0!important;padding:12px 15px!important}.um-account a:focus{outline:0!important}.um-account-side{float:left;width:30%;padding:0;box-sizing:border-box}.um-account-main{float:left;width:70%;padding:0 0 0 1.5em;box-sizing:border-box}.um-account-main a{border-bottom:none!important}.um-account-tab{display:none}.um-account-tab .um-field .um-field-label{display:flex;flex-direction:row;align-items:baseline;flex-wrap:nowrap;justify-content:flex-start}.um-account-main div.um-account-heading{display:flex;flex-wrap:nowrap;flex-direction:row;justify-content:flex-start;align-items:baseline;margin:0!important;font-size:18px;line-height:18px;font-weight:700;color:#555}.um-account-main div.um-account-heading i{margin-right:10px;font-size:26px;position:relative;top:2px}.um-account-main p{margin:20px 0 0 0!important;padding:0!important}.um-account-main label{font-size:15px}.um-account-meta{text-align:center;margin-bottom:20px}.um-account-meta img{margin:0!important;position:static!important;float:none!important;display:inline-block}.um-account-meta.radius-1 img{-moz-border-radius:999px;-webkit-border-radius:999px;border-radius:999px}.um-account-meta.radius-2 img{-moz-border-radius:4px;-webkit-border-radius:4px;border-radius:4px}.um-account-meta.radius-3 img{-moz-border-radius:0;-webkit-border-radius:0;border-radius:0}.um-account-name{padding-top:12px}.um-account-name a{font-weight:700;color:#555;text-decoration:none!important;font-size:18px;line-height:1.4em}.um-account-profile-link a{font-size:13px;font-weight:400}.um-account-nav a{display:block;height:44px;line-height:44px;color:#666!important;text-decoration:none!important;position:relative;padding-left:40px;border-bottom:1px solid #eee!important;transition:all .2s linear;font-size:14px}.um-account-nav a.current{font-weight:700}.um-account-nav span.arr{position:absolute;right:0;top:1px;font-size:28px}.um-account-nav span.ico{position:absolute;left:0;top:0;font-size:21px;width:21px;text-align:center}.um-account-side li,.um-account-side ul{margin:0!important;padding:0!important;list-style-type:none!important}.um-account-side li{margin-bottom:1px!important;background:#eee}.um-account-side li a{display:block;padding:4px 0;font-size:14px;height:30px;line-height:20px;color:#999;position:relative}.um-account-side li a span.um-account-arrow{position:absolute;right:10px;top:6px;font-size:26px;opacity:.6}.um-account-side li a span.um-account-icon,.um-account-side li a.current span.um-account-icon,.um-account-side li a.current:hover span.um-account-icon{text-align:center;font-size:20px;width:20px;height:30px;border-right:1px solid #ccc;color:#444;float:left;padding:0 15px;font-weight:400!important}.um-account-side li a span.um-account-icon i{display:block;height:30px;line-height:30px}.um-account-side li a span.um-account-title{padding-left:20px;float:left;height:30px;line-height:30px;color:#555}.um-account-side li a:hover{color:#444;background:#ddd}.um-account-side li a.current,.um-account-side li a.current:hover{color:#444;font-weight:700;text-decoration:none!important}.um-field-export_data .um-field-error{display:none}.um-field-export_data .um-field-area-response{display:none;line-height:1.5;padding:10px 0}.um-request-button{display:inline-block;background-color:#3ba1da;border-radius:5px;color:#fff;margin:10px 0 0;padding:5px 10px;text-decoration:none}.um-request-button:hover{background-color:#44b0ec;color:#fff;text-decoration:none} \ No newline at end of file +.um-account i{vertical-align:baseline!important}.um-account p.um-notice{margin:0 0 20px 0!important;padding:12px 15px!important}.um-account a:focus{outline:0!important}.um-account-side{float:left;width:30%;padding:0;box-sizing:border-box}.um-account-main{float:left;width:70%;padding:0 0 0 1.5em;box-sizing:border-box}.um-account-main a{border-bottom:none!important}.um-account-tab{display:none}.um-account-tab .um-field .um-field-label{display:flex;flex-direction:row;align-items:baseline;flex-wrap:nowrap;justify-content:flex-start}.um-account-main div.um-account-heading{display:flex;flex-wrap:nowrap;flex-direction:row;justify-content:flex-start;align-items:baseline;margin:0!important;font-size:18px;line-height:18px;font-weight:700;color:#555}div.uimob340 .um-account-main div.um-account-heading.uimob340-hide,div.uimob500 .um-account-main div.um-account-heading.uimob500-hide{display:none}.um-account-side .um-account-link{box-sizing:content-box}.um-account-main div.um-account-heading i{margin-right:10px;font-size:26px;position:relative;top:2px}.um-account-main p{margin:20px 0 0 0!important;padding:0!important}.um-account-main label{font-size:15px}.um-account-meta{text-align:center;margin-bottom:20px}.um-account-meta img{margin:0!important;position:static!important;float:none!important;display:inline-block}.um-account-meta.radius-1 img{-moz-border-radius:999px;-webkit-border-radius:999px;border-radius:999px}.um-account-meta.radius-2 img{-moz-border-radius:4px;-webkit-border-radius:4px;border-radius:4px}.um-account-meta.radius-3 img{-moz-border-radius:0;-webkit-border-radius:0;border-radius:0}.um-account-name{padding-top:12px}.um-account-name a{font-weight:700;color:#555;text-decoration:none!important;font-size:18px;line-height:1.4em}.um-account-profile-link a{font-size:13px;font-weight:400}.um-account-nav a{display:block;height:44px;line-height:44px;color:#666!important;text-decoration:none!important;position:relative;padding-left:40px;border-bottom:1px solid #eee!important;transition:all .2s linear;font-size:14px}.um-account-nav a.current{font-weight:700}.um-account-nav span.arr{position:absolute;right:0;top:1px;font-size:28px}.um-account-nav span.ico{position:absolute;left:0;top:0;font-size:21px;width:21px;text-align:center}.um-account-side li,.um-account-side ul{margin:0!important;padding:0!important;list-style-type:none!important}.um-account-side li{margin-bottom:1px!important;background:#eee}.um-account-side li a{display:block;padding:4px 0;font-size:14px;height:30px;line-height:20px;color:#999;position:relative}.um-account-side li a span.um-account-arrow{position:absolute;right:10px;top:6px;font-size:26px;opacity:.6}.um-account-side li a span.um-account-icon,.um-account-side li a.current span.um-account-icon,.um-account-side li a.current:hover span.um-account-icon{text-align:center;font-size:20px;width:20px;height:30px;border-right:1px solid #ccc;color:#444;float:left;padding:0 15px;font-weight:400!important;box-sizing:content-box}.um-account-side li a span.um-account-icon i{display:block;height:30px;line-height:30px}.um-account-side li a span.um-account-title{padding-left:20px;float:left;height:30px;line-height:30px;color:#555}.um-account-side li a:hover{color:#444;background:#ddd}.um-account-side li a.current,.um-account-side li a.current:hover{color:#444;font-weight:700;text-decoration:none!important}.um-field-export_data .um-field-error{display:none}.um-field-export_data .um-field-area-response{display:none;line-height:1.5;padding:10px 0}.um-request-button{display:inline-block;background-color:#3ba1da;border-radius:5px;color:#fff;margin:10px 0 0;padding:5px 10px;text-decoration:none}.um-request-button:hover{background-color:#44b0ec;color:#fff;text-decoration:none} \ No newline at end of file diff --git a/readme.txt b/readme.txt index 72b9e875..021021bc 100644 --- a/readme.txt +++ b/readme.txt @@ -166,7 +166,7 @@ No specific extensions are needed. But we highly recommended keep active these P IMPORTANT: PLEASE UPDATE THE PLUGIN TO AT LEAST VERSION 2.6.7 IMMEDIATELY. VERSION 2.6.7 PATCHES SECURITY PRIVILEGE ESCALATION VULNERABILITY. PLEASE SEE [THIS ARTICLE](https://docs.ultimatemember.com/article/1866-security-incident-update-and-recommended-actions) FOR MORE INFORMATION -= 2.8.2: January 11, 2024 = += 2.8.2: January 15, 2024 = * Enhancements: @@ -184,6 +184,7 @@ IMPORTANT: PLEASE UPDATE THE PLUGIN TO AT LEAST VERSION 2.6.7 IMMEDIATELY. VERSI - Fixed: cropper conflict with Avada theme and active Fusion Image lazyload - Fixed: MegaMenu conflict with nav menu items conditional settings (e.g. Newsletter theme) - Fixed: PHP Fatal error when there isn't a proper WP_Post object in UM User Profile > Posts loop + - Fixed: Account styles * Templates required update: From 7a4690b48ed5e59123807dec9604b3cc6dd63af2 Mon Sep 17 00:00:00 2001 From: Mykyta Synelnikov Date: Mon, 15 Jan 2024 10:04:07 +0200 Subject: [PATCH 32/43] - fixed #1427 `um_form_version` meta is unique; --- includes/admin/core/class-admin-metabox.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/admin/core/class-admin-metabox.php b/includes/admin/core/class-admin-metabox.php index 603426b8..96546ada 100644 --- a/includes/admin/core/class-admin-metabox.php +++ b/includes/admin/core/class-admin-metabox.php @@ -1267,7 +1267,7 @@ if ( ! class_exists( 'um\admin\core\Admin_Metabox' ) ) { } // Set post meta for legacy support in the future. - add_post_meta( $post_id, 'um_form_version', UM_VERSION ); + add_post_meta( $post_id, 'um_form_version', UM_VERSION, true ); if ( empty( $_POST['post_title'] ) ) { $where = array( 'ID' => $post_id ); From d5446a1986ebcf1574e9b4167ef1cee14cf5bdc9 Mon Sep 17 00:00:00 2001 From: Mykyta Synelnikov Date: Mon, 15 Jan 2024 10:31:08 +0200 Subject: [PATCH 33/43] - updated readme; --- readme.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/readme.txt b/readme.txt index 021021bc..5816b5a3 100644 --- a/readme.txt +++ b/readme.txt @@ -185,6 +185,7 @@ IMPORTANT: PLEASE UPDATE THE PLUGIN TO AT LEAST VERSION 2.6.7 IMMEDIATELY. VERSI - Fixed: MegaMenu conflict with nav menu items conditional settings (e.g. Newsletter theme) - Fixed: PHP Fatal error when there isn't a proper WP_Post object in UM User Profile > Posts loop - Fixed: Account styles + - Fixed: Saving `um_form_version` postmeta * Templates required update: From bd151875c9caf002ff2c0090f4ee90f0979ee0f0 Mon Sep 17 00:00:00 2001 From: Mykyta Synelnikov Date: Mon, 15 Jan 2024 11:36:57 +0200 Subject: [PATCH 34/43] - reviewed #1375; --- includes/core/class-shortcodes.php | 56 +++++++++++++++++++----------- 1 file changed, 36 insertions(+), 20 deletions(-) diff --git a/includes/core/class-shortcodes.php b/includes/core/class-shortcodes.php index 9c8941aa..5bdbe0d6 100644 --- a/includes/core/class-shortcodes.php +++ b/includes/core/class-shortcodes.php @@ -74,9 +74,7 @@ if ( ! class_exists( 'um\core\Shortcodes' ) ) { add_shortcode( 'um_show_content', array( &$this, 'um_shortcode_show_content_for_role' ) ); add_shortcode( 'ultimatemember_searchform', array( &$this, 'ultimatemember_searchform' ) ); - if ( ! shortcode_exists( 'um_profile_link' ) ) { - add_shortcode( 'um_profile_link', array( &$this, 'um_profile_link' ) ); - } + add_shortcode( 'um_author_profile_link', array( &$this, 'author_profile_link' ) ); add_filter( 'body_class', array( &$this, 'body_class' ), 0 ); @@ -462,43 +460,61 @@ if ( ! class_exists( 'um\core\Shortcodes' ) ) { return $output; } - /** - * Display profile link. + * Display post author's link to UM User Profile. * - * @since 2.8.0 + * @since 2.8.2 * - * Example 1: [um_profile_link] - * Example 2: [um_profile_link title="Go to profile" user_id="29"] + * Example 1: [um_author_profile_link] + * Example 2: [um_author_profile_link title="Go to profile" user_id="29"] * * @param array $attr { * Attributes of the shortcode. * - * @type string class A link class. - * @type string title A link text. - * @type int user_id User ID. Author ID if empty. + * @type string class A link class. + * @type string title A link text. + * @type int user_id User ID. Author ID if empty. + * @type bool raw Get raw URL or link layout. `false` by default. * } - * @return string|void Profile link HTML or profile link URL if the link text is empty. + * @return string Profile link HTML or profile link URL if the link text is empty. */ - public function um_profile_link( $attr ) { + public function author_profile_link( $attr = array(), $content = '' ) { + $default_user_id = 0; + if ( is_singular() ) { + $default_user_id = get_post()->post_author; + } elseif ( is_author() ) { + $default_user_id = get_the_author_meta( 'ID' ); + } $defaults_atts = array( 'class' => 'um-link um-profile-link', - 'title' => '', - 'user_id' => is_singular() ? get_post()->post_author : ( is_author() ? get_the_author_meta( 'ID' ) : 0 ), + 'title' => __( 'Go to profile', 'ultimate-member' ), + 'user_id' => $default_user_id, + 'raw' => false, ); - $atts = shortcode_atts( $defaults_atts, $attr, 'um_profile_link' ); + $atts = shortcode_atts( $defaults_atts, $attr, 'um_author_profile_link' ); if ( empty( $atts['user_id'] ) ) { - return; + return ''; } - $url = um_user_profile_url( $atts['user_id'] ); - return empty( $atts['title'] ) ? $url : '' . esc_html( $atts['title'] ) . ''; + $user_id = absint( $atts['user_id'] ); + $url = um_user_profile_url( $user_id ); + if ( empty( $url ) ) { + return ''; + } + + if ( ! empty( $atts['raw'] ) ) { + return $url; + } + + $title = ! empty( $atts['title'] ) ? $atts['title'] : __( 'Go to profile', 'ultimate-member' ); + $link_html = empty( $content ) ? $title : $content; + + return '' . wp_kses_post( $link_html ) . ''; } - /** * @param array $args * From f049832b730dd4a982861917b03d98256874926e Mon Sep 17 00:00:00 2001 From: Mykyta Synelnikov Date: Mon, 15 Jan 2024 11:48:18 +0200 Subject: [PATCH 35/43] - updated docs; --- includes/core/class-shortcodes.php | 15 +++++++++------ readme.txt | 1 + 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/includes/core/class-shortcodes.php b/includes/core/class-shortcodes.php index 5bdbe0d6..bd5c5ddd 100644 --- a/includes/core/class-shortcodes.php +++ b/includes/core/class-shortcodes.php @@ -465,17 +465,20 @@ if ( ! class_exists( 'um\core\Shortcodes' ) ) { * * @since 2.8.2 * - * Example 1: [um_author_profile_link] - * Example 2: [um_author_profile_link title="Go to profile" user_id="29"] + * Example 1: [um_author_profile_link] current post author User Profile URL + * Example 2: [um_author_profile_link title="User profile" user_id="29"] + * Example 3: [um_author_profile_link title="User profile" user_id="29"]Visit Author Profile[/um_author_profile_link] + * Example 4: [um_author_profile_link raw="1"] for result like http://localhost:8000/user/janedoe/ * * @param array $attr { * Attributes of the shortcode. * - * @type string class A link class. - * @type string title A link text. - * @type int user_id User ID. Author ID if empty. - * @type bool raw Get raw URL or link layout. `false` by default. + * @type string $class A link class. + * @type string $title A link text. + * @type int $user_id User ID. Author ID if empty. + * @type bool $raw Get raw URL or link layout. `false` by default. * } + * @param string $content * @return string Profile link HTML or profile link URL if the link text is empty. */ public function author_profile_link( $attr = array(), $content = '' ) { diff --git a/readme.txt b/readme.txt index 5816b5a3..c9f8bdf4 100644 --- a/readme.txt +++ b/readme.txt @@ -172,6 +172,7 @@ IMPORTANT: PLEASE UPDATE THE PLUGIN TO AT LEAST VERSION 2.6.7 IMMEDIATELY. VERSI - Added: The `data` protocol for embedding base64 encoded logos in emails - Added: Hook `um_access_restricted_post_instance` for filtering the restricted post instance + - Added: Shortcode `[um_author_profile_link]` for getting user Profile URL - Updated: Using underscore.js native debounce method for resize handler - Updated: Texts spelling From e1885a73a8ad542cfd2ed60aef38a6bce4ab8553 Mon Sep 17 00:00:00 2001 From: "WordPress .pot File Generator" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 15 Jan 2024 10:58:44 +0000 Subject: [PATCH 36/43] =?UTF-8?q?=F0=9F=94=84=20Generated=20POT=20File?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- languages/ultimate-member.pot | 70 ++++++++++++++++++++--------------- 1 file changed, 40 insertions(+), 30 deletions(-) diff --git a/languages/ultimate-member.pot b/languages/ultimate-member.pot index 9d1a0a1e..d8099916 100644 --- a/languages/ultimate-member.pot +++ b/languages/ultimate-member.pot @@ -1,15 +1,15 @@ -# Copyright (C) 2023 Ultimate Member +# Copyright (C) 2024 Ultimate Member # This file is distributed under the same license as the Ultimate Member plugin. msgid "" msgstr "" -"Project-Id-Version: Ultimate Member 2.8.1\n" +"Project-Id-Version: Ultimate Member 2.8.2\n" "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/ultimate-member\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"POT-Creation-Date: 2023-12-20T20:39:58+00:00\n" +"POT-Creation-Date: 2024-01-15T10:58:42+00:00\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "X-Generator: WP-CLI 2.9.0\n" "X-Domain: ultimate-member\n" @@ -1534,8 +1534,8 @@ msgstr "" #: includes/admin/class-site-health.php:1785 #: includes/core/class-member-directory.php:405 -#: includes/core/um-filters-fields.php:1017 -#: includes/core/um-filters-fields.php:1034 +#: includes/core/um-filters-fields.php:1018 +#: includes/core/um-filters-fields.php:1035 msgid "Age" msgstr "" @@ -2100,8 +2100,8 @@ msgstr "" #: includes/core/um-actions-profile.php:846 #: assets/js/admin/forms.js:306 #: assets/js/admin/forms.js:380 -#: assets/js/admin/forms.js:657 -#: assets/js/admin/forms.js:690 +#: assets/js/admin/forms.js:659 +#: assets/js/admin/forms.js:692 msgid "Remove" msgstr "" @@ -2110,7 +2110,7 @@ msgid "Select media" msgstr "" #: includes/admin/core/class-admin-forms.php:1399 -#: assets/js/admin/forms.js:738 +#: assets/js/admin/forms.js:740 msgid "Select" msgstr "" @@ -2318,8 +2318,9 @@ msgstr "" #: includes/admin/core/class-admin-metabox.php:451 #: includes/admin/core/class-admin-metabox.php:602 #: includes/admin/core/class-admin-metabox.php:2385 -#: includes/admin/core/class-admin-navmenu.php:70 -#: includes/admin/core/class-admin-navmenu.php:168 +#: includes/admin/core/class-admin-navmenu.php:72 +#: includes/admin/core/class-admin-navmenu.php:126 +#: includes/admin/core/class-admin-navmenu.php:203 #: includes/admin/templates/access/restrict_content.php:65 #: includes/core/class-builtin.php:760 #: assets/js/admin/block-restrictions.js:102 @@ -2358,7 +2359,7 @@ msgstr "" #: includes/admin/core/class-admin-metabox.php:469 #: includes/admin/core/class-admin-metabox.php:621 -msgid "Would you like to display 404 error on the term's archive page and terms' posts single pages when users haven't access?" +msgid "Would you like to display a 404 page for users who do not have access to this term on the term's archive page and terms' posts single pages?" msgstr "" #: includes/admin/core/class-admin-metabox.php:470 @@ -3394,28 +3395,32 @@ msgstr "" msgid "By Role" msgstr "" -#: includes/admin/core/class-admin-navmenu.php:64 -#: includes/admin/core/class-admin-navmenu.php:160 +#: includes/admin/core/class-admin-navmenu.php:66 +#: includes/admin/core/class-admin-navmenu.php:119 +#: includes/admin/core/class-admin-navmenu.php:195 msgid "Ultimate Member Menu Settings" msgstr "" -#: includes/admin/core/class-admin-navmenu.php:68 -#: includes/admin/core/class-admin-navmenu.php:164 +#: includes/admin/core/class-admin-navmenu.php:70 +#: includes/admin/core/class-admin-navmenu.php:123 +#: includes/admin/core/class-admin-navmenu.php:199 msgid "Who can see this menu link?" msgstr "" -#: includes/admin/core/class-admin-navmenu.php:71 -#: includes/admin/core/class-admin-navmenu.php:171 +#: includes/admin/core/class-admin-navmenu.php:73 +#: includes/admin/core/class-admin-navmenu.php:127 +#: includes/admin/core/class-admin-navmenu.php:206 msgid "Logged Out Users" msgstr "" -#: includes/admin/core/class-admin-navmenu.php:72 -#: includes/admin/core/class-admin-navmenu.php:174 +#: includes/admin/core/class-admin-navmenu.php:74 +#: includes/admin/core/class-admin-navmenu.php:128 +#: includes/admin/core/class-admin-navmenu.php:209 msgid "Logged In Users" msgstr "" -#: includes/admin/core/class-admin-navmenu.php:77 -#: includes/admin/core/class-admin-navmenu.php:180 +#: includes/admin/core/class-admin-navmenu.php:79 +#: includes/admin/core/class-admin-navmenu.php:215 msgid "Select the member roles that can see this link" msgstr "" @@ -5012,7 +5017,7 @@ msgid "Leave empty if you want to display a post for all logged in users" msgstr "" #: includes/admin/templates/access/restrict_content.php:84 -msgid "Would you like to display 404 page when users haven't access?" +msgid "Would you like to display a 404 page for users who do not have access to this page?" msgstr "" #: includes/admin/templates/access/restrict_content.php:85 @@ -6359,7 +6364,7 @@ msgstr "" #. translators: %s: The message after registration process based on a role data and user status after registration #. translators: %s: Restricted blog page message. #. translators: %s: Restricted taxonomy message. -#: includes/core/class-access.php:738 +#: includes/core/class-access.php:774 #: includes/core/class-fields.php:1549 #: includes/core/um-actions-account.php:510 #: templates/message.php:23 @@ -8923,15 +8928,20 @@ msgstr "" msgid "The \"unassigned\" $status has been removed. Use `UM()->setup()->set_default_user_status()` for setting up default user account status." msgstr "" -#: includes/core/class-shortcodes.php:407 +#: includes/core/class-shortcodes.php:409 msgid "This content has been restricted to logged in users only. Please login to view this content." msgstr "" -#: includes/core/class-shortcodes.php:778 +#: includes/core/class-shortcodes.php:494 +#: includes/core/class-shortcodes.php:515 +msgid "Go to profile" +msgstr "" + +#: includes/core/class-shortcodes.php:837 msgid "You are already registered." msgstr "" -#: includes/core/class-shortcodes.php:1037 +#: includes/core/class-shortcodes.php:1096 msgid "Default Template" msgstr "" @@ -9725,21 +9735,21 @@ msgid "This user has not made any comments." msgstr "" #. translators: %s: human time diff. -#: templates/profile/posts-single.php:43 +#: templates/profile/posts-single.php:45 msgid "%s ago" msgstr "" #. translators: %s: categories list. -#: templates/profile/posts-single.php:49 +#: templates/profile/posts-single.php:53 msgid "in: %s" msgstr "" -#: templates/profile/posts-single.php:56 +#: templates/profile/posts-single.php:61 msgid "no comments" msgstr "" #. translators: %s: comments number. -#: templates/profile/posts-single.php:59 +#: templates/profile/posts-single.php:64 msgid "%s comment" msgid_plural "%s comments" msgstr[0] "" From 5340a65858e31d042bb5b9f61b951acd1aed73c3 Mon Sep 17 00:00:00 2001 From: Mykyta Synelnikov Date: Tue, 16 Jan 2024 01:30:16 +0200 Subject: [PATCH 37/43] - updated version; --- README.md | 2 +- ultimate-member.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 734786ff..e5fe5998 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,7 @@ GNU Version 2 or Any Later Version ### IMPORTANT: PLEASE UPDATE THE PLUGIN TO AT LEAST VERSION 2.6.7 IMMEDIATELY. VERSION 2.6.7 PATCHES SECURITY PRIVILEGE ESCALATION VULNERABILITY. PLEASE SEE [THIS ARTICLE](https://docs.ultimatemember.com/article/1866-security-incident-update-and-recommended-actions) FOR MORE INFORMATION -[Official Release Version: 2.8.2](https://github.com/ultimatemember/ultimatemember/releases/tag/2.8.2). +[Official Release Version: 2.8.3](https://github.com/ultimatemember/ultimatemember/releases/tag/2.8.3). ## Changelog diff --git a/ultimate-member.php b/ultimate-member.php index 608bd39a..82bb8b5f 100644 --- a/ultimate-member.php +++ b/ultimate-member.php @@ -3,7 +3,7 @@ * Plugin Name: Ultimate Member * Plugin URI: http://ultimatemember.com/ * Description: The easiest way to create powerful online communities and beautiful user profiles with WordPress - * Version: 2.8.2 + * Version: 2.8.3-alpha * Author: Ultimate Member * Author URI: http://ultimatemember.com/ * Text Domain: ultimate-member From d9021373ce86eeed5926545302813d2fba6db421 Mon Sep 17 00:00:00 2001 From: ashubawork Date: Tue, 16 Jan 2024 14:00:22 +0200 Subject: [PATCH 38/43] - add meta to user --- includes/class-config.php | 4 ++-- includes/core/class-mail.php | 29 ++++++++------------------- includes/core/class-password.php | 5 +++++ includes/core/class-user.php | 12 +++-------- includes/core/um-actions-register.php | 17 +++++++++------- templates/email/welcome_email.php | 4 ++-- 6 files changed, 30 insertions(+), 41 deletions(-) diff --git a/includes/class-config.php b/includes/class-config.php index 2b570c3b..27e2f6e6 100644 --- a/includes/class-config.php +++ b/includes/class-config.php @@ -334,8 +334,8 @@ if ( ! class_exists( 'um\Config' ) ) { 'subject' => 'Welcome to {site_name}!', 'body' => 'Hi {display_name},

    ' . 'Thank you for signing up with {site_name}! Your account is now active.

    ' . - 'To login please visit the following url:

    ' . - '{login_url}

    ' . + '{action_title}:

    ' . + '{action_url}

    ' . 'Your account e-mail: {email}
    ' . 'Your account username: {username}

    ' . 'If you have any problems, please contact us at {admin_email}

    ' . diff --git a/includes/core/class-mail.php b/includes/core/class-mail.php index af429cf2..c71d194e 100644 --- a/includes/core/class-mail.php +++ b/includes/core/class-mail.php @@ -423,9 +423,6 @@ if ( ! class_exists( 'um\core\Mail' ) ) { add_filter( 'um_template_tags_patterns_hook', array( UM()->mail(), 'add_placeholder' ) ); add_filter( 'um_template_tags_replaces_hook', array( UM()->mail(), 'add_replace_placeholder' ) ); - if ( array_key_exists( 'generated_pass', $args ) && 1 === absint( $args['generated_pass'] ) ) { - add_filter( 'um_template_tags_replaces_hook', array( UM()->mail(), 'add_replace_placeholder_set_password' ) ); - } /** * Filters email notification subject. @@ -624,9 +621,10 @@ if ( ! class_exists( 'um\core\Mail' ) ) { $placeholders[] = '{admin_email}'; $placeholders[] = '{submitted_registration}'; $placeholders[] = '{login_url}'; - $placeholders[] = '{login_button}'; $placeholders[] = '{password}'; $placeholders[] = '{account_activation_link}'; + $placeholders[] = '{action_url}'; + $placeholders[] = '{action_title}'; return $placeholders; } @@ -643,25 +641,14 @@ if ( ! class_exists( 'um\core\Mail' ) ) { $replace_placeholders[] = um_admin_email(); $replace_placeholders[] = um_user_submitted_registration_formatted(); $replace_placeholders[] = um_get_core_page( 'login' ); - $replace_placeholders[] = esc_html__( 'Login to our site', 'ultimate-member' ); $replace_placeholders[] = esc_html__( 'Your set password', 'ultimate-member' ); $replace_placeholders[] = um_user( 'account_activation_link' ); - return $replace_placeholders; - } - - - public function add_replace_placeholder_set_password( $replace_placeholders ) { - $key = array_search( um_get_core_page( 'login' ), $replace_placeholders, true ); - if ( false !== $key ) { - $url = UM()->password()->reset_url(); - $replace_placeholders[ $key ] = add_query_arg( array( 'set_pass' => 'new_user' ), $url ); - } - - $button = esc_html__( 'Login to our site', 'ultimate-member' ); - $button_key = array_search( $button, $replace_placeholders , true ); - if ( false !== $key ) { - $url = UM()->password()->reset_url(); - $replace_placeholders[ $button_key ] = esc_html__( 'Set your password', 'ultimate-member' ); + if ( true === (bool) get_user_meta( um_user( 'ID' ), 'um_password_generated', true ) ) { + $replace_placeholders[] = um_user( 'password_reset_link' ); + $replace_placeholders[] = esc_html__( 'Set your password', 'ultimate-member' ); + } else { + $replace_placeholders[] = um_get_core_page( 'login' ); + $replace_placeholders[] = esc_html__( 'Login to our site', 'ultimate-member' ); } return $replace_placeholders; } diff --git a/includes/core/class-password.php b/includes/core/class-password.php index a5e1c882..06d69997 100644 --- a/includes/core/class-password.php +++ b/includes/core/class-password.php @@ -599,6 +599,11 @@ if ( ! class_exists( 'um\core\Password' ) ) { } $this->setcookie( $rp_cookie, false ); + $password_generated = get_user_meta( $user->ID, 'um_password_generated', true ); + if ( $password_generated ) { + delete_user_meta( $user->ID, 'um_password_generated' ); + } + /** * UM hook * diff --git a/includes/core/class-user.php b/includes/core/class-user.php index c47690f3..9a96da1f 100644 --- a/includes/core/class-user.php +++ b/includes/core/class-user.php @@ -1690,7 +1690,7 @@ if ( ! class_exists( 'um\core\User' ) ) { ?> * */ - function approve( $repeat = true, $args = array() ) { + public function approve( $repeat = true ) { $user_id = um_user( 'ID' ); if ( ! $repeat ) { @@ -1702,7 +1702,7 @@ if ( ! class_exists( 'um\core\User' ) ) { delete_option( "um_cache_userdata_{$user_id}" ); - if ( um_user( 'account_status' ) == 'awaiting_admin_review' ) { + if ( 'awaiting_admin_review' === um_user( 'account_status' ) ) { $userdata = get_userdata( $user_id ); $this->maybe_generate_password_reset_key( $userdata ); @@ -1712,13 +1712,7 @@ if ( ! class_exists( 'um\core\User' ) ) { } else { //$userdata = get_userdata( $user_id ); //get_password_reset_key( $userdata ); - $welcome_email_args = array(); - if ( true === (bool) $args['generated_pass'] ) { - $welcome_email_args = array( - 'generated_pass' => 1, - ); - } - UM()->mail()->send( um_user( 'user_email' ), 'welcome_email', $welcome_email_args ); + UM()->mail()->send( um_user( 'user_email' ), 'welcome_email' ); } $this->set_status( 'approved' ); diff --git a/includes/core/um-actions-register.php b/includes/core/um-actions-register.php index f85c4ad4..14938c8f 100644 --- a/includes/core/um-actions-register.php +++ b/includes/core/um-actions-register.php @@ -8,12 +8,12 @@ if ( ! defined( 'ABSPATH' ) ) { * * @param int $user_id */ -function um_post_registration_approved_hook( $user_id, $args ) { +function um_post_registration_approved_hook( $user_id ) { um_fetch_user( $user_id ); - UM()->user()->approve( true, $args ); + UM()->user()->approve( true ); } -add_action( 'um_post_registration_approved_hook', 'um_post_registration_approved_hook', 10, 2 ); +add_action( 'um_post_registration_approved_hook', 'um_post_registration_approved_hook', 10, 1 ); /** * Account needs email validation. @@ -417,8 +417,10 @@ function um_submit_form_register( $args, $form_data ) { $user_email = $args['user_email']; } + $generate_password = false; if ( ! isset( $args['user_password'] ) ) { - $user_password = UM()->validation()->generate( 8 ); + $generate_password = true; + $user_password = UM()->validation()->generate( 8 ); } else { $user_password = $args['user_password']; } @@ -456,9 +458,6 @@ function um_submit_form_register( $args, $form_data ) { 'user_password' => $user_password, 'user_email' => trim( $user_email ), ); - if ( ! isset( $args['user_password'] ) ) { - $credentials['generated_pass'] = true; - } // @todo test when ready maybe remove if ( ! empty( $args['submitted'] ) ) { @@ -523,6 +522,10 @@ function um_submit_form_register( $args, $form_data ) { return; } + if ( true === $generate_password ) { + update_user_meta( $user_id, 'um_password_generated', true ); + } + /** * Fires after complete UM user registration. * diff --git a/templates/email/welcome_email.php b/templates/email/welcome_email.php index ac4ab960..ffb7c6f8 100644 --- a/templates/email/welcome_email.php +++ b/templates/email/welcome_email.php @@ -21,9 +21,9 @@ if ( ! defined( 'ABSPATH' ) ) {
    -
    Thank you for signing up!Your account is now active.
    +
    Thank you for signing up! Your account is now active.
    - +
    If you have any problems, please contact us at {admin_email}
    From c8ddd5d23c3face99725accb604a9ef022c59268 Mon Sep 17 00:00:00 2001 From: ashubawork Date: Tue, 16 Jan 2024 16:09:26 +0200 Subject: [PATCH 39/43] - fix emails placeholders --- includes/core/class-mail.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/includes/core/class-mail.php b/includes/core/class-mail.php index c71d194e..965e36dd 100644 --- a/includes/core/class-mail.php +++ b/includes/core/class-mail.php @@ -643,13 +643,15 @@ if ( ! class_exists( 'um\core\Mail' ) ) { $replace_placeholders[] = um_get_core_page( 'login' ); $replace_placeholders[] = esc_html__( 'Your set password', 'ultimate-member' ); $replace_placeholders[] = um_user( 'account_activation_link' ); - if ( true === (bool) get_user_meta( um_user( 'ID' ), 'um_password_generated', true ) ) { - $replace_placeholders[] = um_user( 'password_reset_link' ); - $replace_placeholders[] = esc_html__( 'Set your password', 'ultimate-member' ); - } else { + + if ( 'pending' === um_user( 'status' ) || ! get_user_meta( um_user( 'ID' ), 'um_password_generated', true ) ) { $replace_placeholders[] = um_get_core_page( 'login' ); $replace_placeholders[] = esc_html__( 'Login to our site', 'ultimate-member' ); + } else { + $replace_placeholders[] = um_user( 'password_reset_link' ); + $replace_placeholders[] = esc_html__( 'Set your password', 'ultimate-member' ); } + return $replace_placeholders; } } From 9e61abfa7a6e5b5edec7dca0cd2aaf241f158294 Mon Sep 17 00:00:00 2001 From: ashubawork Date: Wed, 17 Jan 2024 13:24:40 +0200 Subject: [PATCH 40/43] - change password text --- templates/password-change.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/templates/password-change.php b/templates/password-change.php index 46bf34a6..322a2e65 100644 --- a/templates/password-change.php +++ b/templates/password-change.php @@ -57,12 +57,16 @@ if ( ! defined( 'ABSPATH' ) ) { foreach ( $fields as $key => $data ) { $output .= UM()->fields()->edit_field( $key, $data ); } - echo $output; ?> + echo wp_kses( $output, UM()->get_allowed_html( 'templates' ) ); ?>
    - + + + + +
    From 7ce364f87414e57667af678d3e230f794f275296 Mon Sep 17 00:00:00 2001 From: ashubawork Date: Wed, 17 Jan 2024 13:40:53 +0200 Subject: [PATCH 41/43] - small wpcs fix --- templates/password-change.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/templates/password-change.php b/templates/password-change.php index 322a2e65..9834b066 100644 --- a/templates/password-change.php +++ b/templates/password-change.php @@ -57,7 +57,8 @@ if ( ! defined( 'ABSPATH' ) ) { foreach ( $fields as $key => $data ) { $output .= UM()->fields()->edit_field( $key, $data ); } - echo wp_kses( $output, UM()->get_allowed_html( 'templates' ) ); ?> + echo wp_kses( $output, UM()->get_allowed_html( 'templates' ) ); + ?>
    From 205a3ea9bce39b62ff26e377c74bfc84dc7dd8a7 Mon Sep 17 00:00:00 2001 From: Mykyta Synelnikov Date: Wed, 17 Jan 2024 16:06:58 +0200 Subject: [PATCH 42/43] - reviewed #1428; --- includes/core/class-mail.php | 3 ++- includes/core/class-password.php | 15 ++++++++++++--- includes/core/um-actions-register.php | 6 +++--- templates/email/welcome_email.php | 2 +- templates/password-change.php | 5 +++-- 5 files changed, 21 insertions(+), 10 deletions(-) diff --git a/includes/core/class-mail.php b/includes/core/class-mail.php index 965e36dd..349aae5f 100644 --- a/includes/core/class-mail.php +++ b/includes/core/class-mail.php @@ -644,7 +644,8 @@ if ( ! class_exists( 'um\core\Mail' ) ) { $replace_placeholders[] = esc_html__( 'Your set password', 'ultimate-member' ); $replace_placeholders[] = um_user( 'account_activation_link' ); - if ( 'pending' === um_user( 'status' ) || ! get_user_meta( um_user( 'ID' ), 'um_password_generated', true ) ) { + $set_password_required = get_user_meta( um_user( 'ID' ), 'um_set_password_required', true ); + if ( empty( $set_password_required ) || 'pending' === um_user( 'status' ) ) { $replace_placeholders[] = um_get_core_page( 'login' ); $replace_placeholders[] = esc_html__( 'Login to our site', 'ultimate-member' ); } else { diff --git a/includes/core/class-password.php b/includes/core/class-password.php index 06d69997..b76de3b5 100644 --- a/includes/core/class-password.php +++ b/includes/core/class-password.php @@ -155,6 +155,7 @@ if ( ! class_exists( 'um\core\Password' ) ) { if ( false !== $this->change_password ) { // then COOKIE are valid then get data from them and populate hidden fields for the password reset form + $args['rp_mode'] = 'pw_change'; $args['template'] = 'password-change'; $args['rp_key'] = ''; $rp_cookie = 'wp-resetpass-' . COOKIEHASH; @@ -163,6 +164,14 @@ if ( ! class_exists( 'um\core\Password' ) ) { $args['login'] = $rp_login; $args['rp_key'] = $rp_key; + + $rp_user_obj = get_user_by( 'login', $rp_login ); + if ( false !== $rp_user_obj ) { + $set_password_required = get_user_meta( $rp_user_obj->ID, 'um_set_password_required', true ); + if ( ! empty( $set_password_required ) ) { + $args['rp_mode'] = 'pw_set'; + } + } } } @@ -599,9 +608,9 @@ if ( ! class_exists( 'um\core\Password' ) ) { } $this->setcookie( $rp_cookie, false ); - $password_generated = get_user_meta( $user->ID, 'um_password_generated', true ); - if ( $password_generated ) { - delete_user_meta( $user->ID, 'um_password_generated' ); + $password_generated = get_user_meta( $user->ID, 'um_set_password_required', true ); + if ( ! empty( $password_generated ) ) { + delete_user_meta( $user->ID, 'um_set_password_required' ); } /** diff --git a/includes/core/um-actions-register.php b/includes/core/um-actions-register.php index 14938c8f..5d4bf6ac 100644 --- a/includes/core/um-actions-register.php +++ b/includes/core/um-actions-register.php @@ -11,9 +11,9 @@ if ( ! defined( 'ABSPATH' ) ) { function um_post_registration_approved_hook( $user_id ) { um_fetch_user( $user_id ); - UM()->user()->approve( true ); + UM()->user()->approve(); } -add_action( 'um_post_registration_approved_hook', 'um_post_registration_approved_hook', 10, 1 ); +add_action( 'um_post_registration_approved_hook', 'um_post_registration_approved_hook' ); /** * Account needs email validation. @@ -523,7 +523,7 @@ function um_submit_form_register( $args, $form_data ) { } if ( true === $generate_password ) { - update_user_meta( $user_id, 'um_password_generated', true ); + update_user_meta( $user_id, 'um_set_password_required', true ); } /** diff --git a/templates/email/welcome_email.php b/templates/email/welcome_email.php index ffb7c6f8..b81eb789 100644 --- a/templates/email/welcome_email.php +++ b/templates/email/welcome_email.php @@ -5,7 +5,7 @@ * * This template can be overridden by copying it to {your-theme}/ultimate-member/email/welcome_email.php * - * @version 2.6.1 + * @version 2.8.3 */ if ( ! defined( 'ABSPATH' ) ) { exit; diff --git a/templates/password-change.php b/templates/password-change.php index 9834b066..98c6e3b7 100644 --- a/templates/password-change.php +++ b/templates/password-change.php @@ -6,8 +6,9 @@ * * Call: function ultimatemember_password() * - * @version 2.7.0 + * @version 2.8.3 * + * @var string $rp_mode * @var string $mode * @var string $rp_key * @var int $form_id @@ -63,7 +64,7 @@ if ( ! defined( 'ABSPATH' ) ) {
    - + From f026f44323d37d9dfdf4bda20a6fefd8d0cbc2ce Mon Sep 17 00:00:00 2001 From: Mykyta Synelnikov Date: Thu, 18 Jan 2024 11:30:49 +0200 Subject: [PATCH 43/43] - reviewed #1428; --- includes/core/class-password.php | 4 +- includes/core/class-permalinks.php | 10 ++++- includes/core/um-actions-core.php | 3 +- templates/password-change.php | 67 ++++++++++++------------------ 4 files changed, 40 insertions(+), 44 deletions(-) diff --git a/includes/core/class-password.php b/includes/core/class-password.php index b76de3b5..77f4c5cb 100644 --- a/includes/core/class-password.php +++ b/includes/core/class-password.php @@ -608,8 +608,8 @@ if ( ! class_exists( 'um\core\Password' ) ) { } $this->setcookie( $rp_cookie, false ); - $password_generated = get_user_meta( $user->ID, 'um_set_password_required', true ); - if ( ! empty( $password_generated ) ) { + $set_password_required = get_user_meta( $user->ID, 'um_set_password_required', true ); + if ( ! empty( $set_password_required ) ) { delete_user_meta( $user->ID, 'um_set_password_required' ); } diff --git a/includes/core/class-permalinks.php b/includes/core/class-permalinks.php index 48779ce8..5d66a799 100644 --- a/includes/core/class-permalinks.php +++ b/includes/core/class-permalinks.php @@ -125,8 +125,14 @@ if ( ! class_exists( 'um\core\Permalinks' ) ) { wp_die( __( 'This activation link is expired.', 'ultimate-member' ) ); } + $redirect = um_get_core_page( 'login', 'account_active' ); + $set_password_required = get_user_meta( $user_id, 'um_set_password_required', true ); + um_fetch_user( $user_id ); UM()->user()->approve(); + if ( ! empty( $set_password_required ) ) { + $redirect = um_user( 'password_reset_link' ); + } um_reset_user(); $user_role = UM()->roles()->get_priority_user_role( $user_id ); @@ -167,7 +173,9 @@ if ( ! class_exists( 'um\core\Permalinks' ) ) { */ do_action( 'um_after_email_confirmation', $user_id ); - $redirect = empty( $user_role_data['url_email_activate'] ) ? um_get_core_page( 'login', 'account_active' ) : trim( $user_role_data['url_email_activate'] ); // Role setting "URL redirect after e-mail activation" + if ( empty( $set_password_required ) ) { + $redirect = empty( $user_role_data['url_email_activate'] ) ? um_get_core_page( 'login', 'account_active' ) : trim( $user_role_data['url_email_activate'] ); // Role setting "URL redirect after e-mail activation" + } $redirect = apply_filters( 'um_after_email_confirmation_redirect', $redirect, $user_id, $login ); exit( wp_redirect( $redirect ) ); diff --git a/includes/core/um-actions-core.php b/includes/core/um-actions-core.php index 9c195a81..8779fafc 100644 --- a/includes/core/um-actions-core.php +++ b/includes/core/um-actions-core.php @@ -100,10 +100,11 @@ function um_action_request_process() { wp_die( esc_html__( 'You do not have permission to make this action.', 'ultimate-member' ) ); } + um_fetch_user( $uid ); + add_filter( 'um_template_tags_patterns_hook', array( UM()->password(), 'add_placeholder' ), 10, 1 ); add_filter( 'um_template_tags_replaces_hook', array( UM()->password(), 'add_replace_placeholder' ), 10, 1 ); - um_fetch_user( $uid ); UM()->user()->approve(); exit( wp_redirect( UM()->permalinks()->get_current_url( true ) ) ); break; diff --git a/templates/password-change.php b/templates/password-change.php index 98c6e3b7..6ad5b9c1 100644 --- a/templates/password-change.php +++ b/templates/password-change.php @@ -8,18 +8,16 @@ * * @version 2.8.3 * - * @var string $rp_mode - * @var string $mode - * @var string $rp_key - * @var int $form_id - * @var array $args + * @var string $rp_mode 'pw_set' or 'pw_change' for display it differently. + * @var string $rp_key Reset password key. + * @var array $args Change password arguments */ if ( ! defined( 'ABSPATH' ) ) { exit; } ?> -
    +
    @@ -30,23 +28,18 @@ if ( ! defined( 'ABSPATH' ) ) { Add hidden field at the start of the change password form. + * function my_custom_change_password_page_hidden_fields( $cp_args ) { + * echo '' * } - * ?> + * add_action( 'um_change_password_page_hidden_fields', 'my_custom_change_password_page_hidden_fields' ); */ do_action( 'um_change_password_page_hidden_fields', $args ); @@ -58,11 +51,12 @@ if ( ! defined( 'ABSPATH' ) ) { foreach ( $fields as $key => $data ) { $output .= UM()->fields()->edit_field( $key, $data ); } - echo wp_kses( $output, UM()->get_allowed_html( 'templates' ) ); + if ( $output ) { + echo wp_kses( $output, UM()->get_allowed_html( 'templates' ) ); + } ?>
    -
    @@ -72,29 +66,22 @@ if ( ! defined( 'ABSPATH' ) ) {
    -
    Add hidden field at the start of the change password form. + * function my_custom_change_password_form( $cp_args ) { + * echo '' * } - * ?> + * add_action( 'um_change_password_form', 'my_custom_change_password_form' ); */ do_action( 'um_change_password_form', $args ); /** This action is documented in includes/core/um-actions-profile.php */