Skip to content

Commit

Permalink
Merge pull request #384 from cyberchimps/develop
Browse files Browse the repository at this point in the history 
Develop
  • Loading branch information
@pallavic27
pallavic27 committed Mar 1, 2024
2 parents e8a0d93 + dd3fdbe commit 2febd8b
Show file tree
Hide file tree
Showing 39 changed files with 4,437 additions and 589 deletions.
1 change: 0 additions & 1 deletion admin/admin-functions.php
View file
Expand Up @@ -127,4 +127,3 @@ function responsive_upgrade_pro_react() {
add_action( 'admin_notices', 'responsive_upgrade_pro_react', 20 );
}
}

10 changes: 7 additions & 3 deletions admin/css/responsive-getting-started-page.css
View file
Expand Up @@ -264,15 +264,17 @@ body.toplevel_page_responsive #wpbody-content {
margin-bottom: 12px;
}

.responsive-theme-upgrade-now-btn {
.responsive-theme-upgrade-now-btn,
.responsive-theme-install-responsive-add-ons {
padding: 8px 20px;
background-color: #2271B1;
border: none;
border-radius: 4px;
color: white;
}

.responsive-theme-upgrade-now-btn:hover, .responsive-theme-upgrade-now-btn:focus {
.responsive-theme-upgrade-now-btn:hover, .responsive-theme-upgrade-now-btn:focus,
.responsive-theme-install-responsive-add-ons:hover, .responsive-theme-install-responsive-add-ons:focus {
color: #FFFFFF;
}

Expand Down Expand Up @@ -702,7 +704,9 @@ input:checked + .resp-megamenu-slider:before {
border-radius: 4px !important;
}

#responsive-theme-setting-wl-section {
#responsive-theme-setting-wl-section,
.responsive-theme-setting-pro-not-activated-section,
#responsive-theme-setting-activation-key-section {
display: none;
}

Expand Down
18 changes: 18 additions & 0 deletions admin/js/responsive-getting-started.js
View file
Expand Up @@ -292,6 +292,9 @@ $(document).ready(function () {
);

})
if ( ! localize.isRSTActivated ) {
$('#responsive-theme-setting-activation-key-section').show();
}

// Switching of Setting Tabs.
$('#responsive-theme-setting-wl-tab').click(function(){
Expand All @@ -301,15 +304,30 @@ $(document).ready(function () {
$('#responsive-theme-setting-wl-section').show()
$('#responsive-theme-setting-activation-key-tab span, #responsive-theme-setting-activation-key-tab p').removeClass('responsive-theme-setting-active-tab');
$('#responsive-theme-setting-wl-tab span, #responsive-theme-setting-wl-tab p').addClass('responsive-theme-setting-active-tab')
$('#responsive-setting-item-app-connection-tab span, #responsive-setting-item-app-connection-tab p').removeClass('responsive-theme-setting-active-tab')
$('#responsive-theme-setting-activation-key-section').hide()
$('#responsive-theme-setting-app-connection-section').hide()
})

$('#responsive-theme-setting-activation-key-tab').click(function(){
$('#responsive-theme-setting-activation-key-section').show()
$('.responsive-theme-setting-pro-not-activated-section').show()
$('#responsive-theme-setting-app-connection-section').hide()
$('#responsive-theme-setting-activation-key-tab span, #responsive-theme-setting-activation-key-tab p').addClass('responsive-theme-setting-active-tab')
$('#responsive-theme-setting-wl-tab span, #responsive-theme-setting-wl-tab p').removeClass('responsive-theme-setting-active-tab')
$('#responsive-setting-item-app-connection-tab span, #responsive-setting-item-app-connection-tab p').removeClass('responsive-theme-setting-active-tab')
$('#responsive-theme-setting-wl-section').hide()
})

$('#responsive-setting-item-app-connection-tab').click(function(){
$('#responsive-theme-setting-app-connection-section').show()
$('#responsive-theme-setting-activation-key-section').hide()
$('.responsive-theme-setting-pro-not-activated-section').hide()
$('#responsive-setting-item-app-connection-tab span, #responsive-setting-item-app-connection-tab p').addClass('responsive-theme-setting-active-tab')
$('#responsive-theme-setting-activation-key-tab span, #responsive-theme-setting-activation-key-tab p').removeClass('responsive-theme-setting-active-tab');
$('#responsive-theme-setting-wl-tab span, #responsive-theme-setting-wl-tab p').removeClass('responsive-theme-setting-active-tab')
$('#responsive-theme-setting-wl-section').hide()
})

// Function to show error styling and message while activating license.
function show_activation_error( inputTarget, msgTarget, msg ) {
Expand Down
47 changes: 35 additions & 12 deletions admin/templates/get-started.php
View file
Expand Up @@ -13,6 +13,23 @@
exit; // Exit if accessed directly.
}

if ( ! function_exists( 'check_is_responsive_addons_greater' ) ) {
/**
* Check if Responsive Addons is installed.
*/
function check_is_responsive_addons_greater() {
if ( is_plugin_active( 'responsive-add-ons/responsive-add-ons.php' ) ) {
$raddons_version = get_plugin_data( WP_PLUGIN_DIR . '/responsive-add-ons/responsive-add-ons.php' )['Version'];
$is_raddons_greater = false;
if ( version_compare( $raddons_version, '3.0.0', '>=' ) ) {
$is_raddons_greater = true;
}
return $is_raddons_greater;
}
return false;
}
}

$slug = 'responsive-addons-pro';
$state = '';
if ( file_exists( ABSPATH . 'wp-content/plugins/' . $slug . '/' . $slug . '.php' ) ) {
Expand All @@ -32,14 +49,14 @@
network_admin_url( 'plugins.php' )
);

$admin_logo = apply_filters( 'responsive_admin_menu_icon', esc_url( RESPONSIVE_THEME_URI ) . 'admin/images/responsive-logo-colored.jpg' );
$admin_footer_logo = apply_filters( 'responsive_admin_menu_footer_icon', esc_url( RESPONSIVE_THEME_URI . 'admin/images/cyberchimps-logo.png' ));
$admin_logo = apply_filters( 'responsive_admin_menu_icon', esc_url( RESPONSIVE_THEME_URI ) . 'admin/images/responsive-logo-colored.jpg' );
$admin_footer_logo = apply_filters( 'responsive_admin_menu_footer_icon', esc_url( RESPONSIVE_THEME_URI . 'admin/images/cyberchimps-logo.png' ) );
?>

<div class="responsive-theme-getting-started-page">
<div class="responsive-theme-getting-started-header bg-white">
<div class="responsive-theme-brand">
<img class="responsive-theme-logo" src="<?php echo $admin_logo; ?>" >
<img class="responsive-theme-logo" src="<?php echo esc_url( $admin_logo ); ?>" >
<div class="responsive-theme-version"><?php echo esc_html( RESPONSIVE_THEME_VERSION ); ?></div>
</div>
<p class="responsive-theme-brand-desc"><?php esc_html_e( 'Blazing fast, mobile-friendly, fully-customizable WordPress theme.', 'responsive' ); ?></p>
Expand All @@ -50,17 +67,20 @@
<p class="responsive-theme-tab-name">Home</p>
</div>
<?php
if ( 'installed' === $state || 'activated' === $state ) {
if ( 'activated' === $state ) {
?>
<div class="responsive-theme-tab responsive-theme-settings-tab" data-tab="settings">
<p class="responsive-theme-tab-name">Settings</p>
</div>
<?php
}
?>
<div class="responsive-theme-tab responsive-theme-templates-tab" data-tab="templates">
<p class="responsive-theme-tab-name">Starter&nbsp;Templates</p>
</div>
<?php do_action( 'responsive_addons_getting_started_settings_tab' ); ?>
<?php if( ! is_plugin_active( 'responsive-add-ons/responsive-add-ons.php' ) ): ?>
<div class="responsive-theme-tab responsive-theme-templates-tab" data-tab="templates">
<p class="responsive-theme-tab-name">Starter&nbsp;Templates</p>
</div>
<?php endif; ?>
<div class="responsive-theme-tab responsive-theme-plugins-tab" data-tab="plugins">
<p class="responsive-theme-tab-name">Useful&nbsp;Plugins</p>
</div>
Expand All @@ -84,17 +104,20 @@
<?php require_once RESPONSIVE_THEME_DIR . 'admin/templates/getting-started-home.php'; ?>
</div>
<?php
if ( 'installed' === $state || 'activated' === $state ) {
if ( 'activated' === $state ) {
?>
<div class="responsive-theme-settings-content responsive-theme-tab-content" id="responsive_settings">
<?php require_once RESPONSIVE_THEME_DIR . 'admin/templates/getting-started-settings.php'; ?>
</div>
<?php
}
?>
<div class="responsive-theme-templates-content responsive-theme-tab-content" id="responsive_templates">
<?php require_once RESPONSIVE_THEME_DIR . 'admin/templates/getting-started-rst.php'; ?>
</div>
<?php do_action( 'responsive_addons_getting_started_settings_tab_content' ); ?>
<?php if( ! is_plugin_active( 'responsive-add-ons/responsive-add-ons.php' ) ): ?>
<div class="responsive-theme-templates-content responsive-theme-tab-content" id="responsive_templates">
<?php require_once RESPONSIVE_THEME_DIR . 'admin/templates/getting-started-rst.php'; ?>
</div>
<?php endif; ?>
<div class="responsive-theme-plugins-content responsive-theme-tab-content" id="responsive_plugins">
<?php require_once RESPONSIVE_THEME_DIR . 'admin/templates/getting-started-useful-plugins.php'; ?>
</div>
Expand Down Expand Up @@ -124,6 +147,6 @@
</div>
<div class="responsive-theme-hr"></div>
</div>
<img class="responsive-theme-cyberchimps-logo" src="<?php echo $admin_footer_logo; ?>" alt="">
<img class="responsive-theme-cyberchimps-logo" src="<?php echo esc_url( $admin_footer_logo ); ?>" alt="">
</div>
</div>
20 changes: 9 additions & 11 deletions admin/templates/getting-started-free-vs-pro.php
View file
Expand Up @@ -20,7 +20,7 @@
<thead class="">
<tr>
<td><?php esc_html_e( 'Features', 'responsive' ); ?></td>
<td class="text-center"><?php esc_html_e( 'Free', 'responsive' ); ?></td>
<td class="text-center"><?php esc_html_e( 'Responsive Free', 'responsive' ); ?></td>
<td class="text-center"><?php esc_html_e( 'Responsive Pro', 'responsive' ); ?></td>
</tr>
</thead>
Expand All @@ -45,41 +45,39 @@
<div class="responsive-theme-freevspro-feature-title mb-2"><?php esc_html_e( 'Fully Customizable', 'responsive' ); ?></div>
<div class="responsive-theme-freevspro-feature-desc"><?php esc_html_e( 'Advanced settings for Typography, Layouts and Colors', 'responsive' ); ?></div>
</td>
<td class="text-center">
<div class="responsive-theme-freevspro-feature-desc"><?php esc_html_e( 'Limited Options', 'responsive' ); ?></div>
</td>
<td class="text-center"><img src="<?php echo esc_url( RESPONSIVE_THEME_URI ) . 'admin/images/tick.svg'; ?>" alt=""></td>
<td class="text-center"><img src="<?php echo esc_url( RESPONSIVE_THEME_URI ) . 'admin/images/tick.svg'; ?>" alt=""></td>
</tr>
<tr>
<td class="responsive-theme-freevspro-features">
<div class="responsive-theme-freevspro-feature-title mb-2"><?php esc_html_e( 'Mega Menu', 'responsive' ); ?></div>
<div class="responsive-theme-freevspro-feature-desc"><?php esc_html_e( 'Adds Nav module for building mega menu, & highlight tags', 'responsive' ); ?></div>
</td>
<td class="text-center"><img src="<?php echo esc_url( RESPONSIVE_THEME_URI ) . 'admin/images/cross.svg'; ?>" alt=""></td>
<td class="text-center"><img src="<?php echo esc_url( RESPONSIVE_THEME_URI ) . 'admin/images/tick.svg'; ?>" alt=""></td>
<td class="text-center"><img src="<?php echo esc_url( RESPONSIVE_THEME_URI ) . 'admin/images/tick.svg'; ?>" alt=""></td>
</tr>
<tr>
<td class="responsive-theme-freevspro-features">
<div class="responsive-theme-freevspro-feature-title mb-2"><?php esc_html_e( 'White Label Feature', 'responsive' ); ?></div>
<div class="responsive-theme-freevspro-feature-desc"><?php esc_html_e( 'White Label the theme and plugin name', 'responsive' ); ?></div>
</td>
<td class="text-center"><img src="<?php echo esc_url( RESPONSIVE_THEME_URI ) . 'admin/images/cross.svg'; ?>" alt=""></td>
<td class="text-center"><img src="<?php echo esc_url( RESPONSIVE_THEME_URI ) . 'admin/images/tick.svg'; ?>" alt=""></td>
<td class="text-center"><img src="<?php echo esc_url( RESPONSIVE_THEME_URI ) . 'admin/images/tick.svg'; ?>" alt=""></td>
</tr>
<tr>
<td class="responsive-theme-freevspro-features">
<div class="responsive-theme-freevspro-feature-title mb-2"><?php esc_html_e( 'Lifter LMS Integration', 'responsive' ); ?></div>
<div class="responsive-theme-freevspro-feature-desc"><?php esc_html_e( 'Advanced customizer settings for Lifter LMS Plugin', 'responsive' ); ?></div>
</td>
<td class="text-center"><img src="<?php echo esc_url( RESPONSIVE_THEME_URI ) . 'admin/images/cross.svg'; ?>" alt=""></td>
<td class="text-center"><img src="<?php echo esc_url( RESPONSIVE_THEME_URI ) . 'admin/images/tick.svg'; ?>" alt=""></td>
<td class="text-center"><img src="<?php echo esc_url( RESPONSIVE_THEME_URI ) . 'admin/images/tick.svg'; ?>" alt=""></td>
</tr>
<tr>
<td class="responsive-theme-freevspro-features">
<div class="responsive-theme-freevspro-feature-title mb-2"><?php esc_html_e( 'Learn Dash Integration', 'responsive' ); ?></div>
<div class="responsive-theme-freevspro-feature-desc"><?php esc_html_e( 'Advanced customizer settings for Learn Dash', 'responsive' ); ?></div>
</td>
<td class="text-center"><img src="<?php echo esc_url( RESPONSIVE_THEME_URI ) . 'admin/images/cross.svg'; ?>" alt=""></td>
<td class="text-center"><img src="<?php echo esc_url( RESPONSIVE_THEME_URI ) . 'admin/images/tick.svg'; ?>" alt=""></td>
<td class="text-center"><img src="<?php echo esc_url( RESPONSIVE_THEME_URI ) . 'admin/images/tick.svg'; ?>" alt=""></td>
</tr>
<tr>
Expand All @@ -99,15 +97,15 @@
<div class="responsive-theme-freevspro-feature-title mb-2"><?php esc_html_e( 'Elementor Widgets', 'responsive' ); ?></div>
<div class="responsive-theme-freevspro-feature-desc"><?php esc_html_e( 'Access to 50+ Elementor Widgets for free', 'responsive' ); ?></div>
</td>
<td class="text-center"><img src="<?php echo esc_url( RESPONSIVE_THEME_URI ) . 'admin/images/cross.svg'; ?>" alt=""></td>
<td class="text-center"><img src="<?php echo esc_url( RESPONSIVE_THEME_URI ) . 'admin/images/tick.svg'; ?>" alt=""></td>
<td class="text-center"><img src="<?php echo esc_url( RESPONSIVE_THEME_URI ) . 'admin/images/tick.svg'; ?>" alt=""></td>
</tr>
<tr>
<td class="responsive-theme-freevspro-features">
<div class="responsive-theme-freevspro-feature-title mb-2"><?php esc_html_e( 'Theme Builder', 'responsive' ); ?></div>
<div class="responsive-theme-freevspro-feature-desc"><?php esc_html_e( 'Access to REA Theme Builder Feature', 'responsive' ); ?></div>
</td>
<td class="text-center"><img src="<?php echo esc_url( RESPONSIVE_THEME_URI ) . 'admin/images/cross.svg'; ?>" alt=""></td>
<td class="text-center"><img src="<?php echo esc_url( RESPONSIVE_THEME_URI ) . 'admin/images/tick.svg'; ?>" alt=""></td>
<td class="text-center"><img src="<?php echo esc_url( RESPONSIVE_THEME_URI ) . 'admin/images/tick.svg'; ?>" alt=""></td>
</tr>
<tr>
Expand Down Expand Up @@ -138,7 +136,7 @@
<p class="responsive-theme-freevspro-responsive-pro-title"><?php esc_html_e( 'Do More with Responsive Pro', 'responsive' ); ?></p>
<div class="row">
<div class="col-md-10 offset-md-1">
<p class="responsive-theme-freevspro-responsive-pro-desc mt-3"><?php esc_html_e( 'Get powerful customizer settings in the Responsive Pro plugin, access to Premium Starter Template, and Responsive Elementor addons worth $47 for free. With all the features you get, the product pays for itself!', 'responsive' ); ?></p>
<p class="responsive-theme-freevspro-responsive-pro-desc mt-3"><?php esc_html_e( 'Get powerful theme customizer settings, integrations with third party plugins and access to Premium Starter Templates.', 'responsive' ); ?></p>
</div>
</div>
<div class="row">
Expand Down

0 comments on commit 2febd8b

Please sign in to comment.