diff --git a/assets/js/admin.js b/assets/js/admin.js index ca12047d..3bfc144b 100644 --- a/assets/js/admin.js +++ b/assets/js/admin.js @@ -1441,9 +1441,6 @@ scInput.on('input', function () { scConnectForm.removeData('scValidated'); resetVisualState(); - if (scApiKeyBadgeHolders().not('.is_hidden').length) { - scApiKeyBadgeSetChecking(); - } }); scConnectForm.on('submit', function (e) { @@ -1482,6 +1479,7 @@ scConnectMsgWrap.hide(); scmsgError.hide(); scmsgSuccess.hide(); + scApiKeyBadgeSetChecking(); var ajaxNonce = (connectCfg && connectCfg.nonce) || scConnectForm.attr('data-sc-connect-validate-nonce') || ''; var fallbackAjaxUrl = (function () { diff --git a/assets/scss/add-ons.scss b/assets/scss/add-ons.scss index 7b22acd0..7796923f 100644 --- a/assets/scss/add-ons.scss +++ b/assets/scss/add-ons.scss @@ -10,6 +10,9 @@ .sc_addons_main { flex: 1 1 auto; min-width: 0; + .sc_addons_card_subtitle { + margin-top: 8px; + } } .sc_addons_sidebar { @@ -63,6 +66,7 @@ .sc_addon_item_desc { color: var(--sc-color-medium-gray); + margin-top: 8px; } .sc_addon_item_actions { diff --git a/assets/scss/connect.scss b/assets/scss/connect.scss index c85a3b91..818f689e 100644 --- a/assets/scss/connect.scss +++ b/assets/scss/connect.scss @@ -21,6 +21,31 @@ text-align: center; } + .sc_connect_welcome_title_row { + display: flex; + align-items: center; + gap: 20px; + text-align: left; + margin-bottom: 16px; + + .sc_logo_link img { + display: block; + height: 40px; + width: auto; + } + } + + .sc_connect_welcome_heading { + margin: 0; + padding: 0; + text-align: left; + flex: 1; + } + .sc_connect_welcome_subtitle { + text-align: left; + margin: 0px; + } + .sc_connect_welcome_video { /* Video placeholder container */ margin: 40px auto 0; @@ -84,12 +109,10 @@ .sc_connect_helper_row { display: flex; flex-direction: column; - margin-top: 8px; font-family: var(--sc-font-body); font-size: var(--sc-font-base); line-height: var(--sc-body-small-line-height); color: var(--sc-color-dark-gray); - gap: 12px; } .sc_connect_helper_text { @@ -186,7 +209,7 @@ .sc_section_title { display: block; width: 100%; - margin-bottom: 16px; + margin-bottom: 8px; } .sc_helpful_links_cards_wrapper { @@ -558,7 +581,7 @@ } .sc_connect_credentials_link_row_center { - margin-top: 21px; + margin-top: 8px; text-align: center; } @@ -571,10 +594,6 @@ margin-top: 16px; } - .sc_connect_credentials_step_help { - margin-top: 8px; - } - .sc_connect_credentials_field_top { margin-top: 16px; } @@ -619,7 +638,7 @@ .sc_connect_modal__actions { margin-top: 0; - justify-content: flex-end; + justify-content: center; flex-wrap: wrap; } } @@ -629,15 +648,22 @@ } .sc_connect_credentials_link_row { - margin-top: 10px; + margin-top: 8px; } .sc_connect_credentials_core_card { margin-top: 24px; } - - .sc_connect_credentials_core_form { - margin-top: 12px; + .sc_setup_card { + .sc_connect_credentials_core_form { + margin-top: 12px; + .sc_item_spaced { + margin-bottom: 0px; + } + } + .sc_connect_setup_progress_title { + margin: 0px; + } } @media (max-width: 1024px) { diff --git a/assets/scss/design-system.scss b/assets/scss/design-system.scss index f82c9bba..7881e177 100644 --- a/assets/scss/design-system.scss +++ b/assets/scss/design-system.scss @@ -265,6 +265,7 @@ line-height: var(--sc-h3-line-height); letter-spacing: var(--sc-letter-spacing); color: var(--sc-color-black); + margin: 0px; } .sc_h4 { @@ -274,6 +275,7 @@ line-height: var(--sc-h4-line-height); letter-spacing: var(--sc-letter-spacing); color: var(--sc-color-black); + margin: 0px; } .sc_h5 { @@ -1158,17 +1160,12 @@ justify-content: space-between; margin: 0 auto 24px; - .sc_connect_page_header_left, - .sc_connect_page_header_right { + .sc_connect_page_header_left { display: flex; align-items: center; flex: 0 0 auto; } - .sc_connect_page_header_right { - margin-left: auto; - } - .sc_connect_page_header_left .sc_logo_link img { display: block; height: 40px; diff --git a/assets/scss/misc-settings.scss b/assets/scss/misc-settings.scss index fb1f169c..ed69a305 100644 --- a/assets/scss/misc-settings.scss +++ b/assets/scss/misc-settings.scss @@ -41,6 +41,11 @@ margin: 0 0 10px; } + /* Card title already shows "General"; hide duplicate Settings API section heading. */ + .simcal-misc-settings-general > h2 { + display: none; + } + .sc_misc_settings_card + .sc_misc_settings_card { margin-top: 24px; } @@ -76,6 +81,13 @@ } } + .simcal-misc-settings-general { + .form-table { + th { + vertical-align: middle; + } + } + } .submit { margin: 18px 0 0; padding: 0; diff --git a/includes/admin/pages.php b/includes/admin/pages.php index d74d5631..c850397a 100644 --- a/includes/admin/pages.php +++ b/includes/admin/pages.php @@ -254,11 +254,6 @@ class="wrap -
- - - -
@@ -311,11 +306,6 @@ class="wrap
-
- - - -
@@ -334,7 +324,7 @@ class="wrap
-
+ page . '_' . $calendars_tab_id . '_start'); settings_fields('simple-calendar_' . $this->page . '_' . $calendars_tab_id); diff --git a/includes/admin/pages/add-ons.php b/includes/admin/pages/add-ons.php index fbc00ff1..7298e952 100644 --- a/includes/admin/pages/add-ons.php +++ b/includes/admin/pages/add-ons.php @@ -143,20 +143,6 @@ public static function html() ]); $catalog = [ - 'fullcalendar' => [ - 'title' => __('FullCalendar Extended', 'google-calendar-events'), - 'description' => __( - 'Adds month, week, day, and list views to your calendar with improved interactivity and display flexibility.', - 'google-calendar-events', - ), - 'learn_more_url' => 'https://simplecalendar.io/downloads/fullcalendar/', - 'buy_url' => simcal_get_url('addons'), - 'is_active' => function_exists('simcal_is_fullcalendar_addon_active') - ? simcal_is_fullcalendar_addon_active() - : $is_plugin_active('simple-calendar-fullcalendar/simple-calendar-fullcalendar.php'), - 'icon' => 'fullcalendar-extended.svg', - 'license_key' => $fullcalendar_license_key, - ], 'google_pro' => [ 'title' => __('Google Calendar Pro', 'google-calendar-events'), 'description' => __( @@ -171,6 +157,20 @@ public static function html() 'icon' => 'google-calendar-pro.svg', 'license_key' => $google_pro_license_key, ], + 'fullcalendar' => [ + 'title' => __('FullCalendar Extended', 'google-calendar-events'), + 'description' => __( + 'Adds month, week, day, and list views to your calendar with improved interactivity and display flexibility.', + 'google-calendar-events', + ), + 'learn_more_url' => 'https://simplecalendar.io/downloads/fullcalendar/', + 'buy_url' => simcal_get_url('addons'), + 'is_active' => function_exists('simcal_is_fullcalendar_addon_active') + ? simcal_is_fullcalendar_addon_active() + : $is_plugin_active('simple-calendar-fullcalendar/simple-calendar-fullcalendar.php'), + 'icon' => 'fullcalendar-extended.svg', + 'license_key' => $fullcalendar_license_key, + ], 'appointment' => [ 'title' => __('Book an Appointment', 'google-calendar-events'), 'description' => __( diff --git a/includes/admin/pages/components/progress.php b/includes/admin/pages/components/progress.php index 5c405488..dddb4a23 100644 --- a/includes/admin/pages/components/progress.php +++ b/includes/admin/pages/components/progress.php @@ -17,13 +17,13 @@ $circle_class = $percent >= 100 ? '100' : ($percent >= 67 ? '67' : '33'); ?> -
-

+
+

diff --git a/includes/admin/pages/connect-controller.php b/includes/admin/pages/connect-controller.php index efcb7917..94a88fcc 100644 --- a/includes/admin/pages/connect-controller.php +++ b/includes/admin/pages/connect-controller.php @@ -47,6 +47,9 @@ ]; $step_template_path = isset($step_template_map[$step]) ? $step_template_map[$step] : $step_template_map['api_key']; +$welcome_context_for_template = + $is_pro_flow && 'appointment' !== (string) $welcome_context ? 'pro' : (string) $welcome_context; + $context = [ // Shared. 'assets_base' => $assets_base, @@ -62,10 +65,16 @@ 'has_published_pro_calendar' => $has_published_pro_calendar, 'should_hide_progress' => $should_hide_progress, // Welcome. - 'video_url' => (function () use ($is_pro_flow) { + 'video_url' => (function () use ($is_pro_flow, $welcome_context_for_template) { $core_video_url = 'https://www.youtube.com/embed/3QveIbm5Oc0?si=fMEUU0Za7KFzlJk5'; $pro_video_url = 'https://www.youtube.com/embed/lmN774Fk3rw?si=zBMoOck0BjI7Q39j'; - $default = $is_pro_flow ? $pro_video_url : $core_video_url; + $appointment_video_url = 'https://www.youtube.com/embed/yCSpUlBnunw'; + $default = + 'appointment' === $welcome_context_for_template + ? $appointment_video_url + : ($is_pro_flow + ? $pro_video_url + : $core_video_url); /** * Filter the welcome video embed URL shown on the Connect welcome step. @@ -73,11 +82,11 @@ * @since 3.6.2 * * @param string $default_embed_url Default YouTube embed URL. - * @param string $context 'core' or 'pro'. + * @param string $context 'core', 'pro', or 'appointment'. */ - return apply_filters('simple_calendar_connect_welcome_video_url', $default, $is_pro_flow ? 'pro' : 'core'); + return apply_filters('simple_calendar_connect_welcome_video_url', $default, $welcome_context_for_template); })(), - 'welcome_context' => $is_pro_flow ? 'pro' : $welcome_context, + 'welcome_context' => $welcome_context_for_template, // Sidebar. 'sidebar_template_path' => SIMPLE_CALENDAR_PATH . 'includes/admin/pages/connect/sidebar.php', ]; diff --git a/includes/admin/pages/connect/layout.php b/includes/admin/pages/connect/layout.php index ada69558..4b107dd6 100644 --- a/includes/admin/pages/connect/layout.php +++ b/includes/admin/pages/connect/layout.php @@ -13,6 +13,8 @@ } ?>
+ +
-
- - - -
- - +
@@ -79,7 +79,7 @@ class="sc_text--body_b3 sc_connect_google_api_key_health_detail is_hidden"
@@ -133,10 +133,7 @@ class="sc_icon--square"

- + - +

diff --git a/includes/admin/pages/connect/partials/oauth-via-simple-calendar.php b/includes/admin/pages/connect/partials/oauth-via-simple-calendar.php index 1e3d57ba..6715815b 100644 --- a/includes/admin/pages/connect/partials/oauth-via-simple-calendar.php +++ b/includes/admin/pages/connect/partials/oauth-via-simple-calendar.php @@ -26,7 +26,7 @@ class="sc_btn sc_btn--blue" data-sc-pro-mark-via-sc="1" data-sc-pro-oauth-url="" > - +
+ + +
'sc_connect_step_credentials', 'text' => __('Connect', 'google-calendar-events'), - 'completed' => - $has_via_sc_authenticated || - $has_own_authenticated || - (('own' === $pro_connection_choice || $show_own_credentials) && $has_client_credentials) || - $has_published_pro_calendar, + 'completed' => $has_via_sc_authenticated || $has_own_authenticated || $has_published_pro_calendar, 'icon_src' => $assets_base . 'check.svg', ], [ 'id' => 'sc_connect_step_private', - 'text' => __('Display', 'google-calendar-events'), + 'text' => __('Add new calendar', 'google-calendar-events'), 'completed' => $has_published_pro_calendar, 'icon_src' => $assets_base . 'check.svg', ], @@ -137,19 +132,19 @@ 'label' => $core_label, 'items' => [ [ - 'text' => __('Watch Tutorial', 'google-calendar-events'), + 'text' => __('Watch tutorial', 'google-calendar-events'), 'completed' => true, 'icon_src' => $assets_base . 'check.svg', ], [ 'id' => 'sc_connect_step_api_key', - 'text' => __('Add API Key', 'google-calendar-events'), + 'text' => __('Add API key', 'google-calendar-events'), 'completed' => $has_core_api_key_verified, 'icon_src' => $assets_base . 'check.svg', ], [ 'id' => 'sc_connect_step_calendar', - 'text' => __('Add New Calendar', 'google-calendar-events'), + 'text' => __('Add new calendar', 'google-calendar-events'), 'completed' => $has_core_api_key_verified && $has_published_calendar, 'icon_src' => $assets_base . 'check.svg', ], diff --git a/includes/admin/pages/connect/steps/pro-credentials.php b/includes/admin/pages/connect/steps/pro-credentials.php index 7157675d..b2719b76 100644 --- a/includes/admin/pages/connect/steps/pro-credentials.php +++ b/includes/admin/pages/connect/steps/pro-credentials.php @@ -72,7 +72,7 @@

- +

" data-sc-subtitle-connected=" @@ -196,30 +196,6 @@ class="sc_link sc_link_muted sc_text--body_b3" -
- Step-by-step instructions', - 'google-calendar-events', - ), - simcal_ga_campaign_url( - simcal_get_url('docs') . '/gcal-pro-how-to-properly-configure-the-google-oauth-client/', - 'gcal-pro', - 'settings-link', - ), - ); - - echo sprintf( - __( - 'Google Developers Console ', - 'google-calendar-events', - ), - simcal_get_url('gdev-console'), - ); - ?> -
- $client_id, 'client_secret' => $client_secret, ]; + $step_by_step_url = simcal_ga_campaign_url( + simcal_get_url('docs') . '/gcal-pro-how-to-properly-configure-the-google-oauth-client/', + 'gcal-pro', + 'settings-link', + ); + ob_start(); + ?> +

+ ', + '', + ); ?> +

+ (string) ob_get_clean(), + ]; include SIMPLE_CALENDAR_PATH . 'includes/admin/pages/connect/partials/render-connect-fields.php'; ?>
" data-sc-can-unhide="" > - +
@@ -281,7 +278,7 @@ class="sc_btn sc_btn--white" class="sc_link sc_link_muted sc_text--body_b3" > - +
diff --git a/includes/admin/pages/connect/steps/welcome.php b/includes/admin/pages/connect/steps/welcome.php index c81ec9e6..2e4c50df 100644 --- a/includes/admin/pages/connect/steps/welcome.php +++ b/includes/admin/pages/connect/steps/welcome.php @@ -3,6 +3,7 @@ * Step: Welcome. * * Variables expected: + * - string $assets_base * - string $video_url * - string $welcome_context */ @@ -11,27 +12,43 @@ } $welcome_context = isset($welcome_context) ? (string) $welcome_context : 'core'; -$heading = - 'pro' === $welcome_context - ? __('Welcome to Simple Calendar (Pro)', 'google-calendar-events') - : __('Welcome to Simple Calendar (Core)', 'google-calendar-events'); -$subtitle = - 'pro' === $welcome_context - ? __( - 'Experience a one-stop solution for 1-click Google Calendar integration, with zero stress of handling complex API keys, Client ID, and Client Secret, powered by Simple Calendar’s pro addons.', - 'google-calendar-events', - ) - : __( - 'Experience an easy, breezy integration of Google Calendar with WordPress using the OG Google Calendar WordPress plugin.', - 'google-calendar-events', - ); +if ('appointment' === $welcome_context) { + $heading = __('Welcome to Appointment booking', 'google-calendar-events'); + $subtitle = __( + 'Explore the Simple Calendar addon that allows Google Calendar appointment bookings directly from your website in real-time, while automatically blocking booked time slots to prevent double bookings.', + 'google-calendar-events', + ); +} elseif ('pro' === $welcome_context) { + $heading = __('Welcome to Simple Calendar Pro Version', 'google-calendar-events'); + $subtitle = __( + 'Experience a one-stop solution for 1-click Google Calendar integration, with zero stress of handling complex API keys, Client ID, and Client Secret, powered by Simple Calendar’s pro addons.', + 'google-calendar-events', + ); +} else { + $heading = __('Getting started with Simple Calendar', 'google-calendar-events'); + $subtitle = __( + 'Experience an easy-breezy integration of Google Calendar with WordPress using the OG Google Calendar WordPress plugin.', + 'google-calendar-events', + ); +} $video_url = isset($video_url) ? trim((string) $video_url) : ''; +$assets_base = isset($assets_base) ? (string) $assets_base : (string) (SIMPLE_CALENDAR_ASSETS . 'images/admin/'); ?>
-

- -

+
+ +

+ +

+

@@ -61,7 +78,7 @@ class="sc_connect_welcome_video_iframe"
diff --git a/includes/functions/admin.php b/includes/functions/admin.php index 671a61ed..72aadbd0 100644 --- a/includes/functions/admin.php +++ b/includes/functions/admin.php @@ -499,6 +499,71 @@ function simcal_is_fullcalendar_addon_active() return (bool) apply_filters('simcal_is_fullcalendar_addon_active', $is_active); } +/** + * Whether the Simple Calendar Book an Appointment add-on is active. + * + * Mirrors the other add-on detection helpers so Connect can keep the Appointment + * onboarding context even when Google Calendar Pro is also active. + * + * @since 4.0.0 + * + * @return bool + */ +function simcal_is_appointment_addon_active() +{ + $is_active = false; + + if (defined('SIMPLE_CALENDAR_APPOINTMENT_VERSION')) { + $is_active = true; + } elseif (class_exists('\SimpleCalendar\Simple_Calendar_Appointment')) { + $is_active = true; + } + + if (!$is_active) { + if (!function_exists('is_plugin_active') && defined('ABSPATH')) { + $plugin_file = trailingslashit(ABSPATH) . 'wp-admin/includes/plugin.php'; + if (is_readable($plugin_file)) { + // phpcs:ignore WordPressVIPMinimum.Files.IncludingFile.UsingVariable + require_once $plugin_file; + } + } + + if (function_exists('is_plugin_active')) { + $is_active = is_plugin_active('simple-calendar-appointment/simple-calendar-appointment.php'); + } else { + $active_plugins = (array) get_option('active_plugins', []); + $active_plugins = array_map('strval', $active_plugins); + foreach ($active_plugins as $p) { + $p_lower = strtolower($p); + if ( + strpos($p_lower, 'simple-calendar-appointment') !== false || + (strpos($p_lower, 'appointment') !== false && strpos($p_lower, 'simple-calendar') !== false) + ) { + $is_active = true; + break; + } + } + + if (!$is_active) { + $sitewide = (array) get_option('active_sitewide_plugins', []); + $sitewide_files = array_map('strval', array_keys($sitewide)); + foreach ($sitewide_files as $p) { + $p_lower = strtolower($p); + if ( + strpos($p_lower, 'simple-calendar-appointment') !== false || + (strpos($p_lower, 'appointment') !== false && strpos($p_lower, 'simple-calendar') !== false) + ) { + $is_active = true; + break; + } + } + } + } + } + + return (bool) apply_filters('simcal_is_appointment_addon_active', $is_active); +} + /** * Build variables for Connect sidebar (progress / rating / Pro CTA) and Connect step logic. * @@ -533,9 +598,18 @@ function simcal_prepare_connect_sidebar_scope() $welcome_context = $welcome_context ? $welcome_context : 'core'; $is_appointment_active = - function_exists('simcal_is_appointment_addon_active') && simcal_is_appointment_addon_active(); - $is_pro_active = simcal_is_google_calendar_pro_active('') || $is_appointment_active; - if (!$is_pro_active && 'pro' === $welcome_context) { + defined('SIMPLE_CALENDAR_APPOINTMENT_VERSION') || + class_exists('\SimpleCalendar\Simple_Calendar_Appointment') || + (function_exists('simcal_is_appointment_addon_active') && simcal_is_appointment_addon_active()); + $is_google_pro_active = simcal_is_google_calendar_pro_active(''); + $is_pro_active = $is_google_pro_active || $is_appointment_active; + if ('appointment' === $welcome_context && !$is_appointment_active) { + $welcome_context = $is_google_pro_active ? 'pro' : 'core'; + update_option('simple_calendar_connect_welcome_context', $welcome_context, false); + } elseif ('pro' === $welcome_context && !$is_google_pro_active && $is_appointment_active) { + $welcome_context = 'appointment'; + update_option('simple_calendar_connect_welcome_context', $welcome_context, false); + } elseif ('pro' === $welcome_context && !$is_google_pro_active && !$is_appointment_active) { $welcome_context = 'core'; delete_option('simple_calendar_connect_welcome_context'); } diff --git a/includes/post-types.php b/includes/post-types.php index c136ce87..05067a9b 100644 --- a/includes/post-types.php +++ b/includes/post-types.php @@ -167,7 +167,7 @@ public static function register_post_types() 'name_admin_bar' => __('Calendar', 'google-calendar-events'), 'parent_item_colon' => __('Parent Calendar:', 'google-calendar-events'), 'all_items' => __('All Calendars', 'google-calendar-events'), - 'add_new_item' => __('Add New Calendar', 'google-calendar-events'), + 'add_new_item' => __('Add New calendar', 'google-calendar-events'), 'add_new' => __('Add New', 'google-calendar-events'), 'new_item' => __('New Calendar', 'google-calendar-events'), 'edit_item' => __('Edit Calendar', 'google-calendar-events'),