Skip to content

Commit

Permalink
v2.4.9
Browse files Browse the repository at this point in the history
  • Loading branch information
@wpexpertsio
wpexpertsio committed Sep 1, 2022
1 parent b21da25 commit bd1f47c
Show file tree
Hide file tree
Showing 93 changed files with 416 additions and 890 deletions.
31 changes: 13 additions & 18 deletions addons/badges/assets/css/front.css
View file
Original file line number Diff line number Diff line change
@@ -1,28 +1,23 @@
.the-badge {
.mycred-users-badges .the-badge.vertical {
display: flex;
align-items: center;
justify-content: space-between;
margin-bottom: 10px;
}

hr.badge-line {

margin-top: 10px !important;
.mycred-users-badges .the-badge.horizontal {
display: inline-flex;
margin-right: 10px;
margin-bottom: 10px;
}

.page-excerpt {

width: 100%;
margin-left:10px;
.mycred-users-badges .the-badge .mycred-badge-content {
display: table;
margin-left: 15px;
}


.page-excerpt {

width: 100%;
margin-left:10px;
.mycred-users-badges .the-badge .mycred-badge-content h4.title {
margin: 0;
}

.demo-badge-title {
margin-left: 20px;
width: 100%;
.mycred-users-badges .the-badge .mycred-badge-content p.excerpt {
margin: 10px 0 0 0;
}
14 changes: 10 additions & 4 deletions addons/badges/includes/mycred-badge-functions.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1306,13 +1306,17 @@ function mycred_badge_show_levels( $user_id, $badge, $settings = NULL ) {

if( ! empty( $settings->core["badges"]["show_levels"] ) || $badge->open_badge && ! empty( $settings->core["badges"]["show_steps_to_achieve"] ) ) {

$content .= '<div class="mycred-badge-page-levels-container">';

if ( ! $badge->open_badge )
$content .= "<h3>" . __("Levels", "mycred") . "</h3>";
else
$content .= "<h3>" . __("Requirement", "mycred") . "</h3>";

$levels = mycred_show_badge_requirements( $badge->post_id );

$content .= '<div class="mycred-badge-page-levels">';

foreach ( $levels as $id => $level ) {

$level_image_url = $level["image"];
Expand All @@ -1328,13 +1332,11 @@ function mycred_badge_show_levels( $user_id, $badge, $settings = NULL ) {
if ( ! $badge->open_badge ) {

if ( ! empty( $level_image_url ) )
$content .= '<img src="'.$level_image_url.'" class="mycred-level-image mycred-float-left" />';
$content .= '<img src="'.$level_image_url.'" class="mycred-level-image" />';

$content .= "<h4>$heading</h4>";
}

$content .= "<div class='clear'></div>";

if ( ! empty( $settings->core["badges"]["show_steps_to_achieve"] ) )
$content .= mycred_badge_level_req_check( $badge->post_id, $id );

Expand All @@ -1348,7 +1350,11 @@ function mycred_badge_show_levels( $user_id, $badge, $settings = NULL ) {
$content .= '</div>';
}

$content .= '<div class="clear"></div>';
$content .= '<div class="mycred-clearfix"></div>';

$content .= '</div>';

$content .= '</div>';

}

Expand Down
234 changes: 58 additions & 176 deletions addons/badges/includes/mycred-badge-shortcodes.php
View file
Original file line number Diff line number Diff line change
@@ -1,211 +1,99 @@
<?php
if ( ! defined( 'myCRED_VERSION' ) ) exit;

if (! function_exists('mycred_render_my_badges') ) :
/**
* Shortcode: mycred_my_badges
* Allows you to show the current users earned badges.
* @since 1.5
* @version 1.2.1
*/
if ( ! function_exists( 'mycred_render_my_badges' ) ) :
function mycred_render_my_badges( $atts, $content = '' ) {

extract(
shortcode_atts(
array(
'show' => 'earned',
'width' => MYCRED_BADGE_WIDTH,
'height' => MYCRED_BADGE_HEIGHT,
'user_id' => 'current',
'title' => '',
'post_excerpt' => ''
), $atts, MYCRED_SLUG . '_my_badges'
)
);

if ( ! is_user_logged_in() && $user_id == 'current' ) {
extract( shortcode_atts( array(
'show' => 'earned',
'width' => MYCRED_BADGE_WIDTH,
'height' => MYCRED_BADGE_HEIGHT,
'user_id' => 'current',
'title' => 0,
'excerpt' => 0,
'display' => 'vertical'
), $atts, MYCRED_SLUG . '_my_badges' ) );

if ( ! is_user_logged_in() && $user_id == 'current' )
return $content;
}

$all_badges = mycred_get_badge_ids();
$profile_user_id = mycred_get_user_id( $user_id );
$users_badges = mycred_get_users_badges( $profile_user_id, true );
$user_id = mycred_get_user_id( $user_id );

ob_start();

echo '<div class="row" id="mycred-users-badges"><div class="col-xs-12">';

// Show only badges that we have earned
if ( $show == 'earned' ) {

foreach ( $all_badges as $badge_id ) {

echo '<div class="the-badge">';

$page_id = get_page($badge_id);
$badge_id = absint( $badge_id );
$has_earned = mycred_get_badge( $badge_id );
$badge = mycred_get_badge( $badge_id );
$users_badges = mycred_get_users_badges($profile_user_id );
$mycred = mycred();

if ( array_key_exists( $badge_id, $users_badges ) ) {

$earned = 1;
$earned_level = $users_badges[ $badge_id ];
$badge_image = $badge->get_image( $earned_level );

}

if( $has_earned ) {
$user_id = mycred_get_user_id( $user_id );
$all_badges = mycred_get_badge_ids();
$users_badges = mycred_get_users_badges( $user_id );
$css_classes = in_array( $display, array( 'vertical', 'horizontal' ) ) ? $display : 'vertical';

$badge_title = $has_earned->title;
$badge_img = $has_earned->main_image;
$level_image = $has_earned->level_image;
$show_img = $has_earned->user_has_badge( $profile_user_id );
wp_enqueue_style( 'mycred-badge-front-style' );

if( $show_img ) {

$earned_badge_image = ! empty( $has_earned->level_image ) ? $has_earned->level_image : $has_earned->main_image;

echo '<div class="demo-badge-image">' . wp_kses_post( $earned_badge_image ) . '</div>';

if( $title == 'show' ) {

echo '<div class="demo-badge-title">' . esc_html( $badge_title ) . ' '.'</div>';
ob_start();

}
else {
echo '<div class="mycred-users-badges">';

echo '<div class="demo-badge-title" style="display:none;">' . esc_html( $badge_title ) . ' '.'</div>';
foreach ( $all_badges as $badge_id ) {

}
$user_has_earned = array_key_exists( $badge_id, $users_badges );

if( $post_excerpt == 'show' ) {
if ( $show == 'earned' && ! $user_has_earned ) continue;

echo '<div class="page-excerpt">' . wp_kses_post( $page_id->post_excerpt ) . ' '.'</div>';
$css_classes = $user_has_earned ? $display . ' earned' : $display;

}
else {

echo '<div class="page-excerpt" style="display:none;">' . wp_kses_post( $page_id->post_excerpt ) . ' '.'</div>';

}
echo '<div class="the-badge '. esc_attr( $css_classes ) .'">';

}
$level = $user_has_earned ? $users_badges[ $badge_id ] : NULL;
$badge = mycred_get_badge( $badge_id, $level );
$badge->image_width = $width;
$badge->image_height = $height;

}
if ( $user_has_earned ) {

}

}
// Show all badges highlighting the ones we earned
elseif ( $show == 'all' ) {

$users_badges = mycred_get_users_badges( $user_id );
$all_badges = mycred_get_badge_ids();

foreach ( $all_badges as $badge_id ) {

echo '<div class="the-badge">';

// User has not earned badge
if ( ! array_key_exists( $badge_id, $users_badges ) ) {

$badge = mycred_get_badge( $badge_id );
$page_id = get_page( $badge_id );
$badge->image_width = $width;
$badge->image_height = $height;
$badge_title = $badge->title;
$badge_img = $badge->main_image;
if ( $badge->level_image !== false )
echo wp_kses_post( $badge->get_image( $level ) );

if ( $badge->main_image !== false ) {

echo '<div class="demo-badge-image">' . wp_kses_post( $badge_img ) . '</div>';

if( $title == 'show' ) {

echo '<div class="demo-badge-title">' . esc_html( $badge_title ) . ' '.'</div>';

} else {

echo '<div class="demo-badge-title" style="display:none;">' . esc_html( $badge_title ) . ' '.'</div>';

}

if( $post_excerpt == 'show' ) {

echo '<div class="page-excerpt">' . wp_kses_post( $page_id->post_excerpt ) . ' '.'</div>';

}
else {

echo '<div class="page-excerpt" style="display:none;">' . wp_kses_post( $page_id->post_excerpt ) . ' '.'</div>';

}

}

}
// User has earned badge
else {
}
else {

$level = $users_badges[ $badge_id ];
$badge = mycred_get_badge( $badge_id, $level );
$badge->image_width = $width;
$badge->image_height = $height;
$badge_page_id = get_page( $badge_id );
if ( $badge->main_image !== false )
echo wp_kses_post( $badge->get_image( 'main' ) );

if ( $badge->level_image !== false ) {
}


echo '<div class="demo-badge-image">' . wp_kses_post( $badge->get_image( $level ) ) . '</div>';
if ( $title == 1 || $excerpt == 1 ) {

if( $title == 'show' ) {

echo '<div class="demo-badge-title">' . esc_html( $badge->title ) . ' '.'</div>';
echo '<div class="mycred-badge-content">';

}
else {

echo '<div class="demo-badge-title" style="display:none;">' . esc_html( $badge->title ) . ' '.'</div>';
if ( $title == 1 && ! empty( $badge->title ) )
echo '<h4 class="title">' . esc_html( $badge->title ) . '</h4>';

}
if ( $excerpt == 1 ) {

if( $post_excerpt == 'show' ) {

echo '<div class="page-excerpt">' . wp_kses_post( $badge_page_id->post_excerpt ) . ' '.'</div>';
$badge_excerpt = get_the_excerpt( $badge_id );

}
else {

echo '<div class="page-excerpt" style="display:none;">' . wp_kses_post( $badge_page_id->post_excerpt ) . ' '.'</div>';;

}

}
if ( ! empty( $badge_excerpt ) )
echo '<p class="excerpt">' . esc_html( $badge_excerpt ) . '</p>';

}
}

echo '</div>';

if( $title == 'show' || $post_excerpt == 'show' ) {

echo '<hr class="badge-line">';

}
else {

echo '';

}

}

echo '</div>';

}
echo '</div></div>';

echo '</div>';

$output = ob_get_contents();
ob_end_clean();

return apply_filters('mycred_my_badges', $output, $user_id);
return apply_filters( 'mycred_my_badges', $output, $user_id );

}
}
endif;

/**
Expand Down Expand Up @@ -409,10 +297,4 @@ function mycred_render_badge_evidence( $atts = '' ) {

return $content;
}
endif;

add_action( 'wp_enqueue_scripts', 'enqueue_badge_front_shortcode_scripts' );

function enqueue_badge_front_shortcode_scripts() {
wp_enqueue_style( 'mycred-badge-front-style', plugins_url( 'assets/css/front.css', myCRED_BADGE ), array(), myCRED_BADGE_VERSION , 'all');
}
endif;
7 changes: 6 additions & 1 deletion addons/badges/myCRED-addon-badges.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,8 @@ public function module_init() {
public function enqueue_front_scripts() {

wp_enqueue_script( 'mycred-badge-front', plugins_url( 'assets/js/front.js', myCRED_BADGE ), array('jquery'), myCRED_BADGE_VERSION );
wp_register_style( 'mycred-badge-front-style', plugins_url( 'assets/css/front.css', myCRED_BADGE ), array(), myCRED_BADGE_VERSION , 'all' );

}

/**
Expand Down Expand Up @@ -1764,6 +1766,9 @@ public function badge_user_screen( $user ) {

$badge_id = absint( $badge_id );
$badge = mycred_get_badge( $badge_id );

if ( empty( $badge ) ) continue;

$earned = 0;
$earned_level = 0;
$badge_image = $badge->main_image;
Expand Down Expand Up @@ -2108,7 +2113,7 @@ public function mycred_badge_page_template( $content ) {

global $post;

if ( is_single() && $post->post_type == MYCRED_BADGE_KEY ) {
if ( is_single() && ! empty( $post->post_type ) && $post->post_type == MYCRED_BADGE_KEY ) {

$mycred = mycred();

Expand Down
Loading

0 comments on commit bd1f47c

Please sign in to comment.