<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[1331] sites/trunk/wordpress.org/public_html/wp-content: WP.org Themes: Make commercial theme shops the content type that they are.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/1331">1331</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/1331","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>obenland</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-02-25 23:26:57 +0000 (Wed, 25 Feb 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>WP.org Themes: Make commercial theme shops the content type that they are.
See <a href="http://meta.trac.wordpress.org/ticket/745">#745</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsthemedirectorythemedirectoryphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/theme-directory.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgthemespagecommercialphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-themes/page-commercial.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgthemesstylecss">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-themes/style.css</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsthemedirectorythemedirectoryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/theme-directory.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/theme-directory.php 2015-02-25 21:13:25 UTC (rev 1330)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/theme-directory.php 2015-02-25 23:26:57 UTC (rev 1331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -68,6 +68,30 @@
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type( 'repopackage', $args );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 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',
+ ) );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Add the browse/* views
</span><span class="cx" style="display: block; padding: 0 10px"> add_rewrite_tag( '%browse%', '(featured|popular|new)' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_permastruct( 'browse', 'browse/%browse%' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -82,7 +106,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return WP_Query
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wporg_themes_set_up_query( $wp_query ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_admin() || in_array( $wp_query->get( 'pagename' ), array( 'upload', 'commercial', 'getting-started' ) ) || 'nav_menu_item' == $wp_query->get( 'post_type' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 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' ) ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $wp_query;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgthemespagecommercialphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-themes/page-commercial.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-themes/page-commercial.php 2015-02-25 21:13:25 UTC (rev 1330)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-themes/page-commercial.php 2015-02-25 23:26:57 UTC (rev 1331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5,26 +5,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @package wporg-themes
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$theme_shops = new WP_Query( array(
+ 'post_type' => 'theme_shop',
+ 'posts_per_page' => -1,
+ 'orderby' => 'rand',
+) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/**
- * 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 );
-
</del><span class="cx" style="display: block; padding: 0 10px"> get_header();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( have_posts() ) :
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -51,15 +37,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="themes">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="theme-browser content-filterable">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="themes">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?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; ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?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();
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgthemesstylecss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-themes/style.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-themes/style.css 2015-02-25 21:13:25 UTC (rev 1330)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-themes/style.css 2015-02-25 23:26:57 UTC (rev 1331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -814,11 +814,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /* Commercial Page Template */
</span><span class="cx" style="display: block; padding: 0 10px"> .commercial .theme .more-details {
</span><span class="cx" style="display: block; padding: 0 10px"> font-size: 13px;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- top: 23%;
- right: 5%;
- left: 5%;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ top: 23%;
+ right: 5%;
+ left: 5%;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.commercial .theme .more-details p {
+ margin: 0;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> .commercial .themes {
</span><span class="cx" style="display: block; padding: 0 10px"> padding: 0;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>