Changeset 3341

Timestamp:

06/12/2016 11:54:09 AM (8 years ago)

Author:

obenland

Message:

Plugin Directory: Add support for RTL banners.

Fixes #1740.

Location:

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

Files:

• class-template.php (modified) (5 diffs)
• cli/class-import.php (modified) (1 diff)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-template.php

@@ -20 +20 @@
 
         $count = get_post_meta( $post->ID, 'active_installs', true );
-    
+
         if ( $count <= 10 ) {
             $text = __( 'Less than 10', 'wporg-plugins' );
@@ -266 +266 @@
             return false;
         }
+
+        $banner = $banner_2x = false;
         $plugin_slug = $plugin->post_name;
-
         $raw_banners = get_post_meta( $plugin->ID, 'assets_banners', true );
 
-        $banner = $banner_2x = false;
-        foreach ( $raw_banners as $file => $info ) {
+        // Split in rtl and non-rtl banners.
+        $rtl_banners = array_filter( $raw_banners, function( $info ) {
+            return (bool) stristr( $info['filename'], '-rtl' );
+        } );
+        $raw_banners = array_diff_key( $raw_banners, $rtl_banners );
+
+        // Default are non-rtl banners.
+        foreach ( $raw_banners as $info ) {
             switch ( $info['resolution'] ) {
                 case '1544x500':
@@ -280 +287 @@
                     $banner = self::get_asset_url( $plugin_slug, $info );
                     break;
+            }
+        }
+
+        if ( is_rtl() ) {
+            foreach ( $rtl_banners as $info ) {
+                switch ( $info['resolution'] ) {
+                    case '1544x500':
+                        $banner_2x = self::get_asset_url( $plugin_slug, $info );
+                        break;
+
+                    case '772x250':
+                        $banner = self::get_asset_url( $plugin_slug, $info );
+                        break;
+                }
             }
         }
@@ -292 +313 @@
                 $html = "<style type='text/css'>";
                 $html .= "#{$id} { background-image: url('{$banner}'); }";
-                if ( ! empty( $icon_2x ) ) {
+                if ( ! empty( $banner_2x ) ) {
                     $html .= "@media only screen and (-webkit-min-device-pixel-ratio: 1.5) { #{$id} { background-image: url('{$banner_2x}'); } }";
                 }
@@ -300 +321 @@
                 return $html;
                 break;
+
             case 'raw':
             default:

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/cli/class-import.php

@@ -292 +292 @@
         if ( $svn_assets_folder ) { // /assets/ may not exist.
             foreach ( $svn_assets_folder as $asset ) {
-                // screenshot-0.(png|jpg|jpeg|gif)  ||  icon.svg
-                if ( ! preg_match( '!^(?P<type>screenshot|banner|icon)(-(?P<resolution>[\dx]+)\.(png|jpg|jpeg|gif)|\.svg)$!i', $asset['filename'], $m ) ) {
+                // screenshot-0(-rtl).(png|jpg|jpeg|gif)  ||  icon.svg
+                if ( ! preg_match( '!^(?P<type>screenshot|banner|icon)(-(?P<resolution>[\dx]+)(-rtl)?\.(png|jpg|jpeg|gif)|\.svg)$!i', $asset['filename'], $m ) ) {
                     continue;
                 }