diff --git a/templates/account.php b/templates/account.php index aa58d6c5..d89bfab9 100644 --- a/templates/account.php +++ b/templates/account.php @@ -1,3 +1,5 @@ + +
@@ -33,9 +35,13 @@
- + + +
@@ -45,21 +51,39 @@
- + mobile()->isMobile() ) { ?> - + - +
@@ -69,15 +93,21 @@ if ( isset( $info['custom'] ) || UM()->options()->get( "account_tab_{$id}" ) == 1 || $id == 'general' ) { ?>
  • -
    • \ No newline at end of file diff --git a/templates/gdpr-register.php b/templates/gdpr-register.php index 44789c5e..b9318622 100644 --- a/templates/gdpr-register.php +++ b/templates/gdpr-register.php @@ -1,9 +1,9 @@ - +
    -
    + +
    @@ -34,10 +37,13 @@ if ( isset( $errors['use_gdpr_agreement'] ) ) { - $error_message = ! empty( $args['use_gdpr_error_text'] ) ? $args['use_gdpr_error_text'] : __( 'Please confirm your acceptance of our privacy policy', 'ultimate-member' ); + $error_message = ! empty( $args['use_gdpr_error_text'] ) ? $args['use_gdpr_error_text'] : __( 'Please confirm your acceptance of our privacy policy', 'ultimate-member' ); ?> - echo '

    ' . $error_message . '


    '; - } ?> +

    + +

    +
    +
    diff --git a/templates/login-to-view.php b/templates/login-to-view.php index 89d58e2c..36f8cd9e 100644 --- a/templates/login-to-view.php +++ b/templates/login-to-view.php @@ -1,5 +1,7 @@ + +
    -
    +
    \ No newline at end of file diff --git a/templates/login.php b/templates/login.php index 97bc1530..04d80691 100644 --- a/templates/login.php +++ b/templates/login.php @@ -1,136 +1,138 @@ + +
    - +
    - - - */ - do_action( "um_before_form", $args ); - /** - * UM hook - * - * @type action - * @title um_before_{$mode}_fields - * @description Some actions before login form fields - * @input_vars - * [{"var":"$args","type":"array","desc":"Login form shortcode arguments"}] - * @change_log - * ["Since: 2.0"] - * @usage add_action( 'um_before_{$mode}_fields', 'function_name', 10, 1 ); - * @example - * - */ - do_action( "um_before_{$mode}_fields", $args ); + + */ + do_action( "um_before_form", $args ); - /** - * UM hook - * - * @type action - * @title um_main_{$mode}_fields - * @description Some actions before login form fields - * @input_vars - * [{"var":"$args","type":"array","desc":"Login form shortcode arguments"}] - * @change_log - * ["Since: 2.0"] - * @usage add_action( 'um_before_{$mode}_fields', 'function_name', 10, 1 ); - * @example - * - */ - do_action( "um_main_{$mode}_fields", $args ); + /** + * UM hook + * + * @type action + * @title um_before_{$mode}_fields + * @description Some actions before login form fields + * @input_vars + * [{"var":"$args","type":"array","desc":"Login form shortcode arguments"}] + * @change_log + * ["Since: 2.0"] + * @usage add_action( 'um_before_{$mode}_fields', 'function_name', 10, 1 ); + * @example + * + */ + do_action( "um_before_{$mode}_fields", $args ); - /** - * UM hook - * - * @type action - * @title um_after_form_fields - * @description Some actions after login form fields - * @input_vars - * [{"var":"$args","type":"array","desc":"Login form shortcode arguments"}] - * @change_log - * ["Since: 2.0"] - * @usage add_action( 'um_after_form_fields', 'function_name', 10, 1 ); - * @example - * - */ - do_action( 'um_after_form_fields', $args ); + /** + * UM hook + * + * @type action + * @title um_main_{$mode}_fields + * @description Some actions before login form fields + * @input_vars + * [{"var":"$args","type":"array","desc":"Login form shortcode arguments"}] + * @change_log + * ["Since: 2.0"] + * @usage add_action( 'um_before_{$mode}_fields', 'function_name', 10, 1 ); + * @example + * + */ + do_action( "um_main_{$mode}_fields", $args ); - /** - * UM hook - * - * @type action - * @title um_after_{$mode}_fields - * @description Some actions after login form fields - * @input_vars - * [{"var":"$args","type":"array","desc":"Login form shortcode arguments"}] - * @change_log - * ["Since: 2.0"] - * @usage add_action( 'um_after_{$mode}_fields', 'function_name', 10, 1 ); - * @example - * - */ - do_action( "um_after_{$mode}_fields", $args ); + /** + * UM hook + * + * @type action + * @title um_after_form_fields + * @description Some actions after login form fields + * @input_vars + * [{"var":"$args","type":"array","desc":"Login form shortcode arguments"}] + * @change_log + * ["Since: 2.0"] + * @usage add_action( 'um_after_form_fields', 'function_name', 10, 1 ); + * @example + * + */ + do_action( 'um_after_form_fields', $args ); + + /** + * UM hook + * + * @type action + * @title um_after_{$mode}_fields + * @description Some actions after login form fields + * @input_vars + * [{"var":"$args","type":"array","desc":"Login form shortcode arguments"}] + * @change_log + * ["Since: 2.0"] + * @usage add_action( 'um_after_{$mode}_fields', 'function_name', 10, 1 ); + * @example + * + */ + do_action( "um_after_{$mode}_fields", $args ); + + /** + * UM hook + * + * @type action + * @title um_after_form + * @description Some actions after login form fields + * @input_vars + * [{"var":"$args","type":"array","desc":"Login form shortcode arguments"}] + * @change_log + * ["Since: 2.0"] + * @usage add_action( 'um_after_form', 'function_name', 10, 1 ); + * @example + * + */ + do_action( "um_after_form", $args ); ?> - /** - * UM hook - * - * @type action - * @title um_after_form - * @description Some actions after login form fields - * @input_vars - * [{"var":"$args","type":"array","desc":"Login form shortcode arguments"}] - * @change_log - * ["Since: 2.0"] - * @usage add_action( 'um_after_form', 'function_name', 10, 1 ); - * @example - * - */ - do_action( "um_after_form", $args ); ?> -
    diff --git a/templates/logout.php b/templates/logout.php index d4e5bd5b..897d16bf 100644 --- a/templates/logout.php +++ b/templates/logout.php @@ -1,14 +1,18 @@ + +
    - +
    - +
    - + + +
    -
    +
    - -
    - - - -
    - - - - options()->get('cover_thumb_sizes'); - if ( UM()->mobile()->isTablet() ) { - $cover_size = $sizes[1]; - } else { - $cover_size = $sizes[0]; - } - ?> + + +
    + +
    + + + +
    + + + + options()->get( 'cover_thumb_sizes' ); + if ( UM()->mobile()->isTablet() ) { + $cover_size = $sizes[1]; + } else { + $cover_size = $sizes[0]; + } ?> + +
    +
    + + + +
    +
    + + options()->get( 'profile_photocorner' ); + $default_size = str_replace( 'px', '', $corner ); ?> + +
    + + + +
    + + + +
    + + +
    + + + +
    + + */ + do_action( 'um_members_just_after_name', um_user('ID'), $args ); + + if ( UM()->roles()->um_current_user_can( 'edit', um_user('ID') ) ) { ?> +
    + + + +
    + + */ + do_action( 'um_members_after_user_name', um_user('ID'), $args ); + + if ( $show_tagline && ! empty( $tagline_fields ) && is_array( $tagline_fields ) ) { + + um_fetch_user( $member ); + + foreach( $tagline_fields as $key ) { + if ( $key ) { + $value = um_filtered_value( $key ); + if ( ! $value ) { + continue; + } ?> + +
    + +
    + + + +
    + + +
    + + +
    + + + +
    + fields()->get_label( $key ) ); ?>: +
    + + +
    + fields()->show_social_urls(); ?> +
    + + +
    + +
    + +
    + + + +
    -
    -
    - - - options()->get('profile_photosize') ); - $corner = UM()->options()->get('profile_photocorner'); - ?> -
    - - -
    - - -
    - - - - */ - do_action( 'um_members_just_after_name', um_user('ID'), $args ); ?> - - roles()->um_current_user_can( 'edit', um_user('ID') ) ) { ?> -
    - - - -
    - - */ - do_action( 'um_members_after_user_name', um_user('ID'), $args ); ?> - - - -
    - - - -
    - - -
    - - -
    - - - -
    fields()->get_label( $key ) ); ?>:
    - - -
    - fields()->show_social_urls(); ?> -
    - - -
    - -
    - -
    - - - -
    - -
    - - + um_reset_user(); ?>
    -
    +
    \ No newline at end of file diff --git a/templates/members.php b/templates/members.php index 71b84f50..311a6b18 100644 --- a/templates/members.php +++ b/templates/members.php @@ -1,3 +1,5 @@ + +
    diff --git a/templates/message.php b/templates/message.php index 144ad682..8468c960 100644 --- a/templates/message.php +++ b/templates/message.php @@ -1,3 +1,5 @@ + +
    diff --git a/templates/password-change.php b/templates/password-change.php index 4d273184..3e6616c7 100644 --- a/templates/password-change.php +++ b/templates/password-change.php @@ -1,3 +1,5 @@ + +
    diff --git a/templates/password-reset.php b/templates/password-reset.php index e5531bef..07198c5b 100644 --- a/templates/password-reset.php +++ b/templates/password-reset.php @@ -1,3 +1,5 @@ + +
    diff --git a/templates/profile.php b/templates/profile.php index cfe24506..2ef11bc4 100644 --- a/templates/profile.php +++ b/templates/profile.php @@ -1,3 +1,5 @@ + +
    @@ -141,56 +143,58 @@ do_action( 'um_profile_menu', $args ); $nav = UM()->profile()->active_tab; - $subnav = ( get_query_var('subnav') ) ? get_query_var('subnav') : 'default'; + $subnav = ( get_query_var('subnav') ) ? get_query_var('subnav') : 'default'; ?> - print "
    "; +
    - // Custom hook to display tabbed content - /** - * UM hook - * - * @type action - * @title um_profile_content_{$nav} - * @description Custom hook to display tabbed content - * @input_vars - * [{"var":"$args","type":"array","desc":"Profile form shortcode arguments"}] - * @change_log - * ["Since: 2.0"] - * @usage add_action( 'um_profile_content_{$nav}', 'function_name', 10, 1 ); - * @example - * - */ - do_action("um_profile_content_{$nav}", $args); + + */ + do_action("um_profile_content_{$nav}", $args); - /** - * UM hook - * - * @type action - * @title um_profile_content_{$nav}_{$subnav} - * @description Custom hook to display tabbed content - * @input_vars - * [{"var":"$args","type":"array","desc":"Profile form shortcode arguments"}] - * @change_log - * ["Since: 2.0"] - * @usage add_action( 'um_profile_content_{$nav}_{$subnav}', 'function_name', 10, 1 ); - * @example - * - */ - do_action( "um_profile_content_{$nav}_{$subnav}", $args ); + /** + * UM hook + * + * @type action + * @title um_profile_content_{$nav}_{$subnav} + * @description Custom hook to display tabbed content + * @input_vars + * [{"var":"$args","type":"array","desc":"Profile form shortcode arguments"}] + * @change_log + * ["Since: 2.0"] + * @usage add_action( 'um_profile_content_{$nav}_{$subnav}', 'function_name', 10, 1 ); + * @example + * + */ + do_action( "um_profile_content_{$nav}_{$subnav}", $args ); ?> - print "
    "; +
    +
    - if ( um_is_on_edit_profile() ) { ?> + shortcodes()->loop as $comment ) {
    - comment_ID ); ?> + comment_ID ) ); ?>
    diff --git a/templates/profile/comments.php b/templates/profile/comments.php index 069343c6..c96ed05f 100644 --- a/templates/profile/comments.php +++ b/templates/profile/comments.php @@ -1,8 +1,10 @@ -shortcodes()->loop = UM()->query()->make('post_type=comment&number=10&offset=0&user_id=' . um_user('ID') ); ?> +shortcodes()->loop ) { ?> - - shortcodes()->load_template('profile/comments-single'); ?> +UM()->shortcodes()->loop = UM()->query()->make('post_type=comment&number=10&offset=0&user_id=' . um_user('ID') ); + +if ( UM()->shortcodes()->loop ) { + + UM()->shortcodes()->load_template('profile/comments-single'); ?>
    @@ -10,9 +12,11 @@ shortcodes()->loop) >= 10 ) { ?> -
    - -
    +
    + + + +
    @@ -20,6 +24,8 @@ -
    +
    + +
    \ No newline at end of file diff --git a/templates/profile/posts-single.php b/templates/profile/posts-single.php index 3e353b84..114cc3e1 100644 --- a/templates/profile/posts-single.php +++ b/templates/profile/posts-single.php @@ -1,7 +1,9 @@ + +
    - post_title ); ?> + post_title ); ?>
    ID ) ) { diff --git a/templates/profile/posts.php b/templates/profile/posts.php index 82e5b64a..81388fc0 100644 --- a/templates/profile/posts.php +++ b/templates/profile/posts.php @@ -1,4 +1,6 @@ - +
    - +
    - - - */ - do_action( "um_before_form", $args ); - /** - * UM hook - * - * @type action - * @title um_before_{$mode}_fields - * @description Some actions before register form fields - * @input_vars - * [{"var":"$args","type":"array","desc":"Register form shortcode arguments"}] - * @change_log - * ["Since: 2.0"] - * @usage add_action( 'um_before_{$mode}_fields', 'function_name', 10, 1 ); - * @example - * - */ - do_action( "um_before_{$mode}_fields", $args ); + + */ + do_action( "um_before_form", $args ); - /** - * UM hook - * - * @type action - * @title um_before_{$mode}_fields - * @description Some actions before register form fields - * @input_vars - * [{"var":"$args","type":"array","desc":"Register form shortcode arguments"}] - * @change_log - * ["Since: 2.0"] - * @usage add_action( 'um_before_{$mode}_fields', 'function_name', 10, 1 ); - * @example - * - */ - do_action( "um_main_{$mode}_fields", $args ); + /** + * UM hook + * + * @type action + * @title um_before_{$mode}_fields + * @description Some actions before register form fields + * @input_vars + * [{"var":"$args","type":"array","desc":"Register form shortcode arguments"}] + * @change_log + * ["Since: 2.0"] + * @usage add_action( 'um_before_{$mode}_fields', 'function_name', 10, 1 ); + * @example + * + */ + do_action( "um_before_{$mode}_fields", $args ); - /** - * UM hook - * - * @type action - * @title um_after_form_fields - * @description Some actions after register form fields - * @input_vars - * [{"var":"$args","type":"array","desc":"Register form shortcode arguments"}] - * @change_log - * ["Since: 2.0"] - * @usage add_action( 'um_after_form_fields', 'function_name', 10, 1 ); - * @example - * - */ - do_action( 'um_after_form_fields', $args ); + /** + * UM hook + * + * @type action + * @title um_before_{$mode}_fields + * @description Some actions before register form fields + * @input_vars + * [{"var":"$args","type":"array","desc":"Register form shortcode arguments"}] + * @change_log + * ["Since: 2.0"] + * @usage add_action( 'um_before_{$mode}_fields', 'function_name', 10, 1 ); + * @example + * + */ + do_action( "um_main_{$mode}_fields", $args ); - /** - * UM hook - * - * @type action - * @title um_after_{$mode}_fields - * @description Some actions after register form fields - * @input_vars - * [{"var":"$args","type":"array","desc":"Register form shortcode arguments"}] - * @change_log - * ["Since: 2.0"] - * @usage add_action( 'um_after_{$mode}_fields', 'function_name', 10, 1 ); - * @example - * - */ - do_action( "um_after_{$mode}_fields", $args ); + /** + * UM hook + * + * @type action + * @title um_after_form_fields + * @description Some actions after register form fields + * @input_vars + * [{"var":"$args","type":"array","desc":"Register form shortcode arguments"}] + * @change_log + * ["Since: 2.0"] + * @usage add_action( 'um_after_form_fields', 'function_name', 10, 1 ); + * @example + * + */ + do_action( 'um_after_form_fields', $args ); - /** - * UM hook - * - * @type action - * @title um_after_form - * @description Some actions after register form fields - * @input_vars - * [{"var":"$args","type":"array","desc":"Register form shortcode arguments"}] - * @change_log - * ["Since: 2.0"] - * @usage add_action( 'um_after_form', 'function_name', 10, 1 ); - * @example - * - */ - do_action( "um_after_form", $args ); ?> + /** + * UM hook + * + * @type action + * @title um_after_{$mode}_fields + * @description Some actions after register form fields + * @input_vars + * [{"var":"$args","type":"array","desc":"Register form shortcode arguments"}] + * @change_log + * ["Since: 2.0"] + * @usage add_action( 'um_after_{$mode}_fields', 'function_name', 10, 1 ); + * @example + * + */ + do_action( "um_after_{$mode}_fields", $args ); + + /** + * UM hook + * + * @type action + * @title um_after_form + * @description Some actions after register form fields + * @input_vars + * [{"var":"$args","type":"array","desc":"Register form shortcode arguments"}] + * @change_log + * ["Since: 2.0"] + * @usage add_action( 'um_after_form', 'function_name', 10, 1 ); + * @example + * + */ + do_action( "um_after_form", $args ); ?>
    - +
    - +
    \ No newline at end of file diff --git a/templates/restricted-taxonomy.php b/templates/restricted-taxonomy.php index c0b02ff7..d8d4c87d 100644 --- a/templates/restricted-taxonomy.php +++ b/templates/restricted-taxonomy.php @@ -1,4 +1,4 @@ - diff --git a/templates/searchform.php b/templates/searchform.php index f039c851..5904a2cd 100644 --- a/templates/searchform.php +++ b/templates/searchform.php @@ -1,8 +1,10 @@ + +