diff --git a/admin/assets/css/um-admin-global.css b/admin/assets/css/um-admin-global.css index 80bfc2ee..5ede186a 100644 --- a/admin/assets/css/um-admin-global.css +++ b/admin/assets/css/um-admin-global.css @@ -1,3 +1,31 @@ +.um-admin-notice { + border-color: #3ba1da !important; + color: #555; +} + +.um-admin-notice a.button-primary { + background-color: #3ba1da !important; + border-color: #3ba1da !important; +} + +.um-admin-notice a.button-primary:hover { + background-color: #2295d8 !important; + border-color: #2295d8 !important; +} + +.um-admin-notice a.button-secondary {opacity: 0.7} +.um-admin-notice a.button-secondary:hover {opacity: 0.9} +.um-admin-notice a {text-decoration: none;color: #3ba1da} +.um-admin-notice a:hover {color: #44b0ec} + +.um-filter { + padding: 12px; + border-color: #ddd !important; + margin: 20px 0 0 0 !important; + font-size: 14px; + line-height: 24px; +} + /* - General metabox styling */ diff --git a/admin/assets/css/um-admin-misc.css b/admin/assets/css/um-admin-misc.css index 1e085890..fad537f3 100644 --- a/admin/assets/css/um-admin-misc.css +++ b/admin/assets/css/um-admin-misc.css @@ -23,12 +23,15 @@ background: #3ba1da url(../img/logo_small.png) no-repeat center 0px !important; } -.um-about-wrap a.button-primary { - height: 46px; - line-height: 46px; - padding: 0 20px !important; - font-size: 14px; - border: none; +.um-about-wrap .ultimatemember-actions a.button-primary, +.um-about-wrap .ultimatemember-actions a.button { + vertical-align: top; + margin: 0 5px 0 0; +} + +.changelog a.button-primary { + height: 40px; + line-height: 38px; } .um-about-wrap a {text-decoration: none} @@ -93,16 +96,6 @@ body.um-admin-modal-open { top: 1px; } -.um-admin a.button-primary, -.um-admin input.button-primary { - background: #3ba1da; - box-shadow: none !important; - border-radius: 2px; - color: #fff; -} -.um-admin a.button-primary:hover, -.um-admin input.button-primary:hover {background: #44b0ec;} - /* - Form Inputs */ diff --git a/admin/core/um-admin-actions.php b/admin/core/um-admin-actions.php index 963be56c..17e31e81 100644 --- a/admin/core/um-admin-actions.php +++ b/admin/core/um-admin-actions.php @@ -4,9 +4,16 @@ *** @when role is saved ***/ function um_admin_delete_role_cache($post_id, $post){ + global $ultimatemember; if(get_post_type( $post_id ) == 'um_role'){ $slug = $post->post_name; delete_option("um_cached_role_{$slug}"); + + // need to remove cache of all users + $users = get_users( array( 'fields' => array( 'ID' ), 'meta_key' => 'role', 'meta_value' => $slug ) ); + foreach( $users as $user ) { + $ultimatemember->user->remove_cache( $user->ID ); + } } } add_action('save_post', 'um_admin_delete_role_cache', 1111, 2); diff --git a/admin/core/um-admin-dashboard.php b/admin/core/um-admin-dashboard.php index f5e7d90c..4ef97615 100644 --- a/admin/core/um-admin-dashboard.php +++ b/admin/core/um-admin-dashboard.php @@ -15,6 +15,52 @@ class UM_Admin_Dashboard { add_action( 'admin_head', array( $this, 'menu_order_count' ) ); + add_filter( 'admin_footer_text', array( $this, 'admin_footer_text' ), 1000 ); + + add_action( 'wp_ajax_ultimatemember_rated', array( $this, 'ultimatemember_rated' ) ); + add_action( 'wp_ajax_nopriv_ultimatemember_rated', array( $this, 'ultimatemember_rated' ) ); + + } + + /** + * Change the admin footer text on UM admin pages + */ + public function admin_footer_text( $footer_text ) { + $current_screen = get_current_screen(); + + // Add the dashboard pages + $um_pages[] = 'toplevel_page_ultimatemember'; + $um_pages[] = 'admin_page_ultimatemember-about'; + $um_pages[] = 'ultimate-member_page_um_options'; + $um_pages[] = 'edit-um_form'; + $um_pages[] = 'edit-um_role'; + $um_pages[] = 'edit-um_directory'; + $um_pages[] = 'ultimate-member_page_ultimatemember-extensions'; + + if ( isset( $current_screen->id ) && in_array( $current_screen->id, $um_pages ) ) { + // Change the footer text + if ( ! get_option( 'um_admin_footer_text_rated' ) ) { + + $footer_text = sprintf( __( 'If you like Ultimate Member please consider leaving a %s★★★★★%s review. It will help us to grow the plugin and make it more popular. Thank you.', 'ultimatemember' ), '', '' ); + + $footer_text .= ""; + } + } + + return $footer_text; + } + + /** + * When user clicks the review link in backend + */ + function ultimatemember_rated() { + update_option('um_admin_footer_text_rated', 1 ); + die(); } /** @@ -52,6 +98,8 @@ class UM_Admin_Dashboard { public function menu_order_count() { global $menu, $submenu; + if ( !current_user_can( 'list_users' ) ) return; + $count = $this->get_pending_users_count(); foreach( $menu as $key => $menu_item ) { diff --git a/admin/core/um-admin-enqueue.php b/admin/core/um-admin-enqueue.php index e159587e..12aa5012 100644 --- a/admin/core/um-admin-enqueue.php +++ b/admin/core/um-admin-enqueue.php @@ -172,7 +172,7 @@ class UM_Admin_Enqueue { wp_register_style('um_admin_columns', um_url . 'admin/assets/css/um-admin-columns.css' ); wp_enqueue_style('um_admin_columns'); - + wp_register_style('um_admin_misc', um_url . 'admin/assets/css/um-admin-misc.css' ); wp_enqueue_style('um_admin_misc'); @@ -277,6 +277,10 @@ class UM_Admin_Enqueue { wp_enqueue_style('um_admin_rtl'); } + } else { + + $this->load_global_css(); + } } diff --git a/admin/templates/extensions.php b/admin/templates/extensions.php index f26c34bf..8cdeebb5 100644 --- a/admin/templates/extensions.php +++ b/admin/templates/extensions.php @@ -83,6 +83,11 @@

Ultimate Member - Extensions

+
+
Core Extensions Bundle – Check out our extensions bundle which includes all extensions at a significant discount.
+
View our Extensions Bundle
+
+