diff --git a/plugins/hwp-previews/assets/css/hwp-previews.css b/plugins/hwp-previews/assets/css/hwp-previews.css index 0fbb51b7..54ecdca3 100644 --- a/plugins/hwp-previews/assets/css/hwp-previews.css +++ b/plugins/hwp-previews/assets/css/hwp-previews.css @@ -1,3 +1,9 @@ +.settings_page_hwp-previews #poststuff .postbox .inside h2 { + font-size: 1.3em; + font-weight: 600; + padding-left: 0; +} + .hwp-previews-tag-cloud { display: flex; flex-wrap: wrap; diff --git a/plugins/hwp-previews/src/Admin/Settings/Fields/Field/Abstract_Settings_Field.php b/plugins/hwp-previews/src/Admin/Settings/Fields/Field/Abstract_Settings_Field.php index a594eeb1..d8744b17 100644 --- a/plugins/hwp-previews/src/Admin/Settings/Fields/Field/Abstract_Settings_Field.php +++ b/plugins/hwp-previews/src/Admin/Settings/Fields/Field/Abstract_Settings_Field.php @@ -124,12 +124,14 @@ public function settings_field_callback( array $args ): void { $settings_key = $args['settings_key'] ?? HWP_PREVIEWS_SETTINGS_KEY; printf( - '
+ ' - %1$s -
', + %1$s + ', esc_attr( $this->get_description() ), - esc_attr( $settings_key ) + esc_attr( $settings_key ), + esc_attr( $post_type ), + esc_attr( $this->id ), ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped diff --git a/plugins/hwp-previews/src/Admin/Settings/Fields/Field/Checkbox_Field.php b/plugins/hwp-previews/src/Admin/Settings/Fields/Field/Checkbox_Field.php index a2705d2a..f73484ce 100644 --- a/plugins/hwp-previews/src/Admin/Settings/Fields/Field/Checkbox_Field.php +++ b/plugins/hwp-previews/src/Admin/Settings/Fields/Field/Checkbox_Field.php @@ -41,7 +41,7 @@ public function render_field( $option_value, $setting_key, $post_type ): string : $this->default; return sprintf( - '', + '', esc_attr( $setting_key ), esc_attr( $post_type ), esc_attr( $this->id ), diff --git a/plugins/hwp-previews/src/Admin/Settings/Fields/Field/Text_Input_Field.php b/plugins/hwp-previews/src/Admin/Settings/Fields/Field/Text_Input_Field.php index c4ec3ca7..8d781e2b 100644 --- a/plugins/hwp-previews/src/Admin/Settings/Fields/Field/Text_Input_Field.php +++ b/plugins/hwp-previews/src/Admin/Settings/Fields/Field/Text_Input_Field.php @@ -53,7 +53,7 @@ public function render_field( array $option_value, string $setting_key, string $ return sprintf( - '', + '', $this->get_input_type(), esc_attr( $setting_key ), esc_attr( $post_type ), diff --git a/plugins/hwp-previews/src/Admin/Settings/Templates/settings-page-main.php b/plugins/hwp-previews/src/Admin/Settings/Templates/settings-page-main.php index fbf8a2e8..f190b7bc 100644 --- a/plugins/hwp-previews/src/Admin/Settings/Templates/settings-page-main.php +++ b/plugins/hwp-previews/src/Admin/Settings/Templates/settings-page-main.php @@ -14,7 +14,7 @@

- +
@@ -45,7 +45,7 @@
-

+

$hwp_previews_param_desc ) : ?> @@ -59,7 +59,7 @@
-

+

    diff --git a/plugins/hwp-previews/tests/wpunit/Admin/Settings/Fields/Field/CheckboxFieldTest.php b/plugins/hwp-previews/tests/wpunit/Admin/Settings/Fields/Field/CheckboxFieldTest.php index f6ad46b6..60abb4d9 100644 --- a/plugins/hwp-previews/tests/wpunit/Admin/Settings/Fields/Field/CheckboxFieldTest.php +++ b/plugins/hwp-previews/tests/wpunit/Admin/Settings/Fields/Field/CheckboxFieldTest.php @@ -65,8 +65,9 @@ public function test_render_field_checked(): void { $post_type = 'post'; $expected_input_name = 'hwp_previews_settings[' . $post_type . '][in_iframe]'; + $expceted_input_label = 'hwp_previews_settings-' . $post_type . '-in_iframe-tooltip'; $expected_css_class = 'custom-css-class'; - $expected_output = ''; + $expected_output = ''; $rendered_output = $field->render_field($option_value, $setting_key, $post_type); @@ -80,8 +81,9 @@ public function test_render_field_unchecked(): void { $post_type = 'post'; $expected_input_name = 'hwp_previews_settings[' . $post_type . '][in_iframe]'; + $expceted_input_label = 'hwp_previews_settings-' . $post_type . '-in_iframe-tooltip'; $expected_css_class = 'custom-css-class'; - $expected_output = ''; + $expected_output = ''; $rendered_output = $field->render_field($option_value, $setting_key, $post_type); @@ -99,7 +101,7 @@ public function test_render_field_without_css_class(): void { $rendered_output = $field->render_field([], HWP_PREVIEWS_SETTINGS_KEY, 'page'); $this->assertEquals( - '', + '', $rendered_output ); } diff --git a/plugins/hwp-previews/tests/wpunit/Admin/Settings/Fields/Field/TextInputFieldTest.php b/plugins/hwp-previews/tests/wpunit/Admin/Settings/Fields/Field/TextInputFieldTest.php index ebba02cd..cb4baad0 100644 --- a/plugins/hwp-previews/tests/wpunit/Admin/Settings/Fields/Field/TextInputFieldTest.php +++ b/plugins/hwp-previews/tests/wpunit/Admin/Settings/Fields/Field/TextInputFieldTest.php @@ -89,10 +89,11 @@ public function test_render_field_with_default_value() { $rendered_output = $field->render_field( $option_value, $setting_key, $post_type ); $excepted_input_name = 'hwp_previews_settings[' . $post_type . '][preview_url]'; + $expceted_input_label = 'hwp_previews_settings-' . $post_type . '-preview_url-tooltip'; $excepted_input_value = 'https://example.com/' . $post_type . '?preview=true&post_id={ID}&name={slug}'; $excepted_css_class = 'custom-css-class'; - $expected_output = ''; + $expected_output = ''; $this->assertEquals( $expected_output, $rendered_output ); } @@ -105,9 +106,10 @@ public function test_render_field_with_no_option_value() { $rendered_output = $field->render_field( $option_value, $setting_key, $post_type ); $excepted_input_name = 'hwp_previews_settings[' . $post_type . '][preview_url]'; + $expceted_input_label = 'hwp_previews_settings-' . $post_type . '-preview_url-tooltip'; $excepted_input_value = 'https://example.com/' . $post_type . '?preview=true&post_id={ID}&name={slug}'; $excepted_css_class = 'custom-css-class'; - $expected_output = ''; + $expected_output = ''; $this->assertEquals( $expected_output, $rendered_output ); } @@ -123,9 +125,10 @@ public function test_render_field_with_different_option_value_to_default_value() $rendered_output = $field->render_field( $option_value, $setting_key, $post_type ); $excepted_input_name = 'hwp_previews_settings[' . $post_type . '][preview_url]'; + $expceted_input_label = 'hwp_previews_settings-' . $post_type . '-preview_url-tooltip'; $default_value = 'https://example.com/' . $post_type . '?preview=true&post_id={ID}&name={slug}'; $excepted_css_class = 'custom-css-class'; - $expected_output = ''; + $expected_output = ''; $this->assertEquals( $expected_output, $rendered_output ); } @@ -141,7 +144,7 @@ public function test_render_field_without_css_class() { $rendered_output = $field->render_field( [], HWP_PREVIEWS_SETTINGS_KEY, 'page' ); $this->assertEquals( - '', + '', $rendered_output ); } diff --git a/plugins/hwp-previews/tests/wpunit/Admin/Settings/Fields/Field/TextURLFieldTest.php b/plugins/hwp-previews/tests/wpunit/Admin/Settings/Fields/Field/TextURLFieldTest.php index fa28133c..e2aae306 100644 --- a/plugins/hwp-previews/tests/wpunit/Admin/Settings/Fields/Field/TextURLFieldTest.php +++ b/plugins/hwp-previews/tests/wpunit/Admin/Settings/Fields/Field/TextURLFieldTest.php @@ -91,9 +91,10 @@ public function test_render_field_with_default_value() { $rendered_output = $field->render_field( $option_value, $setting_key, $post_type ); $excepted_input_name = 'hwp_previews_settings[' . $post_type . '][preview_url]'; + $expceted_input_label = 'hwp_previews_settings-' . $post_type . '-preview_url-tooltip'; $excepted_input_value = 'https://example.com/' . $post_type . '?preview=true&post_id={ID}&name={slug}'; $excepted_css_class = 'custom-css-class'; - $expected_output = ''; + $expected_output = ''; $this->assertEquals( $expected_output, $rendered_output ); } @@ -106,9 +107,10 @@ public function test_render_field_with_no_option_value() { $rendered_output = $field->render_field( $option_value, $setting_key, $post_type ); $excepted_input_name = 'hwp_previews_settings[' . $post_type . '][preview_url]'; + $expceted_input_label = 'hwp_previews_settings-' . $post_type . '-preview_url-tooltip'; $excepted_input_value = 'https://example.com/' . $post_type . '?preview=true&post_id={ID}&name={slug}'; $excepted_css_class = 'custom-css-class'; - $expected_output = ''; + $expected_output = ''; $this->assertEquals( $expected_output, $rendered_output ); } @@ -124,9 +126,10 @@ public function test_render_field_with_different_option_value_to_default_value() $rendered_output = $field->render_field( $option_value, $setting_key, $post_type ); $excepted_input_name = 'hwp_previews_settings[' . $post_type . '][preview_url]'; + $expceted_input_label = 'hwp_previews_settings-' . $post_type . '-preview_url-tooltip'; $default_value = 'https://example.com/' . $post_type . '?preview=true&post_id={ID}&name={slug}'; $excepted_css_class = 'custom-css-class'; - $expected_output = ''; + $expected_output = ''; $this->assertEquals( $expected_output, $rendered_output ); } @@ -142,7 +145,7 @@ public function test_render_field_without_css_class() { $rendered_output = $field->render_field( [], HWP_PREVIEWS_SETTINGS_KEY, 'page' ); $this->assertEquals( - '', + '', $rendered_output ); }