Skip to content

Commit 48562df

Browse files
ilicfilipilicfilip
authored
Merge pull request #617 from ProgressPlanner/filip/v18/badges-alt-attribute
Set alt attribute for badges
2 parents 42ae3af + 5403b02 commit 48562df

9 files changed

Lines changed: 26 additions & 14 deletions

File tree

‎assets/js/web-components/prpl-badge.js‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,22 @@
1313
customElements.define(
1414
'prpl-badge',
1515
class extends HTMLElement {
16-
constructor( badgeId ) {
16+
constructor( badgeId, badgeName ) {
1717
// Get parent class properties
1818
super();
1919

2020
badgeId = badgeId || this.getAttribute( 'badge-id' );
21+
badgeName = badgeName || this.getAttribute( 'badge-name' );
22+
23+
if ( ! badgeName || 'null' === badgeName ) {
24+
badgeName = `${ prplL10n( 'badge' ) }`;
25+
}
26+
2127
this.innerHTML = `
2228
<img
23-
src="${
24-
progressPlannerBadge.remoteServerRootUrl
25-
}/wp-json/progress-planner-saas/v1/badge-svg/?badge_id=${ badgeId }"
26-
alt="${ prplL10n( 'badge' ) }"
27-
onerror="this.onerror=null;this.src='${
28-
progressPlannerBadge.placeholderImageUrl
29-
}';"
29+
src="${ progressPlannerBadge.remoteServerRootUrl }/wp-json/progress-planner-saas/v1/badge-svg/?badge_id=${ badgeId }"
30+
alt="${ badgeName }"
31+
onerror="this.onerror=null;this.src='${ progressPlannerBadge.placeholderImageUrl }';"
3032
/>
3133
`;
3234
}

‎assets/js/web-components/prpl-gauge.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ const prplUpdateRaviGauge = ( pointsDiff ) => {
104104
max: gaugeElement.getAttribute( 'data-max' ),
105105
value: gaugeElement.getAttribute( 'data-value' ),
106106
badgeId: gaugeElement.getAttribute( 'data-badge-id' ),
107+
badgeName: gaugeElement.getAttribute( 'data-badge-name' ),
107108
};
108109

109110
if ( ! gaugeProps ) {
@@ -130,7 +131,7 @@ const prplUpdateRaviGauge = ( pointsDiff ) => {
130131
'var(--prpl-padding) var(--prpl-padding) calc(var(--prpl-padding) * 2) var(--prpl-padding)',
131132
marginBottom: 'var(--prpl-padding)',
132133
},
133-
`<prpl-badge complete="true" badge-id="${ gaugeProps.badgeId }"></prpl-badge>`
134+
`<prpl-badge complete="true" badge-id="${ gaugeProps.badgeId }" badge-name="${ gaugeProps.badgeName }"></prpl-badge>`
134135
);
135136
gauge.id = gaugeProps.id;
136137
gauge.setAttribute( 'background', gaugeProps.background );

‎views/dashboard-widgets/score.php‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
use Progress_Planner\Badges\Monthly;
99

10+
$prpl_badge = Monthly::get_instance_from_id( Monthly::get_badge_id_from_date( new \DateTime() ) );
1011
?>
1112
<div class="prpl-dashboard-widget">
1213
<div>
@@ -19,12 +20,14 @@
1920
marginBottom="0"
2021
data-max="<?php echo (int) Monthly::TARGET_POINTS; ?>"
2122
data-value="<?php echo (float) \progress_planner()->get_admin__widgets__monthly_badges()->get_score()['target_score']; ?>"
22-
data-badge-id="<?php echo \esc_attr( Monthly::get_badge_id_from_date( new \DateTime() ) ); ?>"
23+
data-badge-id="<?php echo \esc_attr( $prpl_badge->get_id() ); ?>"
24+
data-badge-name="<?php echo \esc_attr( $prpl_badge->get_name() ); ?>"
2325
>
2426
<progress max="<?php echo (int) Monthly::TARGET_POINTS; ?>" value="<?php echo (float) \progress_planner()->get_admin__widgets__monthly_badges()->get_score()['target_score']; ?>">
2527
<prpl-badge
2628
complete="true"
27-
badge-id="<?php echo \esc_attr( Monthly::get_badge_id_from_date( new \DateTime() ) ); ?>"
29+
badge-id="<?php echo \esc_attr( $prpl_badge->get_id() ); ?>"
30+
badge-name="<?php echo \esc_attr( $prpl_badge->get_name() ); ?>"
2831
></prpl-badge>
2932
</progress>
3033
</prpl-gauge>

‎views/page-widgets/badge-streak-content.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<div class="prpl-latest-badges-wrapper">
3232
<prpl-gauge background="<?php echo \esc_attr( $prpl_widget_details->get_background() ); ?>" color="var(--prpl-color-accent-orange)">
3333
<progress max="100" value="<?php echo (float) $prpl_widget_details->get_progress()['progress']; ?>">
34-
<prpl-badge complete="true" badge-id="<?php echo \esc_attr( $prpl_widget_details->get_id() ); ?>"></prpl-badge>
34+
<prpl-badge complete="true" badge-id="<?php echo \esc_attr( $prpl_widget_details->get_id() ); ?> " badge-name="<?php echo \esc_attr( $prpl_widget_details->get_name() ); ?>"></prpl-badge>
3535
</progress>
3636
</prpl-gauge>
3737
<div class="prpl-badge-content-wrapper">
@@ -76,6 +76,7 @@ class="prpl-badge"
7676
<prpl-badge
7777
complete="<?php echo 100 === (int) $prpl_badge->get_progress()['progress'] ? 'true' : 'false'; ?>"
7878
badge-id="<?php echo \esc_attr( $prpl_badge->get_id() ); ?>"
79+
badge-name="<?php echo \esc_attr( $prpl_badge->get_name() ); ?>"
7980
></prpl-badge>
8081
<p><?php echo \esc_html( $prpl_badge->get_name() ); ?></p>
8182
</span>

‎views/page-widgets/badge-streak-maintenance.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<div class="prpl-latest-badges-wrapper">
3232
<prpl-gauge background="<?php echo \esc_attr( $prpl_widget_details->get_background() ); ?>" color="var(--prpl-color-accent-orange)">
3333
<progress max="100" value="<?php echo (float) $prpl_widget_details->get_progress()['progress']; ?>">
34-
<prpl-badge complete="true" badge-id="<?php echo \esc_attr( $prpl_widget_details->get_id() ); ?>"></prpl-badge>
34+
<prpl-badge complete="true" badge-id="<?php echo \esc_attr( $prpl_widget_details->get_id() ); ?>" badge-name="<?php echo \esc_attr( $prpl_widget_details->get_name() ); ?>"></prpl-badge>
3535
</progress>
3636
</prpl-gauge>
3737
<div class="prpl-badge-content-wrapper">
@@ -76,6 +76,7 @@ class="prpl-badge"
7676
<prpl-badge
7777
complete="<?php echo 100 === (int) $prpl_badge->get_progress()['progress'] ? 'true' : 'false'; ?>"
7878
badge-id="<?php echo \esc_attr( $prpl_badge->get_id() ); ?>"
79+
badge-name="<?php echo \esc_attr( $prpl_badge->get_name() ); ?>"
7980
></prpl-badge>
8081
<p><?php echo \esc_html( $prpl_badge->get_name() ); ?></p>
8182
</span>

‎views/page-widgets/monthly-badges.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,10 @@
2727
data-max="<?php echo (int) Monthly::TARGET_POINTS; ?>"
2828
data-value="<?php echo (float) $prpl_widget->get_score()['target_score']; ?>"
2929
data-badge-id="<?php echo \esc_attr( $prpl_badge->get_id() ); ?>"
30+
data-badge-name="<?php echo \esc_attr( $prpl_badge->get_name() ); ?>"
3031
>
3132
<progress max="<?php echo (int) Monthly::TARGET_POINTS; ?>" value="<?php echo (float) $prpl_widget->get_score()['target_score']; ?>">
32-
<prpl-badge complete="true" badge-id="<?php echo \esc_attr( $prpl_badge->get_id() ); ?>"></prpl-badge>
33+
<prpl-badge complete="true" badge-id="<?php echo \esc_attr( $prpl_badge->get_id() ); ?>" badge-name="<?php echo \esc_attr( $prpl_badge->get_name() ); ?>"></prpl-badge>
3334
</progress>
3435
</prpl-gauge>
3536

‎views/page-widgets/parts/monthly-badges.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ class="prpl-badge prpl-badge-<?php echo \esc_attr( $prpl_badge->get_id() ); ?>"
6464
<prpl-badge
6565
complete="<?php echo 100 === (int) $prpl_badge->progress_callback()['progress'] ? 'true' : 'false'; ?>"
6666
badge-id="<?php echo \esc_attr( $prpl_badge->get_id() ); ?>"
67+
badge-name="<?php echo \esc_attr( $prpl_badge->get_name() ); ?>"
6768
></prpl-badge>
6869
<p><?php echo \esc_html( $prpl_badge->get_name() ); ?></p>
6970
</span>

‎views/popovers/monthly-badges.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ class="prpl-badge"
6363
<prpl-badge
6464
complete="<?php echo $prpl_badge_completed ? 'true' : 'false'; ?>"
6565
badge-id="<?php echo \esc_attr( $prpl_badge->get_id() ); ?>"
66+
badge-name="<?php echo \esc_attr( $prpl_badge->get_name() ); ?>"
6667
></prpl-badge>
6768
<p><?php echo \esc_html( $prpl_badge->get_name() ); ?></p>
6869
</span>

‎views/popovers/parts/badge-streak-badge.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ class="prpl-badge"
2020
<prpl-badge
2121
complete="<?php echo 100 === (int) $prpl_badge_progress['progress'] ? 'true' : 'false'; ?>"
2222
badge-id="<?php echo \esc_attr( $prpl_badge->get_id() ); ?>"
23+
badge-name="<?php echo \esc_attr( $prpl_badge->get_name() ); ?>"
2324
></prpl-badge>
2425
<?php echo \esc_html( $prpl_badge->get_name() ); ?>
2526
</div>

0 commit comments

Comments
 (0)