'; + + echo sprintf(__( 'Registration is disabled. Please go to the general settings page in the WordPress admin and select anyone can register. Hide this notice', 'ultimatemember' ), admin_url('options-general.php'), add_query_arg('um_adm_action', 'um_can_register_notice') ); + + echo '
'; + + } + } + + /*** + *** @updating users + ***/ + function show_update_messages(){ + if ( !isset($_REQUEST['update']) ) return; - + $update = $_REQUEST['update']; - switch($update) { case 'user_updated': @@ -36,9 +55,9 @@ class UM_Admin_Notices { if ( !empty( $messages ) ) { foreach( $messages as $message ) { if ( isset($message['err_content'])) { - echo '' . $message['err_content'] . '
' . $message['err_content'] . '
' . $message['content'] . '
' . $message['content'] . '
'; + echo '
'; echo __( 'Help us improve Ultimate Member’s compatibility with other plugins and themes by allowing us to track non-sensitive data on your site. Click here to see what data we track.', 'ultimatemember' ); diff --git a/admin/templates/about.php b/admin/templates/about.php index 0c818542..69304e7d 100644 --- a/admin/templates/about.php +++ b/admin/templates/about.php @@ -1,5 +1,5 @@ - +
Ultimate Member has been designed to be as easy to use as possible and you shouldn’t run into any difficulties. However, the plugin contains lots of different elements so we have created the following page to help you get started with Ultimate Member.
+ +Upon activation the plugin will install 7 core pages. These pages are required for the plugin to function correctly and cannot be deleted.
++
+ +The plugin has several different elements in the WordPress admin that allow you to customize your community/membership site:
++
If you want to learn more about Ultimate Member you’ll need to register on our website where you will be able to interact and get help from other Ultimate Member users via our community forum and also be able to access other useful resources including the plugin’s documentation.
+ + + +' . $err . '
'; } + if ( isset( $success ) ) { + $output .= '' . $success . '
'; + } + echo $output; } \ No newline at end of file diff --git a/core/um-actions-profile.php b/core/um-actions-profile.php index da7aaf21..633c291b 100644 --- a/core/um-actions-profile.php +++ b/core/um-actions-profile.php @@ -65,13 +65,17 @@ fields->editing ) { - echo $ultimatemember->menu->new_ui( 'bc', 'div.um-cover', 'click', array( + + $items = array( ''.__('Change cover photo','ultimatemember').'', ''.__('Remove','ultimatemember').'', ''.__('Cancel','ultimatemember').'', - ) ); + ); + + echo $ultimatemember->menu->new_ui( 'bc', 'div.um-cover', 'click', $items ); + } - + ?> fields->add_hidden_field( 'cover_photo' ); ?> @@ -156,18 +160,22 @@ if ( !um_profile('profile_photo') ) { // has profile photo - echo $ultimatemember->menu->new_ui( 'bc', 'div.um-profile-photo', 'click', array( + $items = array( ''.__('Upload photo','ultimatemember').'', ''.__('Cancel','ultimatemember').'', - ) ); + ); + + echo $ultimatemember->menu->new_ui( 'bc', 'div.um-profile-photo', 'click', $items ); } else if ( $ultimatemember->fields->editing == true ) { - echo $ultimatemember->menu->new_ui( 'bc', 'div.um-profile-photo', 'click', array( + $items = array( ''.__('Change photo','ultimatemember').'', ''.__('Remove photo','ultimatemember').'', ''.__('Cancel','ultimatemember').'', - ) ); + ); + + echo $ultimatemember->menu->new_ui( 'bc', 'div.um-profile-photo', 'click', $items ); } @@ -261,7 +269,7 @@ if ( !is_user_logged_in() ) return; // not allowed for guests - if ( isset( $ultimatemember->user->cannot_edit ) && $ultimatemember->user->cannot_edit == 1 ) return; + if ( isset( $ultimatemember->user->cannot_edit ) && $ultimatemember->user->cannot_edit == 1 ) return; // do not proceed if user cannot edit if ( $ultimatemember->fields->editing == true ) { @@ -281,19 +289,31 @@ ''.__('My Account','ultimatemember').'', + $items = array( 'editprofile' => ''.__('Edit Profile','ultimatemember').'', + 'myaccount' => ''.__('My Account','ultimatemember').'', 'cancel' => ''.__('Cancel','ultimatemember').'', ); + + $cancel = $items['cancel']; if ( !um_is_myprofile() ) { + $actions = $ultimatemember->user->get_admin_actions(); - unset($menu_items['myaccount']); - $menu_items = array_merge( $actions, $menu_items ); + + unset( $items['cancel'] ); + $items = array_merge( $items, $actions ); + $items['cancel'] = $cancel; + + $items = apply_filters('um_profile_edit_menu_items', $items ); + + } else { + + $items = apply_filters('um_myprofile_edit_menu_items', $items ); + } - echo $ultimatemember->menu->new_ui( 'bc', 'div.um-profile-edit', 'click', $menu_items ); + echo $ultimatemember->menu->new_ui( 'bc', 'div.um-profile-edit', 'click', $items ); ?> diff --git a/core/um-actions-wpadmin.php b/core/um-actions-wpadmin.php index b3a0eef1..0210ba81 100644 --- a/core/um-actions-wpadmin.php +++ b/core/um-actions-wpadmin.php @@ -21,107 +21,4 @@ return true; } } - add_filter( 'show_admin_bar' , 'um_control_admin_bar'); - - /*** - *** @show admin bar menu for plugin - ***/ - add_action('admin_bar_menu', 'um_plugin_admin_bar', 99999999 ); - function um_plugin_admin_bar() { - - global $wp_admin_bar; - - if( !is_super_admin() || !is_admin_bar_showing() || is_admin() ) return; - - if ( !um_get_option('wpadmin_um_bar') ) return; - - $args = array( - 'id' => 'um_parent', - 'title' => 'Ultimate Member', - 'href' => admin_url('admin.php?page=ultimatemember-about'), - 'meta' => array( ) - ); - - $wp_admin_bar->add_node( $args ); - - $args = array( - 'parent' => 'um_parent', - 'id' => 'um_sub1', - 'title' => 'About this plugin', - 'href' => admin_url('admin.php?page=ultimatemember-about'), - 'meta' => array( ) - ); - - $wp_admin_bar->add_node( $args ); - - $args = array( - 'parent' => 'um_parent', - 'id' => 'um_sub2', - 'title' => 'Getting Started', - 'href' => admin_url('admin.php?page=ultimatemember-start'), - 'meta' => array( ) - ); - - $wp_admin_bar->add_node( $args ); - - $args = array( - 'parent' => 'um_parent', - 'id' => 'um_sub3', - 'title' => 'Dashboard', - 'href' => admin_url('admin.php?page=ultimatemember'), - 'meta' => array( ) - ); - - $wp_admin_bar->add_node( $args ); - - $args = array( - 'parent' => 'um_parent', - 'id' => 'um_sub4', - 'title' => 'Settings', - 'href' => admin_url('admin.php?page=um_options'), - 'meta' => array( ) - ); - - $wp_admin_bar->add_node( $args ); - - $args = array( - 'parent' => 'um_parent', - 'id' => 'um_sub5', - 'title' => 'Forms', - 'href' => admin_url('edit.php?post_type=um_form'), - 'meta' => array( ) - ); - - $wp_admin_bar->add_node( $args ); - - $args = array( - 'parent' => 'um_parent', - 'id' => 'um_sub6', - 'title' => 'Member Levels', - 'href' => admin_url('edit.php?post_type=um_role'), - 'meta' => array( ) - ); - - $wp_admin_bar->add_node( $args ); - - $args = array( - 'parent' => 'um_parent', - 'id' => 'um_sub7', - 'title' => 'Member Directories', - 'href' => admin_url('edit.php?post_type=um_directory'), - 'meta' => array( ) - ); - - $wp_admin_bar->add_node( $args ); - - $args = array( - 'parent' => 'um_parent', - 'id' => 'um_sub8', - 'title' => 'Members', - 'href' => admin_url('users.php'), - 'meta' => array( ) - ); - - $wp_admin_bar->add_node( $args ); - - } \ No newline at end of file + add_filter( 'show_admin_bar' , 'um_control_admin_bar'); \ No newline at end of file diff --git a/core/um-filters-login.php b/core/um-filters-login.php index 86ab4c13..30e092e6 100644 --- a/core/um-filters-login.php +++ b/core/um-filters-login.php @@ -1,5 +1,44 @@ '.$err.'