Wordpress 3.2

[autoinstalls/wordpress.git] / wp-admin / themes.php

diff --git a/wp-admin/themes.php b/wp-admin/themes.php
index 171a0b22acd9d2af31f08a85f01b61f09acb5b4d..b845e69b55eedd5e2db91b385e92ddf8ad3363ef 100644 (file)
--- a/wp-admin/themes.php
+++ b/wp-admin/themes.php
@@ -40,7 +40,7 @@ if ( current_user_can( 'switch_themes' ) ) :
 $help = '<p>' . __('Aside from the default theme included with your WordPress installation, themes are designed and developed by third parties.') . '</p>';
 $help .= '<p>' . __('You can see your active theme at the top of the screen. Below are the other themes you have installed that are not currently in use. You can see what your site would look like with one of these themes by clicking the Preview link. To change themes, click the Activate link.') . '</p>';
 if ( current_user_can('install_themes') )
-       $help .= '<p>' . sprintf(__('If you would like to see more themes to choose from, click on the &#8220;Install Themes&#8221; tab and you will be able to browse or search for additional themes from the <a href="%s" target="_blank">WordPress.org Theme Directory</a>. Themes in the WordPress.org Theme Directory are designed and developed by third parties, and are licensed under the GNU General Public License, version 2, just like WordPress. Oh, and they&#8217;re free!'), 'http://wordpress.org/extend/themes/') . '</p>';
+       $help .= '<p>' . sprintf(__('If you would like to see more themes to choose from, click on the &#8220;Install Themes&#8221; tab and you will be able to browse or search for additional themes from the <a href="%s" target="_blank">WordPress.org Theme Directory</a>. Themes in the WordPress.org Theme Directory are designed and developed by third parties, and are compatible with the license WordPress uses. Oh, and they&#8217;re free!'), 'http://wordpress.org/extend/themes/') . '</p>';
 
 $help .= '<p><strong>' . __('For more information:') . '</strong></p>';
 $help .= '<p>' . __('<a href="http://codex.wordpress.org/Using_Themes" target="_blank">Documentation on Using Themes</a>') . '</p>';
@@ -71,15 +71,11 @@ require_once('./admin-header.php');
 
 <div class="wrap"><?php
 screen_icon();
-if ( !is_multisite() ) : ?>
+if ( ! is_multisite() && current_user_can( 'install_themes' ) ) : ?>
 <h2 class="nav-tab-wrapper">
-<a href="themes.php" class="nav-tab nav-tab-active"><?php echo esc_html( $title ); ?></a>
-       <?php if ( current_user_can('install_themes') ) : ?>
-<a href="<?php echo admin_url( 'theme-install.php'); ?>" class="nav-tab"><?php echo esc_html_x('Install Themes', 'theme'); ?></a>
-       <?php endif;
-else : ?>
-<h2>
-<?php echo esc_html( $title ); ?>
+<a href="themes.php" class="nav-tab nav-tab-active"><?php echo esc_html( $title ); ?></a><a href="<?php echo admin_url( 'theme-install.php'); ?>" class="nav-tab"><?php echo esc_html_x('Install Themes', 'theme'); ?></a>
+<?php else : ?>
+<h2><?php echo esc_html( $title ); ?>
 <?php endif; ?>
 </h2>
 
@@ -147,9 +143,9 @@ if ( ! current_user_can( 'switch_themes' ) ) {
 <form class="search-form filter-form" action="" method="get">
 
 <p class="search-box">
-       <label class="screen-reader-text" for="theme-search-input"><?php _e('Search Themes'); ?>:</label>
+       <label class="screen-reader-text" for="theme-search-input"><?php _e('Search Installed Themes'); ?>:</label>
        <input type="text" id="theme-search-input" name="s" value="<?php _admin_search_query(); ?>" />
-       <?php submit_button( __( 'Search Themes' ), 'button', 'submit', false ); ?>
+       <?php submit_button( __( 'Search Installed Themes' ), 'button', false, false, array( 'id' => 'search-submit' ) ); ?>
        <a id="filter-click" href="?filter=1"><?php _e( 'Feature Filter' ); ?></a>
 </p>
 
@@ -184,7 +180,7 @@ if ( ! current_user_can( 'switch_themes' ) ) {
        <?php endforeach; ?>
 
        <div class="feature-container">
-               <?php submit_button( __( 'Apply Filters' ), 'button-secondary submitter', 'submit', false, array( 'style' => 'margin-left: 120px' ) ); ?>
+               <?php submit_button( __( 'Apply Filters' ), 'button-secondary submitter', false, false, array( 'style' => 'margin-left: 120px', 'id' => 'filter-submit' ) ); ?>
                &nbsp;
                <small><a id="mini-filter-click" href="<?php echo esc_url( remove_query_arg( array('filter', 'features', 'submit') ) ); ?>"><?php _e( 'Close filters' )?></a></small>
        </div>
@@ -213,7 +209,7 @@ if ( current_user_can('edit_themes') && count( $broken_themes ) ) {
 
 <table id="broken-themes">
        <tr>
-               <th><?php _e('Name'); ?></th>
+               <th><?php _ex('Name', 'theme name'); ?></th>
                <th><?php _e('Description'); ?></th>
        </tr>
 <?php