From ad25281202249311964d73b4f0976cec12eb0d8d Mon Sep 17 00:00:00 2001 From: Bogdan Preda Date: Wed, 12 Jul 2023 17:20:08 +0300 Subject: [PATCH 1/4] chore: register otter product page Codeinwp/neve-pro-addon#2519 --- inc/admin/dashboard/main.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/inc/admin/dashboard/main.php b/inc/admin/dashboard/main.php index c2a735c917..232c230962 100755 --- a/inc/admin/dashboard/main.php +++ b/inc/admin/dashboard/main.php @@ -87,18 +87,20 @@ public function init() { add_filter( 'neve_about_us_metadata', function () { + $product_pages = []; + if ( ! defined( 'OTTER_BLOCKS_VERSION' ) ) { + $product_pages[] = 'otter-page'; + } + return [ // Top-level page in the dashboard sidebar 'location' => 'neve-welcome', // Logo to display on the page 'logo' => get_template_directory_uri() . '/assets/img/dashboard/logo.svg', - // Menu displayed at the top of the page - optional - // 'page_menu' => [ - // [ 'text' => 'SDK GitHub Issues', 'url' => esc_url( 'https://github.com/codeinwp/themeisle-sdk/issues' ) ], - // [ 'text' => 'Themeisle', 'url' => esc_url( 'https://themeisle.com' ) ] - // ], // Condition to show or hide the upgrade menu in the sidebar 'has_upgrade_menu' => ! defined( 'NEVE_PRO_VERSION' ), + // Add predefined product pages to the about page. + 'product_pages' => $product_pages, // Upgrade menu item link & text 'upgrade_link' => tsdk_utmify( esc_url( 'https://themeisle.com/themes/neve/upgrade/' ), 'aboutfilter', 'nevedashboard' ), 'upgrade_text' => __( 'Upgrade', 'neve' ) . ' ' . $this->theme_args['name'], From eb3fe6d6d700e1f886a57b07783dec5bce1c79ed Mon Sep 17 00:00:00 2001 From: Bogdan Preda Date: Thu, 13 Jul 2023 12:16:15 +0300 Subject: [PATCH 2/4] chore: simplified filter logic --- inc/admin/dashboard/main.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/inc/admin/dashboard/main.php b/inc/admin/dashboard/main.php index 90cdc83639..f3c82e2b68 100755 --- a/inc/admin/dashboard/main.php +++ b/inc/admin/dashboard/main.php @@ -110,10 +110,6 @@ public function register_about_page() { add_filter( 'neve_about_us_metadata', function () use ( $filtered_name ) { - $product_pages = []; - if ( ! defined( 'OTTER_BLOCKS_VERSION' ) ) { - $product_pages[] = 'otter-page'; - } return [ // Top-level page in the dashboard sidebar @@ -123,7 +119,7 @@ function () use ( $filtered_name ) { // Condition to show or hide the upgrade menu in the sidebar 'has_upgrade_menu' => ! defined( 'NEVE_PRO_VERSION' ), // Add predefined product pages to the about page. - 'product_pages' => $product_pages, + 'product_pages' => [ 'otter-page' ], // Upgrade menu item link & text 'upgrade_link' => tsdk_utmify( esc_url( 'https://themeisle.com/themes/neve/upgrade/' ), 'aboutfilter', 'nevedashboard' ), 'upgrade_text' => __( 'Upgrade', 'neve' ) . ' ' . $filtered_name, From 0d31f494b03ccda003d9096226d852b0cc35619b Mon Sep 17 00:00:00 2001 From: cristian-ungureanu Date: Wed, 2 Aug 2023 16:10:13 +0300 Subject: [PATCH 3/4] chore: update themeisle-sdk version --- composer.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index 5a740b2c81..e7b261fbbd 100644 --- a/composer.lock +++ b/composer.lock @@ -8,16 +8,16 @@ "packages": [ { "name": "codeinwp/themeisle-sdk", - "version": "3.3.1", + "version": "3.3.2", "source": { "type": "git", "url": "https://github.com/Codeinwp/themeisle-sdk.git", - "reference": "efb66935e69935b21ad99b0e55484e611ce4549d" + "reference": "b799403bec877749ee0a2916dc859366d62bd76c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Codeinwp/themeisle-sdk/zipball/efb66935e69935b21ad99b0e55484e611ce4549d", - "reference": "efb66935e69935b21ad99b0e55484e611ce4549d", + "url": "https://api.github.com/repos/Codeinwp/themeisle-sdk/zipball/b799403bec877749ee0a2916dc859366d62bd76c", + "reference": "b799403bec877749ee0a2916dc859366d62bd76c", "shasum": "" }, "require-dev": { @@ -42,9 +42,9 @@ ], "support": { "issues": "https://github.com/Codeinwp/themeisle-sdk/issues", - "source": "https://github.com/Codeinwp/themeisle-sdk/tree/v3.3.1" + "source": "https://github.com/Codeinwp/themeisle-sdk/tree/v3.3.2" }, - "time": "2023-06-21T06:55:46+00:00" + "time": "2023-08-02T13:04:20+00:00" }, { "name": "wptt/webfont-loader", From d79ac5e89a1e8d09890a8ee7e9ba44d7986e4540 Mon Sep 17 00:00:00 2001 From: cristian-ungureanu Date: Wed, 2 Aug 2023 16:19:30 +0300 Subject: [PATCH 4/4] chore: update themeisle-sdk version in composer-dev --- composer-dev.lock | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/composer-dev.lock b/composer-dev.lock index 0742f48271..28d86e9c78 100644 --- a/composer-dev.lock +++ b/composer-dev.lock @@ -8,16 +8,16 @@ "packages": [ { "name": "codeinwp/themeisle-sdk", - "version": "3.2.40", + "version": "3.3.2", "source": { "type": "git", "url": "https://github.com/Codeinwp/themeisle-sdk.git", - "reference": "d719fff89cb6643e555f5e3daa4ebd627ccb4fd7" + "reference": "b799403bec877749ee0a2916dc859366d62bd76c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Codeinwp/themeisle-sdk/zipball/d719fff89cb6643e555f5e3daa4ebd627ccb4fd7", - "reference": "d719fff89cb6643e555f5e3daa4ebd627ccb4fd7", + "url": "https://api.github.com/repos/Codeinwp/themeisle-sdk/zipball/b799403bec877749ee0a2916dc859366d62bd76c", + "reference": "b799403bec877749ee0a2916dc859366d62bd76c", "shasum": "" }, "require-dev": { @@ -42,9 +42,9 @@ ], "support": { "issues": "https://github.com/Codeinwp/themeisle-sdk/issues", - "source": "https://github.com/Codeinwp/themeisle-sdk/tree/v3.2.40" + "source": "https://github.com/Codeinwp/themeisle-sdk/tree/v3.3.2" }, - "time": "2023-03-30T09:29:30+00:00" + "time": "2023-08-02T13:04:20+00:00" }, { "name": "wptt/webfont-loader", @@ -989,5 +989,5 @@ "platform-overrides": { "php": "7.2" }, - "plugin-api-version": "2.1.0" + "plugin-api-version": "2.3.0" }