Changeset 15898

Timestamp:

10/21/2010 05:06:52 PM (13 years ago)

Author:

nacin

Message:

Network admin theme install. props PeteMall, fixes #15184.

Location:

trunk/wp-admin

Files:

• includes/class-wp-upgrader.php (modified) (1 diff)
• includes/default-list-tables.php (modified) (1 diff)
• includes/theme-install.php (modified) (4 diffs)
• network/menu.php (modified) (2 diffs)
• network/theme-install.php (added)
• theme-install.php (modified) (3 diffs)

trunk/wp-admin/includes/class-wp-upgrader.php

@@ -1359 +1359 @@
 
         if ( $this->type == 'web' )
-            $install_actions['themes_page'] = '<a href="' . admin_url('theme-install.php') . '" title="' . esc_attr__('Return to Theme Installer') . '" target="_parent">' . __('Return to Theme Installer') . '</a>';
+            $install_actions['themes_page'] = '<a href="' . self_admin_url('theme-install.php') . '" title="' . esc_attr__('Return to Theme Installer') . '" target="_parent">' . __('Return to Theme Installer') . '</a>';
         else
-            $install_actions['themes_page'] = '<a href="' . admin_url('themes.php') . '" title="' . esc_attr__('Themes page') . '" target="_parent">' . __('Return to Themes page') . '</a>';
-
-        if ( ! $this->result || is_wp_error($this->result) )
+            $install_actions['themes_page'] = '<a href="' . self_admin_url('themes.php') . '" title="' . esc_attr__('Themes page') . '" target="_parent">' . __('Return to Themes page') . '</a>';
+
+        if ( ! $this->result || is_wp_error($this->result) || is_network_admin() )
             unset( $install_actions['activate'], $install_actions['preview'] );
 

trunk/wp-admin/includes/default-list-tables.php

@@ -4185 +4185 @@
         foreach ( (array) $tabs as $action => $text ) {
             $class = ( $action == $tab ) ? ' class="current"' : '';
-            $href = admin_url('theme-install.php?tab=' . $action);
+            $href = self_admin_url('theme-install.php?tab=' . $action);
             $display_tabs[$action] = "<a href='$href'$class>$text</a>";
         }

trunk/wp-admin/includes/theme-install.php

@@ -78 +78 @@
 ?>
 <h4><?php _e('Feature Filter') ?></h4>
-<form method="post" action="<?php echo admin_url( 'theme-install.php?tab=search' ); ?>">
+<form method="post" action="<?php echo self_admin_url( 'theme-install.php?tab=search' ); ?>">
 <p class="install-help"><?php _e('Find a theme based on specific features') ?></p>
     <?php
@@ -117 +117 @@
 <h4><?php _e('Install a theme in .zip format') ?></h4>
 <p class="install-help"><?php _e('If you have a theme in a .zip format, you may install it by uploading it here.') ?></p>
-<form method="post" enctype="multipart/form-data" action="<?php echo admin_url('update.php?action=upload-theme') ?>">
+<form method="post" enctype="multipart/form-data" action="<?php echo self_admin_url('update.php?action=upload-theme') ?>">
     <?php wp_nonce_field( 'theme-upload') ?>
     <input type="file" name="themezip" />
@@ -141 +141 @@
     if ( !is_array($actions) ) {
         $actions = array();
-        $actions[] = '<a href="' . admin_url('theme-install.php?tab=theme-information&amp;theme=' . $theme->slug .
+        $actions[] = '<a href="' . self_admin_url('theme-install.php?tab=theme-information&amp;theme=' . $theme->slug .
                                         '&amp;TB_iframe=true&amp;tbWidth=500&amp;tbHeight=385') . '" class="thickbox thickbox-preview onclick" title="' . esc_attr(sprintf(__('Install &#8220;%s&#8221;'), $name)) . '">' . __('Install') . '</a>';
-        $actions[] = '<a href="' . $preview_link . '" class="thickbox thickbox-preview onclick previewlink" title="' . esc_attr(sprintf(__('Preview &#8220;%s&#8221;'), $name)) . '">' . __('Preview') . '</a>';
+        if ( !is_network_admin() )
+            $actions[] = '<a href="' . $preview_link . '" class="thickbox thickbox-preview onclick previewlink" title="' . esc_attr(sprintf(__('Preview &#8220;%s&#8221;'), $name)) . '">' . __('Preview') . '</a>';
         $actions = apply_filters('theme_install_action_links', $actions, $theme);
     }
@@ -289 +290 @@
 case 'install':
     if ( current_user_can('install_themes') ) :
-    $buttons .= '<a class="button-primary" id="install" href="' . wp_nonce_url(admin_url('update.php?action=install-theme&theme=' . $api->slug), 'install-theme_' . $api->slug) . '" target="_parent">' . __('Install Now') . '</a>';
+    $buttons .= '<a class="button-primary" id="install" href="' . wp_nonce_url(self_admin_url('update.php?action=install-theme&theme=' . $api->slug), 'install-theme_' . $api->slug) . '" target="_parent">' . __('Install Now') . '</a>';
     endif;
     break;
 case 'update_available':
     if ( current_user_can('update_themes') ) :
-    $buttons .= '<a class="button-primary" id="install" href="' . wp_nonce_url(admin_url('update.php?action=upgrade-theme&theme=' . $update_file), 'upgrade-theme_' . $update_file) . '" target="_parent">' . __('Install Update Now') . '</a>';
+    $buttons .= '<a class="button-primary" id="install" href="' . wp_nonce_url(self_admin_url('update.php?action=upgrade-theme&theme=' . $update_file), 'upgrade-theme_' . $update_file) . '" target="_parent">' . __('Install Update Now') . '</a>';
     endif;
     break;

trunk/wp-admin/network/menu.php

@@ -20 +20 @@
 
 $menu[10] = array(__('Users'), 'manage_network_users', 'users.php', '', 'menu-top menu-icon-users', 'menu-users', 'div');
+
 $menu[15] = array(__('Themes'), 'manage_network_themes', 'themes.php', '', 'menu-top menu-icon-appearance', 'menu-appearance', 'div');
+$submenu['themes.php'][5]  = array( __('Themes'), 'manage_network_themes', 'themes.php' );
+$submenu['themes.php'][10] = array( _x('Add New', 'theme'), 'manage_network_themes', 'theme-install.php' );
+$submenu['themes.php'][15] = array( _x('Editor', 'theme editor'), 'edit_themes', 'theme-editor.php' );
 
 $plugin_update_count = $theme_update_count = $wordpress_update_count = 0;
@@ -60 +64 @@
 $menu[99] = array( '', 'read', 'separator-last', '', 'wp-menu-separator-last' );
 
-$submenu['themes.php'][5]  = array( __('Themes'), 'manage_network_themes', 'themes.php' );
-$submenu['themes.php'][15] = array( _x('Editor', 'plugin editor'), 'edit_themes', 'theme-editor.php' );
-
 require_once(ABSPATH . 'wp-admin/includes/menu.php');
 

trunk/wp-admin/theme-install.php

@@ -16 +16 @@
 $title = __('Install Themes');
 $parent_file = 'themes.php';
-$submenu_file = 'themes.php';
+if ( !is_network_admin() )
+    $submenu_file = 'themes.php';
 
 wp_enqueue_style( 'theme-install' );
@@ -36 +37 @@
 add_contextual_help($current_screen, $help);
 
-include('./admin-header.php');
+include(ABSPATH . 'wp-admin/admin-header.php');
 ?>
 <div class="wrap">
-<?php screen_icon(); ?>
+<?php
+screen_icon(); 
+
+if ( is_network_admin() ) : ?>
+<h2><?php echo esc_html( $title ); ?></h2>
+<?php else : ?>
 <h2><a href="themes.php" class="nav-tab"><?php echo esc_html_x('Manage Themes', 'theme'); ?></a><a href="theme-install.php" class="nav-tab nav-tab-active"><?php echo esc_html( $title ); ?></a></h2>
 
-<?php $wp_list_table->views(); ?>
+<?php 
+endif;
+
+$wp_list_table->views(); ?>
 
 <br class="clear" />
@@ -48 +57 @@
 </div>
 <?php
-include('./admin-footer.php');
+include(ABSPATH . 'wp-admin/admin-footer.php');