← All changes | includes/controls/gallery.php +52 -99 4.2.1 → 3.20.0-dev2 View file →

		@@ -31,18 +31,8 @@
31	31	public function get_type() {
32	32	return 'gallery';
33	33	}
34	34
35		- public function on_export( $settings ) {
36		- foreach ( $settings as $attachment ) {
37		- if ( ! empty( $attachment['url'] ) ) {
38		- do_action( 'elementor/templates/collect_media_url', $attachment['url'], $attachment );
39		- }
40		- }
41		-
42		- return $settings;
43		- }
44		-
45	35	/**
46	36	* Import gallery images.
47	37	*
48	38	* Used to import gallery control files from external sites while importing
		@@ -50,9 +40,9 @@
50	40	*
51	41	* @since 1.0.0
52	42	* @access public
53	43	*
54		- * @param array $settings Control settings.
	44	+ * @param array $settings Control settings
55	45	*
56	46	* @return array Control settings.
57	47	*/
58	48	public function on_import( $settings ) {
		@@ -60,20 +50,9 @@
60	50	if ( empty( $attachment['url'] ) ) {
61	51	continue;
62	52	}
63	53
64		- $local_file_path = \Elementor\TemplateLibrary\Classes\Media_Mapper::get_local_file_path( $attachment['url'] );
65		- $imported_attachment = false;
66		-
67		- if ( $local_file_path !== $attachment['url'] && file_exists( $local_file_path ) ) {
68		- $imported_attachment = Plugin::$instance->templates_manager->get_import_images_instance()->import_local_file( $local_file_path );
69		- }
70		-
71		- if ( ! $imported_attachment ) {
72		- $imported_attachment = Plugin::$instance->templates_manager->get_import_images_instance()->import( $attachment );
73		- }
74		-
75		- $attachment = $imported_attachment;
	54	+ $attachment = Plugin::$instance->templates_manager->get_import_images_instance()->import( $attachment );
76	55	}
77	56
78	57	// Filter out attachments that don't exist
79	58	$settings = array_filter( $settings );
		@@ -101,10 +80,11 @@
101	80	<# } #>
102	81	<div class="elementor-control-media__content elementor-control-tag-area">
103	82	<div class="elementor-control-gallery-status elementor-control-dynamic-switcher-wrapper">
104	83	<span class="elementor-control-gallery-status-title"></span>
105		- <button class="elementor-control-gallery-clear elementor-control-unit-1 tooltip-target" data-tooltip="<?php echo esc_attr__( 'Clear gallery', 'elementor' ); ?>" aria-label="<?php echo esc_attr__( 'Clear gallery', 'elementor' ); ?>">
	84	+ <button class="elementor-control-gallery-clear elementor-control-unit-1 tooltip-target" data-tooltip="<?php echo esc_attr__( 'Clear gallery', 'elementor' ); ?>">
106	85	<i class="eicon-trash-o" aria-hidden="true"></i>
	86	+ <span class="elementor-screen-only"><?php echo esc_html__( 'Clear gallery', 'elementor' ); ?></span>
107	87	</button>
108	88	</div>
109	89	<div class="elementor-control-gallery-content">
110	90	<div class="elementor-control-gallery-thumbnails" tabindex="0"></div>
		@@ -111,91 +91,64 @@
111	91	<div class="elementor-control-gallery-edit">
112	92	<span><i class="eicon-pencil" aria-hidden="true"></i></span>
113	93	<span class="elementor-screen-only"><?php echo esc_html__( 'Edit gallery', 'elementor' ); ?></span>
114	94	</div>
115		- <button class="elementor-button elementor-control-gallery-add tooltip-target" data-tooltip="<?php echo esc_attr__( 'Add Images', 'elementor' ); ?>" aria-label="<?php echo esc_attr__( 'Add Images', 'elementor' ); ?>">
	95	+ <button class="elementor-button elementor-control-gallery-add tooltip-target" data-tooltip="<?php echo esc_attr__( 'Add Images', 'elementor' ); ?>">
116	96	<i class="eicon-plus-circle" aria-hidden="true"></i>
	97	+ <span class="elementor-screen-only"><?php echo esc_html__( 'Add Images', 'elementor' ); ?></span>
117	98	</button>
118	99	</div>
119	100	</div>
120		-
121		- <?php
122		- /*
123		- ?>
124		- <div class="elementor-control-media__warnings" role="alert" style="display: none;">
	101	+ <?php if ( ! Hints::should_display_hint( 'image-optimization-once' ) && ! Hints::should_display_hint( 'image-optimization' ) ) { ?>
	102	+ <div class="elementor-control-media__warnings elementor-descriptor" role="alert" style="display: none;">
125	103	<?php
126		- Hints::get_notice_template( [
127		- 'type' => 'warning',
128		- 'content' => esc_html__( 'This image doesn’t contain ALT text - which is necessary for accessibility and SEO.', 'elementor' ),
129		- 'icon' => true,
130		- ] );
	104	+ Hints::get_notice_template( [
	105	+ 'type' => 'warning',
	106	+ 'content' => esc_html__( 'Images marked in red don’t contain ALT text - which is necessary for accessibility and SEO.', 'elementor' ),
	107	+ 'icon' => true,
	108	+ ] );
131	109	?>
132	110	</div>
133		- <?php
134		- */ ?>
135		- <?php $this->maybe_display_io_hints(); ?>
	111	+ <?php } ?>
	112	+ <?php if ( Hints::should_display_hint( 'image-optimization-once' ) || Hints::should_display_hint( 'image-optimization' ) ) :
	113	+ $once_dismissed = Hints::is_dismissed( 'image-optimization-once' );
	114	+ if ( $once_dismissed ) {
	115	+ if ( Hints::is_plugin_installed( 'image-optimization' ) ) {
	116	+ $content = sprintf(
	117	+ __( 'This image is large and may slow things down. %1$sActivate Image Optimizer%2$s to reduce size without losing quality.', 'elementor' ),
	118	+ '<a href="' . Hints::get_plugin_action_url( 'image-optimization' ) . '" target="_blank">',
	119	+ '</a>'
	120	+ );
	121	+ } else {
	122	+ $content = sprintf(
	123	+ __( 'This image is large and may slow things down. %1$sInstall Image Optimizer%2$s to reduce size without losing quality.', 'elementor' ),
	124	+ '<a href="' . Hints::get_plugin_action_url( 'image-optimization' ) . '" target="_blank">',
	125	+ '</a>'
	126	+ );
	127	+ }
	128	+ } else {
	129	+ $content = sprintf(
	130	+ '%1$s <a href="%2$s" target="_blank">%3$s</a>',
	131	+ esc_html__( 'Don’t let unoptimized images be the downfall of your site’s performance.', 'elementor' ),
	132	+ Hints::get_plugin_action_url( 'image-optimization' ),
	133	+ Hints::is_plugin_installed( 'image-optimization' ) ? esc_html__( 'Activate Image Optimizer!', 'elementor' ) : esc_html__( 'Install Image Optimizer!', 'elementor' )
	134	+ );
	135	+ }
	136	+ $dismissible = $once_dismissed ? 'image_optimizer_hint' : 'image-optimization-once';
	137	+ ?>
	138	+ <div class="elementor-control-media__promotions elementor-descriptor" role="alert" style="display: none;">
	139	+ <?php
	140	+ Hints::get_notice_template( [
	141	+ 'display' => ! $once_dismissed,
	142	+ 'type' => $once_dismissed ? 'warning' : 'info',
	143	+ 'content' => $content,
	144	+ 'icon' => true,
	145	+ 'dismissible' => $dismissible,
	146	+ ] );
	147	+ ?>
	148	+ </div>
	149	+ <?php endif; ?>
136	150	</div>
137		- </div>
138		- <?php
139		- }
140		-
141		- private function maybe_display_io_hints() {
142		- $plugin_slug = 'image-optimization';
143		-
144		- if ( ! Hints::should_display_hint( $plugin_slug ) ) {
145		- return;
146		- }
147		-
148		- $one_subscription = Hints::is_plugin_connected_to_one_subscription();
149		- $is_installed = Hints::is_plugin_installed( 'image-optimization' );
150		- $is_active = Hints::is_plugin_active( 'image-optimization' );
151		-
152		- if ( $is_active ) {
153		- return;
154		- }
155		-
156		- if ( $one_subscription ) {
157		- if ( ! $is_installed ) {
158		- $content = esc_html__( 'Optimize your images to improve site speed and performance. Image Optimization is included in your ONE subscription.', 'elementor' );
159		- $button_text = esc_html__( 'Install now', 'elementor' );
160		- $button_url = Hints::get_plugin_install_url( $plugin_slug );
161		- $source = 'io-editor-gallery-one-install';
162		- } elseif ( ! $is_active ) {
163		- $content = esc_html__( 'Image Optimization is installed and included in your ONE subscription. Activate it to optimize images and improve site performance.', 'elementor' );
164		- $button_text = esc_html__( 'Activate now', 'elementor' );
165		- $button_url = Hints::get_plugin_activate_url( $plugin_slug );
166		- $source = 'io-editor-gallery-one-activate';
167		- }
168		- } else {
169		- $content = esc_html__( 'Optimize your images to enhance site performance by using Image Optimization.', 'elementor' );
170		- if ( ! $is_installed ) {
171		- $button_text = esc_html__( 'Install now', 'elementor' );
172		- $button_url = Hints::get_plugin_install_url( $plugin_slug );
173		- $source = 'io-editor-gallery-install';
174		- } elseif ( ! $is_active ) {
175		- $button_text = esc_html__( 'Activate now', 'elementor' );
176		- $button_url = Hints::get_plugin_activate_url( $plugin_slug );
177		- $source = 'io-editor-gallery-activate';
178		- }
179		- }
180		- ?>
181		- <div class="elementor-control-media__promotions" role="alert">
182		- <?php
183		- Hints::get_notice_template( [
184		- 'display' => ! Hints::is_dismissed( $plugin_slug ),
185		- 'type' => 'info',
186		- 'icon' => true,
187		- 'heading' => '',
188		- 'content' => $content,
189		- 'dismissible' => 'image_optimizer_hint',
190		- 'button_text' => $button_text,
191		- 'button_event' => 'image_optimizer_hint',
192		- 'button_data' => [
193		- 'action_url' => $button_url,
194		- 'source' => $source,
195		- ],
196		- ] );
197		- ?>
198	151	</div>
199	152	<?php
200	153	}
201	154