| @@ -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 |
| @@ -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 ); |
| @@ -138,64 +117,35 @@ | ||
| 138 | 117 | <?php |
| 139 | 118 | } |
| 140 | 119 | |
| 141 | 120 | private function maybe_display_io_hints() { |
| 142 | - $plugin_slug = 'image-optimization'; | |
| 143 | - | |
| 144 | - if ( ! Hints::should_display_hint( $plugin_slug ) ) { | |
| 121 | + if ( Hints::should_display_hint( 'image-optimization' ) ) { | |
| 122 | + $content_text = esc_html__( 'Optimize your images to enhance site performance by using Image Optimizer.', 'elementor' ); | |
| 123 | + $button_text = Hints::is_plugin_installed( 'image-optimization' ) ? esc_html__( 'Activate Plugin', 'elementor' ) : esc_html__( 'Install Plugin', 'elementor' ); | |
| 124 | + $action_url = Hints::get_plugin_action_url( 'image-optimization' ); | |
| 125 | + } elseif ( Hints::should_display_hint( 'image-optimization-connect' ) ) { | |
| 126 | + $content_text = esc_html__( "This image isn't optimized. You need to connect your Image Optimizer account first.", 'elementor' ); | |
| 127 | + $button_text = esc_html__( 'Connect Now', 'elementor' ); | |
| 128 | + $action_url = admin_url( 'admin.php?page=image-optimization-settings' ); | |
| 129 | + } else { | |
| 145 | 130 | return; |
| 146 | 131 | } |
| 147 | 132 | |
| 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 | 133 | ?> |
| 181 | - <div class="elementor-control-media__promotions" role="alert"> | |
| 134 | + <div class="elementor-control-media__promotions" role="alert" style="display: none;"> | |
| 182 | 135 | <?php |
| 183 | 136 | Hints::get_notice_template( [ |
| 184 | - 'display' => ! Hints::is_dismissed( $plugin_slug ), | |
| 137 | + 'display' => ! Hints::is_dismissed( 'image-optimization' ), | |
| 185 | 138 | 'type' => 'info', |
| 139 | + 'content' => $content_text, | |
| 186 | 140 | 'icon' => true, |
| 187 | - 'heading' => '', | |
| 188 | - 'content' => $content, | |
| 189 | 141 | 'dismissible' => 'image_optimizer_hint', |
| 190 | 142 | 'button_text' => $button_text, |
| 191 | 143 | 'button_event' => 'image_optimizer_hint', |
| 192 | 144 | 'button_data' => [ |
| 193 | - 'action_url' => $button_url, | |
| 194 | - 'source' => $source, | |
| 145 | + 'action_url' => $action_url, | |
| 195 | 146 | ], |
| 196 | - ] ); | |
| 197 | - ?> | |
| 147 | + ] ); ?> | |
| 198 | 148 | </div> |
| 199 | 149 | <?php |
| 200 | 150 | } |
| 201 | 151 | |
