Changeset 8218

Timestamp:

06/30/2008 11:12:18 PM (16 years ago)

Author:

ryan

Message:

Plugins page layout improvements from DD32. see #7091

File:

• trunk/wp-admin/plugins.php (modified) (11 diffs)

trunk/wp-admin/plugins.php

@@ -3 +3 @@
 
 $action = '';
-foreach( array('activate-selected', 'deactivate-selected', 'delete-selected') as $action_key ) {
+foreach( array('activate-selected', 'deactivate-selected', 'delete-selected', 'clear-recent-list') as $action_key ) {
     if( isset($_POST[$action_key]) ) {
         $action = $action_key;
@@ -150 +150 @@
                 require_once('admin-footer.php');
                 exit;
-            }
+            } //Endif verify-delete
             $delete_result = delete_plugins($plugins);
 
             wp_cache_delete('plugins', 'plugins');
-
+            break;
+        case 'clear-recent-list':
+            update_option('recently_activated', array());
             break;
     }
@@ -198 +200 @@
 <?php
 
+$all_plugins = get_plugins();
 $active_plugins = array();
-$available_plugins = array();
+$inactive_plugins = array();
 $recent_plugins = array();
 $recently_activated = (array)get_option('recently_activated');
@@ -209 +212 @@
 if( $recently_activated != get_option('recently_activated') ) //If array changed, update it.
     update_option('recently_activated', $recently_activated);
-
-$all_plugins = get_plugins();
 
 $plugins_allowedtags = array('a' => array('href' => array(),'title' => array()),'abbr' => array('title' => array()),'acronym' => array('title' => array()),'code' => array(),'em' => array(),'strong' => array());
@@ -224 +225 @@
         $plugin_data['Description'] .= ' <cite>' . sprintf( __('By %s'), $plugin_data['Author'] ) . '.</cite>';
 
+    //Filter into individual sections
     if ( is_plugin_active($plugin_file) ) {
         $active_plugins[ $plugin_file ] = $plugin_data;
@@ -230 +232 @@
             $recent_plugins[ $plugin_file ] = $plugin_data;
         else
-            $available_plugins[ $plugin_file ] = $plugin_data;
+            $inactive_plugins[ $plugin_file ] = $plugin_data;
     }
 }
@@ -290 +292 @@
 ?>
 
+<?php if ( ! empty($active_plugins) ) : ?>
 <h3 id="currently-active"><?php _e('Currently Active Plugins') ?></h3>
 <form method="post" action="<?php echo admin_url('plugins.php') ?>">
@@ -304 +307 @@
 
 <p><?php printf(__('If something goes wrong with a plugin and you can&#8217;t use WordPress, delete or rename that file in the <code>%s</code> directory and it will be automatically deactivated.'), WP_PLUGIN_DIR); ?></p>
+<?php endif; ?>
 
 <?php if ( ! empty($recent_plugins) ) : ?>
 <h3 id="recent-plugins"><?php _e('Recently Active Plugins') ?></h3>
+<p><?php _e('The following plugins were recently active. When a plugin has been inactive for more than 7 days it will be moved to the Inactive plugin list.') ?></p>
 <form method="post" action="<?php echo admin_url('plugins.php') ?>">
 <?php wp_nonce_field('bulk-manage-plugins') ?>
@@ -316 +321 @@
         <input type="submit" name="delete-selected" value="<?php _e('Delete') ?>" class="button-secondary" />
 <?php endif; ?>
+        <input type="submit" name="clear-recent-list" value="<?php _e('Clear List') ?>" class="button-secondary" />
     </div>
 </div>
@@ -323 +329 @@
 <?php endif; ?>
 
-<h3 id="available-plugins"><?php _e('Available Plugins') ?></h3>
+<?php if ( ! empty($inactive_plugins) ) : ?>
+<h3 id="inactive-plugins"><?php _e('Inactive Plugins') ?></h3>
 <form method="post" action="<?php echo admin_url('plugins.php') ?>">
 <?php wp_nonce_field('bulk-manage-plugins') ?>
 
-<?php if ( ! empty($available_plugins) ) : ?>
 <div class="tablenav">
     <div class="alignleft">
@@ -337 +343 @@
 </div>
 <br class="clear" />
-<?php print_plugins_table($available_plugins, 'available') ?>
+<?php print_plugins_table($inactive_plugins, 'inactive') ?>
 </form>
+<?php endif; ?>
+
+<?php if ( empty($all_plugins) ) : ?>
+<p><?php _e('You do not appear to have any plugins available at this time.') ?></p>
 <?php endif; ?>