Merge branch 'develop' into release/v1.3.2

pluginever · May 24, 2022 · 434656c · 434656c
2 parents edcafc4 + 48f0bc3
commit 434656c
Show file tree

Hide file tree

Showing 27 changed files with 241 additions and 112 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,38 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+- OS: [e.g. iOS]
+- Browser [e.g. chrome, safari]
+- Version [e.g. 22]
+
+**Smartphone (please complete the following information):**
+- Device: [e.g. iPhone6]
+- OS: [e.g. iOS8.1]
+- Browser [e.g. stock browser, safari]
+- Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
diff --git a/assets/css/_wpcp-log-table.scss b/assets/css/_wpcp-log-table.scss
@@ -16,9 +16,12 @@
 			color: #721c24;
 		}
 	}
-
 	.column-date {
 		width: 15%;
 	}
 
+	li.error a {
+		text-decoration: none;
+	}
+
 }
diff --git a/assets/css/metabox/_actions.scss b/assets/css/metabox/_actions.scss
@@ -4,6 +4,8 @@
 		margin: 20px -12px 0;
 		padding: 10px 15px;
 		border-top: 1px solid #ccd0d4;
+		position: relative;
+		opacity: 1;
 	}
 
 	select{

diff --git a/assets/css/metabox/_campaign-status.scss b/assets/css/metabox/_campaign-status.scss
@@ -20,6 +20,11 @@
 		box-sizing: border-box;
 		justify-content: space-between;
 
+		@media (max-width:767px) {
+			padding-top: 10px;
+			padding-bottom: 10px;
+		}
+
 		.wpcp-campaign-statue-item {
 			flex-grow: 1;
 			position: relative;
@@ -32,9 +37,16 @@
 			border-left: 3px solid #007cba;
 			min-height: 56px;
 			box-sizing: border-box;
+			@media (max-width: 767px) {
+				width: 50%;
+				margin-bottom: 10px;
+			}
 
 			&:last-of-type {
 				margin-right: 0;
+				@media (max-width: 767px) {
+					margin-right: 15px;
+				}
 			}
 		}
 
@@ -45,10 +57,8 @@
 			line-height: 1;
 		}
 	}
-
 }
 
-
 @-webkit-keyframes blink {
 	from {
 		opacity: 1.0;

diff --git a/assets/css/metabox/_common.scss b/assets/css/metabox/_common.scss
@@ -30,3 +30,22 @@
 		}
 	}
 }
+
+._wpcp_custom_meta_fields-field {
+		.widefat td {
+			@media screen and (max-width: 767px) {
+				padding: 10px 4px;
+				font-size: 10px;
+				line-height: 1.1em;
+			}
+
+	}
+}
+.wp_content_pilot_page_wpcp-settings {
+	.postbox,.form-table {
+		a {
+			text-decoration: none;
+		}
+	}
+}
+
diff --git a/assets/css/metabox/_dc.scss b/assets/css/metabox/_dc.scss
@@ -16,7 +16,10 @@
 		box-sizing: border-box;
 		//padding: 0 12px 0 0;
 		margin: 0 0 12px;
-		clear: both
+		clear: both;
+		@media screen and ( max-width: 767px ){
+			width: 100%;
+		}
 	}
 	.form-field:nth-child(even) {
 		float: right;

diff --git a/assets/css/metabox/_selection.scss b/assets/css/metabox/_selection.scss
@@ -44,8 +44,12 @@
 		}
 
 		img {
-			width: 201px;
+			width: 150px;
 			height: auto;
+
+			@media (max-width: 767px) {
+				width: 130px;
+			}
 		}
 
 		input:checked + label {
@@ -77,3 +81,10 @@
 	}
 }
 
+.post-new-php.post-type-wp_content_pilot {
+	#poststuff {
+		#post-body.columns-2 {
+			margin-right: 0 !important;
+		}
+	}
+}
diff --git a/assets/css/wp-content-pilot.css b/assets/css/wp-content-pilot.css
diff --git a/includes/admin/class-wpcp-admin.php b/includes/admin/class-wpcp-admin.php
@@ -51,7 +51,6 @@ function admin_menu() {
 		$hook = 'edit.php?post_type=wp_content_pilot';
 		add_submenu_page( $hook, __( 'Status', 'wp-content-pilot' ), __( 'Status', 'wp-content-pilot' ), 'edit_others_posts', 'wpcp-status', array( $this, 'status_page' ) );
 		add_submenu_page( $hook, __( 'Logs', 'wp-content-pilot' ), __( 'Logs', 'wp-content-pilot' ), 'edit_others_posts', 'wpcp-logs', array( $this, 'logs_page' ) );
-		add_submenu_page( $hook, 'Help', '<span style="color:orange;">Help</span>', 'edit_others_posts', 'wpcp-help', array( $this, 'help_page' ) );
 	}
 
 	/**
@@ -70,14 +69,6 @@ public function logs_page() {
 		wpcp_get_views( 'page/logs-page.php' );
 	}
 
-	/**
-	 * Help Page
-	 * @since 1.2.0
-	 */
-	public function help_page() {
-		wpcp_get_views( 'page/help-page.php' );
-	}
-
 	/**
 	 * @since 1.2.0
 	 */

diff --git a/includes/admin/class-wpcp-help.php b/includes/admin/class-wpcp-help.php
@@ -325,12 +325,6 @@ public function get_features() {
 				'free'  => false,
 				'pro'   => true,
 			],
-//			[
-//				'title' => __( 'Quora', 'wp-content-pilot' ),
-//				'desc'  => __( 'Quora module to import articles', 'wp-content-pilot' ),
-//				'free'  => false,
-//				'pro'   => true,
-//			],
 			[
 				'title' => __( 'Reddit', 'wp-content-pilot' ),
 				'desc'  => __( 'Reddit module to import articles', 'wp-content-pilot' ),
@@ -367,12 +361,6 @@ public function get_features() {
 				'free'  => false,
 				'pro'   => true,
 			],
-			[
-				'title' => __( 'Eventful', 'wp-content-pilot' ),
-				'desc'  => __( 'Eventful module to import events', 'wp-content-pilot' ),
-				'free'  => false,
-				'pro'   => true,
-			],
 			[
 				'title' => __( 'Etsy', 'wp-content-pilot' ),
 				'desc'  => __( 'Etsy module to import products', 'wp-content-pilot' ),

diff --git a/includes/admin/class-wpcp-settings.php b/includes/admin/class-wpcp-settings.php
@@ -39,6 +39,7 @@ function admin_menu() {
 			$this,
 			'settings_page'
 		) );
+		add_submenu_page( 'edit.php?post_type=wp_content_pilot', __( 'Help', 'wp-content-pilot' ), __( 'Help', 'wp-content-pilot' ), 'edit_others_posts', 'wpcp-help', array( $this, 'help_page' ) );
 	}
 
 	/**
@@ -49,7 +50,7 @@ function get_settings_sections() {
 		$sections = array(
 			array(
 				'id'    => 'wpcp_settings_misc',
-				'title' => __( 'Misc Settings', 'wp-content-pilot' )
+				'title' => __( 'General Settings', 'wp-content-pilot' )
 			),
 			array(
 				'id'    => 'wpcp_article_spinner',
@@ -70,15 +71,15 @@ function get_settings_fields() {
 			'wpcp_settings_misc'   => array(
 				array(
 					'name'    => 'uninstall_on_delete',
-					'label'   => __( 'Remove Data on Uninstall?', 'wp-content-pilot' ),
+					'label'   => __( 'Remove data on uninstall?', 'wp-content-pilot' ),
 					'desc'    => __( 'Check this box if you would like to completely remove all of its data when the plugin is deleted.', 'wp-content-pilot' ),
 					'type'    => 'checkbox',
 					'default' => ''
 				),
 				array(
 					'name'    => 'post_publish_mail',
-					'label'   => __( 'Post Publish mail', 'wp-content-pilot' ),
-					'desc'    => __( 'Send mail After post publish', 'wp-content-pilot' ),
+					'label'   => __( 'Post publish mail', 'wp-content-pilot' ),
+					'desc'    => __( 'Send mail after post publish', 'wp-content-pilot' ),
 					'type'    => 'checkbox',
 					'default' => ''
 				),
@@ -94,21 +95,21 @@ function get_settings_fields() {
 				array(
 					'name'    => 'spinrewriter_head',
 					'label'   => __( 'SpinreWriter', 'wp-content-pilot' ),
-					'desc'    => sprintf( __( 'SpinreWriter is one of the best Article Spinner, if you do not have account please %ssign up%s.', 'wp-content-pilot' ), '<a href="https://bit.ly/spinrewriterpluginever" target="_blank">', '</a>' ),
+					'desc'    => sprintf( __( 'Spin rewriter is one of the best Article Spinner, if you do not have account please %ssign up%s.', 'wp-content-pilot' ), '<a href="https://bit.ly/spinrewriterpluginever" target="_blank">', '</a>' ),
 					'type'    => 'html',
 					'default' => ''
 				),
 				array(
 					'name'    => 'spinrewriter_email',
 					'label'   => __( 'Email', 'wp-content-pilot' ),
-					'desc'    => __( 'Input your email address of SpinreWriter.', 'wp-content-pilot' ),
+					'desc'    => __( 'Input your email address of Spin rewriter.', 'wp-content-pilot' ),
 					'type'    => 'text',
 					'default' => ''
 				),
 				array(
 					'name'    => 'spinrewriter_api_key',
 					'label'   => __( 'API Key', 'wp-content-pilot' ),
-					'desc'    => __( 'Input API key of SpinreWriter.', 'wp-content-pilot' ),
+					'desc'    => __( 'Input API key of Spin rewriter.', 'wp-content-pilot' ),
 					'type'    => 'text',
 					'default' => ''
 				),
@@ -130,10 +131,11 @@ function settings_page() {
 					<div id="postbox-container-1" class="postbox-container" style="margin-top: 15px;">
 						<?php if ( ! defined( 'WPCP_PRO_VERSION' ) ): ?>
 							<div class="postbox" style="min-width: inherit;">
-								<h3 class="hndle"><label for="title"><?php _e( 'Upgrade to PRO', 'wp-content-pilot' ); ?></label></h3>
+								<h3 class="hndle"><label for="title"><?php _e( 'Upgrade to Pro', 'wp-content-pilot' ); ?></label></h3>
 								<div class="inside">
 									<?php
-									echo sprintf( __( 'Pro version support 15+ campaign sources with exclusive features, %supgrade to pro now%s.', 'wp-content-pilot' ), '<a href="https://pluginever.com/plugins/wp-content-pilot-pro/" target="_blank">', '</a>' )
+									echo sprintf( __( 'Pro version supports 25+ campaign sources with exclusive features. %sUpgrade to Pro.%s', 'wp-content-pilot' ), '<a href="https://pluginever.com/plugins/wp-content-pilot-pro/" target="_blank">', '</a>' )
+
 									?>
 								</div>
 							</div>
@@ -143,7 +145,7 @@ function settings_page() {
 							<h3 class="hndle"><label for="title"><?php _e( 'Documentation', 'wp-content-pilot' ); ?></label></h3>
 							<div class="inside">
 								<?php
-								echo sprintf( __( 'Please visit the %s WP Content Pilot %s  plugin\'s documentation page to learn how to use this plugin', 'wp-content-pilot' ), '<a href="https://pluginever.com/docs/wp-content-pilot/" target="_blank">', '</a>' )
+								echo sprintf( __( 'We have detailed documentation on every aspects of %s WP Content Pilot %s', 'wp-content-pilot' ), '<a href="https://pluginever.com/docs/wp-content-pilot/" target="_blank">', '</a>' )
 								?>
 							</div>
 						</div>
@@ -152,7 +154,7 @@ function settings_page() {
 							<h3 class="hndle"><label for="title"><?php _e( 'Support', 'wp-content-pilot' ); ?></label></h3>
 							<div class="inside">
 								<?php
-								echo sprintf( __( 'Having issues or difficulties? You can post your issue on the %s Support Forum.%s', 'wp-content-pilot' ), '<a href="https://pluginever.com/support/" target="_blank">', '</a>' )
+								echo sprintf( __( 'Our expert support team is always ready to help you out. %s support forum%s', 'wp-content-pilot' ), '<a href="https://pluginever.com/support/" target="_blank">', '</a>' )
 								?>
 
 							</div>
@@ -162,7 +164,7 @@ function settings_page() {
 							<h3 class="hndle"><label for="title">Rate Us</label></h3>
 							<div class="inside">
 								<?php
-								echo sprintf( __( 'Like the plugin? Please give us a  %s rating.%s', 'wp-content-pilot' ), '<a href="https://wordpress.org/support/plugin/wp-content-pilot/reviews/#new-post" target="_blank">', '</a>' )
+								echo sprintf( __( 'If you like WP Content Pilot, please leave us a  %s rating.%s It takes a minute and helps a lot. Thanks in advance!' , 'wp-content-pilot' ), '<a href="https://wordpress.org/support/plugin/wp-content-pilot/reviews/#new-post" target="_blank">', '</a>' )
 								?>
 								<div class="ratings-stars-container">
 									<a href="https://wordpress.org/support/plugin/wp-content-pilot/reviews/?filter=5"
@@ -184,6 +186,14 @@ class="dashicons dashicons-star-filled"></span>
 		<?php
 	}
 
+	/**
+	 * Help Page
+	 * @since 1.3.2
+	 */
+	public function help_page() {
+		wpcp_get_views( 'page/help-page.php' );
+	}
+
 	/**
 	 * Get all the pages
 	 *