Changeset 14425

Timestamp:

05/03/2010 11:25:14 PM (16 years ago)

Author:

wpmuguru

Message:

themes admin pages UI cleanup, props PeteMall, see #13238

Location:

trunk/wp-admin

Files:

• ms-themes.php (modified) (4 diffs)
• themes.php (modified) (3 diffs)

trunk/wp-admin/ms-themes.php

@@ -30 +30 @@
         <?php screen_icon(); ?>
         <h2><?php _e( 'Network Themes' ) ?></h2>
-        <p><?php _e( 'Disable themes network-wide. You can enable themes on a site-by-site basis.' ) ?></p>
+        <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>
         <table class="widefat">
             <thead>
                 <tr>
-                    <th style="width:15%;text-align:center;"><?php _e( 'Active' ) ?></th>
+                    <th style="width:15%;"><?php _e( 'Enable' ) ?></th>
                     <th style="width:25%;"><?php _e( 'Theme' ) ?></th>
                     <th style="width:10%;"><?php _e( 'Version' ) ?></th>
@@ -60 +62 @@
                 ?>
                 <tr valign="top" class="<?php echo $class, $class1; ?>">
-                    <td style="text-align:center;">
+                    <td>
                         <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>
                         &nbsp;&nbsp;&nbsp;
@@ -74 +76 @@
 
         <p class="submit">
-            <input type="submit" value="<?php _e( 'Update Themes' ) ?>" /></p>
+            <input type="submit" value="<?php _e( 'Apply Changes' ) ?>" /></p>
     </form>
 
@@ -81 +83 @@
         <?php printf( __( 'Themes Installed: %d' ), $total_theme_count); ?>
         <br />
-        <?php printf( __( 'Themes Activated: %d' ), $activated_themes_count); ?>
+        <?php printf( __( 'Themes Enabled: %d' ), $activated_themes_count); ?>
     </p>
 </div>

trunk/wp-admin/themes.php

@@ -35 +35 @@
 if ( current_user_can('install_themes') ) {
     $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>';
-    $help .= '<p>' . __('Once a theme is uploaded, you should see it on this page.') . '</p>' ;
+    $help .= '<p>' . __('Once a theme is uploaded, you should see it on this screen.') . '</p>' ;
 }
 
@@ -45 +45 @@
 require_once('./admin-header.php');
 if ( is_multisite() && current_user_can('edit_themes') ) {
-    ?><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
+    ?><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
 }
 ?>
@@ -53 +53 @@
 <?php elseif ( isset($_GET['activated']) ) :
         if ( isset($wp_registered_sidebars) && count( (array) $wp_registered_sidebars ) ) { ?>
-<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
+<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
         } else { ?>
-<div id="message2" class="updated"><p><?php printf(__('New theme activated. <a href="%s">Visit site</a>'), get_bloginfo('url') . '/'); ?></p></div><?php
+<div id="message2" class="updated"><p><?php printf( __('New theme activated. <a href="%s">Visit site</a>'), home_url( '/ ' ) ); ?></p></div><?php
         }
     elseif ( isset($_GET['deleted']) ) : ?>