Merge branch 'ari/convert-blog-description-to-interactive' into ari/plugin-installer

Author: aristath

assets/css/admin.css

@@ -324,8 +324,13 @@ button.prpl-info-icon {
 		transition: all 0.25s ease-in-out;
 	}
 
-	&:hover,
-	&:focus {
+	&:disabled {
+		opacity: 0.5;
+		pointer-events: none;
+	}
+
+	&:not([disabled]):hover,
+	&:not([disabled]):focus {
 		background: #cf2441;
 
 		&::after {
@@ -342,8 +347,8 @@ button.prpl-info-icon {
 .prpl-wrap button.prpl-button-secondary {
 	background: var(--prpl-color-gray-3);
 
-	&:hover,
-	&:focus {
+	&:not([disabled]):hover,
+	&:not([disabled]):focus {
 		background: var(--prpl-color-gray-4);
 		box-shadow: 3px 3px 10px var(--prpl-color-gray-4);
 	}
@@ -509,3 +514,4 @@ button.prpl-info-icon {
 		transform: rotate(360deg);
 	}
 }
+

assets/css/page-widgets/suggested-tasks.css

@@ -456,8 +456,8 @@
 				transition: all 0.25s ease-in-out;
 			}
 
-			&:hover,
-			&:focus {
+			&:not([disabled]):hover,
+			&:not([disabled]):focus {
 				background: var(--prpl-color-400-orange); /* WIP: pick exact color */
 
 				&::after {

assets/js/recommendations/core-blogdescription.js

@@ -12,3 +12,12 @@ prplInteractiveTaskFormListener.siteSettings( {
 	taskId: 'core-blogdescription',
 	popoverId: 'prpl-popover-core-blogdescription',
 } );
+
+document
+	.querySelector( 'input#blogdescription' )
+	.addEventListener( 'input', function ( e ) {
+		const button = document.querySelector(
+			'[popover-id="prpl-popover-core-blogdescription"] button[type="submit"]'
+		);
+		button.disabled = e.target.value.length === 0;
+	} );

classes/suggested-tasks/providers/class-blog-description.php

@@ -92,7 +92,7 @@ public function should_add_task() {
 	 */
 	public function print_popover_instructions() {
 		?>
-		<p><?php \esc_html_e( 'In a few words, explain what this site is about.', 'progress-planner' ); ?></p>
+		<p><?php \esc_html_e( 'In a few words, explain what this site is about. This information is used in your website\'s schema and RSS feeds, and can be displayed on your site. The tagline typically is your site\'s mission statement.', 'progress-planner' ); ?></p>
 		<?php
 	}
 
@@ -104,16 +104,17 @@ public function print_popover_instructions() {
 	public function print_popover_form_contents() {
 		?>
 		<label>
+			<p><?php echo \wp_kses_post( $this->get_task_details()['description'] ); ?></p>
 			<input
 				name="blogdescription"
 				type="text"
 				id="blogdescription"
 				value="<?php echo \esc_attr( \get_bloginfo( 'description' ) ); ?>"
 				class="regular-text"
+				placeholder="<?php \esc_html_e( 'A catchy phrase to describe your website', 'progress-planner' ); ?>"
 			>
-			<p><?php echo \wp_kses_post( $this->get_task_details()['description'] ); ?></p>
 		</label>
-		<button type="submit" class="prpl-button prpl-button-primary" style="color: #fff;">
+		<button type="submit" class="prpl-button prpl-button-primary" style="color: #fff;" disabled>
 			<?php \esc_html_e( 'Save', 'progress-planner' ); ?>
 		</button>
 		<?php

classes/suggested-tasks/providers/class-disable-comments.php

@@ -113,10 +113,26 @@ public function is_task_completed( $task_id = '' ) {
 	 * @return void
 	 */
 	public function print_popover_instructions() {
-		?>
-		<p><?php \esc_html_e( "If you don't need comments on your site, consider disabling them.", 'progress-planner' ); ?></p>
-		<p><?php \esc_html_e( 'You can disable new comments by clicking on the button, or disable all comments by installing the Comment-free zone plugin.', 'progress-planner' ); ?></p>
-		<?php
+		$comments_count = (int) \wp_count_comments()->approved;
+
+		echo '<p>';
+		if ( 0 === $comments_count ) {
+			\esc_html_e( 'Your site currently has no approved comments. Therefore, it seems your site might not need comments. If that is true for most posts or pages on your site, you can use WordPress\'s default setting to disable comments. If your site really doesn\'t need any comments, we recommend installing the "Comment-Free Zone" plugin.', 'progress-planner' );
+		} else {
+			printf(
+				\esc_html(
+					// translators: %d is the number of approved comments.
+					\_n(
+						'Your site currently has %d approved comment. Therefore, it seems your site might not need comments. If that is true for most posts or pages on your site, you can use WordPress\'s default setting to disable comments. If your site really doesn\'t need any comments, we recommend installing the "Comment-Free Zone" plugin.',
+						'Your site currently has %d approved comments. Therefore, it seems your site might not need comments. If that is true for most posts or pages on your site, you can use WordPress\'s default setting to disable comments. If your site really doesn\'t need any comments, we recommend installing the "Comment-Free Zone" plugin.',
+						$comments_count,
+						'progress-planner'
+					)
+				),
+				(int) $comments_count
+			);
+		}
+		echo '</p>';
 	}
 
 	/**