Better theme admin page

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@659 7be80a69-a1ef-0310-a953-fb0f7c49ff36

2 files changed, 4 insertions, 6 deletions

diff --git a/index-install.php b/index-install.php
index 8058ffb..904537f 100644
--- a/index-install.php
+++ b/index-install.php
@@ -387,6 +387,7 @@ function step3() {
     $wpdb->query( "INSERT INTO ".$wpdb->sitemeta." (meta_id, site_id, meta_key, meta_value) VALUES (NULL, 1, 'blog_upload_space', '10' )" );
     $wpdb->query( "INSERT INTO ".$wpdb->sitemeta." (meta_id, site_id, meta_key, meta_value) VALUES (NULL, 1, 'fileupload_maxk', '1500' )" );
     $wpdb->query( "INSERT INTO ".$wpdb->sitemeta." (meta_id, site_id, meta_key, meta_value) VALUES (NULL, 1, 'site_admins', '" . serialize( array( 'admin' ) ) . "' )" );
+    $wpdb->query( "INSERT INTO ".$wpdb->sitemeta." (meta_id, site_id, meta_key, meta_value) VALUES (NULL, 1, 'allowed_themes', '" . serialize( array( 'WordPress Classic', 'WordPress Default' ) ) . "' )" );
     $wpdb->query( "INSERT INTO ".$wpdb->sitemeta." (meta_id, site_id, meta_key, meta_value) VALUES (NULL, 1, 'illegal_names', '" . serialize( array(  "www", "web", "root", "admin", "main", "invite", "administrator" ) ) . "' )" );
     $wpdb->query( "INSERT INTO ".$wpdb->sitemeta." (meta_id, site_id, meta_key, meta_value) VALUES (NULL, 1, 'welcome_email', 'Dear User,
 
diff --git a/wp-admin/wpmu-themes.php b/wp-admin/wpmu-themes.php
index a8e679c..ce482cd 100644
--- a/wp-admin/wpmu-themes.php
+++ b/wp-admin/wpmu-themes.php
@@ -13,16 +13,13 @@ if (isset($_GET['updated'])) {
 print '<div class="wrap">';
 $themes = get_themes();
 $allowed_themes = get_site_option( "allowed_themes" );
-if( $allowed_themes == false ) {
-	$allowed_themes = array_keys( $themes );
-}
 ?>
 
 <form action='wpmu-edit.php?action=updatethemes' method='POST'>
 <h3>Site Themes</h3>
 <table border="0" cellspacing="5" cellpadding="5">
 <caption>Disable themes site-wide. You can enable themes on a blog by blog basis.</caption>
-<tr><th width="100">Disabled</th><th>Theme</th><th>Description</th></tr>
+<tr><th width="100">Active</th><th>Theme</th><th>Description</th></tr>
 <?php
 while( list( $key, $val ) = each( $themes ) ) {
 	$i++;
@@ -37,9 +34,9 @@ while( list( $key, $val ) = each( $themes ) ) {
 
 <tr valign="top" style="<?php if ($i%2) echo 'background: #eee'; ?>">
 <td>
-<label><input name="theme[<?php echo $key ?>]" type="radio" id="<?php echo $key ?>" value="disabled" <?php echo $disabled ?>/> Yes</label>
+<label><input name="theme[<?php echo $key ?>]" type="radio" id="<?php echo $key ?>" value="disabled" <?php echo $disabled ?>/>No</label>
 &nbsp;&nbsp;&nbsp; 
-<label><input name="theme[<?php echo $key ?>]" type="radio" id="<?php echo $key ?>" value="enabled" <?php echo $enabled ?>/> No</label>
+<label><input name="theme[<?php echo $key ?>]" type="radio" id="<?php echo $key ?>" value="enabled" <?php echo $enabled ?>/>Yes</label>
 </td>
 <th scope="row" align="left"><?php echo $key ?></th> 
 <td><?php echo $val[ 'Description' ] ?></td>