Skip to content

Commit

Permalink
Merge pull request #153 from rupok/development
Browse files Browse the repository at this point in the history
update to v2.9.2
  • Loading branch information
rupok authored Jan 24, 2019
2 parents 9379ace + b182ef4 commit 847a97c
Show file tree
Hide file tree
Showing 9 changed files with 190 additions and 92 deletions.
3 changes: 3 additions & 0 deletions admin/assets/css/admin.css
Original file line number Diff line number Diff line change
Expand Up @@ -601,4 +601,7 @@ textarea.eael-form-control {
}
#eael_plugins_versions {
height: 36px;
}
.eael-notice-text {
padding-left: 10px;
}
3 changes: 3 additions & 0 deletions admin/assets/css/eael-notice.css
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,9 @@
top: -2px;
}

.wpdeveloper-notice-message {
padding: 10px 0;
}
.wpdeveloper-upsale-notice .wpdeveloper-notice-message {
display: flex;
align-items: center;
Expand Down
2 changes: 1 addition & 1 deletion admin/partials/version-control.php
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
</g>
</svg>
</div>
<h5 class="eael-admin-title">Warning: Please backup your database before making the rollback.</h5>
<p class="eael-notice-text">Usually you should not loose any data on the rollback process. But it's always good to have a backup of your database.</p>
</div>
</div>
</div>
Expand Down
6 changes: 3 additions & 3 deletions essential_adons_elementor.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* Description: The ultimate elements library for Elementor page builder plugin for WordPress.
* Plugin URI: https://essential-addons.com/elementor/
* Author: WPDeveloper
* Version: 2.9.0
* Version: 2.9.2
* Author URI: https://wpdeveloper.net/
*
* Text Domain: essential-addons-elementor
Expand All @@ -16,8 +16,8 @@
define( 'ESSENTIAL_ADDONS_EL_URL', plugins_url( '/', __FILE__ ) );
define( 'ESSENTIAL_ADDONS_EL_PATH', plugin_dir_path( __FILE__ ) );
define( 'ESSENTIAL_ADDONS_EL_ROOT', __FILE__ );
define( 'ESSENTIAL_ADDONS_VERSION', '2.9.0' );
define( 'ESSENTIAL_ADDONS_STABLE_VERSION', '2.9.0' );
define( 'ESSENTIAL_ADDONS_VERSION', '2.9.1' );
define( 'ESSENTIAL_ADDONS_STABLE_VERSION', '2.9.1' );
define( 'ESSENTIAL_ADDONS_BASENAME', plugin_basename( __FILE__ ) );


Expand Down
10 changes: 3 additions & 7 deletions includes/class-plugin-usage-tracker.php
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ public function init() {
// add_action( 'admin_init', array( $this, 'do_tracking' ) );

// Display the admin notice on activation
// add_action( 'wpdeveloper_optin_notice', array( $this, 'optin_notice' ) );
add_action( 'wpdeveloper_notices', array( $this, 'optin_notice' ) );
add_action( 'admin_notices', array( $this, 'marketing_notice' ) );

// Deactivation
Expand Down Expand Up @@ -622,10 +622,9 @@ public function optin_notice() {
$notice_text = __( 'Want to help make <strong>Essential Addons for Elementor</strong> even more awesome? You can get a <strong>25% discount coupon</strong> for Pro upgrade if you allow. <a class="insights-data-we-collect" href="#">What we collect.</a>', 'plugin-usage-tracker' );
}
// And we allow you to filter the text anyway
// ob_start();
$notice_text = apply_filters( 'wisdom_notice_text_' . esc_attr( $this->plugin_name ), $notice_text ); ?>

<!-- <div class="notice notice-info updated put-dismiss-notice"> -->
<div class="notice notice-info updated put-dismiss-notice">
<p><?php echo __( $notice_text ); ?></p>
<div class="eael-insights-data" style="display: none;">
<p><?php echo __( 'We collect non-sensitive diagnostic data and plugin usage information. Your site URL, WordPress & PHP version, plugins & themes and email address to send you the discount coupon. This data lets us make sure this plugin always stays compatible with the most popular plugins and themes. No spam, I promise.' ); ?></p>
Expand All @@ -639,13 +638,10 @@ public function optin_notice() {
jQuery('.eael-insights-data').slideToggle('fast');
});
</script>";?>
<!-- </div> -->
</div>
<?php
// echo ob_get_clean();
}

}

/**
* Display the marketing notice to users if enabled
* Only displays after the user has opted in to tracking
Expand Down
11 changes: 1 addition & 10 deletions includes/class-wpdev-core-install.php
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,6 @@ public function init_hooks() {
}
add_action( 'wp_ajax_wpdeveloper_upsale_core_install', array( $this, 'core_install' ) );
}
/**
* Show the plugin installation notice
*
* @return void
*/



/**
* Fail if plugin installtion/activation fails
*
Expand All @@ -45,7 +37,7 @@ public function fail_on_error( $thing ) {
}

/**
* Install WPSP
* Install Upsale Plugin
*
* @return void
*/
Expand All @@ -68,7 +60,6 @@ public function core_install() {

wp_send_json_success();
}

/**
* Install and activate a plugin
*
Expand Down
Loading

0 comments on commit 847a97c

Please sign in to comment.