Changeset 6851

Timestamp:

03/10/2018 12:11:16 PM (9 years ago)

Author:

ocean90

Message:

Translate: Use new Plugin Directory code to obtain plugin icons.

Location:

sites/trunk/wordpress.org/public_html/wp-content/plugins

Files:

• wporg-gp-customizations/templates/style.css (modified) (2 diffs)
• wporg-gp-routes/inc/class-plugin.php (modified) (1 diff)
• wporg-gp-routes/inc/routes/class-locale.php (modified) (2 diffs)
• wporg-gp-routes/inc/routes/class-wp-plugins.php (modified) (1 diff)

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/templates/style.css

@@ -883 +883 @@
 }
 
+.projects .project-icon .plugin-icon {
+        width: 128px;
+        height: 128px;
+        background-size: contain;
+}
+
 .projects .project-icon .default-icon span,
 .projects .project-icon .wordpress-icon span {
@@ -997 +1003 @@
 
 .project-box .project-icon .plugin-icon {
-        margin: 0 !important;
+        width: 64px;
+        height: 64px;
+        background-size: contain;
 }
 

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-routes/inc/class-plugin.php

@@ -37 +37 @@
          */
         public function plugins_loaded() {
-                if ( file_exists( WPORGPATH . 'extend/plugins-plugins/_plugin-icons.php' ) ) {
-                        include_once WPORGPATH . 'extend/plugins-plugins/_plugin-icons.php';
+                if ( file_exists( WPORGPATH . 'wp-content/plugins/plugin-directory/class-template.php' ) ) {
+                        include_once WPORGPATH . 'wp-content/plugins/plugin-directory/class-template.php';
                 }
 

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-routes/inc/routes/class-locale.php

@@ -3 +3 @@
 namespace WordPressdotorg\GlotPress\Routes\Routes;
 
-// wporg_get_plugin_icon()
 use GP;
 use GP_Locales;
@@ -311 +310 @@
                                         return '<div class="default-icon"><span class="dashicons dashicons-admin-appearance"></span></div>';
                                 }
-                        case 'bbpress':
-                        case 'buddypress':
-                                if ( function_exists( 'wporg_get_plugin_icon' ) ) {
-                                        $screenshot = wporg_get_plugin_icon( $project->slug, $size );
-                                        if ( $screenshot ) {
-                                                return $screenshot;
+                        case 'wp-plugins':
+                                $icon = '';
+
+                                if ( class_exists( 'WordPressdotorg\Plugin_Directory\Template' ) ) {
+                                        $directory_post_id = gp_get_meta( 'wp-plugins', $sub_project->id, 'directory-post-id' );
+                                        if ( $directory_post_id ) {
+                                                switch_to_blog( WPORG_PLUGIN_DIRECTORY_BLOGID );
+                                                $icon = \WordPressdotorg\Plugin_Directory\Template::get_plugin_icon( $directory_post_id, 'html' );
+                                                restore_current_blog();
                                         }
                                 }
+
+                                if ( $icon ) {
+                                        return $icon;
+                                }
+
                                 return '<div class="default-icon"><span class="dashicons dashicons-admin-plugins"></span></div>';
-                        case 'wp-plugins':
-                                if ( function_exists( 'wporg_get_plugin_icon' ) ) {
-                                        $screenshot = wporg_get_plugin_icon( $sub_project->slug, $size );
-                                        if ( $screenshot ) {
-                                                return $screenshot;
-                                        }
-                                }
-                                return '<div class="default-icon"><span class="dashicons dashicons-admin-plugins"></span></div>';
-                        case 'glotpress':
-                                return '<div class="icon"><img src="'. plugins_url( 'templates/images/glotpress.png', 'wporg-gp-customizations/wporg-gp-customizations.php' ) . '" width="' . $size . '" height="' . $size . '"></div>';
                         case 'apps':
                                 return '<div class="default-icon"><span class="dashicons dashicons-smartphone"></span></div>';

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-routes/inc/routes/class-wp-plugins.php

@@ -172 +172 @@
 
                 $icon = '';
-                if ( function_exists( 'wporg_get_plugin_icon' ) ) {
-                        $icon = wporg_get_plugin_icon( $project->slug, $size );
+
+                if ( class_exists( 'WordPressdotorg\Plugin_Directory\Template' ) ) {
+                        $directory_post_id = gp_get_meta( 'wp-plugins', $project->id, 'directory-post-id' );
+                        if ( $directory_post_id ) {
+                                switch_to_blog( WPORG_PLUGIN_DIRECTORY_BLOGID );
+                                $icon = \WordPressdotorg\Plugin_Directory\Template::get_plugin_icon( $directory_post_id, 'html' );
+                                restore_current_blog();
+                        }
                 }