Changeset 11027

Timestamp:

04/21/2009 06:49:53 AM (17 years ago)

Author:

ryan

Message:

Add per page screen option to plugins page. see #9527

Location:

trunk/wp-admin

Files:

• includes/misc.php (modified) (1 diff)
• includes/template.php (modified) (5 diffs)
• plugins.php (modified) (2 diffs)

trunk/wp-admin/includes/misc.php

@@ -346 +346 @@
             case 'categories_per_page':
             case 'edit_tags_per_page':
+            case 'plugins_per_page':
                 $value = (int) $value;
                 if ( $value < 1 || $value > 999 )

trunk/wp-admin/includes/template.php

@@ -3352 +3352 @@
         $screen = $meta_screens[$screen];
     $show_screen = false;
-    if ( !empty($wp_meta_boxes[$screen]) || !empty($column_screens) )
+    $show_on_screen = false;
+    if ( !empty($wp_meta_boxes[$screen]) || !empty($column_screens) ) {
+        $show_screen = true;
+        $show_on_screen = true;
+    }
+
+    $screen_options = screen_options($screen);
+    if ( $screen_options )
         $show_screen = true;
 
@@ -3404 +3411 @@
 <div id="screen-options-wrap" class="hidden">
     <form id="adv-settings" action="" method="post">
+<?php if ( $show_on_screen ) : ?>
     <h5><?php _e('Show on screen') ?></h5>
     <div class="metabox-prefs">
@@ -3413 +3421 @@
     <br class="clear" />
     </div>
+<?php endif; ?>
 <?php echo screen_layout($screen); ?>
-<?php echo screen_options($screen); ?>
+<?php echo $screen_options; ?>
 <div><?php wp_nonce_field( 'screen-options-nonce', 'screenoptionnonce', false ); ?></div>
 </form>
@@ -3556 +3565 @@
             $per_page_label = __('Tags per page:');
             break;
+        case 'plugins':
+            $per_page_label = __('Plugins per page:');
+            break;
         default:
             return '';
@@ -3569 +3581 @@
     if ( !empty($per_page_label) )
         $return .= "<label for='$option'>$per_page_label</label> <input type='text' class='screen-per-page' name='wp_screen_options[value]' id='$option' maxlength='3' value='$per_page' />\n";
-        $return .= "<input type='submit' class='button' value='" . __('Apply') . "' />";
-        $return .= "<input type='hidden' name='wp_screen_options[option]' value='$option' />";
+    $return .= "<input type='submit' class='button' value='" . __('Apply') . "' />";
+    $return .= "<input type='hidden' name='wp_screen_options[option]' value='$option' />";
     $return .= "</div>\n";
     return $return;

trunk/wp-admin/plugins.php

@@ -207 +207 @@
 <div class="wrap">
 <?php screen_icon(); ?>
-    <h2><?php echo wp_specialchars( $title ); ?></h2>
+<h2><?php echo wp_specialchars( $title ); ?></h2>
+
+<p><?php _e('Plugins extend and expand the functionality of WordPress. Install new plugins and then activate, deactivate, or delete them here.'); ?></p>
 
 <?php
@@ -285 +287 @@
 $total_this_page = "total_{$status}_plugins";
 $total_this_page = $$total_this_page;
-$plugins_per_page = apply_filters('plugins_per_page', 20, $status);
+$plugins_per_page = get_user_option('plugins_per_page');
+if ( empty($plugins_per_page) )
+    $plugins_per_page = 20;
+$plugins_per_page = apply_filters('plugins_per_page', $plugins_per_page);
 
 $start = ($page - 1) * $plugins_per_page;