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