Ticket #6019: 6019.diff

Index: wp-admin.css
===================================================================
--- wp-admin.css        (revision 7063)
+++ wp-admin.css        (working copy)
@@ -1,10 +1,24 @@
-.plugins p {
-       margin: 4px;
+#plugins .active td {
+       opacity:1;
+       filter:alpha(opacity=100)
+}
+
+#plugins .active td.name {
+       font-weight: bold;
+}
+
+#plugins td {
+       opacity:0.70;
+       filter:alpha(opacity=70)
+}
+
+#plugins p {
+       margin: 0 4px;
        padding: 0;
 }
 
-.plugins .name {
-       font-size: 16px;
+#plugins .togl {
+       width: 150px;
 }
 
 .import-system {
@@ -116,7 +130,9 @@
 }
 
 .submit {
-       margin: 1.5em 0 0 0;
+       border-top: 1px solid #ccc;
+       padding: 1.5em 0 0 0;
+       margin: 10px 0 0 0;
        -moz-border-radius-bottomleft: 3px;
        -khtml-border-bottom-left-radius: 3px;
        -webkit-border-bottom-left-radius: 3px;
@@ -197,7 +213,7 @@
        margin-left: 15px;
        padding: 0 15px;
        margin-bottom: 20px;
-       margin-right: 15%;
+       margin-right: 15px;
 }
 
 .updated a, .error a {
@@ -395,19 +411,6 @@
        zoom: 1;
 }
 
-.active td {
-       background: #BEB;
-}
-.active .name {
-       background: #9C9;
-}
-.alternate.active td {
-       background: #ADA;
-}
-.alternate.active .name {
-       background: #8B8;
-}
-
 #ajax-response {
        padding: .5em;
 }
@@ -522,6 +525,11 @@
        border-color: #e4f2fd;
 }
 
+.tablenav a.button-secondary {
+       display: inline-block;
+       margin-right: 8px;
+}
+
 .tablenav .next, .tablenav .prev{
        border-color: #e4f2fd;
        background-color: #e4f2fd;
@@ -603,7 +611,7 @@
 
 #user_info {
        position: absolute;
-       right: 25px;
+       right: 15px;
        top: 11px;
        color: #ccc;
        font-size: 11px;
@@ -742,7 +750,7 @@
 }
 
 #sidemenu {
-       margin: -30px 15% 0 315px;
+       margin: -30px 15px 0 315px;
        color: #999;
        list-style: none;
        position: relative;
@@ -912,6 +920,7 @@
        border-collapse: collapse;
        margin-top: 1em;
        width: 100%;
+       margin-bottom: -8px;
 }
 
 .form-table td {
@@ -925,6 +934,7 @@
        text-align: left;
        padding: 10px;
        border-bottom: 8px solid #fff;
+       width: 150px;
 }
 
 .form-table tr {
@@ -1134,7 +1144,7 @@
        position: absolute;
        background-color: #eaf3fa;
        width: 200px;
-       right: 25px;
+       right: 15px;
 }
 
 
@@ -1386,7 +1396,7 @@
 
 #the-comment-list td {
        vertical-align: top;
-       font-size: 11px;
+       font-size: 12px;
 }
 
 #the-comment-list td.comment {
Index: plugins.php
===================================================================
--- plugins.php (revision 7063)
+++ plugins.php (working copy)
@@ -81,15 +81,38 @@
        echo '</p>';
 } else {
 ?>
-<table class="widefat plugins">
+
+<div class="tablenav">
+       <div style="float: left">
+       <?php
+       $active = get_option('active_plugins');
+       $inactive = get_option('deactivated_plugins');
+       if ( !empty($active) ) {
+       ?>
+       <a class="button-secondary" href="<?php echo wp_nonce_url('plugins.php?action=deactivate-all', 'deactivate-all'); ?>" class="delete"><?php _e('Deactivate All Plugins'); ?></a>
+       <?php
+       } elseif ( empty($active) && !empty($inactive) ) {
+       ?>
+       <a class="button-secondary" href="<?php echo wp_nonce_url('plugins.php?action=reactivate-all', 'reactivate-all'); ?>" class="delete"><?php _e('Reactivate All Plugins'); ?></a>
+       <?php
+       } // endif active/inactive plugin check
+       ?>
+       </div>
+       <br style="clear:both;">
+</div>
+
+<br style="clear:both;">
+
+<table class="widefat">
        <thead>
        <tr>
                <th><?php _e('Plugin'); ?></th>
                <th style="text-align: center"><?php _e('Version'); ?></th>
                <th><?php _e('Description'); ?></th>
-               <th style="text-align: center"<?php if ( current_user_can('edit_plugins') ) echo ' colspan="2"'; ?>><?php _e('Action'); ?></th>
+               <th <?php if ( current_user_can('edit_plugins') ) echo ' colspan="2"'; ?>><?php _e('Action'); ?></th>
        </tr>
        </thead>
+       <tbody id="plugins">
 <?php
        $style = '';
 
@@ -126,36 +149,15 @@
                <td class='name'>{$plugin_data['Title']}</td>
                <td class='vers'>{$plugin_data['Version']}</td>
                <td class='desc'><p>{$plugin_data['Description']}$author</p></td>
-               <td class='togl'>$toggle</td>";
-               if ( current_user_can('edit_plugins') )
-               echo "
-               <td>$edit</td>";
+               <td class='togl'>$toggle"; if ( current_user_can('edit_plugins') ) echo " | $edit</td>";
                echo"
        </tr>";
        do_action( 'after_plugin_row', $plugin_file );
        }
 ?>
+       </tbody>
+</table>
 
-<tr>
-       <td colspan="3">&nbsp;</td>
-       <td colspan="2" style="width:12em;">
-       <?php
-       $active = get_option('active_plugins');
-       $inactive = get_option('deactivated_plugins');
-       if ( !empty($active) ) {
-       ?>
-       <a href="<?php echo wp_nonce_url('plugins.php?action=deactivate-all', 'deactivate-all'); ?>" class="delete"><?php _e('Deactivate All Plugins'); ?></a>
-       <?php
-       } elseif ( empty($active) && !empty($inactive) ) {
-       ?>
-       <a href="<?php echo wp_nonce_url('plugins.php?action=reactivate-all', 'reactivate-all'); ?>" class="delete"><?php _e('Reactivate All Plugins'); ?></a>
-       <?php
-       } // endif active/inactive plugin check
-       ?>
-       </td>
-</tr>
-
-</table>
 <?php
 }
 ?>
Index: css/global.css
===================================================================
--- css/global.css      (revision 7062)
+++ css/global.css      (working copy)
@@ -65,8 +65,8 @@
 
 .widefat td, .widefat th {
        border-bottom: 1px solid #ccc;
-       font-size: 10px;
-       padding: 10px 6px 20px 6px;
+       font-size: 12px;
+       padding: 10px 10px 20px;
        vertical-align: text-top;
 }
 
@@ -87,7 +87,7 @@
 .wrap {
        margin: 0;
        margin-left: 15px;
-       margin-right: 25px;
+       margin-right: 15px;
        padding: 0;
 }
 
Index: export.php
===================================================================
--- export.php  (revision 7063)
+++ export.php  (working copy)
@@ -14,16 +14,15 @@
 
 <div class="wrap">
 <h2><?php _e('Export'); ?></h2>
-<div class="narrow">
 <p><?php _e('When you click the button below WordPress will create an XML file for you to save to your computer.'); ?></p>
 <p><?php _e('This format, which we call WordPress eXtended RSS or WXR, will contain your posts, comments, custom fields, and categories.'); ?></p>
 <p><?php _e('Once you&#8217;ve saved the download file, you can use the Import function on another WordPress blog to import this blog.'); ?></p>
 <form action="" method="get">
-<h3><?php _e('Optional options'); ?></h3>
+<h3><?php _e('Options'); ?></h3>
 
-<table class="niceblue">
+<table class="form-table">
 <tr>
-<th><?php _e('Restrict Author:'); ?></th>
+<th><?php _e('Restrict Author'); ?></th>
 <td>
 <select name="author">
 <option value="all" selected="selected"><?php _e('All Authors'); ?></option>
@@ -43,7 +42,6 @@
 </p>
 </form>
 </div>
-</div>
 
 <?php