From 0e204455fa116cf47fac76d2db486d47600a34cf Mon Sep 17 00:00:00 2001
From: mtdkei <mtdkei@gmail.com>
Date: Thu, 24 Oct 2024 12:20:21 +0900
Subject: [PATCH 01/10] Add get_help_notice() function to display help notices
 based on locale

---
 .../package/class.post-type-manager.php       | 90 +++++++++++++++----
 1 file changed, 73 insertions(+), 17 deletions(-)

diff --git a/inc/post-type-manager/package/class.post-type-manager.php b/inc/post-type-manager/package/class.post-type-manager.php
index 45076d46..59224e8d 100644
--- a/inc/post-type-manager/package/class.post-type-manager.php
+++ b/inc/post-type-manager/package/class.post-type-manager.php
@@ -57,6 +57,55 @@ public static function add_cap_post_type_manage() {
 			$role->add_cap( 'publish_others_' . $post_type_name . 's' );
 		}
 
+		/**
+		 * ヘルプ通知
+		 *
+		 * @return string
+		 */
+		public static function get_help_notice() {
+			// サイトの言語が日本語 (ja) であるかどうかを判定
+			if ( get_locale() !== 'ja' ) {
+				return ''; // 日本語以外の場合は何も返さない
+			}
+
+			$dismiss_url = esc_url(
+				wp_nonce_url(
+					add_query_arg('vkblocks-dismiss-pro', 'dismiss_admin_notice'),
+					'vkblocks-dismiss-pro-' . get_current_user_id()
+				)
+			);
+
+			// ヘルプ通知のHTMLを生成して返す
+			return wp_kses_post(
+				'<div class="notice notice-info is-dismissible">
+					<p style="margin-top: 10px;"><strong>' . __( 'Help and Documentation', 'vk-all-in-one-expansion-unit' ) . ':</strong> ' . __( 'Learn more about custom post type settings by visiting the following resources:', 'vk-all-in-one-expansion-unit' ) . '</p>
+					<ul style="list-style-type: disc; margin-top: 0; margin-left: 20px;">
+						<li><a href="https://ex-unit.nagoya/ja/about/custom_post_type_manager" target="_blank">' . __( 'ExUnit Site: Custom Post Type Manager', 'vk-all-in-one-expansion-unit' ) . '</a></li>
+						<li><a href="https://training.vektor-inc.co.jp/courses/x-t9-custom-post-type/" target="_blank">' . __( 'Vektor Training: X-T9 Setup Guide for Custom Post Types', 'vk-all-in-one-expansion-unit' ) . '</a></li>
+						<li><a href="https://training.vektor-inc.co.jp/courses/lightning-basic-settings/lessons/lightning-custom-post-type-lightning/" target="_blank">' . __( 'Vektor Training: Lightning Basic Settings for Custom Post Types', 'vk-all-in-one-expansion-unit' ) . '</a></li>
+					</ul>
+					<p><a href="' . $dismiss_url . '" target="_parent">' . esc_html__( 'Dismiss this notice', 'vk-blocks' ) . '</a></p>
+				</div>'
+			);
+		}
+		
+		/**
+		 * Display help notice on specific page
+		 *
+		 * @return void
+		 */
+		public static function display_help_notice() {
+			// 現在のページを取得
+			global $pagenow;
+
+			// 特定のページのみ通知を表示する
+			if ($pagenow === 'edit.php' && isset($_GET['post_type']) && $_GET['post_type'] === 'post_type_manage') {
+				// 通知のHTMLを取得して表示
+				echo self::get_help_notice();
+			}
+
+		}
+
 		/*******************************************
 		 * カスタムフィールドの meta box を作成.
 		 */
@@ -70,11 +119,15 @@ public static function add_meta_box() {
 		 * @return void
 		 */
 		public static function add_meta_box_action() {
+
 			global $post;
 
 			// CSRF対策の設定（フォームにhiddenフィールドとして追加するためのnonceを「'noncename__post_type_manager」として設定）.
 			wp_nonce_field( wp_create_nonce( __FILE__ ), 'noncename__post_type_manager' );
 
+			// 通知メッセージを取得して表示
+			echo self::get_help_notice();
+			
 			?>
 			<style type="text/css">
 			table.table { border-collapse: collapse; border-spacing: 0;width:100%; }
@@ -170,24 +223,25 @@ public static function add_meta_box_action() {
 			echo '<hr>';
 
 			// JavaScript to update icon selection and validate input
-			echo '<script>
-function updateIconSelection(icon) {
-    document.getElementById("veu_menu_icon").value = icon;
-}
+			echo '
+			<script>
+				function updateIconSelection(icon) {
+					document.getElementById("veu_menu_icon").value = icon;
+				}
 
-document.addEventListener("DOMContentLoaded", function () {
-    var inputField = document.getElementById("veu_menu_icon");
-    
-    // `change` イベントを使用して、フォーカスが外れたときにチェックする
-    inputField.addEventListener("change", function() {
-        // SVGデータURI、\'none\'、または\'dashicons-\'で始まる値を許可
-        if (!this.value.startsWith("dashicons-") && !this.value.startsWith("data:image/svg+xml;base64,") && this.value !== \'none\') {
-            alert("' . __( 'Please enter a valid input. You can enter a Dashicon class, a base64-encoded SVG, or \'none\' to leave it blank for CSS customization.', 'vk-all-in-one-expansion-unit' ) . '");
-            this.value = ""; // 不正な入力をクリア
-        }
-    });
-});
-</script>';
+				document.addEventListener("DOMContentLoaded", function () {
+					var inputField = document.getElementById("veu_menu_icon");
+					
+					// `change` イベントを使用して、フォーカスが外れたときにチェックする
+					inputField.addEventListener("change", function() {
+						// SVGデータURI、\'none\'、または\'dashicons-\'で始まる値を許可
+						if (!this.value.startsWith("dashicons-") && !this.value.startsWith("data:image/svg+xml;base64,") && this.value !== \'none\') {
+							alert("' . __( 'Please enter a valid input. You can enter a Dashicon class, a base64-encoded SVG, or \'none\' to leave it blank for CSS customization.', 'vk-all-in-one-expansion-unit' ) . '");
+							this.value = ""; // 不正な入力をクリア
+						}
+					});
+				});
+			</script>';
 
 			/*******************************************
 			 * Export to Rest api
@@ -568,4 +622,6 @@ public function __construct() {
 
 	$VK_Post_Type_Manager = new VK_Post_Type_Manager(); // phpcs:ignore
 
+	add_action('admin_notices', array('VK_Post_Type_Manager', 'display_help_notice'), 20);
+
 }

From fb9070666d443de0591b6e0aec1acd1485b86e95 Mon Sep 17 00:00:00 2001
From: mtdkei <mtdkei@gmail.com>
Date: Thu, 24 Oct 2024 12:22:01 +0900
Subject: [PATCH 02/10] Add target="_blank"

---
 admin/admin-active-setting-page.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/admin/admin-active-setting-page.php b/admin/admin-active-setting-page.php
index 20fcef52..bbfc665f 100644
--- a/admin/admin-active-setting-page.php
+++ b/admin/admin-active-setting-page.php
@@ -66,9 +66,11 @@
 				?>
 				<?php echo ( $count > 1 && $i >= 1 ) ? ' | ' : ''; ?>
 				<span>
-				<a href="<?php echo ( $att['url'] ) ? esc_html( $att['url'] ) : admin_url() . 'admin.php?page=vkExUnit_main_setting'; ?>">
-				<?php echo esc_html( $att['name'] ); ?>
-				</a></span>
+				<a href="<?php echo ( $att['url'] ) ? esc_url( $att['url'] ) : admin_url() . 'admin.php?page=vkExUnit_main_setting'; ?>"
+					<?php echo ( isset( $att['target'] ) && $att['target'] === '_blank' ) ? 'target="_blank"' : ''; ?>>
+					<?php echo esc_html( $att['name'] ); ?>
+				</a>
+				</span>
 
 				<?php
 					endif;

From d2b308b75df305ee59f9bba3f4e11a2c6bae7b20 Mon Sep 17 00:00:00 2001
From: mtdkei <mtdkei@gmail.com>
Date: Thu, 24 Oct 2024 12:23:02 +0900
Subject: [PATCH 03/10] Add Learn more for post_type_manager

---
 veu-packages.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/veu-packages.php b/veu-packages.php
index 025779ac..b9822643 100644
--- a/veu-packages.php
+++ b/veu-packages.php
@@ -547,6 +547,12 @@ function veu_get_packages( $is_block_theme = null ) {
 				'url'         => admin_url() . 'edit.php?post_type=post_type_manage',
 				'enable_only' => 1,
 			),
+			( get_locale() === 'ja' ) ? array(
+				'name'        => __( 'Learn more', 'vk-all-in-one-expansion-unit' ),
+				'url'         => 'https://ex-unit.nagoya/ja/about/custom_post_type_manager',
+				'target'      => '_blank',
+				'enable_only' => false,
+			) : null,
 		),
 		'default'     => true,
 		'include'     => 'post-type-manager/post-type-manager-config.php',

From 07a3c2684a714c652109f8545650bd70b111bea5 Mon Sep 17 00:00:00 2001
From: mtdkei <mtdkei@gmail.com>
Date: Thu, 24 Oct 2024 12:25:04 +0900
Subject: [PATCH 04/10] Add changelog

---
 readme.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/readme.txt b/readme.txt
index d63699ac..00adbaae 100644
--- a/readme.txt
+++ b/readme.txt
@@ -81,6 +81,8 @@ e.g.
 
 == Changelog ==
 
+[ Add function ][ Post Type Manager ] Added links to explanatory articles and Vectre from the custom post type settings.
+
 = 9.99.6 =
 [ Bug fix ][ Child Page List ] Fixed an issue related to a PHP error.
 

From 518d3c5cf423343fa403ab5d53e47fc67ea28920 Mon Sep 17 00:00:00 2001
From: mtdkei <mt@matsudakeinoMacBook-Air.local>
Date: Thu, 24 Oct 2024 13:14:14 +0900
Subject: [PATCH 05/10] Fix: function name

---
 inc/post-type-manager/package/class.post-type-manager.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/inc/post-type-manager/package/class.post-type-manager.php b/inc/post-type-manager/package/class.post-type-manager.php
index 59224e8d..c4e2d758 100644
--- a/inc/post-type-manager/package/class.post-type-manager.php
+++ b/inc/post-type-manager/package/class.post-type-manager.php
@@ -62,7 +62,7 @@ public static function add_cap_post_type_manage() {
 		 *
 		 * @return string
 		 */
-		public static function get_help_notice() {
+		public static function add_post_type_get_help_notice() {
 			// サイトの言語が日本語 (ja) であるかどうかを判定
 			if ( get_locale() !== 'ja' ) {
 				return ''; // 日本語以外の場合は何も返さない
@@ -101,7 +101,7 @@ public static function display_help_notice() {
 			// 特定のページのみ通知を表示する
 			if ($pagenow === 'edit.php' && isset($_GET['post_type']) && $_GET['post_type'] === 'post_type_manage') {
 				// 通知のHTMLを取得して表示
-				echo self::get_help_notice();
+				echo self::add_post_type_get_help_notice();
 			}
 
 		}
@@ -126,7 +126,7 @@ public static function add_meta_box_action() {
 			wp_nonce_field( wp_create_nonce( __FILE__ ), 'noncename__post_type_manager' );
 
 			// 通知メッセージを取得して表示
-			echo self::get_help_notice();
+			echo self::add_post_type_get_help_notice();
 			
 			?>
 			<style type="text/css">

From 8c87a2181af9f1e0a434f780ae0e02629d6d8eda Mon Sep 17 00:00:00 2001
From: mtdkei <mt@matsudakeinoMacBook-Air.local>
Date: Fri, 25 Oct 2024 10:54:28 +0900
Subject: [PATCH 06/10] Fix Dismiss Notice Functionality: Store User Dismissal
 Flag to Prevent Re-Display

---
 .../package/class.post-type-manager.php              | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/inc/post-type-manager/package/class.post-type-manager.php b/inc/post-type-manager/package/class.post-type-manager.php
index c4e2d758..fa19e354 100644
--- a/inc/post-type-manager/package/class.post-type-manager.php
+++ b/inc/post-type-manager/package/class.post-type-manager.php
@@ -68,6 +68,11 @@ public static function add_post_type_get_help_notice() {
 				return ''; // 日本語以外の場合は何も返さない
 			}
 
+			// ユーザーが通知を無視したフラグが保存されているかをチェック
+			if ( get_user_meta( get_current_user_id(), 'vkblocks_dismissed_notice', true ) ) {
+				return ''; // 通知を無視している場合は何も返さない
+			}
+
 			$dismiss_url = esc_url(
 				wp_nonce_url(
 					add_query_arg('vkblocks-dismiss-pro', 'dismiss_admin_notice'),
@@ -88,7 +93,7 @@ public static function add_post_type_get_help_notice() {
 				</div>'
 			);
 		}
-		
+
 		/**
 		 * Display help notice on specific page
 		 *
@@ -104,6 +109,11 @@ public static function display_help_notice() {
 				echo self::add_post_type_get_help_notice();
 			}
 
+			// 通知の無視パラメーターをチェック
+			if ( isset( $_GET['vkblocks-dismiss-pro'] ) && $_GET['vkblocks-dismiss-pro'] === 'dismiss_admin_notice' ) {
+				check_admin_referer( 'vkblocks-dismiss-pro-' . get_current_user_id() );
+				update_user_meta( get_current_user_id(), 'vkblocks_dismissed_notice', true );
+			}
 		}
 
 		/*******************************************

From 36b94d8e77f30fdc7e576a5817b77e22dee35357 Mon Sep 17 00:00:00 2001
From: mtdkei <mt@matsudakeinoMacBook-Air.local>
Date: Mon, 28 Oct 2024 11:07:31 +0900
Subject: [PATCH 07/10] Fixed notice dismissal key: Renamed
 'vkblocks-dismiss-pro' to 'vk-all-in-one-expansion-unit-dismiss'

---
 .../package/class.post-type-manager.php            | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/inc/post-type-manager/package/class.post-type-manager.php b/inc/post-type-manager/package/class.post-type-manager.php
index fa19e354..55d1fd9d 100644
--- a/inc/post-type-manager/package/class.post-type-manager.php
+++ b/inc/post-type-manager/package/class.post-type-manager.php
@@ -69,16 +69,16 @@ public static function add_post_type_get_help_notice() {
 			}
 
 			// ユーザーが通知を無視したフラグが保存されているかをチェック
-			if ( get_user_meta( get_current_user_id(), 'vkblocks_dismissed_notice', true ) ) {
+			if ( get_user_meta( get_current_user_id(), 'vk-all-in-one-expansion-unit_dismissed_notice', true ) ) {
 				return ''; // 通知を無視している場合は何も返さない
 			}
 
 			$dismiss_url = esc_url(
 				wp_nonce_url(
-					add_query_arg('vkblocks-dismiss-pro', 'dismiss_admin_notice'),
-					'vkblocks-dismiss-pro-' . get_current_user_id()
+					add_query_arg('vk-all-in-one-expansion-unit-dismiss', 'dismiss_admin_notice'),
+					'vk-all-in-one-expansion-unit-dismiss-' . get_current_user_id()
 				)
-			);
+			);			
 
 			// ヘルプ通知のHTMLを生成して返す
 			return wp_kses_post(
@@ -110,9 +110,9 @@ public static function display_help_notice() {
 			}
 
 			// 通知の無視パラメーターをチェック
-			if ( isset( $_GET['vkblocks-dismiss-pro'] ) && $_GET['vkblocks-dismiss-pro'] === 'dismiss_admin_notice' ) {
-				check_admin_referer( 'vkblocks-dismiss-pro-' . get_current_user_id() );
-				update_user_meta( get_current_user_id(), 'vkblocks_dismissed_notice', true );
+			if ( isset( $_GET['vk-all-in-one-expansion-unit-dismiss'] ) && $_GET['vk-all-in-one-expansion-unit-dismiss'] === 'dismiss_admin_notice' ) {
+				check_admin_referer( 'vk-all-in-one-expansion-unit-dismiss-' . get_current_user_id() );
+				update_user_meta( get_current_user_id(), 'vk-all-in-one-expansion-unit_dismissed_notice', true );
 			}
 		}
 

From dec9aab5f98f1e17f434195a2c4f5903fd76c639 Mon Sep 17 00:00:00 2001
From: mtdkei <mt@matsudakeinoMacBook-Air.local>
Date: Mon, 28 Oct 2024 14:20:51 +0900
Subject: [PATCH 08/10] Refactored help notice display logic into
 is_display_help_notice method

---
 .../package/class.post-type-manager.php       | 29 +++++++++++++++----
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/inc/post-type-manager/package/class.post-type-manager.php b/inc/post-type-manager/package/class.post-type-manager.php
index 55d1fd9d..d79a6c15 100644
--- a/inc/post-type-manager/package/class.post-type-manager.php
+++ b/inc/post-type-manager/package/class.post-type-manager.php
@@ -95,24 +95,41 @@ public static function add_post_type_get_help_notice() {
 		}
 
 		/**
-		 * Display help notice on specific page
+		 * Check if the help notice should be displayed on the current page.
 		 *
-		 * @return void
+		 * @return bool
 		 */
-		public static function display_help_notice() {
+		public static function is_display_help_notice() {
 			// 現在のページを取得
 			global $pagenow;
 
 			// 特定のページのみ通知を表示する
 			if ($pagenow === 'edit.php' && isset($_GET['post_type']) && $_GET['post_type'] === 'post_type_manage') {
+				// 通知の無視パラメーターが保存されていないかどうかを確認
+				if (!get_user_meta(get_current_user_id(), 'vk-all-in-one-expansion-unit_dismissed_notice', true)) {
+					return true;
+				}
+			}
+
+			return false;
+		}
+
+		/**
+		 * Display help notice on specific page
+		 *
+		 * @return void
+		 */
+		public static function display_help_notice() {
+			// 通知を表示するかどうかの判定
+			if (self::is_display_help_notice()) {
 				// 通知のHTMLを取得して表示
 				echo self::add_post_type_get_help_notice();
 			}
 
 			// 通知の無視パラメーターをチェック
-			if ( isset( $_GET['vk-all-in-one-expansion-unit-dismiss'] ) && $_GET['vk-all-in-one-expansion-unit-dismiss'] === 'dismiss_admin_notice' ) {
-				check_admin_referer( 'vk-all-in-one-expansion-unit-dismiss-' . get_current_user_id() );
-				update_user_meta( get_current_user_id(), 'vk-all-in-one-expansion-unit_dismissed_notice', true );
+			if (isset($_GET['vk-all-in-one-expansion-unit-dismiss']) && $_GET['vk-all-in-one-expansion-unit-dismiss'] === 'dismiss_admin_notice') {
+				check_admin_referer('vk-all-in-one-expansion-unit-dismiss-' . get_current_user_id());
+				update_user_meta(get_current_user_id(), 'vk-all-in-one-expansion-unit_dismissed_notice', true);
 			}
 		}
 

From 2cc022944ccca7c0fd39aa4dc50a1724978d0707 Mon Sep 17 00:00:00 2001
From: mtdkei <mt@matsudakeinoMacBook-Air.local>
Date: Mon, 28 Oct 2024 14:21:34 +0900
Subject: [PATCH 09/10] Delete commentout

---
 inc/post-type-manager/package/class.post-type-manager.php | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/inc/post-type-manager/package/class.post-type-manager.php b/inc/post-type-manager/package/class.post-type-manager.php
index d79a6c15..968eb87a 100644
--- a/inc/post-type-manager/package/class.post-type-manager.php
+++ b/inc/post-type-manager/package/class.post-type-manager.php
@@ -100,12 +100,9 @@ public static function add_post_type_get_help_notice() {
 		 * @return bool
 		 */
 		public static function is_display_help_notice() {
-			// 現在のページを取得
 			global $pagenow;
 
-			// 特定のページのみ通知を表示する
 			if ($pagenow === 'edit.php' && isset($_GET['post_type']) && $_GET['post_type'] === 'post_type_manage') {
-				// 通知の無視パラメーターが保存されていないかどうかを確認
 				if (!get_user_meta(get_current_user_id(), 'vk-all-in-one-expansion-unit_dismissed_notice', true)) {
 					return true;
 				}
@@ -120,13 +117,12 @@ public static function is_display_help_notice() {
 		 * @return void
 		 */
 		public static function display_help_notice() {
-			// 通知を表示するかどうかの判定
+
 			if (self::is_display_help_notice()) {
-				// 通知のHTMLを取得して表示
+
 				echo self::add_post_type_get_help_notice();
 			}
 
-			// 通知の無視パラメーターをチェック
 			if (isset($_GET['vk-all-in-one-expansion-unit-dismiss']) && $_GET['vk-all-in-one-expansion-unit-dismiss'] === 'dismiss_admin_notice') {
 				check_admin_referer('vk-all-in-one-expansion-unit-dismiss-' . get_current_user_id());
 				update_user_meta(get_current_user_id(), 'vk-all-in-one-expansion-unit_dismissed_notice', true);

From eadbb8a1644d4fca2765fbc01e5c3c0db15c316d Mon Sep 17 00:00:00 2001
From: mtdkei <mt@matsudakeinoMacBook-Air.local>
Date: Tue, 29 Oct 2024 08:54:32 +0900
Subject: [PATCH 10/10] Refactored Method to Consolidate Display Conditions for
 Help Notices and Improve Readability

---
 .../package/class.post-type-manager.php         | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/inc/post-type-manager/package/class.post-type-manager.php b/inc/post-type-manager/package/class.post-type-manager.php
index 968eb87a..a080d131 100644
--- a/inc/post-type-manager/package/class.post-type-manager.php
+++ b/inc/post-type-manager/package/class.post-type-manager.php
@@ -63,15 +63,6 @@ public static function add_cap_post_type_manage() {
 		 * @return string
 		 */
 		public static function add_post_type_get_help_notice() {
-			// サイトの言語が日本語 (ja) であるかどうかを判定
-			if ( get_locale() !== 'ja' ) {
-				return ''; // 日本語以外の場合は何も返さない
-			}
-
-			// ユーザーが通知を無視したフラグが保存されているかをチェック
-			if ( get_user_meta( get_current_user_id(), 'vk-all-in-one-expansion-unit_dismissed_notice', true ) ) {
-				return ''; // 通知を無視している場合は何も返さない
-			}
 
 			$dismiss_url = esc_url(
 				wp_nonce_url(
@@ -102,13 +93,17 @@ public static function add_post_type_get_help_notice() {
 		public static function is_display_help_notice() {
 			global $pagenow;
 
+			if ( get_locale() !== 'ja' ) {
+				return false;
+			}
+		
+			// 特定のページのみ通知を表示する
 			if ($pagenow === 'edit.php' && isset($_GET['post_type']) && $_GET['post_type'] === 'post_type_manage') {
+				// ユーザーが通知を無視したフラグが保存されているかどうかを確認
 				if (!get_user_meta(get_current_user_id(), 'vk-all-in-one-expansion-unit_dismissed_notice', true)) {
 					return true;
 				}
 			}
-
-			return false;
 		}
 
 		/**