<!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>[16113] trunk/wp-admin:
  First pass at a new Network Admins page for Theme enable/disable/upgrade.</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16113">16113</a></dd>
<dt>Author</dt> <dd>westi</dd>
<dt>Date</dt> <dd>2010-10-31 09:37:15 +0000 (Sun, 31 Oct 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>First pass at a new Network Admins page for Theme enable/disable/upgrade. See <a href="http://trac.wordpress.org/ticket/14897">#14897</a> props PeteMall.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesclasswplisttablephp">trunk/wp-admin/includes/class-wp-list-table.php</a></li>
<li><a href="#trunkwpadminnetworkthemesphp">trunk/wp-admin/network/themes.php</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkwpadminincludeslisttablemsthemesphp">trunk/wp-admin/includes/list-table-ms-themes.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesclasswplisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-list-table.php (16112 => 16113)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-list-table.php        2010-10-31 09:29:57 UTC (rev 16112)
+++ trunk/wp-admin/includes/class-wp-list-table.php        2010-10-31 09:37:15 UTC (rev 16113)
</span><span class="lines">@@ -850,7 +850,7 @@
</span><span class="cx">                 'WP_Users_Table' =&gt; 'users', 'WP_Comments_Table' =&gt; 'comments', 'WP_Post_Comments_Table' =&gt; 'comments',
</span><span class="cx">                 'WP_Links_Table' =&gt; 'links', 'WP_Sites_Table' =&gt; 'sites', 'WP_MS_Users_Table' =&gt; 'ms-users',
</span><span class="cx">                 'WP_Plugins_Table' =&gt; 'plugins', 'WP_Plugin_Install_Table' =&gt; 'plugin-install', 'WP_Themes_Table' =&gt; 'themes',
</span><del>-                'WP_Theme_Install_Table' =&gt; 'theme-install' );
</del><ins>+                'WP_Theme_Install_Table' =&gt; 'theme-install', 'WP_MS_Themes_Table' =&gt; 'ms-themes' );
</ins><span class="cx"> 
</span><span class="cx">         if ( isset( $core_classes[ $class ] ) ) {
</span><span class="cx">                 require_once( ABSPATH . '/wp-admin/includes/list-table-' . $core_classes[ $class ] . '.php' );
</span></span></pre></div>
<a id="trunkwpadminincludeslisttablemsthemesphp"></a>
<div class="addfile"><h4>Added: trunk/wp-admin/includes/list-table-ms-themes.php (0 => 16113)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/list-table-ms-themes.php                                (rev 0)
+++ trunk/wp-admin/includes/list-table-ms-themes.php        2010-10-31 09:37:15 UTC (rev 16113)
</span><span class="lines">@@ -0,0 +1,305 @@
</span><ins>+&lt;?php
+/**
+ * MS Themes List Table class.
+ *
+ * @package WordPress
+ * @subpackage List_Table
+ * @since 3.1.0
+ */
+class WP_MS_Themes_Table extends WP_List_Table {
+
+        function WP_MS_Themes_Table() {
+                global $status, $page;
+
+                $default_status = get_user_option( 'themes_last_view' );
+                if ( empty( $default_status ) )
+                        $default_status = 'all';
+                $status = isset( $_REQUEST['theme_status'] ) ? $_REQUEST['theme_status'] : $default_status;
+                if ( !in_array( $status, array( 'all', 'enabled', 'disabled', 'upgrade', 'search' ) ) )
+                        $status = 'all';
+                if ( $status != $default_status &amp;&amp; 'search' != $status )
+                        update_user_meta( get_current_user_id(), 'themes_last_view', $status );
+
+                $page = $this-&gt;get_pagenum();
+
+                parent::WP_List_Table( array(
+                        'screen' =&gt; 'themes',
+                        'plural' =&gt; 'plugins', // @todo replace with themes and add css
+                ) );
+        }
+        
+        function check_permissions() {
+                if ( is_multisite() ) {
+                        $menu_perms = get_site_option( 'menu_items', array() );
+
+                        if ( empty( $menu_perms['themes'] ) ) {
+                                if ( !is_super_admin() )
+                                        wp_die( __( 'Cheatin&amp;#8217; uh?' ) );
+                        }
+                }
+
+                if ( !current_user_can('manage_network_themes') )
+                        wp_die( __( 'You do not have sufficient permissions to manage themes for this site.' ) );
+        }
+
+        function prepare_items() {
+                global $status, $themes, $totals, $page, $orderby, $order, $s;
+
+                wp_reset_vars( array( 'orderby', 'order', 's' ) );
+
+                $themes = array(
+                        'all' =&gt; apply_filters( 'all_themes', get_themes() ),
+                        'search' =&gt; array(),
+                        'enabled' =&gt; array(),
+                        'disabled' =&gt; array(),
+                        'upgrade' =&gt; array()
+                );
+                
+                $allowed_themes = get_site_allowed_themes();
+                $current = get_site_transient( 'update_themes' );
+
+                foreach ( (array) $themes['all'] as $key =&gt; $theme ) {
+                        if ( array_key_exists( $theme['Template'], $allowed_themes ) ) {
+                                $themes['all'][$key]['enabled'] = true;
+                                $themes['enabled'][$key] = $themes['all'][$key];
+                        }
+                        else {
+                                $themes['all'][$key]['enabled'] = false;
+                                $themes['disabled'][$key] = $themes['all'][$key];
+                        }
+                        if ( isset( $current-&gt;response[ $theme['Template'] ] ) )
+                                $themes['upgrade'][$key] = $themes['all'][$key];
+                }
+
+                if ( !current_user_can( 'update_themes' ) )
+                        $themes['upgrade'] = array();
+
+                if ( $s ) {
+                        $status = 'search'; echo &quot;opopop&quot;;
+                        $themes['search'] = array_filter( $themes['all'], array( $this, '_search_callback' ) );
+                }
+
+                $totals = array();
+                foreach ( $themes as $type =&gt; $list )
+                        $totals[ $type ] = count( $list );
+
+                if ( empty( $themes[ $status ] ) &amp;&amp; !in_array( $status, array( 'all', 'search' ) ) )
+                        $status = 'all';
+
+                $this-&gt;items = $themes[ $status ];
+                $total_this_page = $totals[ $status ];
+
+                if ( $orderby ) {
+                        $orderby = ucfirst( $orderby );
+                        $order = strtoupper( $order );
+
+                        uasort( $this-&gt;items, array( $this, '_order_callback' ) );
+                }
+
+                $themes_per_page = $this-&gt;get_items_per_page( 'themes_per_page', 999 );
+
+                $start = ( $page - 1 ) * $themes_per_page;
+
+                if ( $total_this_page &gt; $themes_per_page )
+                        $this-&gt;items = array_slice( $this-&gt;items, $start, $themes_per_page );
+
+                $this-&gt;set_pagination_args( array(
+                        'total_items' =&gt; $total_this_page,
+                        'per_page' =&gt; $themes_per_page,
+                ) );
+        }
+        
+        function _search_callback( $theme ) {
+                static $term;
+                if ( is_null( $term ) )
+                        $term = stripslashes( $_REQUEST['s'] );
+                        
+                foreach ( $theme as $key-&gt;$theme )
+                        if ( stripos( $key, $term ) !== false )
+                                return true;
+
+                return false;
+        }
+
+        function _order_callback( $theme_a, $theme_b ) {
+                global $orderby, $order;
+
+                $a = $theme_a[$orderby];
+                $b = $theme_b[$orderby];
+
+                if ( $a == $b )
+                        return 0;
+
+                if ( 'DESC' == $order )
+                        return ( $a &lt; $b ) ? 1 : -1;
+                else
+                        return ( $a &lt; $b ) ? -1 : 1;
+        }
+
+        function no_items() {
+                global $themes;
+
+                if ( !empty( $themes['all'] ) )
+                        _e( 'No themes found.' );
+                else
+                        _e( 'You do not appear to have any themes available at this time.' );
+        }
+
+        function get_columns() {
+                global $status;
+
+                return array(
+                        'cb'          =&gt; '&lt;input type=&quot;checkbox&quot; /&gt;',
+                        'name'        =&gt; __( 'Theme' ),
+                        'description' =&gt; __( 'Description' ),
+                );
+        }
+
+        function get_sortable_columns() {
+                return array(
+                        'name'         =&gt; 'name',
+                );
+        }
+
+        function display_tablenav( $which ) {
+                global $status;
+
+                parent::display_tablenav( $which );
+        }
+
+        function get_views() {
+                global $totals, $status;
+
+                $status_links = array();
+                foreach ( $totals as $type =&gt; $count ) {
+                        if ( !$count )
+                                continue;
+
+                        switch ( $type ) {
+                                case 'all':
+                                        $text = _nx( 'All &lt;span class=&quot;count&quot;&gt;(%s)&lt;/span&gt;', 'All &lt;span class=&quot;count&quot;&gt;(%s)&lt;/span&gt;', $count, 'themes' );
+                                        break;
+                                case 'enabled':
+                                        $text = _n( 'Enabled &lt;span class=&quot;count&quot;&gt;(%s)&lt;/span&gt;', 'Enabled &lt;span class=&quot;count&quot;&gt;(%s)&lt;/span&gt;', $count );
+                                        break;
+                                case 'disabled':
+                                        $text = _n( 'Disabled &lt;span class=&quot;count&quot;&gt;(%s)&lt;/span&gt;', 'Disabled &lt;span class=&quot;count&quot;&gt;(%s)&lt;/span&gt;', $count );
+                                        break;
+                                case 'upgrade':
+                                        $text = _n( 'Upgrade Available &lt;span class=&quot;count&quot;&gt;(%s)&lt;/span&gt;', 'Upgrade Available &lt;span class=&quot;count&quot;&gt;(%s)&lt;/span&gt;', $count );
+                                        break;
+                                case 'search':
+                                        $text = _n( 'Search Results &lt;span class=&quot;count&quot;&gt;(%s)&lt;/span&gt;', 'Search Results &lt;span class=&quot;count&quot;&gt;(%s)&lt;/span&gt;', $count );
+                                        break;
+                        }
+
+                        $status_links[$type] = sprintf( &quot;&lt;li&gt;&lt;a href='%s' %s&gt;%s&lt;/a&gt;&quot;,
+                                add_query_arg('theme_status', $type, 'themes.php'),
+                                ( $type == $status ) ? ' class=&quot;current&quot;' : '',
+                                sprintf( $text, number_format_i18n( $count ) )
+                        );
+                }
+
+                return $status_links;
+        }
+
+        function get_bulk_actions() {
+                global $status;
+
+                $actions = array();
+                if ( 'enabled' != $status )
+                        $actions['network-enable-selected'] = __( 'Network Enable' );
+                if ( 'disabled' != $status )
+                        $actions['network-disable-selected'] = __( 'Network Disable' );
+                if ( current_user_can( 'update_themes' ) )
+                        $actions['update-selected'] = __( 'Update' );
+                        
+                return $actions;
+        }
+
+        function bulk_actions( $which ) {
+                global $status;
+                parent::bulk_actions( $which );
+        }
+
+        function current_action() {
+                return parent::current_action();
+        }
+
+        function display_rows() {
+                global $status, $page, $s;
+
+                $context = $status;
+
+                foreach ( $this-&gt;items as $key =&gt; $theme ) {
+                        // preorder
+                        $actions = array(
+                                'network_enable' =&gt; '',
+                                'network_disable' =&gt; '',
+                                'edit' =&gt; ''
+                        );
+                        
+                        $theme_key = esc_html( $theme['Stylesheet'] );
+
+                        if ( empty( $theme['enabled'] ) ) {
+                                if ( current_user_can( 'manage_network_themes' ) )
+                                        $actions['network_enable'] = '&lt;a href=&quot;' . wp_nonce_url('themes.php?action=network-enable&amp;amp;theme=' . $theme_key . '&amp;amp;paged=' . $page . '&amp;amp;s=' . $s, 'enable-theme_' . $theme_key) . '&quot; title=&quot;' . __('Enable this theme for all sites in this network') . '&quot; class=&quot;edit&quot;&gt;' . __('Network Enable') . '&lt;/a&gt;';
+                        } else {
+                                if ( current_user_can( 'manage_network_themes' ) )
+                                        $actions['network_disable'] = '&lt;a href=&quot;' . wp_nonce_url('themes.php?action=network-disable&amp;amp;theme=' . $theme_key . '&amp;amp;paged=' . $page . '&amp;amp;s=' . $s, 'disable-theme_' . $theme_key) . '&quot; title=&quot;' . __('Disable this theme') . '&quot;&gt;' . __('Network Disable') . '&lt;/a&gt;';
+                        }
+                        
+                        /* @todo link to theme editor        
+                        if ( current_user_can('edit_themes') )
+                                $actions['edit'] = '&lt;a href=&quot;theme-editor.php?file=' . $theme['Stylesheet Files'][0] . '&quot; title=&quot;' . __('Open this theme in the Theme Editor') . '&quot; class=&quot;edit&quot;&gt;' . __('Edit') . '&lt;/a&gt;';
+                        */
+
+                        $actions = apply_filters( 'theme_action_links', array_filter( $actions ), $theme_key, $theme, $context );
+                        $actions = apply_filters( &quot;theme_action_links_$theme_key&quot;, $actions, $theme_key, $theme, $context );
+
+                        $class = empty( $theme['enabled'] ) ? 'inactive' : 'active';
+                        $checkbox = &quot;&lt;input type='checkbox' name='checked[]' value='&quot; . esc_attr( $theme_key ) . &quot;' /&gt;&quot;;
+
+                        $description = '&lt;p&gt;' . $theme['Description'] . '&lt;/p&gt;';
+                        $theme_name = $theme['Name'];
+
+
+                        $id = sanitize_title( $theme_name );
+
+                        echo &quot;
+                &lt;tr id='$id' class='$class'&gt;
+                        &lt;th scope='row' class='check-column'&gt;$checkbox&lt;/th&gt;
+                        &lt;td class='theme-title'&gt;&lt;strong&gt;$theme_name&lt;/strong&gt;&lt;/td&gt;
+                        &lt;td class='desc'&gt;$description&lt;/td&gt;
+                &lt;/tr&gt;
+                &lt;tr class='$class second'&gt;
+                        &lt;td&gt;&lt;/td&gt;
+                        &lt;td class='theme-title'&gt;&quot;;
+
+                        echo $this-&gt;row_actions( $actions, true );
+
+                        echo &quot;&lt;/td&gt;
+                        &lt;td class='desc'&gt;&quot;;
+                        $theme_meta = array();
+                        if ( !empty( $theme['Version'] ) )
+                                $theme_meta[] = sprintf( __( 'Version %s' ), $theme['Version'] );
+                        if ( !empty( $theme['Author'] ) ) {
+                                $author = $theme['Author'];
+                                if ( !empty( $theme['Author URI'] ) )
+                                        $author = '&lt;a href=&quot;' . $theme['Author URI'] . '&quot; title=&quot;' . __( 'Visit author homepage' ) . '&quot;&gt;' . $theme['Author'] . '&lt;/a&gt;';
+                                $theme_meta[] = sprintf( __( 'By %s' ), $author );
+                        }
+                        if ( !empty( $theme['Theme URI'] ) )
+                                $theme_meta[] = '&lt;a href=&quot;' . $theme['Theme URI'] . '&quot; title=&quot;' . __( 'Visit theme homepage' ) . '&quot;&gt;' . __( 'Visit Theme Site' ) . '&lt;/a&gt;';
+
+                        $theme_meta = apply_filters( 'theme_row_meta', $theme_meta, $theme_key, $theme, $status );
+                        echo implode( ' | ', $theme_meta );
+                        echo &quot;&lt;/td&gt;
+                &lt;/tr&gt;\n&quot;;
+
+                        do_action( 'after_theme_row', $theme_key, $theme, $status );
+                        do_action( &quot;after_theme_row_$theme_key&quot;, $theme_key, $theme, $status );
+                }
+        }
+}
+?&gt;
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpadminnetworkthemesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/themes.php (16112 => 16113)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/themes.php        2010-10-31 09:29:57 UTC (rev 16112)
+++ trunk/wp-admin/network/themes.php        2010-10-31 09:37:15 UTC (rev 16113)
</span><span class="lines">@@ -4,94 +4,99 @@
</span><span class="cx">  *
</span><span class="cx">  * @package WordPress
</span><span class="cx">  * @subpackage Multisite
</span><del>- * @since 3.0.0
</del><ins>+ * @since 3.1.0
</ins><span class="cx">  */
</span><span class="cx"> 
</span><span class="cx"> require_once( './admin.php' );
</span><span class="cx"> 
</span><del>-if ( ! current_user_can( 'manage_network_themes' ) )
-        wp_die( __( 'You do not have permission to access this page.' ) );
</del><ins>+$wp_list_table = get_list_table('WP_MS_Themes_Table');
+$wp_list_table-&gt;check_permissions();
</ins><span class="cx"> 
</span><del>-$title = __( 'Network Themes' );
-$parent_file = 'themes.php';
</del><ins>+$action = $wp_list_table-&gt;current_action();
</ins><span class="cx"> 
</span><del>-add_contextual_help($current_screen,
-        '&lt;p&gt;' . __('This screen enables and disables the inclusion of themes available to choose in the Appearance menu for each site. It does not activate or deactivate which theme a site is currently using.') . '&lt;/p&gt;' .
-        '&lt;p&gt;' . __('If the network admin disables a theme that is in use, it can still remain selected on that site. If another theme is chosen, the disabled theme will not appear in the site&amp;#8217;s Appearance &gt; Themes screen.') . '&lt;/p&gt;' .
-        '&lt;p&gt;' . __('Themes can be enabled on a site by site basis by the network admin on the Edit Site screen you go to via the Edit action link on the Sites screen.') . '&lt;/p&gt;' .
-        '&lt;p&gt;&lt;strong&gt;' . __('For more information:') . '&lt;/strong&gt;&lt;/p&gt;' .
-        '&lt;p&gt;' . __('&lt;a href=&quot;http://codex.wordpress.org/Super_Admin_Themes_SubPanel&quot; target=&quot;_blank&quot;&gt;Documentation on Network Themes&lt;/a&gt;') . '&lt;/p&gt;' .
-        '&lt;p&gt;' . __('&lt;a href=&quot;http://wordpress.org/support/&quot; target=&quot;_blank&quot;&gt;Support Forums&lt;/a&gt;') . '&lt;/p&gt;'
-);
</del><ins>+$plugin = isset($_REQUEST['plugin']) ? $_REQUEST['plugin'] : '';
+$s = isset($_REQUEST['s']) ? $_REQUEST['s'] : '';
</ins><span class="cx"> 
</span><del>-require_once( '../admin-header.php' );
</del><ins>+// Clean up request URI from temporary args for screen options/paging uri's to work as expected.
+$_SERVER['REQUEST_URI'] = remove_query_arg(array('error', 'deleted', 'activate', 'activate-multi', 'deactivate', 'deactivate-multi', '_error_nonce'), $_SERVER['REQUEST_URI']);
</ins><span class="cx"> 
</span><del>-if ( isset( $_GET['updated'] ) ) {
-        ?&gt;
-        &lt;div id=&quot;message&quot; class=&quot;updated&quot;&gt;&lt;p&gt;&lt;?php _e( 'Site themes saved.' ) ?&gt;&lt;/p&gt;&lt;/div&gt;
-        &lt;?php
</del><ins>+if ( $action ) {
+        $allowed_themes = get_site_option( 'allowedthemes' );        
+        switch ( $action ) {
+                case 'network-enable':
+                        $allowed_themes[ $_GET['theme'] ] = 1;
+                        update_site_option( 'allowedthemes', $allowed_themes );
+                        wp_redirect( wp_get_referer() ); // @todo add_query_arg for update message
+                        exit;                        
+                        break;
+                case 'network-disable':
+                        unset( $allowed_themes[ $_GET['theme'] ] );
+                        update_site_option( 'allowedthemes', $allowed_themes );
+                        wp_redirect( wp_get_referer() ); // @todo add_query_arg for update message
+                        exit;
+                        break;
+                case 'network-enable-selected':
+                        check_admin_referer('bulk-plugins');
+
+                        $themes = isset( $_POST['checked'] ) ? (array) $_POST['checked'] : array();
+                        if ( empty($themes) ) {
+                                wp_redirect( wp_get_referer() );
+                                exit;
+                        }                                                
+                        foreach( (array) $themes as $theme )
+                                $allowed_themes[ $theme ] = 1;
+                        update_site_option( 'allowedthemes', $allowed_themes );
+                        break;
+                        case 'network-disable-selected':
+                                check_admin_referer('bulk-plugins');
+
+                                $themes = isset( $_POST['checked'] ) ? (array) $_POST['checked'] : array();
+                                if ( empty($themes) ) {
+                                        wp_redirect( wp_get_referer() );
+                                        exit;
+                                }                                                
+                                foreach( (array) $themes as $theme )
+                                        unset( $allowed_themes[ $theme ] );
+                                update_site_option( 'allowedthemes', $allowed_themes );
+                                break;
+
+        }
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-$themes = get_themes();
-$allowed_themes = get_site_allowed_themes();
</del><ins>+$wp_list_table-&gt;prepare_items();
+
+add_screen_option( 'per_page', array('label' =&gt; _x( 'Themes', 'themes per page (screen options)' ), 'default' =&gt; 999) );
+
+$title = __('Themes');
+$parent_file = 'themes.php';
+
+require_once(ABSPATH . 'wp-admin/admin-header.php');
+
</ins><span class="cx"> ?&gt;
</span><ins>+
</ins><span class="cx"> &lt;div class=&quot;wrap&quot;&gt;
</span><del>-        &lt;form action=&quot;&lt;?php echo esc_url( network_admin_url( 'edit.php?action=updatethemes' ) ); ?&gt;&quot; method=&quot;post&quot;&gt;
-                &lt;?php screen_icon(); ?&gt;
-                &lt;h2&gt;&lt;?php _e( 'Network Themes' ) ?&gt;&lt;/h2&gt;
-                &lt;p&gt;&lt;?php _e( 'Themes must be enabled for your network before they will be available to individual sites.' ) ?&gt;&lt;/p&gt;
-                &lt;?php submit_button( __( 'Apply Changes' ), '', '' ); ?&gt;
-                &lt;table class=&quot;widefat&quot;&gt;
-                        &lt;thead&gt;
-                                &lt;tr&gt;
-                                        &lt;th style=&quot;width:15%;&quot;&gt;&lt;?php _e( 'Enable' ) ?&gt;&lt;/th&gt;
-                                        &lt;th style=&quot;width:25%;&quot;&gt;&lt;?php _e( 'Theme' ) ?&gt;&lt;/th&gt;
-                                        &lt;th style=&quot;width:10%;&quot;&gt;&lt;?php _e( 'Version' ) ?&gt;&lt;/th&gt;
-                                        &lt;th style=&quot;width:60%;&quot;&gt;&lt;?php _e( 'Description' ) ?&gt;&lt;/th&gt;
-                                &lt;/tr&gt;
-                        &lt;/thead&gt;
-                        &lt;tbody id=&quot;plugins&quot;&gt;
-                        &lt;?php
-                        $total_theme_count = $activated_themes_count = 0;
-                        $class = '';
-                        foreach ( (array) $themes as $key =&gt; $theme ) {
-                                $total_theme_count++;
-                                $theme_key = esc_html( $theme['Stylesheet'] );
-                                $class = ( 'alt' == $class ) ? '' : 'alt';
-                                $class1 = $enabled = $disabled = '';
-                                $enabled = $disabled = false;
</del><ins>+&lt;?php screen_icon('themes'); ?&gt;
+&lt;h2&gt;&lt;?php echo esc_html( $title ); if ( current_user_can('install_themes') ) { ?&gt; &lt;a href=&quot;theme-install.php&quot; class=&quot;button add-new-h2&quot;&gt;&lt;?php echo esc_html_x('Add New', 'theme'); ?&gt;&lt;/a&gt;&lt;?php } ?&gt;&lt;/h2&gt;
+&lt;p&gt;&lt;?php _e( 'Themes must be enabled for your network before they will be available to individual sites.' ) ?&gt;&lt;/p&gt;
</ins><span class="cx"> 
</span><del>-                                if ( isset( $allowed_themes[$theme_key] ) == true ) {
-                                        $enabled = true;
-                                        $activated_themes_count++;
-                                        $class1 = 'active';
-                                } else {
-                                        $disabled = true;
-                                }
-                                ?&gt;
-                                &lt;tr valign=&quot;top&quot; class=&quot;&lt;?php echo $class . ' ' . $class1; ?&gt;&quot;&gt;
-                                        &lt;td&gt;
-                                                &lt;label&gt;&lt;input name=&quot;theme[&lt;?php echo $theme_key ?&gt;]&quot; type=&quot;radio&quot; id=&quot;enabled_&lt;?php echo $theme_key ?&gt;&quot; value=&quot;enabled&quot; &lt;?php checked( $enabled ) ?&gt; /&gt; &lt;?php _e( 'Yes' ) ?&gt;&lt;/label&gt;
-                                                &amp;nbsp;&amp;nbsp;&amp;nbsp;
-                                                &lt;label&gt;&lt;input name=&quot;theme[&lt;?php echo $theme_key ?&gt;]&quot; type=&quot;radio&quot; id=&quot;disabled_&lt;?php echo $theme_key ?&gt;&quot; value=&quot;disabled&quot; &lt;?php checked( $disabled ) ?&gt; /&gt; &lt;?php _e( 'No' ) ?&gt;&lt;/label&gt;
-                                        &lt;/td&gt;
-                                        &lt;th scope=&quot;row&quot; style=&quot;text-align:left;&quot;&gt;&lt;?php echo $key ?&gt;&lt;/th&gt;
-                                        &lt;td&gt;&lt;?php echo $theme['Version'] ?&gt;&lt;/td&gt;
-                                        &lt;td&gt;&lt;?php echo $theme['Description'] ?&gt;&lt;/td&gt;
-                                &lt;/tr&gt;
-                        &lt;?php } ?&gt;
-                        &lt;/tbody&gt;
-                &lt;/table&gt;
-                
-                &lt;?php submit_button( __( 'Apply Changes' ), '', '' ); ?&gt;
-        &lt;/form&gt;
</del><ins>+&lt;form method=&quot;get&quot; action=&quot;&quot;&gt;
+&lt;p class=&quot;search-box&quot;&gt;
+        &lt;label class=&quot;screen-reader-text&quot; for=&quot;theme-search-input&quot;&gt;&lt;?php _e( 'Search Themes' ); ?&gt;:&lt;/label&gt;
+        &lt;input type=&quot;text&quot; id=&quot;theme-search-input&quot; name=&quot;s&quot; value=&quot;&lt;?php _admin_search_query(); ?&gt;&quot; /&gt;
+        &lt;?php submit_button( __( 'Search Installed Themes' ), 'button', '', false ); ?&gt;
+&lt;/p&gt;
+&lt;/form&gt;
</ins><span class="cx"> 
</span><del>-        &lt;h3&gt;&lt;?php _e( 'Total' )?&gt;&lt;/h3&gt;
-        &lt;p&gt;
-                &lt;?php printf( __( 'Themes Installed: %d' ), $total_theme_count); ?&gt;
-                &lt;br /&gt;
-                &lt;?php printf( __( 'Themes Enabled: %d' ), $activated_themes_count); ?&gt;
-        &lt;/p&gt;
</del><ins>+&lt;?php $wp_list_table-&gt;views(); ?&gt;
+
+&lt;form method=&quot;post&quot; action=&quot;&quot;&gt;
+&lt;input type=&quot;hidden&quot; name=&quot;theme_status&quot; value=&quot;&lt;?php echo esc_attr($status) ?&gt;&quot; /&gt;
+&lt;input type=&quot;hidden&quot; name=&quot;paged&quot; value=&quot;&lt;?php echo esc_attr($page) ?&gt;&quot; /&gt;
+
+&lt;?php $wp_list_table-&gt;display(); ?&gt;
+&lt;/form&gt;
+
</ins><span class="cx"> &lt;/div&gt;
</span><span class="cx"> 
</span><del>-&lt;?php include( '../admin-footer.php' ); ?&gt;
</del><ins>+&lt;?php
+include(ABSPATH . 'wp-admin/admin-footer.php');
</ins><span class="cx">\ No newline at end of file
</span></span></pre>
</div>
</div>

</body>
</html>