<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[17739] trunk/wp-content/themes/twentyeleven/functions.php:
More Twenty Eleven cleanup and add the comment-awaiting-moderation class.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/17739">17739</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2011-04-28 10:13:38 +0000 (Thu, 28 Apr 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>More Twenty Eleven cleanup and add the comment-awaiting-moderation class. see <a href="http://trac.wordpress.org/ticket/17198">#17198</a>. see <a href="http://trac.wordpress.org/ticket/15206">#15206</a> for history on the CSS class.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpcontentthemestwentyelevenfunctionsphp">trunk/wp-content/themes/twentyeleven/functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpcontentthemestwentyelevenfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyeleven/functions.php (17738 => 17739)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyeleven/functions.php 2011-04-28 09:47:30 UTC (rev 17738)
+++ trunk/wp-content/themes/twentyeleven/functions.php 2011-04-28 10:13:38 UTC (rev 17739)
</span><span class="lines">@@ -72,11 +72,10 @@
</span><span class="cx"> */
</span><span class="cx"> function twentyeleven_setup() {
</span><span class="cx">
</span><del>- /**
- * Make theme available for translation
- * Translations can be filed in the /languages/ directory
</del><ins>+ /* Make Twenty Eleven available for translation.
+ * Translations can be added to the /languages/ directory.
</ins><span class="cx"> * If you're building a theme based on Twenty Eleven, use a find and replace
</span><del>- * to change 'twentyeleven' to the name of your theme in all the template files
</del><ins>+ * to change 'twentyeleven' to the name of your theme in all the template files.
</ins><span class="cx"> */
</span><span class="cx"> load_theme_textdomain( 'twentyeleven', TEMPLATEPATH . '/languages' );
</span><span class="cx">
</span><span class="lines">@@ -85,27 +84,17 @@
</span><span class="cx"> if ( is_readable( $locale_file ) )
</span><span class="cx"> require_once( $locale_file );
</span><span class="cx">
</span><del>- /**
- * Load up our theme options page
- */
</del><ins>+ // Load up our theme options page and related code.
</ins><span class="cx"> require( dirname( __FILE__ ) . '/inc/theme-options.php' );
</span><span class="cx">
</span><del>- /**
- * Grab Twenty Eleven's Custom Widgets
- */
</del><ins>+ // Grab Twenty Eleven's Epherma widget.
</ins><span class="cx"> require( dirname( __FILE__ ) . '/inc/widgets.php' );
</span><span class="cx">
</span><del>- /**
- * Add default posts and comments RSS feed links to head
- */
</del><ins>+ // Add default posts and comments RSS feed links to <head>.
</ins><span class="cx"> add_theme_support( 'automatic-feed-links' );
</span><span class="cx">
</span><del>- /**
- * This theme uses wp_nav_menu() in one location.
- */
- register_nav_menus( array(
- 'primary' => __( 'Primary Menu', 'twentyeleven' ),
- ) );
</del><ins>+ // This theme uses wp_nav_menu() in one location.
+ register_nav_menu( 'primary', __( 'Primary Menu', 'twentyeleven' ) );
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Add support for an Aside Post Format
</span><span class="lines">@@ -476,25 +465,21 @@
</span><span class="cx"> if ( is_active_sidebar( 'sidebar-5' ) )
</span><span class="cx"> $count++;
</span><span class="cx">
</span><ins>+ $class = '';
+
</ins><span class="cx"> switch ( $count ) {
</span><span class="cx"> case '1':
</span><span class="cx"> $class = 'one';
</span><span class="cx"> break;
</span><del>-
</del><span class="cx"> case '2':
</span><span class="cx"> $class = 'two';
</span><span class="cx"> break;
</span><del>-
</del><span class="cx"> case '3':
</span><span class="cx"> $class = 'three';
</span><span class="cx"> break;
</span><del>-
- default:
- $class = '';
- break;
</del><span class="cx"> }
</span><span class="cx">
</span><del>- if ( '' != $class )
</del><ins>+ if ( $class )
</ins><span class="cx"> echo 'class="' . $class . '"';
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -545,7 +530,7 @@
</span><span class="cx"> </div><!-- .comment-author .vcard -->
</span><span class="cx">
</span><span class="cx"> <?php if ( $comment->comment_approved == '0' ) : ?>
</span><del>- <em><?php _e( 'Your comment is awaiting moderation.', 'twentyeleven' ); ?></em>
</del><ins>+ <em class="comment-awaiting-moderation"><?php _e( 'Your comment is awaiting moderation.', 'twentyeleven' ); ?></em>
</ins><span class="cx"> <br />
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>