#83 - don't register widgets if jetpack is not installed/activated (testimonials and portfolio)

 #82 - changed loading files method
 #69 - changed pagination

various bug fixes

Author: Cosmin

changelog.txt

@@ -0,0 +1,47 @@
+### 1.0.6
+<a href="https://github.com/puikinsh/shapely/issues">Issues</a>
+
+ #83 - don't register widgets if jetpack is not installed/activated (testimonials and portfolio)
+ #82 - changed loading files method
+ #69 - changed pagination
+
+### 1.0.5
+<a href="https://github.com/puikinsh/shapely/issues">Issues</a>
+
+ #62 - done
+ #89 - in plugin
+ #87 - removed from theme - ADDED TO COMPANION
+ #86 - widgets are in the plugin
+ #85 - sanitized the dropdown instead of escaping it
+ #84 - found in the plugin
+ #82 - widget files are found in the plugin, this is no longer an issue
+ #81 - removed if condition in the social menu
+ #80 - followed guide
+ #79 - already fixed
+ #78 - removed REM font size declaration, fixed
+ #77 - figure had a margin left/right that was messing up the columns, changed it to padding . works
+ #76 - added tags in single post
+ #75 - seems to be fixed
+ #74 - redone title section ( if yoast seo is not installed/breadcrumbs not used, title will have a 12 column size )
+ #72 - removed custom css
+ #71 - remooved from extras.php
+ #67 - no longer relevant - widgets are in the companion plugin now
+ #65 - moved to style.css
+ #61 - prefixed
+ #60 - made them translation ready
+ #59 - removed sanitization
+ #58 - added custom logo functionality
+ #57 - moved them in the after theme setup hook
+ #55 - removed one of the enqueues
+ #54 - changed handler names
+ #53 - license changed to gpl v3
+ #52 - this should definitely be esc_html
+ #51 - changed get_template_directory to get_stylesheet_directory (allowed to be overridden in child themes) - but i don`t think this is quite OK
+ #50 - echo esc_html(). esc_attr is used inside html tags (value=<?php echo esc_attr() ?>, etc)
+ #47 - design? or just throw it in there?
+ #44 - no longer relevant
+ #43 - no longer relevant ?
+ #37 - fixed problems during activation
+ #35 - no longer relevant, widgets moved to plugin
+ #21 - added custom header image
+ #25 - fixed

functions.php

@@ -100,7 +100,7 @@ function shapely_setup() {
 			global $shapely_required_actions, $shapely_recommended_plugins;
 
 			$shapely_recommended_plugins = array(
-				'force-regenerate-thumbnails' => array( 'recommended' => true )
+				'fancybox-for-wordpress' => array( 'recommended' => false )
 			);
 
 			/*
@@ -113,14 +113,21 @@ function shapely_setup() {
 			 */
 			$shapely_required_actions = array(
 				array(
-					"id"          => 'shapely-req-ac-install-wp-import-plugin',
+					"id"          => 'shapely-req-ac-install-companion-plugin',
+					"title"       => Shapely_Notify_System::shapely_companion_title(),
+					"description" => Shapely_Notify_System::shapely_companion_description(),
+					"check"       => Shapely_Notify_System::shapely_has_plugin( 'shapely-companion' ),
+					"plugin_slug" => 'shapely-companion'
+				),
+				array(
+					"id"          => 'shapely-req-ac-install-wp-jetpack-plugin',
 					"title"       => Shapely_Notify_System::shapely_jetpack_title(),
 					"description" => Shapely_Notify_System::shapely_jetpack_description(),
 					"check"       => Shapely_Notify_System::shapely_has_plugin( 'jetpack' ),
 					"plugin_slug" => 'jetpack'
 				),
 				array(
-					"id"          => 'shapely-req-ac-install-wp-import-widget-plugin',
+					"id"          => 'shapely-req-ac-install-wp-yoast-plugin',
 					"title"       => Shapely_Notify_System::shapely_yoast_title(),
 					'description' => Shapely_Notify_System::shapely_yoast_description(),
 					"check"       => Shapely_Notify_System::shapely_has_plugin( 'wordpress-seo' ),
@@ -129,7 +136,7 @@ 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 and import sample content data.', '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(),
 				),

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

@@ -5,7 +5,7 @@
 /* New Logo */
 .wp-badge.epsilon-welcome-logo {
     color: #fff;
-    background-image: url(../img/macho-themes-logo.svg);
+    background-image: url(../img/colorlib-logo-white2.png);
     background-position: center center;
     background-size: 70%;
     background-repeat: no-repeat;

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

@@ -12,7 +12,3 @@
     border-radius: 10px;
     z-index: 26;
 }
-
-.button.change-theme {
-    display: none;
-}

inc/admin/welcome-screen/img/colorlib-logo-white2.png

@@ -28,7 +28,12 @@ public static function shapely_is_not_static_page() {
 		 * @return bool
 		 */
 		public static function shapely_has_content() {
-			return get_option( 'shapely-req-import-content', false );
+			$option = get_option( "shapely_show_required_actions" );
+			if ( $option['shapely-req-import-content'] ) {
+				return true;
+			};
+
+			return false;
 		}
 
 		/**
@@ -88,6 +93,20 @@ public static function shapely_has_plugin( $slug = NULL ) {
 			return true;
 		}
 
+		public static function shapely_companion_title() {
+			$installed = self::shapely_check_plugin_is_installed( 'shapely-companion' );
+			if ( ! $installed ) {
+				return __( 'Install: Shapely Companion Plugin', 'shapely' );
+			}
+
+			$active = self::shapely_check_plugin_is_active( 'shapely-companion' );
+			if ( $installed && ! $active ) {
+				return __( 'Activate: Shapely Companion Plugin', 'shapely' );
+			}
+
+			return __( 'Install: Shapely Companion Plugin', 'shapely' );
+		}
+
 		public static function shapely_yoast_title() {
 			$installed = self::shapely_check_plugin_is_installed( 'wordpress-seo' );
 			if ( ! $installed ) {
@@ -116,22 +135,40 @@ public static function shapely_jetpack_title() {
 			return __( 'Install: Jetpack by WordPress', 'shapely' );
 		}
 
+		/**
+		 * @return string
+		 */
+		public static function shapely_companion_description() {
+			$installed = self::shapely_check_plugin_is_installed( 'shapely-companion' );
+
+			if ( ! $installed ) {
+				return __( 'Please install Shapely Companion plugin.', 'shapely' );
+			}
+
+			$active = self::shapely_check_plugin_is_active( 'shapely-companion' );
+			if ( $installed && ! $active ) {
+				return __( 'Please activate Shapely Companion plugin.', 'shapely' );
+			}
+
+			return __( 'Please install Shapely Companion plugin.', 'shapely' );
+		}
+
 		/**
 		 * @return string
 		 */
 		public static function shapely_jetpack_description() {
 			$installed = self::shapely_check_plugin_is_installed( 'jetpack' );
 
 			if ( ! $installed ) {
-				return __( 'Please install Jetpack by WordPress.', 'shapely' );
+				return __( 'Please install Jetpack by WordPress. Note that you won\'t be able to use the Testimonials and Portfolio widgets without it.', 'shapely' );
 			}
 
 			$active = self::shapely_check_plugin_is_active( 'jetpack' );
 			if ( $installed && ! $active ) {
-				return __( 'Please activate Jetpack by WordPress.', 'shapely' );
+				return __( 'Please activate Jetpack by WordPress. Note that you won\'t be able to use the Testimonials and Portfolio widgets without it.', 'shapely' );
 			}
 
-			return __( 'Please install Jetpack by WordPress.', 'shapely' );
+			return __( 'Please install Jetpack by WordPress. Note that you won\'t be able to use the Testimonials and Portfolio widgets without it.', 'shapely' );
 		}
 
 		public static function shapely_yoast_description() {

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

@@ -12,10 +12,7 @@
 
 	<?php
 	global $shapely_required_actions;
-
 	if ( ! empty( $shapely_required_actions ) ):
-
-		/* shapely_show_required_actions is an array of true/false for each required action that was dismissed */
 		$shapely_show_required_actions = get_option( "shapely_show_required_actions" );
 		$hooray = true;
 

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

@@ -25,7 +25,7 @@
 		<p><?php esc_html_e( 'Even if you\'re a long-time WordPress user, we still believe you should give our documentation a very quick Read.', 'shapely' ) ?></p>
 		<p>
 			<a target="_blank"
-			   href="<?php echo esc_url( 'http://docs.machothemes.com/' ); ?>"><?php esc_html_e( 'Full documentation', 'shapely' ); ?></a>
+			   href="<?php echo esc_url( 'https://colorlib.com/wp/support/shapely/' ); ?>"><?php esc_html_e( 'Full documentation', 'shapely' ); ?></a>
 		</p>
 	</div><!--/.col-->
 

inc/admin/welcome-screen/sections/getting-started.php

@@ -6,7 +6,7 @@
 			<i><?php esc_html_e( 'We offer excellent support through our advanced ticketing system. Make sure to register your purchase before contacting support!', 'shapely' ) ?></i>
 		</p>
 		<p><a target="_blank"  class="button button-primary"
-		      href="<?php echo esc_url( 'https://www.machothemes.com/support/' ); ?>"><?php esc_html_e( 'Contact Support', 'shapely' ); ?></a>
+		      href="<?php echo esc_url( 'https://colorlib.com/wp/forums/' ); ?>"><?php esc_html_e( 'Contact Support', 'shapely' ); ?></a>
 		</p>
 	</div><!--/.col-->
 
@@ -16,7 +16,7 @@
 			<i><?php esc_html_e( 'This is the place to go to reference different aspects of the theme. Our online documentation is an incredible resource for learning the ins and outs of using shapely.', 'shapely' ) ?></i>
 		</p>
 		<p>
-			<a target="_blank" href="<?php echo esc_url( 'http://docs.machothemes.com/' ); ?>"><?php esc_html_e( 'See our full documentation', 'shapely' ); ?></a>
+			<a target="_blank" href="<?php echo esc_url( 'https://colorlib.com/wp/support/shapely/' ); ?>"><?php esc_html_e( 'See our full documentation', 'shapely' ); ?></a>
 		</p>
 	</div><!--/.col-->
 

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

@@ -30,62 +30,6 @@ public function __construct() {
 			$this,
 			'shapely_dismiss_required_action_callback'
 		) );
-
-		add_action( 'admin_init', array( $this, 'shapely_activate_plugin' ) );
-		add_action( 'admin_init', array( $this, 'shapely_deactivate_plugin' ) );
-		add_action( 'admin_init', array( $this, 'shapely_set_pages' ) );
-	}
-
-	public function shapely_set_pages() {
-		if ( ! empty( $_GET ) ) {
-			/**
-			 * Check action
-			 */
-			if ( ! empty( $_GET['action'] ) && $_GET['action'] === 'set_page_automatic' ) {
-				$active_tab = $_GET['tab'];
-				$about      = get_page_by_title( 'Homepage' );
-				update_option( 'page_on_front', $about->ID );
-				update_option( 'show_on_front', 'page' );
-
-				// Set the blog page
-				$blog = get_page_by_title( 'Blog' );
-				update_option( 'page_for_posts', $blog->ID );
-
-				wp_redirect( self_admin_url( 'themes.php?page=shapely-welcome&tab=' . $active_tab ) );
-			}
-		}
-	}
-
-
-	public function shapely_activate_plugin() {
-		if ( ! empty( $_GET ) ) {
-			/**
-			 * Check action
-			 */
-			if ( ! empty( $_GET['action'] ) && ! empty( $_GET['plugin'] ) && $_GET['action'] === 'activate_plugin' ) {
-				$active_tab = $_GET['tab'];
-				$url        = self_admin_url( 'themes.php?page=shapely-welcome&tab=' . $active_tab );
-				activate_plugin( $_GET['plugin'], $url );
-			}
-		}
-	}
-
-	public function shapely_deactivate_plugin() {
-		if ( ! empty( $_GET ) ) {
-			/**
-			 * Check action
-			 */
-			if ( ! empty( $_GET['action'] ) && ! empty( $_GET['plugin'] ) && $_GET['action'] === 'deactivate_plugin' ) {
-				$active_tab = $_GET['tab'];
-				$url        = self_admin_url( 'themes.php?page=shapely-welcome&tab=' . $active_tab );
-				$current    = get_option( 'active_plugins', array() );
-				$search     = array_search( $_GET['plugin'], $current );
-				if ( array_key_exists( $search, $current ) ) {
-					unset( $current[ $search ] );
-				}
-				update_option( 'active_plugins', $current );
-			}
-		}
 	}
 
 	/**
@@ -374,10 +318,10 @@ public function shapely_welcome_screen() {
 
 		<div class="wrap about-wrap epsilon-wrap">
 
-			<h1><?php echo __( 'Welcome to shapely! - Version ', 'shapely' ) . $shapely['Version']; ?></h1>
+			<h1><?php echo __( 'Welcome to Shapely! - Version ', 'shapely' ) . $shapely['Version']; ?></h1>
 
 			<div
-				class="about-text"><?php echo esc_html__( 'shapely is now installed and ready to use! Get ready to build something beautiful. We hope you enjoy it! We want to make sure you have the best experience using shapely and that is why we gathered here all the necessary information for you. We hope you will enjoy using shapely, as much as we enjoy creating great products.', 'shapely' ); ?></div>
+				class="about-text"><?php echo esc_html__( 'Shapely is now installed and ready to use! Get ready to build something beautiful. We hope you enjoy it! We want to make sure you have the best experience using shapely and that is why we gathered here all the necessary information for you. We hope you will enjoy using shapely, as much as we enjoy creating great products.', 'shapely' ); ?></div>
 
 			<div class="wp-badge epsilon-welcome-logo"></div>
 
@@ -390,7 +334,8 @@ 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 if ( $this->check_active( 'shapely-companion' ) ): ?>
+				<?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; ?>
@@ -418,8 +363,9 @@ class="nav-tab <?php echo $active_tab == 'changelog' ? 'nav-tab-active' : ''; ?>
 					require_once get_template_directory() . '/inc/admin/welcome-screen/sections/changelog.php';
 					break;
 				case 'demo_content':
-					if ( $this->check_active( 'shapely-companion' ) ) {
-						require_once ABSPATH . 'wp-content/plugins/shapely-companion/shapely-demo-content.php';
+					$shapely_companion = $this->check_active( 'shapely-companion' );
+					if ( $shapely_companion['needs'] === 'deactivate' ) {
+						require_once ABSPATH . 'wp-content/plugins/shapely-companion/inc/views/shapely-demo-content.php';
 					}
 					break;
 				default: