#95 import demo content is now part of the req actions

Author: Cosmin

functions.php

@@ -136,9 +136,8 @@ function shapely_setup() {
 				array(
 					"id"          => 'shapely-req-import-content',
 					"title"       => esc_html__( 'Import content', 'shapely' ),
-					"description" => esc_html__( 'Head over to the Demo Content tab (available only if you installed Shapely Companion plugin) and import sample content data.', 'shapely' ),
-					"help"        => '<a href="' . self_admin_url( 'themes.php?page=shapely-welcome&tab=demo_content' ) . '">' . __( 'Demo Content', 'shapely' ) . '</a>',
-					"check"       => Shapely_Notify_System::shapely_has_content(),
+					"external"    => ABSPATH . 'wp-content/plugins/shapely-companion/inc/views/shapely-demo-content.php',
+					"check"       => Shapely_Notify_System::shapely_check_import_req(),
 				),
 
 			);

inc/admin/welcome-screen/css/welcome.css

@@ -181,4 +181,21 @@
 
 .about-wrap .three-col .plugin_box.col {
     width: 29.81%;
-}
+}
+
+.shapely-media-control img {
+    width: 100%;
+}
+
+#demo_content .spinner {
+    float: none;
+}
+
+#demo_content .updated-message,
+#demo_content .spinner {
+    display: none;
+}
+
+#demo_content .spinner.is-active {
+    display: inline-block;
+}

inc/admin/welcome-screen/notify-system-checks.php

@@ -28,25 +28,32 @@ public static function shapely_is_not_static_page() {
 		 * @return bool
 		 */
 		public static function shapely_has_content() {
-			$option = get_option( "shapely_show_required_actions" );
-			if ( $option['shapely-req-import-content'] ) {
+			$option = get_option( "shapely_imported_demo", false );
+			if ( $option ) {
 				return true;
 			};
 
 			return false;
 		}
 
 		/**
-		 * @return bool
+		 * @return bool|mixed
 		 */
-		public static function shapely_check_wordpress_importer() {
-			if ( file_exists( ABSPATH . 'wp-content/plugins/wordpress-importer/wordpress-importer.php' ) ) {
-				include_once( ABSPATH . 'wp-admin/includes/plugin.php' );
+		public static function shapely_check_import_req() {
+			$needs = array(
+				'has_content' => self::shapely_has_content(),
+				'has_plugin'  => self::shapely_has_plugin( 'shapely-companion' )
+			);
 
-				return is_plugin_active( 'wordpress-importer/wordpress-importer.php' );
+			if ( $needs['has_content'] ) {
+				return true;
 			}
 
-			return false;
+			if ( $needs['has_plugin'] ) {
+				return false;
+			}
+
+			return true;
 		}
 
 		/**

inc/admin/welcome-screen/sections/actions-required.php

@@ -28,16 +28,22 @@
 			<div class="shapely-action-required-box">
 				<?php if ( ! $hidden ): ?>
 					<span data-action="dismiss" class="dashicons dashicons-visibility shapely-required-action-button"
-					      id="<?php echo $shapely_required_action_value['id']; ?>"></span>
+					      id="<?php echo esc_attr( $shapely_required_action_value['id'] ); ?>"></span>
 				<?php else: ?>
-					<span data-action="add" class="dashicons dashicons-hidden shapely-required-action-button" id="<?php echo $shapely_required_action_value['id']; ?>"></span>
+					<span data-action="add" class="dashicons dashicons-hidden shapely-required-action-button"
+					      id="<?php echo esc_attr( $shapely_required_action_value['id'] ); ?>"></span>
 				<?php endif; ?>
-				<h3><?php if ( ! empty( $shapely_required_action_value['title'] ) ): echo $shapely_required_action_value['title']; endif; ?></h3>
+				<h3><?php if ( ! empty( $shapely_required_action_value['title'] ) ): echo esc_html( $shapely_required_action_value['title'] ); endif; ?></h3>
 				<p>
-					<?php if ( ! empty( $shapely_required_action_value['description'] ) ): echo $shapely_required_action_value['description']; endif; ?>
-					<?php if ( ! empty( $shapely_required_action_value['help'] ) ): echo '<br/>' . $shapely_required_action_value['help']; endif; ?>
+					<?php if ( ! empty( $shapely_required_action_value['description'] ) ): echo esc_html( $shapely_required_action_value['description'] ); endif; ?>
+					<?php if ( ! empty( $shapely_required_action_value['help'] ) ): echo '<br/>' . wp_kses_post( $shapely_required_action_value['help'] ); endif; ?>
 				</p>
 				<?php
+				if ( ! empty( $shapely_required_action_value['external'] ) && file_exists( $shapely_required_action_value['external'] ) ) {
+					require_once $shapely_required_action_value['external'];
+				}
+				?>
+				<?php
 				if ( ! empty( $shapely_required_action_value['plugin_slug'] ) ) {
 					$active = $this->check_active( $shapely_required_action_value['plugin_slug'] );
 					$url    = $this->create_action_link( $active['needs'], $shapely_required_action_value['plugin_slug'] );
@@ -73,6 +79,7 @@ class="<?php echo $class; ?>"
 		endforeach;
 	endif;
 
+
 	if ( $hooray ):
 		echo '<span class="hooray">' . __( 'Hooray! There are no required actions for you right now.', 'shapely' ) . '</span>';
 	endif;

inc/admin/welcome-screen/welcome-screen.php

@@ -334,11 +334,6 @@ class="nav-tab <?php echo $active_tab == 'recommended_actions' ? 'nav-tab-active
 					<?php echo $action_count > 0 ? '<span class="badge-action-count">' . esc_html( $action_count ) . '</span>' : '' ?></a>
 				<a href="<?php echo admin_url( 'themes.php?page=shapely-welcome&tab=recommended_plugins' ); ?>"
 				   class="nav-tab <?php echo $active_tab == 'recommended_plugins' ? 'nav-tab-active' : ''; ?> "><?php echo esc_html__( 'Recommended Plugins', 'shapely' ); ?></a>
-				<?php $shapely_companion = $this->check_active( 'shapely-companion' ); ?>
-				<?php if ( $shapely_companion['needs'] === 'deactivate' ): ?>
-					<a href="<?php echo admin_url( 'themes.php?page=shapely-welcome&tab=demo_content' ); ?>"
-					   class="nav-tab <?php echo $active_tab == 'demo_content' ? 'nav-tab-active' : ''; ?> "><?php echo esc_html__( 'Demo Content', 'shapely' ); ?></a>
-				<?php endif; ?>
 				<a href="<?php echo admin_url( 'themes.php?page=shapely-welcome&tab=support' ); ?>"
 				   class="nav-tab <?php echo $active_tab == 'support' ? 'nav-tab-active' : ''; ?> "><?php echo esc_html__( 'Support', 'shapely' ); ?></a>
 				<a href="<?php echo admin_url( 'themes.php?page=shapely-welcome&tab=changelog' ); ?>"
@@ -362,12 +357,6 @@ class="nav-tab <?php echo $active_tab == 'changelog' ? 'nav-tab-active' : ''; ?>
 				case 'changelog':
 					require_once get_template_directory() . '/inc/admin/welcome-screen/sections/changelog.php';
 					break;
-				case 'demo_content':
-					$shapely_companion = $this->check_active( 'shapely-companion' );
-					if ( $shapely_companion['needs'] === 'deactivate' && file_exists( ABSPATH . 'wp-content/plugins/shapely-companion/inc/views/shapely-demo-content.php' ) ) {
-						require_once ABSPATH . 'wp-content/plugins/shapely-companion/inc/views/shapely-demo-content.php';
-					}
-					break;
 				default:
 					require_once get_template_directory() . '/inc/admin/welcome-screen/sections/getting-started.php';
 					break;