Update Epsilon FW to latest version #218

Author: giucu91

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

@@ -12,9 +12,6 @@ public function __construct() {
 		/* create dashbord page */
 		add_action( 'admin_menu', array( $this, 'shapely_welcome_register_menu' ) );
 
-		/* activation notice */
-		add_action( 'load-themes.php', array( $this, 'shapely_activation_admin_notice' ) );
-
 		/* enqueue script and style for welcome screen */
 		add_action( 'admin_enqueue_scripts', array( $this, 'shapely_welcome_style_and_scripts' ) );
 
@@ -30,6 +27,16 @@ public function __construct() {
 			$this,
 			'shapely_dismiss_required_action_callback',
 		) );
+
+		$theme = wp_get_theme();
+		$this->theme_name = $theme->get( 'Name' );
+		$this->theme_slug = $theme->get( 'TextDomain' );
+
+		/**
+		 * Add the notice in the admin backend
+		 */
+		$this->shapely_activation_admin_notice();
+
 	}
 
 	/**
@@ -54,11 +61,37 @@ public function shapely_welcome_register_menu() {
 	 * @since 1.8.2.4
 	 */
 	public function shapely_activation_admin_notice() {
-		global $pagenow;
+		if ( ! class_exists( 'Epsilon_Notifications' ) ) {
+			return;
+		}
+
+		if ( empty( $this->notice ) ) {
+			$this->notice = '<img src="' . get_template_directory_uri() . '/inc/admin/welcome-screen/img/colorlib-logo-white2.png" class="epsilon-author-logo" />';
+
+			/* Translators: %1$s - Theme Name */
+			$this->notice .= '<h1>' . sprintf( esc_html__( 'Welcome to %1$s', 'shapely' ), $this->theme_name ) . '</h1>';
+			$this->notice .= '<p>';
+			$this->notice .=
+				sprintf( /* Translators: Notice */
+					esc_html__( 'Welcome! Thank you for choosing %3$s! To fully take advantage of the best our theme can offer please make sure you visit our %1$swelcome page%2$s.', 'shapely' ),
+					'<a href="' . esc_url( admin_url( 'themes.php?page=' . $this->theme_slug . '-welcome' ) ) . '">',
+					'</a>',
+					$this->theme_name
+				);
+			$this->notice .= '</p>';
+			/* Translators: %1$s - Theme Name */
+			$this->notice .= '<p><a href="' . esc_url( admin_url( 'themes.php?page=' . $this->theme_slug . '-welcome' ) ) . '" class="button button-primary button-hero" style="text-decoration: none;"> ' . sprintf( esc_html__( 'Get started with %1$s', 'shapely' ), $this->theme_name ) . '</a></p>';
 
-		if ( is_admin() && ( 'themes.php' == $pagenow ) && isset( $_GET['activated'] ) ) {
-			add_action( 'admin_notices', array( $this, 'shapely_welcome_admin_notice' ), 99 );
 		}
+
+		$notifications = Epsilon_Notifications::get_instance();
+		$notifications->add_notice(
+			array(
+				'id'      => 'shapely_install_notice',
+				'type'    => 'notice epsilon-big',
+				'message' => $this->notice,
+			)
+		);
 	}
 
 	/**

inc/customizer.php

@@ -340,60 +340,6 @@ function shapely_customizer( $wp_customize ) {
 		'section' => 'shapely_footer_section',
 	) );
 
-	if ( class_exists( 'Epsilon_Control_Color_Scheme' ) ) {
-		$wp_customize->add_setting( 'shapely_color_scheme', array(
-			'sanitize_callback' => 'sanitize_text_field',
-			'default'           => 'default',
-			'transport'         => 'postMessage',
-		) );
-
-		$wp_customize->add_control( new Epsilon_Control_Color_Scheme( $wp_customize, 'shapely_color_scheme', array(
-			'label'       => esc_html__( 'Color scheme', 'shapely' ),
-			'description' => esc_html__( 'Select a color scheme', 'shapely' ),
-			'choices'     => array(
-				array(
-					'id'     => 'purple',
-					'name'   => 'Default',
-					'colors' => array(
-						'accent'               => '#745cf9',
-						'text'                 => '#666666',
-						'content-widget-title' => '#0e1015',
-						'footer-bg'            => '#0e1015',
-						'footer-widget-title'  => '#ffffff',
-						'footer-links'         => '#ffffff',
-					),
-				),
-				array(
-					'id'     => 'yellow',
-					'name'   => 'Yellow',
-					'colors' => array(
-						'accent'               => '#FFC107',
-						'text'                 => '#666666',
-						'content-widget-title' => '#0e1015',
-						'footer-bg'            => '#0e1015',
-						'footer-widget-title'  => '#ffffff',
-						'footer-links'         => '#ffffff',
-					),
-				),
-				array(
-					'id'     => 'green',
-					'name'   => 'Green',
-					'colors' => array(
-						'accent'               => '#2ecc71',
-						'text'                 => '#666666',
-						'content-widget-title' => '#0e1015',
-						'footer-bg'            => '#0e1015',
-						'footer-widget-title'  => '#ffffff',
-						'footer-links'         => '#ffffff',
-					),
-				),
-			),
-			'priority'    => 0,
-			'default'     => 'purple',
-			'section'     => 'colors',
-		) ) );
-	} // End if().
-
 	$wp_customize->add_setting( 'title_in_header', array(
 		'default'           => 1,
 		'sanitize_callback' => 'shapely_sanitize_checkbox',