Merge branch 'develop' into filip/v19/fix-user-task-points

Author: ilicfilip

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

@@ -453,6 +453,10 @@
 			/* If there are no other elements in the form, align the button to the left. */
 			&:only-child {
 				padding-top: 0;
+			}
+
+			&:only-child,
+			&.prpl-steps-nav-wrapper-align-left {
 				justify-content: flex-start;
 
 				/* Display the spinner after the button. */

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

@@ -144,8 +144,8 @@ public function print_popover_instructions() {
 	 */
 	public function print_popover_form_contents() {
 		?>
-		<div class="prpl-steps-nav-wrapper" style="justify-content: flex-start;margin-bottom: 1.25rem;">
-			<button type="submit" class="prpl-button prpl-button-primary" style="order:-2;">
+		<div class="prpl-steps-nav-wrapper prpl-steps-nav-wrapper-align-left" style="justify-content: flex-start;margin-bottom: 1.25rem;">
+			<button type="submit" class="prpl-button prpl-button-primary">
 				<?php \esc_html_e( 'Disable new comments', 'progress-planner' ); ?>
 			</button>
 		</div>

classes/suggested-tasks/providers/class-select-locale.php

@@ -226,7 +226,7 @@ public function print_popover_form_contents() {
 			]
 		);
 
-		$this->print_submit_button( \__( 'Select locale', 'progress-planner' ) );
+		$this->print_submit_button( \__( 'Select locale', 'progress-planner' ), 'prpl-steps-nav-wrapper-align-left' );
 	}
 
 	/**

classes/suggested-tasks/providers/class-select-timezone.php

@@ -144,7 +144,7 @@ public function print_popover_form_contents() {
 			</select>
 		</label>
 		<?php
-		$this->print_submit_button( \__( 'Set site timezone', 'progress-planner' ) );
+		$this->print_submit_button( \__( 'Set site timezone', 'progress-planner' ), 'prpl-steps-nav-wrapper-align-left' );
 	}
 
 	/**

classes/suggested-tasks/providers/class-set-date-format.php

@@ -243,7 +243,7 @@ public function print_popover_form_contents() {
 			</fieldset>
 		</div>
 		<?php
-		$this->print_submit_button( \__( 'Set date format', 'progress-planner' ) );
+		$this->print_submit_button( \__( 'Set date format', 'progress-planner' ), 'prpl-steps-nav-wrapper-align-left' );
 	}
 
 	/**

classes/suggested-tasks/providers/class-site-icon.php

@@ -120,7 +120,7 @@ public function print_popover_form_contents() {
 			<?php \esc_html_e( 'Choose or Upload Image', 'progress-planner' ); ?>
 		</button>
 		<input type="hidden" name="site_icon" id="prpl-site-icon-id" value="<?php echo \esc_attr( $site_icon_id ); ?>">
-		<div class="prpl-steps-nav-wrapper">
+		<div class="prpl-steps-nav-wrapper prpl-steps-nav-wrapper-align-left">
 			<button type="submit" class="prpl-button prpl-button-primary" id="prpl-set-site-icon-button" <?php echo $site_icon_id ? '' : 'disabled'; ?>>
 				<?php \esc_html_e( 'Set site icon', 'progress-planner' ); ?>
 			</button>

classes/suggested-tasks/providers/class-tasks-interactive.php

@@ -211,15 +211,18 @@ public function print_popover_instructions() {
 	 *
 	 * @param string $button_text The text for the button.
 	 *                           If empty, the default text "Submit" will be used.
+	 * @param string $css_class The CSS class for the wrapper.
 	 *
 	 * @return void
 	 */
-	protected function print_submit_button( $button_text = '' ) {
+	protected function print_submit_button( $button_text = '', $css_class = '' ) {
 		if ( empty( $button_text ) ) {
 			$button_text = \__( 'Submit', 'progress-planner' );
 		}
+
+		$css_class = empty( $css_class ) ? 'prpl-steps-nav-wrapper' : 'prpl-steps-nav-wrapper ' . $css_class;
 		?>
-		<div class="prpl-steps-nav-wrapper">
+		<div class="<?php echo \esc_attr( $css_class ); ?>">
 			<button type="submit" class="prpl-button prpl-button-primary">
 				<?php echo \esc_html( $button_text ); ?>
 			</button>

classes/utils/class-debug-tools.php

@@ -77,6 +77,16 @@ public function add_toolbar_items( $admin_bar ) {
 			]
 		);
 
+		// Show all suggested tasks.
+		$admin_bar->add_node(
+			[
+				'id'     => 'prpl-show-all-suggested-tasks',
+				'parent' => 'prpl-debug',
+				'title'  => 'Show All Suggested Tasks',
+				'href'   => \add_query_arg( 'prpl_show_all_recommendations', $this->current_url ),
+			]
+		);
+
 		$this->add_delete_submenu_item( $admin_bar );
 
 		$this->add_upgrading_tasks_submenu_item( $admin_bar );