From 1e8b1d12c9266a07b77914475b34b0fbe6a344d2 Mon Sep 17 00:00:00 2001
From: Ryan Boren <ryan@git.wordpress.org>
Date: Mon, 1 Mar 2010 15:27:42 +0000
Subject: [PATCH] Tab interface for Theme and Add New Theme. First pass. Props
 matveb, dremeda. see #12412

git-svn-id: https://develop.svn.wordpress.org/trunk@13533 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-admin/css/wp-admin.dev.css | 31 +++++++++++++++++++++++++++++++
 wp-admin/menu.php             |  1 -
 wp-admin/theme-install.php    |  3 ++-
 wp-admin/themes.php           |  2 +-
 4 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/wp-admin/css/wp-admin.dev.css b/wp-admin/css/wp-admin.dev.css
index 3cf770be84..45878192a1 100644
--- a/wp-admin/css/wp-admin.dev.css
+++ b/wp-admin/css/wp-admin.dev.css
@@ -3666,4 +3666,35 @@ div#custom-background-image img {
 
 div#custom-background-image p.submit {
 	display: inline;
+}
+
+/* Tab Interface */
+
+.menu-tabs {
+	border-width: 1px 1px 2px;
+	border-style: solid;
+	border-color: #ccc #ccc #f9f9f9;
+	color: #464646;
+	padding: 4px 20px 6px;
+	text-decoration: none;
+	background-color: #fafafa;
+	margin: 0;
+	-moz-border-radius: 5px 5px 0 0;
+	-webkit-border-top-left-radius: 5px;
+	-webkit-border-top-right-radius: 5px;
+	-khtml-border-top-left-radius: 5px;
+	-khtml-border-top-right-radius: 5px;
+	border-top-left-radius: 5px;
+	border-top-right-radius: 5px;
+}
+
+.themes-php .wrap h2, .theme-install-php .wrap h2 {
+	border-bottom: 1px solid #ccc;
+}
+
+.menu-tab-inactive {
+	border-width: 1px 1px 0;
+	background-color: #fafafa;
+	color: #c1c1c1;
+	margin: 0 6px 0 0;
 }
\ No newline at end of file
diff --git a/wp-admin/menu.php b/wp-admin/menu.php
index 9f8bc384d1..ad41d27539 100644
--- a/wp-admin/menu.php
+++ b/wp-admin/menu.php
@@ -107,7 +107,6 @@ $menu[59] = array( '', 'read', 'separator2', '', 'wp-menu-separator' );
 $menu[60] = array( __('Appearance'), 'switch_themes', 'themes.php', '', 'menu-top', 'menu-appearance', 'div' );
 	$submenu['themes.php'][5]  = array(__('Themes'), 'switch_themes', 'themes.php');
 	$submenu['themes.php'][10] = array(_x('Editor', 'theme editor'), 'edit_themes', 'theme-editor.php');
-	$submenu['themes.php'][15] = array(__('Add New Themes'), 'install_themes', 'theme-install.php');
 	$submenu['themes.php'][20] = array(__('Menus'), 'switch_themes', 'nav-menus.php');
 
 $update_plugins = get_site_transient( 'update_plugins' );
diff --git a/wp-admin/theme-install.php b/wp-admin/theme-install.php
index fea431fae2..fcc17e5aad 100644
--- a/wp-admin/theme-install.php
+++ b/wp-admin/theme-install.php
@@ -16,6 +16,7 @@ include(ABSPATH . 'wp-admin/includes/theme-install.php');
 
 $title = __('Install Themes');
 $parent_file = 'themes.php';
+$submenu_file = 'themes.php';
 
 wp_reset_vars( array('tab', 'paged') );
 wp_enqueue_style( 'theme-install' );
@@ -58,7 +59,7 @@ include('admin-header.php');
 ?>
 <div class="wrap">
 <?php screen_icon(); ?>
-<h2><?php echo esc_html( $title ); ?></h2>
+<h2><a href="themes.php" class="menu-tabs menu-tab-inactive"><?php echo esc_html_x('Manage Themes', 'theme'); ?></a><a href="theme-install.php" class="menu-tabs"><?php echo esc_html( $title ); ?></a></h2>
 
 	<ul class="subsubsub">
 <?php
diff --git a/wp-admin/themes.php b/wp-admin/themes.php
index f1e94c56f8..a2e7c78048 100644
--- a/wp-admin/themes.php
+++ b/wp-admin/themes.php
@@ -134,7 +134,7 @@ function theme_update_available( $theme ) {
 
 <div class="wrap">
 <?php screen_icon(); ?>
-<h2><?php echo esc_html( $title ); if ( current_user_can('install_themes') ) { ?> <a href="theme-install.php" class="button add-new-h2"><?php echo esc_html_x('Add New', 'theme'); ?></a><?php } ?></h2>
+<h2><a href="themes.php" class="menu-tabs"><?php echo esc_html( $title ); if ( current_user_can('install_themes') ) { ?></a> <a href="theme-install.php" class="menu-tabs menu-tab-inactive"><?php echo esc_html_x('Install Themes', 'theme'); ?></a><?php } ?></h2>
 
 <h3><?php _e('Current Theme'); ?></h3>
 <div id="current-theme">