- fixed membersgrid edit profile button;

This commit is contained in:
nikitozzzzzzz
2017-08-16 12:59:55 +03:00
parent 7a1c93cc4c
commit 7a604e956a
3 changed files with 191 additions and 13 deletions
+34 -1
View File
@@ -330,11 +330,44 @@
height: 34px; height: 34px;
line-height: 34px; line-height: 34px;
transition: all .2s linear; transition: all .2s linear;
padding: 0px 14px; padding: 0 14px;
color: #666 !important; color: #666 !important;
font-weight: normal; font-weight: normal;
} }
.um-members-pagi a:hover { .um-members-pagi a:hover {
text-decoration: none !important; text-decoration: none !important;
}
.um-members-edit-btn {
margin: 2px 0;
height: 40px;
}
a.um-edit-profile-btn {
padding: 10px 15px !important;
transition: none !important;
display: inline-block !important;
margin: 0 auto !important;
min-width: 110px;
width: auto;
text-align: center;
}
a.um-edit-profile-btn:before {
font-family: "FontAwesome";
margin-right: 8px;
width: 14px;
text-align: left;
display: inline-block;
font-size: 16px;
position: relative;
left: 0;
top: 1px;
}
a.um-edit-profile-btn:before {content: "\f013"}
a.um-edit-profile-btn {
font-size: 13px;
} }
+148 -9
View File
@@ -99,7 +99,9 @@ if ( ! class_exists( 'UM' ) ) {
* Function for add classes to $this->classes * Function for add classes to $this->classes
* for run using UM() * for run using UM()
* *
* @param $class_name * @since 2.0
*
* @param string $class_name
* @param bool $instance * @param bool $instance
*/ */
public function set_class( $class_name, $instance = false ) { public function set_class( $class_name, $instance = false ) {
@@ -130,10 +132,13 @@ if ( ! class_exists( 'UM' ) ) {
/** /**
* UM constructor. * UM constructor.
*
* @since 1.0
*/ */
function __construct() { function __construct() {
parent::__construct(); parent::__construct();
//register autoloader for include UM classes
spl_autoload_register( array( $this, 'um__autoloader' ) ); spl_autoload_register( array( $this, 'um__autoloader' ) );
if ( ! defined( 'WP_UNINSTALL_PLUGIN' ) ) { if ( ! defined( 'WP_UNINSTALL_PLUGIN' ) ) {
@@ -165,12 +170,7 @@ if ( ! class_exists( 'UM' ) ) {
'ar' => 'العربية', 'ar' => 'العربية',
); );
$this->includes(); $language_domain = apply_filters( 'um_language_textdomain', 'ultimate-member' );
register_activation_hook( um_plugin, array( &$this, 'activation' ) );
$language_domain = 'ultimate-member';
$language_domain = apply_filters( 'um_language_textdomain', $language_domain );
$language_locale = ( get_locale() != '' ) ? get_locale() : 'en_US'; $language_locale = ( get_locale() != '' ) ? get_locale() : 'en_US';
$language_locale = apply_filters( 'um_language_locale', $language_locale ); $language_locale = apply_filters( 'um_language_locale', $language_locale );
@@ -180,15 +180,33 @@ if ( ! class_exists( 'UM' ) ) {
load_textdomain( $language_domain, $language_file ); load_textdomain( $language_domain, $language_file );
// include UM classes
$this->includes();
// include hook files
add_action( 'plugins_loaded', array( &$this, 'init' ), 0 ); add_action( 'plugins_loaded', array( &$this, 'init' ), 0 );
//run activation
register_activation_hook( um_plugin, array( &$this, 'activation' ) );
// init widgets // init widgets
add_action( 'widgets_init', array( &$this, 'widgets_init' ) ); add_action( 'widgets_init', array( &$this, 'widgets_init' ) );
//include short non class functions
require_once 'um-short-functions.php'; require_once 'um-short-functions.php';
} }
} }
/**
* Autoload UM classes handler
*
* @since 2.0
*
* @param $class
*/
function um__autoloader( $class ) { function um__autoloader( $class ) {
if ( strpos( $class, 'um' ) === 0 ) { if ( strpos( $class, 'um' ) === 0 ) {
@@ -217,6 +235,8 @@ if ( ! class_exists( 'UM' ) ) {
/** /**
* Plugin Activation * Plugin Activation
*
* @since 2.0
*/ */
function activation() { function activation() {
//first install //first install
@@ -240,6 +260,8 @@ if ( ! class_exists( 'UM' ) ) {
/** /**
* Include required core files used in admin and on the frontend. * Include required core files used in admin and on the frontend.
* *
* @since 2.0
*
* @return void * @return void
*/ */
public function includes() { public function includes() {
@@ -292,6 +314,11 @@ if ( ! class_exists( 'UM' ) ) {
} }
/**
* @since 2.0
*
* @return um\core\Common()
*/
function common() { function common() {
if ( empty( $this->classes['common'] ) ) { if ( empty( $this->classes['common'] ) ) {
$this->classes['common'] = new um\core\Common(); $this->classes['common'] = new um\core\Common();
@@ -300,12 +327,17 @@ if ( ! class_exists( 'UM' ) ) {
} }
/**
* @since 2.0
*/
function ajax_init() { function ajax_init() {
new um\core\AJAX_Common(); new um\core\AJAX_Common();
} }
/** /**
* @since 2.0
*
* @return um\admin\Admin() * @return um\admin\Admin()
*/ */
function admin() { function admin() {
@@ -317,6 +349,8 @@ if ( ! class_exists( 'UM' ) ) {
/** /**
* @since 2.0
*
* @return um\admin\core\Admin_Menu() * @return um\admin\core\Admin_Menu()
*/ */
function admin_menu() { function admin_menu() {
@@ -328,6 +362,8 @@ if ( ! class_exists( 'UM' ) ) {
/** /**
* @since 2.0
*
* @return um\admin\core\Admin_Settings() * @return um\admin\core\Admin_Settings()
*/ */
function admin_settings() { function admin_settings() {
@@ -339,6 +375,8 @@ if ( ! class_exists( 'UM' ) ) {
/** /**
* @since 2.0
*
* @return um\admin\core\Admin_Upgrade() * @return um\admin\core\Admin_Upgrade()
*/ */
function admin_upgrade() { function admin_upgrade() {
@@ -350,6 +388,8 @@ if ( ! class_exists( 'UM' ) ) {
/** /**
* @since 2.0
*
* @return um\admin\core\Admin_Columns() * @return um\admin\core\Admin_Columns()
*/ */
function columns() { function columns() {
@@ -361,6 +401,8 @@ if ( ! class_exists( 'UM' ) ) {
/** /**
* @since 2.0
*
* @return um\admin\core\Admin_Enqueue() * @return um\admin\core\Admin_Enqueue()
*/ */
function admin_enqueue() { function admin_enqueue() {
@@ -372,6 +414,8 @@ if ( ! class_exists( 'UM' ) ) {
/** /**
* @since 2.0
*
* @return um\admin\core\Admin_Functions() * @return um\admin\core\Admin_Functions()
*/ */
function functions() { function functions() {
@@ -383,6 +427,8 @@ if ( ! class_exists( 'UM' ) ) {
/** /**
* @since 2.0
*
* @return um\admin\core\Admin_Metabox() * @return um\admin\core\Admin_Metabox()
*/ */
function metabox() { function metabox() {
@@ -394,6 +440,8 @@ if ( ! class_exists( 'UM' ) ) {
/** /**
* @since 2.0
*
* @return um\admin\core\Admin_Notices() * @return um\admin\core\Admin_Notices()
*/ */
function notices() { function notices() {
@@ -405,6 +453,8 @@ if ( ! class_exists( 'UM' ) ) {
/** /**
* @since 2.0
*
* @return um\admin\core\Admin_Users() * @return um\admin\core\Admin_Users()
*/ */
function users() { function users() {
@@ -416,6 +466,8 @@ if ( ! class_exists( 'UM' ) ) {
/** /**
* @since 2.0
*
* @return um\admin\core\Admin_Builder() * @return um\admin\core\Admin_Builder()
*/ */
function builder() { function builder() {
@@ -427,6 +479,8 @@ if ( ! class_exists( 'UM' ) ) {
/** /**
* @since 2.0
*
* @return um\admin\core\Admin_DragDrop() * @return um\admin\core\Admin_DragDrop()
*/ */
function dragdrop() { function dragdrop() {
@@ -438,6 +492,8 @@ if ( ! class_exists( 'UM' ) ) {
/** /**
* @since 2.0
*
* @param $data array * @param $data array
* @return um\admin\core\Admin_Forms() * @return um\admin\core\Admin_Forms()
*/ */
@@ -451,6 +507,8 @@ if ( ! class_exists( 'UM' ) ) {
/** /**
* @since 2.0
*
* @return um\Dependencies * @return um\Dependencies
*/ */
function dependencies() { function dependencies() {
@@ -463,6 +521,8 @@ if ( ! class_exists( 'UM' ) ) {
/** /**
* @since 2.0
*
* @return um\Config * @return um\Config
*/ */
function config() { function config() {
@@ -475,6 +535,8 @@ if ( ! class_exists( 'UM' ) ) {
/** /**
* @since 2.0
*
* @return um\core\REST_API * @return um\core\REST_API
*/ */
function rest_api() { function rest_api() {
@@ -487,6 +549,8 @@ if ( ! class_exists( 'UM' ) ) {
/** /**
* @since 2.0
*
* @return um\core\Rewrite * @return um\core\Rewrite
*/ */
function rewrite() { function rewrite() {
@@ -499,6 +563,8 @@ if ( ! class_exists( 'UM' ) ) {
/** /**
* @since 2.0
*
* @return um\core\Setup * @return um\core\Setup
*/ */
function setup() { function setup() {
@@ -511,6 +577,8 @@ if ( ! class_exists( 'UM' ) ) {
/** /**
* @since 2.0
*
* @return um\core\FontIcons * @return um\core\FontIcons
*/ */
function fonticons() { function fonticons() {
@@ -523,6 +591,8 @@ if ( ! class_exists( 'UM' ) ) {
/** /**
* @since 2.0
*
* @return um\core\Login * @return um\core\Login
*/ */
function login() { function login() {
@@ -535,6 +605,8 @@ if ( ! class_exists( 'UM' ) ) {
/** /**
* @since 2.0
*
* @return um\core\Register * @return um\core\Register
*/ */
function register() { function register() {
@@ -547,6 +619,8 @@ if ( ! class_exists( 'UM' ) ) {
/** /**
* @since 2.0
*
* @return um\core\Enqueue * @return um\core\Enqueue
*/ */
function enqueue() { function enqueue() {
@@ -559,6 +633,8 @@ if ( ! class_exists( 'UM' ) ) {
/** /**
* @since 2.0
*
* @return um\core\Shortcodes * @return um\core\Shortcodes
*/ */
function shortcodes() { function shortcodes() {
@@ -571,6 +647,8 @@ if ( ! class_exists( 'UM' ) ) {
/** /**
* @since 2.0
*
* @return um\core\Account * @return um\core\Account
*/ */
function account() { function account() {
@@ -583,6 +661,8 @@ if ( ! class_exists( 'UM' ) ) {
/** /**
* @since 2.0
*
* @return um\core\Password * @return um\core\Password
*/ */
function password() { function password() {
@@ -595,6 +675,8 @@ if ( ! class_exists( 'UM' ) ) {
/** /**
* @since 2.0
*
* @return um\core\Form * @return um\core\Form
*/ */
function form() { function form() {
@@ -607,6 +689,8 @@ if ( ! class_exists( 'UM' ) ) {
/** /**
* @since 2.0
*
* @return um\core\Fields * @return um\core\Fields
*/ */
function fields() { function fields() {
@@ -619,6 +703,8 @@ if ( ! class_exists( 'UM' ) ) {
/** /**
* @since 2.0
*
* @return um\core\User * @return um\core\User
*/ */
function user() { function user() {
@@ -631,6 +717,8 @@ if ( ! class_exists( 'UM' ) ) {
/** /**
* @since 2.0
*
* @return um\core\Roles_Capabilities * @return um\core\Roles_Capabilities
*/ */
function roles() { function roles() {
@@ -643,6 +731,8 @@ if ( ! class_exists( 'UM' ) ) {
/** /**
* @since 2.0
*
* @return um\core\User_posts * @return um\core\User_posts
*/ */
function user_posts() { function user_posts() {
@@ -655,6 +745,8 @@ if ( ! class_exists( 'UM' ) ) {
/** /**
* @since 2.0
*
* @return um\core\Profile * @return um\core\Profile
*/ */
function profile() { function profile() {
@@ -667,6 +759,8 @@ if ( ! class_exists( 'UM' ) ) {
/** /**
* @since 2.0
*
* @return um\core\Query * @return um\core\Query
*/ */
function query() { function query() {
@@ -679,6 +773,8 @@ if ( ! class_exists( 'UM' ) ) {
/** /**
* @since 2.0
*
* @return um\core\Date_Time * @return um\core\Date_Time
*/ */
function datetime() { function datetime() {
@@ -691,6 +787,8 @@ if ( ! class_exists( 'UM' ) ) {
/** /**
* @since 2.0
*
* @return um\core\Chart * @return um\core\Chart
*/ */
function chart() { function chart() {
@@ -703,6 +801,8 @@ if ( ! class_exists( 'UM' ) ) {
/** /**
* @since 2.0
*
* @return um\core\Builtin * @return um\core\Builtin
*/ */
function builtin() { function builtin() {
@@ -715,6 +815,8 @@ if ( ! class_exists( 'UM' ) ) {
/** /**
* @since 2.0
*
* @return um\core\Files * @return um\core\Files
*/ */
function files() { function files() {
@@ -727,6 +829,8 @@ if ( ! class_exists( 'UM' ) ) {
/** /**
* @since 2.0
*
* @return um\core\Validation * @return um\core\Validation
*/ */
function validation() { function validation() {
@@ -739,6 +843,8 @@ if ( ! class_exists( 'UM' ) ) {
/** /**
* @since 2.0
*
* @return um\core\Menu * @return um\core\Menu
*/ */
function menu() { function menu() {
@@ -751,6 +857,8 @@ if ( ! class_exists( 'UM' ) ) {
/** /**
* @since 2.0
*
* @return um\core\Access * @return um\core\Access
*/ */
function access() { function access() {
@@ -763,6 +871,8 @@ if ( ! class_exists( 'UM' ) ) {
/** /**
* @since 2.0
*
* @return um\core\Permalinks * @return um\core\Permalinks
*/ */
function permalinks() { function permalinks() {
@@ -775,6 +885,8 @@ if ( ! class_exists( 'UM' ) ) {
/** /**
* @since 2.0
*
* @return um\core\Mail * @return um\core\Mail
*/ */
function mail() { function mail() {
@@ -787,6 +899,8 @@ if ( ! class_exists( 'UM' ) ) {
/** /**
* @since 2.0
*
* @return um\core\Members * @return um\core\Members
*/ */
function members() { function members() {
@@ -799,6 +913,8 @@ if ( ! class_exists( 'UM' ) ) {
/** /**
* @since 2.0
*
* @return um\core\Logout * @return um\core\Logout
*/ */
function logout() { function logout() {
@@ -811,6 +927,8 @@ if ( ! class_exists( 'UM' ) ) {
/** /**
* @since 2.0
*
* @return um\core\Modal * @return um\core\Modal
*/ */
function modal() { function modal() {
@@ -823,6 +941,8 @@ if ( ! class_exists( 'UM' ) ) {
/** /**
* @since 2.0
*
* @return um\core\Cron * @return um\core\Cron
*/ */
function cron() { function cron() {
@@ -835,6 +955,8 @@ if ( ! class_exists( 'UM' ) ) {
/** /**
* @since 2.0
*
* @return um\core\Tracking * @return um\core\Tracking
*/ */
function tracking() { function tracking() {
@@ -847,6 +969,8 @@ if ( ! class_exists( 'UM' ) ) {
/** /**
* @since 2.0
*
* @return um\lib\mobiledetect\Mobile_Detect * @return um\lib\mobiledetect\Mobile_Detect
*/ */
function mobile() { function mobile() {
@@ -858,8 +982,10 @@ if ( ! class_exists( 'UM' ) ) {
} }
/*** /**
*** @Init * Include files with hooked filters/actions
*
* @since 2.0
*/ */
function init() { function init() {
@@ -899,6 +1025,12 @@ if ( ! class_exists( 'UM' ) ) {
} }
/**
* Init UM widgets
*
* @since 2.0
*/
function widgets_init() { function widgets_init() {
register_widget( 'um\widgets\UM_Search_Widget' ); register_widget( 'um\widgets\UM_Search_Widget' );
} }
@@ -907,6 +1039,13 @@ if ( ! class_exists( 'UM' ) ) {
} }
/**
* Function for calling UM methods and variables
*
* @since 2.0
*
* @return UM
*/
function UM() { function UM() {
return UM::instance(); return UM::instance();
} }
+9 -3
View File
@@ -37,9 +37,15 @@
<div class="um-member-name"><a href="<?php echo um_user_profile_url(); ?>" title="<?php echo esc_attr(um_user('display_name')); ?>"><?php echo um_user('display_name', 'html'); ?></a></div> <div class="um-member-name"><a href="<?php echo um_user_profile_url(); ?>" title="<?php echo esc_attr(um_user('display_name')); ?>"><?php echo um_user('display_name', 'html'); ?></a></div>
<?php } ?> <?php } ?>
<?php do_action('um_members_just_after_name', um_user('ID'), $args); ?> <?php do_action('um_members_just_after_name', um_user('ID'), $args ); ?>
<?php do_action('um_members_after_user_name', um_user('ID'), $args); ?> <?php if ( UM()->roles()->um_current_user_can( 'edit', um_user('ID') ) || UM()->roles()->um_user_can( 'can_edit_everyone' ) ) { ?>
<div class="um-members-edit-btn">
<a href="<?php echo um_edit_profile_url() ?>" class="um-edit-profile-btn um-button um-alt"><?php _e( 'Edit profile','ultimate-member' ) ?></a>
</div>
<?php }
do_action('um_members_after_user_name', um_user('ID'), $args); ?>
<?php <?php
if ( $show_tagline && is_array( $tagline_fields ) ) { if ( $show_tagline && is_array( $tagline_fields ) ) {