<!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>[14425] trunk/wp-admin: themes admin pages UI cleanup, props PeteMall,
  see #13238</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14425">14425</a></dd>
<dt>Author</dt> <dd>wpmuguru</dd>
<dt>Date</dt> <dd>2010-05-03 23:25:14 +0000 (Mon, 03 May 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>themes admin pages UI cleanup, props PeteMall, see <a href="http://trac.wordpress.org/ticket/13238">#13238</a></pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminmsthemesphp">trunk/wp-admin/ms-themes.php</a></li>
<li><a href="#trunkwpadminthemesphp">trunk/wp-admin/themes.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminmsthemesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-themes.php (14424 => 14425)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-themes.php        2010-05-03 23:18:49 UTC (rev 14424)
+++ trunk/wp-admin/ms-themes.php        2010-05-03 23:25:14 UTC (rev 14425)
</span><span class="lines">@@ -29,11 +29,13 @@
</span><span class="cx">         &lt;form action=&quot;&lt;?php echo esc_url( admin_url( 'ms-edit.php?action=updatethemes' ) ); ?&gt;&quot; method=&quot;post&quot;&gt;
</span><span class="cx">                 &lt;?php screen_icon(); ?&gt;
</span><span class="cx">                 &lt;h2&gt;&lt;?php _e( 'Network Themes' ) ?&gt;&lt;/h2&gt;
</span><del>-                &lt;p&gt;&lt;?php _e( 'Disable themes network-wide. You can enable themes on a site-by-site basis.' ) ?&gt;&lt;/p&gt;
</del><ins>+                &lt;p&gt;&lt;?php _e( 'Themes must be enabled for your network before they will be available to individual sites.' ) ?&gt;&lt;/p&gt;
+                &lt;p class=&quot;submit&quot;&gt;
+                        &lt;input type=&quot;submit&quot; value=&quot;&lt;?php _e( 'Apply Changes' ) ?&gt;&quot; /&gt;&lt;/p&gt;
</ins><span class="cx">                 &lt;table class=&quot;widefat&quot;&gt;
</span><span class="cx">                         &lt;thead&gt;
</span><span class="cx">                                 &lt;tr&gt;
</span><del>-                                        &lt;th style=&quot;width:15%;text-align:center;&quot;&gt;&lt;?php _e( 'Active' ) ?&gt;&lt;/th&gt;
</del><ins>+                                        &lt;th style=&quot;width:15%;&quot;&gt;&lt;?php _e( 'Enable' ) ?&gt;&lt;/th&gt;
</ins><span class="cx">                                         &lt;th style=&quot;width:25%;&quot;&gt;&lt;?php _e( 'Theme' ) ?&gt;&lt;/th&gt;
</span><span class="cx">                                         &lt;th style=&quot;width:10%;&quot;&gt;&lt;?php _e( 'Version' ) ?&gt;&lt;/th&gt;
</span><span class="cx">                                         &lt;th style=&quot;width:60%;&quot;&gt;&lt;?php _e( 'Description' ) ?&gt;&lt;/th&gt;
</span><span class="lines">@@ -59,7 +61,7 @@
</span><span class="cx">                                 }
</span><span class="cx">                                 ?&gt;
</span><span class="cx">                                 &lt;tr valign=&quot;top&quot; class=&quot;&lt;?php echo $class, $class1; ?&gt;&quot;&gt;
</span><del>-                                        &lt;td style=&quot;text-align:center;&quot;&gt;
</del><ins>+                                        &lt;td&gt;
</ins><span class="cx">                                                 &lt;label&gt;&lt;input name=&quot;theme[&lt;?php echo $theme_key ?&gt;]&quot; type=&quot;radio&quot; id=&quot;enabled_&lt;?php echo $theme_key ?&gt;&quot; value=&quot;enabled&quot; &lt;?php checked( $enabled ) ?&gt; /&gt; &lt;?php _e( 'Yes' ) ?&gt;&lt;/label&gt;
</span><span class="cx">                                                 &amp;nbsp;&amp;nbsp;&amp;nbsp;
</span><span class="cx">                                                 &lt;label&gt;&lt;input name=&quot;theme[&lt;?php echo $theme_key ?&gt;]&quot; type=&quot;radio&quot; id=&quot;disabled_&lt;?php echo $theme_key ?&gt;&quot; value=&quot;disabled&quot; &lt;?php checked( $disabled ) ?&gt; /&gt; &lt;?php _e( 'No' ) ?&gt;&lt;/label&gt;
</span><span class="lines">@@ -73,14 +75,14 @@
</span><span class="cx">                 &lt;/table&gt;
</span><span class="cx"> 
</span><span class="cx">                 &lt;p class=&quot;submit&quot;&gt;
</span><del>-                        &lt;input type=&quot;submit&quot; value=&quot;&lt;?php _e( 'Update Themes' ) ?&gt;&quot; /&gt;&lt;/p&gt;
</del><ins>+                        &lt;input type=&quot;submit&quot; value=&quot;&lt;?php _e( 'Apply Changes' ) ?&gt;&quot; /&gt;&lt;/p&gt;
</ins><span class="cx">         &lt;/form&gt;
</span><span class="cx"> 
</span><span class="cx">         &lt;h3&gt;&lt;?php _e( 'Total' )?&gt;&lt;/h3&gt;
</span><span class="cx">         &lt;p&gt;
</span><span class="cx">                 &lt;?php printf( __( 'Themes Installed: %d' ), $total_theme_count); ?&gt;
</span><span class="cx">                 &lt;br /&gt;
</span><del>-                &lt;?php printf( __( 'Themes Activated: %d' ), $activated_themes_count); ?&gt;
</del><ins>+                &lt;?php printf( __( 'Themes Enabled: %d' ), $activated_themes_count); ?&gt;
</ins><span class="cx">         &lt;/p&gt;
</span><span class="cx"> &lt;/div&gt;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkwpadminthemesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/themes.php (14424 => 14425)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/themes.php        2010-05-03 23:18:49 UTC (rev 14424)
+++ trunk/wp-admin/themes.php        2010-05-03 23:25:14 UTC (rev 14425)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> $help = '&lt;p&gt;' . __('Themes give your WordPress style. Once a theme is installed, you may preview it, activate it or deactivate it here.') . '&lt;/p&gt;';
</span><span class="cx"> if ( current_user_can('install_themes') ) {
</span><span class="cx">         $help .= '&lt;p&gt;' . sprintf(__('You can find additional themes for your site by using the new &lt;a href=&quot;%1$s&quot;&gt;Theme Browser/Installer&lt;/a&gt; functionality or by browsing the &lt;a href=&quot;http://wordpress.org/extend/themes/&quot;&gt;WordPress Theme Directory&lt;/a&gt; directly and installing manually.  To install a theme &lt;em&gt;manually&lt;/em&gt;, &lt;a href=&quot;%2$s&quot;&gt;upload its ZIP archive with the new uploader&lt;/a&gt; or copy its folder via FTP into your &lt;code&gt;wp-content/themes&lt;/code&gt; directory.'), 'theme-install.php', 'theme-install.php?tab=upload' ) . '&lt;/p&gt;';
</span><del>-        $help .= '&lt;p&gt;' . __('Once a theme is uploaded, you should see it on this page.') . '&lt;/p&gt;' ;
</del><ins>+        $help .= '&lt;p&gt;' . __('Once a theme is uploaded, you should see it on this screen.') . '&lt;/p&gt;' ;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> add_contextual_help($current_screen, $help);
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> 
</span><span class="cx"> require_once('./admin-header.php');
</span><span class="cx"> if ( is_multisite() &amp;&amp; current_user_can('edit_themes') ) {
</span><del>-        ?&gt;&lt;div id=&quot;message0&quot; class=&quot;updated&quot;&gt;&lt;p&gt;&lt;?php _e('Administrator: new themes must be activated in the &lt;a href=&quot;ms-themes.php&quot;&gt;Themes Admin&lt;/a&gt; page before they appear here.'); ?&gt;&lt;/p&gt;&lt;/div&gt;&lt;?php
</del><ins>+        ?&gt;&lt;div id=&quot;message0&quot; class=&quot;updated&quot;&gt;&lt;p&gt;&lt;?php printf( __('Administrator: new themes must be activated in the &lt;a href=&quot;%s&quot;&gt;Network Themes&lt;/a&gt; screen before they appear here.'), admin_url( 'ms-themes.php') ); ?&gt;&lt;/p&gt;&lt;/div&gt;&lt;?php
</ins><span class="cx"> }
</span><span class="cx"> ?&gt;
</span><span class="cx"> 
</span><span class="lines">@@ -52,9 +52,9 @@
</span><span class="cx"> &lt;div id=&quot;message1&quot; class=&quot;updated&quot;&gt;&lt;p&gt;&lt;?php _e('The active theme is broken.  Reverting to the default theme.'); ?&gt;&lt;/p&gt;&lt;/div&gt;
</span><span class="cx"> &lt;?php elseif ( isset($_GET['activated']) ) :
</span><span class="cx">                 if ( isset($wp_registered_sidebars) &amp;&amp; count( (array) $wp_registered_sidebars ) ) { ?&gt;
</span><del>-&lt;div id=&quot;message2&quot; class=&quot;updated&quot;&gt;&lt;p&gt;&lt;?php printf(__('New theme activated. This theme supports widgets, please visit the &lt;a href=&quot;%s&quot;&gt;widgets settings page&lt;/a&gt; to configure them.'), admin_url('widgets.php') ); ?&gt;&lt;/p&gt;&lt;/div&gt;&lt;?php
</del><ins>+&lt;div id=&quot;message2&quot; class=&quot;updated&quot;&gt;&lt;p&gt;&lt;?php printf( __('New theme activated. This theme supports widgets, please visit the &lt;a href=&quot;%s&quot;&gt;widgets settings&lt;/a&gt; screen to configure them.'), admin_url( 'widgets.php' ) ); ?&gt;&lt;/p&gt;&lt;/div&gt;&lt;?php
</ins><span class="cx">                 } else { ?&gt;
</span><del>-&lt;div id=&quot;message2&quot; class=&quot;updated&quot;&gt;&lt;p&gt;&lt;?php printf(__('New theme activated. &lt;a href=&quot;%s&quot;&gt;Visit site&lt;/a&gt;'), get_bloginfo('url') . '/'); ?&gt;&lt;/p&gt;&lt;/div&gt;&lt;?php
</del><ins>+&lt;div id=&quot;message2&quot; class=&quot;updated&quot;&gt;&lt;p&gt;&lt;?php printf( __('New theme activated. &lt;a href=&quot;%s&quot;&gt;Visit site&lt;/a&gt;'), home_url( '/ ' ) ); ?&gt;&lt;/p&gt;&lt;/div&gt;&lt;?php
</ins><span class="cx">                 }
</span><span class="cx">         elseif ( isset($_GET['deleted']) ) : ?&gt;
</span><span class="cx"> &lt;div id=&quot;message3&quot; class=&quot;updated&quot;&gt;&lt;p&gt;&lt;?php _e('Theme deleted.') ?&gt;&lt;/p&gt;&lt;/div&gt;
</span></span></pre>
</div>
</div>

</body>
</html>