Skip to content

Commit 8fd0483

Browse files
akashmdiuakashmdiu
committed
Merge branch 'card-79083' into latest
2 parents 7284d9c + 29768e7 commit 8fd0483

13 files changed

Lines changed: 734 additions & 125 deletions

File tree

‎Core/AssetManager.php‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,16 @@ class AssetManager
267267
'footer' => true,
268268
'handle' => 'embedpress-gallery-justify',
269269
'priority' => 15,
270-
'providers' => ['google-photos', 'instagram'], // Only for gallery-based embeds
270+
],
271+
'meetup-timezone-js' => [
272+
'file' => 'js/meetup-timezone.js',
273+
'deps' => [],
274+
'contexts' => ['frontend', 'elementor'],
275+
'type' => 'script',
276+
'footer' => true,
277+
'handle' => 'embedpress-meetup-timezone',
278+
'priority' => 15,
279+
'providers' => ['meetup'], // Only for Meetup embeds
271280
],
272281
'gutenberg-script-js' => [
273282
'file' => 'js/gutneberg-script.js',

‎EmbedPress/Elementor/Widgets/Embedpress_Elementor.php‎

Lines changed: 78 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3860,6 +3860,15 @@ public function init_meetup_control_section()
38603860
]
38613861
);
38623862

3863+
$this->add_control(
3864+
'meetup_rss_feed_note',
3865+
[
3866+
'type' => \Elementor\Controls_Manager::RAW_HTML,
3867+
'raw' => esc_html__('Note: Order By, Order, Events Per Page, and Load More controls only apply to Meetup RSS feeds (URLs with /events). For single event embeds, only timezone and date/time format settings will be used.', 'embedpress'),
3868+
'content_classes' => 'elementor-panel-alert elementor-panel-alert-info',
3869+
]
3870+
);
3871+
38633872
$this->add_control(
38643873
'meetup_orderby',
38653874
[
@@ -3871,7 +3880,7 @@ public function init_meetup_control_section()
38713880
'attendees' => __('Attendees', 'embedpress'),
38723881
],
38733882
'default' => 'date',
3874-
'description' => __('Choose how to sort the events', 'embedpress'),
3883+
'description' => __('Choose how to sort the events (RSS feeds only)', 'embedpress'),
38753884
]
38763885
);
38773886

@@ -3885,7 +3894,7 @@ public function init_meetup_control_section()
38853894
'DESC' => __('Descending', 'embedpress'),
38863895
],
38873896
'default' => 'ASC',
3888-
'description' => __('Sort direction', 'embedpress'),
3897+
'description' => __('Sort direction (RSS feeds only)', 'embedpress'),
38893898
]
38903899
);
38913900

@@ -3897,7 +3906,7 @@ public function init_meetup_control_section()
38973906
'min' => 1,
38983907
'max' => 50,
38993908
'default' => 10,
3900-
'description' => __('Number of events to show per page', 'embedpress'),
3909+
'description' => __('Number of events to show per page (RSS feeds only)', 'embedpress'),
39013910
]
39023911
);
39033912

@@ -3909,7 +3918,63 @@ public function init_meetup_control_section()
39093918
'label_on' => __('Yes', 'embedpress'),
39103919
'label_off' => __('No', 'embedpress'),
39113920
'default' => 'yes',
3912-
'description' => __('Show a "Load More" button to load additional events', 'embedpress'),
3921+
'description' => __('Show a "Load More" button to load additional events (RSS feeds only)', 'embedpress'),
3922+
]
3923+
);
3924+
3925+
$this->add_control(
3926+
'meetup_timezone',
3927+
[
3928+
'label' => __('Timezone', 'embedpress'),
3929+
'type' => Controls_Manager::SELECT,
3930+
'options' => [
3931+
'visitor_timezone' => __('Visitor Timezone (Auto-detect)', 'embedpress'),
3932+
'wp_timezone' => __('WordPress Site Timezone', 'embedpress'),
3933+
'UTC' => __('UTC', 'embedpress'),
3934+
'America/New_York' => __('America/New_York (EST/EDT)', 'embedpress'),
3935+
'America/Chicago' => __('America/Chicago (CST/CDT)', 'embedpress'),
3936+
'America/Denver' => __('America/Denver (MST/MDT)', 'embedpress'),
3937+
'America/Los_Angeles' => __('America/Los_Angeles (PST/PDT)', 'embedpress'),
3938+
'Europe/London' => __('Europe/London (GMT/BST)', 'embedpress'),
3939+
'Europe/Paris' => __('Europe/Paris (CET/CEST)', 'embedpress'),
3940+
'Asia/Tokyo' => __('Asia/Tokyo (JST)', 'embedpress'),
3941+
'Australia/Sydney' => __('Australia/Sydney (AEST/AEDT)', 'embedpress'),
3942+
],
3943+
'default' => 'visitor_timezone',
3944+
'description' => __('Select timezone for displaying event dates and times. Visitor timezone will auto-detect based on their browser.', 'embedpress'),
3945+
]
3946+
);
3947+
3948+
$this->add_control(
3949+
'meetup_date_format',
3950+
[
3951+
'label' => __('Date Format', 'embedpress'),
3952+
'type' => Controls_Manager::SELECT,
3953+
'options' => [
3954+
'wp_date_format' => __('WordPress Date Format', 'embedpress'),
3955+
'm/d/Y' => __('MM/DD/YYYY', 'embedpress'),
3956+
'd/m/Y' => __('DD/MM/YYYY', 'embedpress'),
3957+
'Y-m-d' => __('YYYY-MM-DD', 'embedpress'),
3958+
'F j, Y' => __('Month DD, YYYY', 'embedpress'),
3959+
'j F Y' => __('DD Month YYYY', 'embedpress'),
3960+
],
3961+
'default' => 'wp_date_format',
3962+
'description' => __('Select date format for event dates', 'embedpress'),
3963+
]
3964+
);
3965+
3966+
$this->add_control(
3967+
'meetup_time_format',
3968+
[
3969+
'label' => __('Time Format', 'embedpress'),
3970+
'type' => Controls_Manager::SELECT,
3971+
'options' => [
3972+
'wp_time_format' => __('WordPress Time Format', 'embedpress'),
3973+
'g:i A' => __('12-hour (h:mm AM/PM)', 'embedpress'),
3974+
'H:i' => __('24-hour (HH:mm)', 'embedpress'),
3975+
],
3976+
'default' => 'wp_time_format',
3977+
'description' => __('Select time format for event times', 'embedpress'),
39133978
]
39143979
);
39153980

@@ -4427,6 +4492,15 @@ protected function render()
44274492
if (isset($settings['meetup_enable_pagination'])) {
44284493
$_settings['enable_pagination'] = ($settings['meetup_enable_pagination'] === 'yes');
44294494
}
4495+
if (isset($settings['meetup_timezone'])) {
4496+
$_settings['timezone'] = $settings['meetup_timezone'];
4497+
}
4498+
if (isset($settings['meetup_date_format'])) {
4499+
$_settings['date_format'] = $settings['meetup_date_format'];
4500+
}
4501+
if (isset($settings['meetup_time_format'])) {
4502+
$_settings['time_format'] = $settings['meetup_time_format'];
4503+
}
44304504
}
44314505

44324506
$embed_content = Shortcode::parseContent($settings['embedpress_embeded_link'], true, $_settings);

‎EmbedPress/Gutenberg/EmbedPressBlockRenderer.php‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,15 @@ public static function render_dynamic_content($attributes)
9393
if (isset($attributes['meetupEnablePagination'])) {
9494
$attributes['enable_pagination'] = $attributes['meetupEnablePagination'];
9595
}
96+
if (isset($attributes['meetupTimezone'])) {
97+
$attributes['timezone'] = $attributes['meetupTimezone'];
98+
}
99+
if (isset($attributes['meetupDateFormat'])) {
100+
$attributes['date_format'] = $attributes['meetupDateFormat'];
101+
}
102+
if (isset($attributes['meetupTimeFormat'])) {
103+
$attributes['time_format'] = $attributes['meetupTimeFormat'];
104+
}
96105
}
97106

98107
try {

0 commit comments

Comments
 (0)