Changeset 1331

Timestamp:

02/25/2015 11:26:57 PM (10 years ago)

Author:

obenland

Message:

WP.org Themes: Make commercial theme shops the content type that they are.

See #745.

Location:

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

Files:

• plugins/theme-directory/theme-directory.php (modified) (2 diffs)
• themes/pub/wporg-themes/page-commercial.php (modified) (2 diffs)
• themes/pub/wporg-themes/style.css (modified) (1 diff)

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

@@ -69 +69 @@
     }
 
+    if ( ! post_type_exists( 'theme_shop' ) ) {
+        register_post_type( 'theme_shop', array(
+            'labels'              => array(
+                'name'               => __( 'Theme Shops', 'wporg-themes' ),
+                'singular_name'      => __( 'Theme Shop', 'wporg-themes' ),
+                'add_new'            => __( 'Add New', 'wporg-themes' ),
+                'add_new_item'       => __( 'Add New Theme Shop', 'wporg-themes' ),
+                'edit_item'          => __( 'Edit Theme Shop', 'wporg-themes' ),
+                'new_item'           => __( 'New Theme Shop', 'wporg-themes' ),
+                'view_item'          => __( 'View Theme Shop', 'wporg-themes' ),
+                'search_items'       => __( 'Search Theme Shops', 'wporg-themes' ),
+                'not_found'          => __( 'No Theme Shops found', 'wporg-themes' ),
+                'not_found_in_trash' => __( 'No Theme Shops found in Trash', 'wporg-themes' ),
+                'parent_item_colon'  => __( 'Parent Theme Shop:', 'wporg-themes' ),
+                'menu_name'          => __( 'Theme Shops', 'wporg-themes' ),
+            ),
+            'supports'            => array( 'title', 'editor', 'author', 'custom-fields' ),
+            'public'              => true,
+            'show_in_nav_menus'   => false,
+            'exclude_from_search' => true,
+            'menu_icon'           => 'dashicons-businessman',
+        ) );
+    }
+
     // Add the browse/* views
     add_rewrite_tag( '%browse%', '(featured|popular|new)' );
@@ -83 +107 @@
  */
 function wporg_themes_set_up_query( $wp_query ) {
-    if ( is_admin() || in_array( $wp_query->get( 'pagename' ), array( 'upload', 'commercial', 'getting-started' ) ) || 'nav_menu_item' == $wp_query->get( 'post_type' ) ) {
+    if ( is_admin() || in_array( $wp_query->get( 'pagename' ), array( 'upload', 'commercial', 'getting-started' ) ) || in_array( $wp_query->get( 'post_type' ), array( 'nav_menu_item', 'theme_shop' ) ) ) {
         return $wp_query;
     }

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-themes/page-commercial.php

@@ -6 +6 @@
  */
 
-
-/**
- * Filter to get an array of data for theme shops to be listed.
- *
- * Expected structure for each element in the commercial theme shops array:
- *
- * array(
- *    'name'        => '', // Theme shop name.
- *    'url'         => '', // Company URL.
- *    'description' => "", // Haiku.
- *    'user_id'     => '', // User ID of the WordPress.org user associated with the theme shop.
- *    'image'       => '', // Theme shop site screenshot URL. Optional; only if overriding default, automatic image retrieval.
- * )
- *
- * @param array $commercial Array of commercial theme shops data array. Default empty array.
- */
-$commercial = (array) apply_filters( 'wporg_themes_commercial', array() );
-
-shuffle( $commercial );
+$theme_shops = new WP_Query( array(
+    'post_type'      => 'theme_shop',
+    'posts_per_page' => -1,
+    'orderby'        => 'rand',
+) );
 
 get_header();
@@ -52 +38 @@
                     <div class="theme-browser content-filterable">
                         <div class="themes">
-                            <?php foreach ( $commercial as $theme ) : ?>
-                                <article id="post-<?php echo sanitize_title_with_dashes( $theme['name'] ); ?>" class="theme hentry">
-                                    <div class="theme-screenshot">
-                                        <img src="<?php echo esc_url( '//s0.wp.com/mshots/v1/' . urlencode( $theme['url'] ) . '?w=572' ); ?>" alt="">
-                                    </div>
-                                    <a class="more-details url" href="<?php echo esc_url( $theme['url'] ); ?>" rel="bookmark"><?php echo nl2br( $theme['description'] ); ?></a>
-                                    <h3 class="theme-name entry-title"><?php echo $theme['name']; ?></h3>
-                                </article>
-                            <?php endforeach; ?>
+                            <?php
+                                while ( $theme_shops->have_posts() ) :
+                                    $theme_shops->the_post();
+                            ?>
+                            <article id="post-<?php the_ID(); ?>" <?php post_class( array( 'theme', 'hentry' ) ); ?>>
+                                <div class="theme-screenshot">
+                                    <img src="<?php echo esc_url( '//s0.wp.com/mshots/v1/' . urlencode( post_custom( 'url' ) ) . '?w=572' ); ?>" alt="">
+                                </div>
+                                <a class="more-details url" href="<?php echo esc_url( post_custom( 'url' ) ); ?>" rel="bookmark"><?php the_content(); ?></a>
+                                <h3 class="theme-name entry-title"><?php the_title(); ?></h3>
+                            </article>
+                            <?php
+                                endwhile;
+                                wp_reset_postdata();
+                            ?>
                         </div>
                     </div>

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-themes/style.css

@@ -815 +815 @@
 .commercial .theme .more-details {
     font-size: 13px;
-     top: 23%;
-     right: 5%;
-     left: 5%;
+    top: 23%;
+    right: 5%;
+    left: 5%;
+}
+
+.commercial .theme .more-details p {
+    margin: 0;
 }