Skip to content

Fixes reviewed issues by the WordPress plugin review team #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kawsarahmedr merged 4 commits into from
Jul 31, 2024
Merged

Fixes reviewed issues by the WordPress plugin review team #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3010cd3
Fix review changes claimed by the plugin review team
kawsarahmedr Jul 31, 2024
0b9f7f8
Update distignore
kawsarahmedr Jul 31, 2024
f56a7ac
Update settings template
kawsarahmedr Jul 31, 2024
eef4515
Update admin script
kawsarahmedr Jul 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions .distignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ bower.json
bower_components
.*


# Test related files
phpunit.xml
phpunit.xml.dist
Expand All @@ -42,7 +41,6 @@ codeception.yml
phpcs.xml
phpcs.xml.dist


# IDE related files
.idea
*.iml
Expand All @@ -61,7 +59,6 @@ phpcs.xml.dist
*.zip
/bin/


# OS related files
.DS_Store
.DS_Store?
Expand All @@ -71,7 +68,6 @@ phpcs.xml.dist
ehthumbs.db
Thumbs.db


# Action related files
.wordpress-org

Expand All @@ -80,8 +76,7 @@ Thumbs.db
*.*.map

# Build related files
/assets/js
/assets/css
src
/src/js
/src/css
vendor
Expand Down
2 changes: 1 addition & 1 deletion Gruntfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,4 +90,4 @@ module.exports = function( grunt ) {

grunt.registerTask( 'i18n', [ 'addtextdomain', 'checktextdomain', 'makepot' ] );
grunt.registerTask( 'build', [ 'i18n' ] );
};
};
59 changes: 59 additions & 0 deletions assets/src/css/_form.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
#insertcodes-form{
width: 100%;
.field-group{
border-bottom: 1px solid #ddd;
display: flex;
flex-direction: row;
padding: 1rem;
gap: 0.313rem ;
.field-label{
display: flex;
width: 100%;
max-width: 11.25rem;
}
label,
strong{
align-self: center;
}
.field{
width: 100%;
.description{
margin-top: 0.313rem;
}
}
.field-submit-btn{
width: 100%;
}
&.is-last-item{
border-bottom: none;
a{
align-self: center;
}
}
&.filed-section{
flex-direction: column;
gap: 0.625rem;
background: #dddddd;
}
&.field-editor{
flex-direction: column;
gap: 0.625rem;
.CodeMirror{
border: 1px solid #ddd;
}
}
}
input[type=text],
input[type=email],
input[type=password],
input[type=number],
input[type=date],
input[type=datetime],
input[type=datetime-local],
input[type=month],
textarea {
width: 100%;
padding: 0.313rem 0.5rem;
border: 1px solid #ddd;
}
}
14 changes: 7 additions & 7 deletions src/css/admin.scss → assets/src/css/insertcodes-admin.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
@import "form";

// Page Layouts.
.insert-codes-container{
.insert-codes__header{}
.insert-codes__body{
.insertcodes-container{
.insertcodes__header{}
.insertcodes__body{
display: flex;
flex-wrap: nowrap;
gap: 1.25rem;
h3, h4, p{
margin: 0;
}
.insert-codes__content{
.insertcodes__content{
width: 70%;
border: 1px solid #ddd;
background: #fff;
}
.insert-codes__aside{
.insertcodes__aside{
width: 30%;
.aside__item{
border: 1px solid #ddd;
Expand All @@ -33,8 +33,8 @@
}
@media (max-width: 782px) {
flex-direction: column;
.insert-codes__content,
.insert-codes__aside{
.insertcodes__content,
.insertcodes__aside{
width: 100%;
}
}
Expand Down
19 changes: 19 additions & 0 deletions assets/src/js/insertcodes-admin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
(function ($) {
'use strict';
$(window).on('load', function () {
$.ready.then(function () {
var defaultSettings = wp.codeEditor.defaultSettings ? _.clone(wp.codeEditor.defaultSettings) : {};

// HTML Editor.
var htmlSettings = _.extend({}, defaultSettings, {
codemirror: _.extend({}, defaultSettings.codemirror, {
mode: 'htmlmixed'
})
});

wp.codeEditor.initialize($('#insertcodes_header'), htmlSettings);
wp.codeEditor.initialize($('#insertcodes_body'), htmlSettings);
wp.codeEditor.initialize($('#insertcodes_footer'), htmlSettings);
});
});
})(jQuery);
10 changes: 5 additions & 5 deletions includes/Admin/Admin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace InsertCodes\Admin;

defined( 'ABSPATH' ) || exit;
defined( 'ABSPATH' ) || exit; // Exit if accessed directly.

/**
* Class Admin.
Expand Down Expand Up @@ -99,8 +99,8 @@ public function enqueue_scripts( $hook ) {
'insert-codes_page_insert-codes-settings',
);

wp_register_style( 'insert-codes-admin', INSERT_CODES_URL . 'assets/dist/css/insert-codes-admin.css', array(), '1.0.0' );
wp_register_script( 'insert-codes-admin', INSERT_CODES_URL . 'assets/dist/js/insert-codes-admin.js', array( 'jquery' ), '1.0.0', true );
wp_register_style( 'insertcodes-admin', INSERTCODES_URL . 'assets/dist/css/insertcodes-admin.css', array(), INSERTCODES_VERSION );
wp_register_script( 'insertcodes-admin', INSERTCODES_URL . 'assets/dist/js/insertcodes-admin.js', array( 'jquery' ), INSERTCODES_VERSION, true );

if ( 'toplevel_page_insert-codes' === $hook ) {
$settings = wp_enqueue_code_editor( array( 'type' => 'text/html' ) );
Expand All @@ -110,11 +110,11 @@ public function enqueue_scripts( $hook ) {
return;
}

wp_enqueue_script( 'insert-codes-admin' );
wp_enqueue_script( 'insertcodes-admin' );
}

if ( in_array( $hook, $screens, true ) ) {
wp_enqueue_style( 'insert-codes-admin' );
wp_enqueue_style( 'insertcodes-admin' );
}
}
}
32 changes: 16 additions & 16 deletions includes/Admin/views/codes.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* Insert Codes - Header, after opening Body tag & Footer.
* Insert Codes into Header, after opening Body tag & Footer.
*
* @since 1.0.0
* @package InsertCodess
Expand All @@ -9,62 +9,62 @@
defined( 'ABSPATH' ) || exit; // Exit if accessed directly.

?>
<div class="insert-codes-container">
<div class="wrap insert-codes-wrap">
<div class="insert-codes__header">
<div class="insertcodes-container">
<div class="wrap insertcodes-wrap">
<div class="insertcodes__header">
<h1 class="wp-heading-inline">
<?php esc_html_e( 'Insert Codes', 'insert-codes' ); ?>
</h1>
<p><?php esc_html_e( 'Bellow are the code editor fields for inserting codes inside the header, body & footer.', 'insert-codes' ); ?></p>
</div>
<hr class="wp-header-end">
<div class="insert-codes__body">
<div class="insert-codes__content">
<form id="insert-codes-form" method="post" action="<?php echo esc_html( admin_url( 'admin-post.php' ) ); ?>">
<div class="insertcodes__body">
<div class="insertcodes__content">
<form id="insertcodes-form" method="post" action="<?php echo esc_html( admin_url( 'admin-post.php' ) ); ?>">
<div class="field-group filed-section">
<h3><?php esc_html_e( 'Insert Header, Body & Footer Scripts', 'insert-codes' ); ?></h3>
</div>

<div class="field-group field-editor">
<div class="field-label">
<label for="insert_codes_header"><strong><?php esc_html_e( 'Insert Scripts in Header:', 'insert-codes' ); ?></strong></label>
<label for="insertcodes_header"><strong><?php esc_html_e( 'Insert Scripts in Header:', 'insert-codes' ); ?></strong></label>
</div>
<div class="field">
<textarea type="text" name="insert_codes_header" id="insert_codes_header"><?php echo wp_kses( get_option( 'insert_codes_header' ), insert_codes_get_allowed_html() ); ?></textarea>
<textarea type="text" name="insertcodes_header" id="insertcodes_header"><?php echo wp_kses( get_option( 'insertcodes_header' ), insertcodes_get_allowed_html() ); ?></textarea>
<p class="description"><?php printf( /* translators: HTML head tag as string. */ esc_html__( 'These scripts will be printed in the %s section.', 'insert-codes' ), esc_html( htmlspecialchars( '<head>' ) ) ); ?></p>
</div>
</div>

<div class="field-group field-editor">
<div class="field-label">
<label for="insert_codes_body"><strong><?php esc_html_e( 'Insert Scripts in Body:', 'insert-codes' ); ?></strong></label>
<label for="insertcodes_body"><strong><?php esc_html_e( 'Insert Scripts in Body:', 'insert-codes' ); ?></strong></label>
</div>
<div class="field">
<textarea type="text" name="insert_codes_body" id="insert_codes_body"><?php echo wp_kses( get_option( 'insert_codes_body' ), insert_codes_get_allowed_html() ); ?></textarea>
<textarea type="text" name="insertcodes_body" id="insertcodes_body"><?php echo wp_kses( get_option( 'insertcodes_body' ), insertcodes_get_allowed_html() ); ?></textarea>
<p class="description"><?php printf( /* translators: HTML head tag as string. */ esc_html__( 'These scripts will be printed bellow the %s section.', 'insert-codes' ), esc_html( htmlspecialchars( '<body>' ) ) ); ?></p>
</div>
</div>

<div class="field-group field-editor">
<div class="field-label">
<label for="insert_codes_footer"><strong><?php esc_html_e( 'Insert Scripts in Footer:', 'insert-codes' ); ?></strong></label>
<label for="insertcodes_footer"><strong><?php esc_html_e( 'Insert Scripts in Footer:', 'insert-codes' ); ?></strong></label>
</div>
<div class="field">
<textarea type="text" name="insert_codes_footer" id="insert_codes_footer"><?php echo wp_kses( get_option( 'insert_codes_footer' ), insert_codes_get_allowed_html() ); ?></textarea>
<textarea type="text" name="insertcodes_footer" id="insertcodes_footer"><?php echo wp_kses( get_option( 'insertcodes_footer' ), insertcodes_get_allowed_html() ); ?></textarea>
<p class="description"><?php printf( /* translators: HTML head tag as string. */ esc_html__( 'These scripts will be printed bellow the %s section.', 'insert-codes' ), esc_html( htmlspecialchars( '<footer>' ) ) ); ?></p>
</div>
</div>

<div class="field-group is-last-item">
<input type="hidden" name="action" value="insert_codes_hbf_scripts">
<?php wp_nonce_field( 'insert_codes_hbf_scripts' ); ?>
<input type="hidden" name="action" value="insertcodes_hbf_scripts">
<?php wp_nonce_field( 'insertcodes_hbf_scripts' ); ?>
<div class="field-submit-btn">
<?php submit_button(); ?>
</div>
</div>
</form>
</div>
<div class="insert-codes__aside aside__items">
<div class="insertcodes__aside aside__items">
<div class="aside__item">
<div class="aside__item__header">
<h4><?php esc_html_e( 'Recommended Plugins', 'insert-codes' ); ?></h4>
Expand Down
34 changes: 17 additions & 17 deletions includes/Admin/views/settings.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,49 +9,49 @@
defined( 'ABSPATH' ) || exit; // Exit if accessed directly.

?>
<div class="insert-codes-container">
<div class="wrap insert-codes-wrap">
<div class="insert-codes__header">
<div class="insertcodes-container">
<div class="wrap insertcodes-wrap">
<div class="insertcodes__header">
<h1 class="wp-heading-inline">
<?php esc_html_e( 'Settings', 'insert-codes' ); ?>
</h1>
<p><?php esc_html_e( 'Bellow are the settings fields of the plugin.', 'insert-codes' ); ?></p>
</div>
<hr class="wp-header-end">
<div class="insert-codes__body">
<div class="insert-codes__content">
<form id="insert-codes-form" method="post" action="<?php echo esc_html( admin_url( 'admin-post.php' ) ); ?>">
<div class="insertcodes__body">
<div class="insertcodes__content">
<form id="insertcodes-form" method="post" action="<?php echo esc_html( admin_url( 'admin-post.php' ) ); ?>">
<div class="field-group filed-section">
<h3><?php esc_html_e( 'General Settings', 'insert-codes' ); ?></h3>
<p><?php esc_html_e( 'The following options are the general settings of the plugin. These will determine how the plugin will work.', 'insert-codes' ); ?></p>
</div>

<div class="field-group">
<div class="field-label">
<label for="insert_codes_header_priority"><strong><?php esc_html_e( 'Insert Header\'s Priority:', 'insert-codes' ); ?></strong></label>
<label for="insertcodes_header_priority"><strong><?php esc_html_e( 'Insert Header\'s Priority:', 'insert-codes' ); ?></strong></label>
</div>
<div class="field">
<input type="number" name="insert_codes_header_priority" id="insert_codes_header_priority" placeholder="<?php esc_attr_e( '10', 'insert-codes' ); ?>" value="<?php echo esc_attr( get_option( 'insert_codes_header_priority', 10 ) ); ?>">
<input type="number" name="insertcodes_header_priority" id="insertcodes_header_priority" placeholder="<?php esc_attr_e( '10', 'insert-codes' ); ?>" value="<?php echo esc_attr( get_option( 'insertcodes_header_priority', 10 ) ); ?>">
<p class="description"><?php printf( /* translators: HTML head tag as string. */ esc_html__( 'Enter the scripts execution priority for %s sections. Default action priority is 10', 'insert-codes' ), esc_html( htmlspecialchars( '<head>' ) ) ); ?></p>
</div>
</div>

<div class="field-group">
<div class="field-label">
<label for="insert_codes_body_priority"><strong><?php esc_html_e( 'Insert Body\'s Priority:', 'insert-codes' ); ?></strong></label>
<label for="insertcodes_body_priority"><strong><?php esc_html_e( 'Insert Body\'s Priority:', 'insert-codes' ); ?></strong></label>
</div>
<div class="field">
<input type="number" name="insert_codes_body_priority" id="insert_codes_body_priority" placeholder="<?php esc_attr_e( '10', 'insert-codes' ); ?>" value="<?php echo esc_attr( get_option( 'insert_codes_body_priority', 10 ) ); ?>">
<input type="number" name="insertcodes_body_priority" id="insertcodes_body_priority" placeholder="<?php esc_attr_e( '10', 'insert-codes' ); ?>" value="<?php echo esc_attr( get_option( 'insertcodes_body_priority', 10 ) ); ?>">
<p class="description"><?php printf( /* translators: HTML head tag as string. */ esc_html__( 'Enter the scripts execution priority for %s sections. Default action priority is 10', 'insert-codes' ), esc_html( htmlspecialchars( '<body>' ) ) ); ?></p>
</div>
</div>

<div class="field-group">
<div class="field-label">
<label for="insert_codes_footer_priority"><strong><?php esc_html_e( 'Insert Footer\'s Priority:', 'insert-codes' ); ?></strong></label>
<label for="insertcodes_footer_priority"><strong><?php esc_html_e( 'Insert Footer\'s Priority:', 'insert-codes' ); ?></strong></label>
</div>
<div class="field">
<input type="number" name="insert_codes_footer_priority" id="insert_codes_footer_priority" placeholder="<?php esc_attr_e( '10', 'insert-codes' ); ?>" value="<?php echo esc_attr( get_option( 'insert_codes_footer_priority', 10 ) ); ?>">
<input type="number" name="insertcodes_footer_priority" id="insertcodes_footer_priority" placeholder="<?php esc_attr_e( '10', 'insert-codes' ); ?>" value="<?php echo esc_attr( get_option( 'insertcodes_footer_priority', 10 ) ); ?>">
<p class="description"><?php printf( /* translators: HTML footer tag as string. */ esc_html__( 'Enter the scripts execution priority for %s sections. Default action priority is 10', 'insert-codes' ), esc_html( htmlspecialchars( '<footer>' ) ) ); ?></p>
</div>
</div>
Expand All @@ -66,24 +66,24 @@
<strong><?php esc_html_e( 'Delete Data:', 'insert-codes' ); ?></strong>
</div>
<div class="field">
<label for="insert_codes_delete_data">
<input name="insert_codes_delete_data" id="insert_codes_delete_data" type="checkbox" value="yes" <?php checked( get_option( 'insert_codes_delete_data' ), 'yes' ); ?>>
<label for="insertcodes_delete_data">
<input name="insertcodes_delete_data" id="insertcodes_delete_data" type="checkbox" value="yes" <?php checked( get_option( 'insertcodes_delete_data' ), 'yes' ); ?>>
<?php esc_html_e( 'Delete plugin data', 'insert-codes' ); ?>
</label>
<p class="description"><?php esc_html_e( 'Enabling this will delete all the data while uninstalling the plugin.', 'insert-codes' ); ?></p>
</div>
</div>

<div class="field-group is-last-item">
<input type="hidden" name="action" value="insert_codes_settings">
<?php wp_nonce_field( 'insert_codes_settings' ); ?>
<input type="hidden" name="action" value="insertcodes_settings">
<?php wp_nonce_field( 'insertcodes_settings' ); ?>
<div class="field-submit-btn">
<?php submit_button(); ?>
</div>
</div>
</form>
</div>
<div class="insert-codes__aside aside__items">
<div class="insertcodes__aside aside__items">
<div class="aside__item">
<div class="aside__item__header">
<h4><?php esc_html_e( 'Recommended Plugins', 'insert-codes' ); ?></h4>
Expand Down
Loading