Skip to content

Commit 4e27a5b

Browse files
ilicfilipilicfilip
committed
adjust description form term interactive tasks
1 parent ce57bda commit 4e27a5b

4 files changed

Lines changed: 81 additions & 23 deletions

File tree

‎assets/js/recommendations/remove-terms-without-posts.js‎

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@
4343
taxonomyElement: popover.querySelector(
4444
'#prpl-delete-term-taxonomy'
4545
),
46+
taxonomyNameElement: popover.querySelector(
47+
'#prpl-delete-term-taxonomy-name'
48+
),
4649
termIdField: popover.querySelector( '#prpl-delete-term-id' ),
4750
taxonomyField: popover.querySelector( '#prpl-delete-taxonomy' ),
4851
};
@@ -82,6 +85,9 @@
8285
taxonomy: this.decodeHtmlEntities(
8386
event.detail.target_taxonomy
8487
),
88+
taxonomyName: this.decodeHtmlEntities(
89+
event.detail.target_taxonomy_name
90+
),
8591
termName: this.decodeHtmlEntities(
8692
event.detail.target_term_name
8793
),
@@ -97,19 +103,27 @@
97103
this.currentTermData.termId,
98104
this.currentTermData.taxonomy,
99105
this.currentTermData.termName,
106+
this.currentTermData.taxonomyName,
100107
this.decodeHtmlEntities( event.detail.post_title )
101108
);
102109
}
103110

104111
/**
105112
* Update the popover content.
106113
*
107-
* @param {string} termId The term ID.
108-
* @param {string} taxonomy The taxonomy.
109-
* @param {string} termName The term name.
110-
* @param {string} postTitle The post title.
114+
* @param {string} termId The term ID.
115+
* @param {string} taxonomy The taxonomy.
116+
* @param {string} termName The term name.
117+
* @param {string} taxonomyName The taxonomy name.
118+
* @param {string} postTitle The post title.
111119
*/
112-
updatePopoverContent( termId, taxonomy, termName, postTitle ) {
120+
updatePopoverContent(
121+
termId,
122+
taxonomy,
123+
termName,
124+
taxonomyName,
125+
postTitle
126+
) {
113127
if ( this.elements.popoverTitle ) {
114128
this.elements.popoverTitle.textContent = postTitle;
115129
}
@@ -122,6 +136,10 @@
122136
this.elements.taxonomyElement.textContent = taxonomy;
123137
}
124138

139+
if ( this.elements.taxonomyNameElement ) {
140+
this.elements.taxonomyNameElement.textContent = taxonomyName;
141+
}
142+
125143
if ( this.elements.termIdField ) {
126144
this.elements.termIdField.value = termId;
127145
}

‎assets/js/recommendations/update-term-description.js‎

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,9 @@
4444
taxonomyElement: popover.querySelector(
4545
'#prpl-update-term-taxonomy'
4646
),
47+
taxonomyNameElement: popover.querySelector(
48+
'#prpl-update-term-taxonomy-name'
49+
),
4750
termIdField: popover.querySelector( '#prpl-update-term-id' ),
4851
taxonomyField: popover.querySelector( '#prpl-update-taxonomy' ),
4952
descriptionField: popover.querySelector(
@@ -86,6 +89,9 @@
8689
taxonomy: this.decodeHtmlEntities(
8790
event.detail.target_taxonomy
8891
),
92+
taxonomyName: this.decodeHtmlEntities(
93+
event.detail.target_taxonomy_name
94+
),
8995
termName: this.decodeHtmlEntities(
9096
event.detail.target_term_name
9197
),
@@ -101,19 +107,27 @@
101107
this.currentTermData.termId,
102108
this.currentTermData.taxonomy,
103109
this.currentTermData.termName,
110+
this.currentTermData.taxonomyName,
104111
this.decodeHtmlEntities( event.detail.post_title )
105112
);
106113
}
107114

108115
/**
109116
* Update the popover content.
110117
*
111-
* @param {string} termId The term ID.
112-
* @param {string} taxonomy The taxonomy.
113-
* @param {string} termName The term name.
114-
* @param {string} postTitle The post title.
118+
* @param {string} termId The term ID.
119+
* @param {string} taxonomy The taxonomy.
120+
* @param {string} termName The term name.
121+
* @param {string} taxonomyName The taxonomy name.
122+
* @param {string} postTitle The post title.
115123
*/
116-
updatePopoverContent( termId, taxonomy, termName, postTitle ) {
124+
updatePopoverContent(
125+
termId,
126+
taxonomy,
127+
termName,
128+
taxonomyName,
129+
postTitle
130+
) {
117131
if ( this.elements.popoverTitle ) {
118132
this.elements.popoverTitle.textContent = postTitle;
119133
}
@@ -126,6 +140,10 @@
126140
this.elements.taxonomyElement.textContent = taxonomy;
127141
}
128142

143+
if ( this.elements.taxonomyNameElement ) {
144+
this.elements.taxonomyNameElement.textContent = taxonomyName;
145+
}
146+
129147
if ( this.elements.termIdField ) {
130148
this.elements.termIdField.value = termId;
131149
}

‎classes/suggested-tasks/providers/class-remove-terms-without-posts.php‎

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -341,6 +341,8 @@ public function add_task_actions( $data = [], $actions = [] ) {
341341

342342
$task_details = $this->get_task_details( $task_data );
343343

344+
$taxonomy = \get_taxonomy( $term->taxonomy );
345+
344346
$actions[] = [
345347
'priority' => 10,
346348
'html' => \sprintf(
@@ -352,10 +354,11 @@ public function add_task_actions( $data = [], $actions = [] ) {
352354
\htmlspecialchars(
353355
\wp_json_encode(
354356
[
355-
'post_title' => $task_details['post_title'],
356-
'target_term_id' => $task_data['target_term_id'],
357-
'target_taxonomy' => $task_data['target_taxonomy'],
358-
'target_term_name' => $task_data['target_term_name'],
357+
'post_title' => $task_details['post_title'],
358+
'target_term_id' => $task_data['target_term_id'],
359+
'target_taxonomy' => $task_data['target_taxonomy'],
360+
'target_taxonomy_name' => $taxonomy ? $taxonomy->label : '',
361+
'target_term_name' => $task_data['target_term_name'],
359362
]
360363
),
361364
ENT_QUOTES,
@@ -393,14 +396,23 @@ public function print_popover_form_contents() {
393396
<span id="prpl-delete-term-name"></span>
394397
</p>
395398
<p style="margin: 5px 0 0 0; font-size: 12px; color: #646970;">
396-
<span id="prpl-delete-term-taxonomy"></span>
399+
<?php
400+
printf(
401+
/* translators: %1$s: The taxonomy name, %2$s: The term slug */
402+
\esc_html__( 'You are deleting the term which belongs to the "%1$s" (slug "%2$s").', 'progress-planner' ),
403+
'<span id="prpl-delete-term-taxonomy-name"></span>',
404+
'<span id="prpl-delete-term-taxonomy"></span>'
405+
);
406+
?>
397407
</p>
398408
</div>
399409
<input type="hidden" name="term_id" id="prpl-delete-term-id" value="">
400410
<input type="hidden" name="taxonomy" id="prpl-delete-taxonomy" value="">
401-
<button type="submit" class="prpl-button prpl-button-primary" id="prpl-delete-term-button">
402-
<?php \esc_html_e( 'Delete term', 'progress-planner' ); ?>
403-
</button>
411+
<div class="prpl-steps-nav-wrapper">
412+
<button type="submit" class="prpl-button prpl-button-primary" id="prpl-delete-term-button">
413+
<?php \esc_html_e( 'Delete term', 'progress-planner' ); ?>
414+
</button>
415+
</div>
404416
<?php
405417
}
406418

‎classes/suggested-tasks/providers/class-update-term-description.php‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -325,6 +325,8 @@ public function add_task_actions( $data = [], $actions = [] ) {
325325

326326
$task_details = $this->get_task_details( $task_data );
327327

328+
$taxonomy = \get_taxonomy( $term->taxonomy );
329+
328330
$actions[] = [
329331
'priority' => 10,
330332
'html' => \sprintf(
@@ -336,10 +338,11 @@ public function add_task_actions( $data = [], $actions = [] ) {
336338
\htmlspecialchars(
337339
\wp_json_encode(
338340
[
339-
'post_title' => $task_details['post_title'],
340-
'target_term_id' => $task_data['target_term_id'],
341-
'target_taxonomy' => $task_data['target_taxonomy'],
342-
'target_term_name' => $task_data['target_term_name'],
341+
'post_title' => $task_details['post_title'],
342+
'target_term_id' => $task_data['target_term_id'],
343+
'target_taxonomy' => $task_data['target_taxonomy'],
344+
'target_taxonomy_name' => $taxonomy ? $taxonomy->label : '',
345+
'target_term_name' => $task_data['target_term_name'],
343346
]
344347
),
345348
ENT_QUOTES,
@@ -377,7 +380,14 @@ public function print_popover_form_contents() {
377380
<span id="prpl-update-term-name"></span>
378381
</p>
379382
<p style="margin: 0 0 10px 0; font-size: 12px; color: #646970;">
380-
<span id="prpl-update-term-taxonomy"></span>
383+
<?php
384+
printf(
385+
/* translators: %1$s: The taxonomy name, %2$s: The term slug */
386+
\esc_html__( 'You are updating the term which belongs to the "%1$s" (slug "%2$s").', 'progress-planner' ),
387+
'<span id="prpl-update-term-taxonomy-name"></span>',
388+
'<span id="prpl-update-term-taxonomy"></span>'
389+
);
390+
?>
381391
</p>
382392
</div>
383393
<textarea

0 commit comments

Comments
 (0)