WordPress.org
Get WordPress

Make WordPress Core

Ticket #7957: print-table-headers.diff

File print-table-headers.diff, 19.1 KB (added by DD32, 18 years ago)

  • wp-admin/categories.php

     
    182182?>
    183183
    184184<div class="alignleft">
    185 <select name="action">
    186 <option value="" selected="selected"><?php _e('Actions'); ?></option>
    187 <option value="delete"><?php _e('Delete'); ?></option>
    188 </select>
    189 <input type="submit" value="<?php _e('Apply'); ?>" name="doaction" id="doaction" class="button-secondary action" />
     185<?php print_table_actions( array('' => __('Actions'), 'delete' => __('Delete') ), '', 'action', 'doaction', 'doaction', '', 'categories'); ?>
    190186<?php wp_nonce_field('bulk-categories'); ?>
    191187</div>
    192188
    … …  
    222218?>
    223219
    224220<div class="alignleft">
    225 <select name="action2">
    226 <option value="" selected="selected"><?php _e('Actions'); ?></option>
    227 <option value="delete"><?php _e('Delete'); ?></option>
    228 </select>
    229 <input type="submit" value="<?php _e('Apply'); ?>" name="doaction2" id="doaction2" class="button-secondary action" />
     221<?php print_table_actions( array('' => __('Actions'), 'delete' => __('Delete') ), '', 'action2', 'doaction2', 'doaction2', '', 'categories'); ?>
    230222<?php wp_nonce_field('bulk-categories'); ?>
    231223</div>
    232224

  • wp-admin/edit-comments.php

     
    218218?>
    219219
    220220<div class="alignleft">
    221 <select name="action">
    222 <option value="-1" selected="selected"><?php _e('Actions') ?></option>
    223 <?php if ( empty($comment_status) || 'approved' == $comment_status ): ?>
    224 <option value="unapprove"><?php _e('Unapprove'); ?></option>
    225 <?php endif; ?>
    226 <?php if ( empty($comment_status) || 'moderated' == $comment_status ): ?>
    227 <option value="approve"><?php _e('Approve'); ?></option>
    228 <?php endif; ?>
    229 <?php if ( 'spam' != $comment_status ): ?>
    230 <option value="markspam"><?php _e('Mark as Spam'); ?></option>
    231 <?php endif; ?>
    232 <option value="delete"><?php _e('Delete'); ?></option>
    233 </select>
    234 <input type="submit" name="doaction" id="doaction" value="<?php _e('Apply'); ?>" class="button-secondary apply" />
     221                <?php
     222                $actions = array('-1' => __('Actions') );
     223                if ( empty($comment_status) || 'approved' == $comment_status )
     224                        $actions['unapprove'] = __('Unapprove');
     225                if ( empty($comment_status) || 'moderated' == $comment_status )
     226                        $actions['approve'] = __('Approve');
     227                if ( 'spam' != $comment_status )
     228                        $actions['markspam'] = __('Mark as Spam');
     229                $actions['delete'] = __('Delete');
     230
     231                print_table_actions( $actions, '', 'action', 'doaction', 'doaction', '', 'comments');
     232                ?>
    235233<?php wp_nonce_field('bulk-comments'); ?>
    236234<?php if ( isset($_GET['apage']) ) { ?>
    237235        <input type="hidden" name="apage" value="<?php echo absint( $_GET['apage'] ); ?>" />
    … …  
    285283?>
    286284
    287285<div class="alignleft">
    288 <select name="action2">
    289 <option value="-1" selected="selected"><?php _e('Actions') ?></option>
    290 <?php if ( empty($comment_status) || 'approved' == $comment_status ): ?>
    291 <option value="unapprove"><?php _e('Unapprove'); ?></option>
    292 <?php endif; ?>
    293 <?php if ( empty($comment_status) || 'moderated' == $comment_status ): ?>
    294 <option value="approve"><?php _e('Approve'); ?></option>
    295 <?php endif; ?>
    296 <?php if ( 'spam' != $comment_status ): ?>
    297 <option value="markspam"><?php _e('Mark as Spam'); ?></option>
    298 <?php endif; ?>
    299 <option value="delete"><?php _e('Delete'); ?></option>
    300 </select>
    301 <input type="submit" name="doaction2" id="doaction2" value="<?php _e('Apply'); ?>" class="button-secondary apply" />
    302 
     286<?php print_table_actions( $actions, '', 'action2', 'doaction2', 'doaction2', '', 'comments'); ?>
    303287<?php if ( 'spam' == $comment_status ) { ?>
    304288<input type="submit" name="delete_all_spam2" value="<?php _e('Delete All Spam'); ?>" class="button-secondary apply" />
    305289<?php } ?>

  • wp-admin/edit-link-categories.php

     
    110110?>
    111111
    112112<div class="alignleft">
    113 <select name="action">
    114 <option value="" selected="selected"><?php _e('Actions'); ?></option>
    115 <option value="delete"><?php _e('Delete'); ?></option>
    116 </select>
    117 <input type="submit" value="<?php _e('Apply'); ?>" name="doaction" id="doaction" class="button-secondary action" />
     113<?php print_table_actions( array('' => __('Actions'), 'delete' => __('Delete') ), '', 'action', 'doaction', 'doaction', '', 'link_categories'); ?>
    118114<?php wp_nonce_field('bulk-link-categories'); ?>
    119115</div>
    120116
    … …  
    166162?>
    167163
    168164<div class="alignleft">
    169 <select name="action2">
    170 <option value="" selected="selected"><?php _e('Actions'); ?></option>
    171 <option value="delete"><?php _e('Delete'); ?></option>
    172 </select>
    173 <input type="submit" value="<?php _e('Apply'); ?>" name="doaction2" id="doaction2" class="button-secondary action" />
     165<?php print_table_actions( array('' => __('Actions'), 'delete' => __('Delete') ), '', 'action2', 'doaction2', 'doaction2', '', 'link_categories'); ?>
    174166</div>
    175167
    176168<br class="clear" />

  • wp-admin/edit-pages.php

     
    200200?>
    201201
    202202<div class="alignleft">
    203 <select name="action">
    204 <option value="-1" selected="selected"><?php _e('Actions'); ?></option>
    205 <option value="edit"><?php _e('Edit'); ?></option>
    206 <option value="delete"><?php _e('Delete'); ?></option>
    207 </select>
    208 <input type="submit" value="<?php _e('Apply'); ?>" name="doaction" id="doaction" class="button-secondary action" />
     203<?php print_table_actions( array('-1' => __('Actions'), 'edit' => __('Edit'), 'delete' => __('Delete') ), '', 'action', 'doaction', 'doaction', '', 'pages'); ?>
    209204<?php wp_nonce_field('bulk-pages'); ?>
    210205</div>
    211206
    … …  
    245240?>
    246241
    247242<div class="alignleft">
    248 <select name="action2">
    249 <option value="-1" selected="selected"><?php _e('Actions'); ?></option>
    250 <option value="edit"><?php _e('Edit'); ?></option>
    251 <option value="delete"><?php _e('Delete'); ?></option>
    252 </select>
    253 <input type="submit" value="<?php _e('Apply'); ?>" name="doaction2" id="doaction2" class="button-secondary action" />
     243<?php print_table_actions( array('-1' => __('Actions'), 'edit' => __('Edit'), 'delete' => __('Delete') ), '', 'action2', 'doaction2', 'doaction2', '', 'pages'); ?>
    254244</div>
    255245
    256246<br class="clear" />
    … …  
    311301
    312302</div>
    313303
    314 <?php include('admin-footer.php'); ?>
    315  No newline at end of file
     304<?php include('admin-footer.php'); ?>

  • wp-admin/edit-tags.php

     
    177177?>
    178178
    179179<div class="alignleft">
    180 <select name="action">
    181 <option value="" selected="selected"><?php _e('Actions'); ?></option>
    182 <option value="delete"><?php _e('Delete'); ?></option>
    183 </select>
    184 <input type="submit" value="<?php _e('Apply'); ?>" name="doaction" id="doaction" class="button-secondary action" />
     180<?php print_table_actions( array('' => __('Actions'), 'delete' => __('Delete') ), '', 'action', 'doaction', 'doaction', '', 'tags'); ?>
    185181<?php wp_nonce_field('bulk-tags'); ?>
    186182</div>
    187183
    … …  
    220216?>
    221217
    222218<div class="alignleft">
    223 <select name="action2">
    224 <option value="" selected="selected"><?php _e('Actions'); ?></option>
    225 <option value="delete"><?php _e('Delete'); ?></option>
    226 </select>
    227 <input type="submit" value="<?php _e('Apply'); ?>" name="doaction2" id="doaction2" class="button-secondary action" />
     219<?php print_table_actions( array('' => __('Actions'), 'delete' => __('Delete') ), '', 'action2', 'doaction2', 'doaction2', '', 'tags'); ?>
    228220</div>
    229221
    230222<br class="clear" />

  • wp-admin/edit.php

     
    226226?>
    227227
    228228<div class="alignleft">
    229 <select name="action">
    230 <option value="-1" selected="selected"><?php _e('Actions'); ?></option>
    231 <option value="edit"><?php _e('Edit'); ?></option>
    232 <option value="delete"><?php _e('Delete'); ?></option>
    233 </select>
    234 <input type="submit" value="<?php _e('Apply'); ?>" name="doaction" id="doaction" class="button-secondary action" />
     229<?php print_table_actions( array('-1' => __('Actions'), 'edit' => __('Edit'), 'delete' => __('Delete') ), '', 'doaction', 'doaction', '', 'posts'); ?>
    235230<?php wp_nonce_field('bulk-posts'); ?>
    236231</div>
    237232
    … …  
    259254?>
    260255
    261256<div class="alignleft">
    262 <select name="action2">
    263 <option value="-1" selected="selected"><?php _e('Actions'); ?></option>
    264 <option value="edit"><?php _e('Edit'); ?></option>
    265 <option value="delete"><?php _e('Delete'); ?></option>
    266 </select>
    267 <input type="submit" value="<?php _e('Apply'); ?>" name="doaction2" id="doaction2" class="button-secondary action" />
     257<?php print_table_actions( array('' => __('Actions'), 'edit' => __('Edit'), 'delete' => __('Delete') ), '', 'action2', 'doaction2', 'doaction2', '', 'posts'); ?>
    268258<br class="clear" />
    269259</div>
    270260<br class="clear" />

  • wp-admin/includes/template.php

     
    30903090        }
    30913091}
    30923092
     3093/**
     3094 * Table header dropdown list
     3095 *
     3096 * @since 2.7.0
     3097 * @param array $actions assoc. array of actions for the list
     3098 * @param string $current the keyname of the currently selected item
     3099 * @param string $selectname the name of the selection field
     3100 * @param string $buttonname the name attribute of the submit button
     3101 * @param string $buttonid the ID attribute of the submit button
     3102 * @param string $buttontext the lable on the submit button
     3103 * @param string $table the name of the table the actions apply to, Actions are run through a filter 'table_actions_$table'
     3104 *
     3105 */
     3106function print_table_actions($actions, $current, $selectname, $buttonname, $buttonid, $buttontext = '', $table = '') {
     3107        if ( empty($buttontext) )
     3108                $buttontext = __('Apply');
     3109        if ( !empty($table) )
     3110                $actions = apply_filters('table_actions-$table', $actions, $current, $selectname, $buttonname, $buttonid, $buttontext, $table);
     3111        $actions = apply_filters('table_actions', $actions, $current, $selectname, $buttonname, $buttonid, $buttontext, $table);
     3112        if ( count($actions) > 0 ) {
     3113                echo "<select name='$selectname' class='select-action'>";
     3114                foreach ( $actions as $value => $text ) {
     3115                        $selected = ($current == $value) ? ' selected="selected"' : '';
     3116                        echo "<option value='$value' $selected>$text</option>";
     3117                }
     3118                echo '</select>';
     3119                echo "<input type='submit' name='$buttonname' id='$buttonid' value='$buttontext' class='button-secondary action apply' />";
     3120        }
     3121}
     3122
    30933123?>

  • wp-admin/link-manager.php

     
    135135<div class="tablenav">
    136136
    137137<div class="alignleft">
    138 <select name="action">
    139 <option value="" selected="selected"><?php _e('Actions'); ?></option>
    140 <option value="delete"><?php _e('Delete'); ?></option>
    141 </select>
    142 <input type="submit" value="<?php _e('Apply'); ?>" name="doaction" id="doaction" class="button-secondary action" />
     138<?php print_table_actions( array('' => __('Actions'), 'delete' => __('Delete') ), '', 'action', 'doaction', 'doaction', '', 'links'); ?>
    143139</div>
    144140
    145141<br class="clear" />
    … …  
    266262<div class="tablenav">
    267263
    268264<div class="alignleft">
    269 <select name="action2">
    270 <option value="" selected="selected"><?php _e('Actions'); ?></option>
    271 <option value="delete"><?php _e('Delete'); ?></option>
    272 </select>
    273 <input type="submit" value="<?php _e('Apply'); ?>" name="doaction2" id="doaction2" class="button-secondary action" />
     265<?php print_table_actions( array('' => __('Actions'), 'delete' => __('Delete') ), '', 'action2', 'doaction2', 'doaction2', '', 'links'); ?>
    274266</div>
    275267
    276268<br class="clear" />

  • wp-admin/plugins.php

     
    99/** WordPress Administration Bootstrap */
    1010require_once('admin.php');
    1111
    12 $action = '';
    13 foreach( array('activate-selected', 'deactivate-selected', 'delete-selected', 'clear-recent-list') as $action_key ) {
    14         if( isset($_POST[$action_key]) ) {
    15                 $action = $action_key;
    16                 break;
    17         }
    18 }
    19 
    20 if( isset($_REQUEST['action']) && !empty($_REQUEST['action']) )
    21         $action = $_REQUEST['action'];
    22 
     12$action = isset($_REQUEST['action']) && !empty($_REQUEST['action']) ? $_REQUEST['action'] : '';
    2313$plugin = isset($_REQUEST['plugin']) ? $_REQUEST['plugin'] : '';
    2414
    2515if( !empty($action) ) {
    … …  
    130120                                <p><?php _e('Are you sure you wish to delete these files?') ?></p>
    131121                                <form method="post" action="<?php echo clean_url($_SERVER['REQUEST_URI']); ?>" style="display:inline;">
    132122                                        <input type="hidden" name="verify-delete" value="1" />
    133                                         <input type="hidden" name="delete-selected" value="1" />
     123                                        <input type="hidden" name="action" value="delete-selected" />
    134124                                        <?php
    135125                                                foreach ( (array)$plugins as $plugin )
    136126                                                        echo '<input type="hidden" name="checked[]" value="' . attribute_escape($plugin) . '" />';
    … …  
    321311
    322312<div class="tablenav">
    323313        <div class="alignleft">
    324                 <select name="action">
    325                         <option value="" selected="selected"><?php _e('Actions'); ?></option>
    326                         <option value="deactivate-selected"><?php _e('Deactivate'); ?></option>
    327                 </select>
    328                 <input type="submit" name="doaction_active" value="<?php _e('Apply'); ?>" class="button-secondary action" />
     314                <?php print_table_actions( array('' => __('Actions'), 'deactivate-selected' => __('Deactivate') ), '', 'action', 'doaction_active', 'doaction_active', '', 'plugins_active') ?>
    329315        </div>
    330316</div>
    331317<div class="clear"></div>
    … …  
    343329
    344330<div class="tablenav">
    345331        <div class="alignleft">
    346                 <select name="action">
    347                         <option value="" selected="selected"><?php _e('Actions'); ?></option>
    348                         <option value="activate-selected"><?php _e('Activate'); ?></option>
    349 <?php if( current_user_can('delete_plugins') ) : ?>
    350                         <option value="delete-selected"><?php _e('Delete'); ?></option>
    351 <?php endif; ?>
    352                 </select>
    353                 <input type="submit" value="<?php _e('Apply'); ?>" name="doaction_recent" class="button-secondary action" />
    354                 <input type="submit" name="clear-recent-list" value="<?php _e('Clear List') ?>" class="button-secondary" />
     332                <?php
     333                $actions = array('' => __('Actions'), 'activate-selected' => __('Activate') );
     334                if( current_user_can('delete_plugins') )
     335                        $actions['delete-selected'] = __('Delete');
     336                $actions['clear-recent-list'] = __('Clear List');
     337                print_table_actions( $actions, '', 'action', 'doaction_recent', 'doaction_recent', '', 'plugins_recent')
     338                ?>
    355339        </div>
    356340</div>
    357341<div class="clear"></div>
    … …  
    366350
    367351<div class="tablenav">
    368352        <div class="alignleft">
    369                 <input type="submit" name="activate-selected" value="<?php _e('Activate') ?>" class="button-secondary" />
    370 <?php if( current_user_can('delete_plugins') ) : ?>
    371                 <input type="submit" name="delete-selected" value="<?php _e('Delete') ?>" class="button-secondary" />
    372 <?php endif; ?>
     353                <?php
     354                $actions = array('' => __('Actions'), 'activate-selected' => __('Activate') );
     355                if( current_user_can('delete_plugins') )
     356                        $actions['delete-selected'] = __('Delete');
     357                print_table_actions( $actions, '', 'action', 'doaction_inactive', 'doaction_inactive', '', 'plugins_inactive')
     358                ?>
    373359        </div>
    374360</div>
    375361<div class="clear"></div>

  • wp-admin/upload.php

     
    279279?>
    280280
    281281<div class="alignleft">
    282 <select name="action" class="select-action">
    283 <option value="-1" selected="selected"><?php _e('Actions'); ?></option>
    284 <option value="delete"><?php _e('Delete'); ?></option>
    285 <?php if ( isset($orphans) ) { ?>
    286 <option value="attach"><?php _e('Attach to a post'); ?></option>
    287 <?php } ?>
    288 </select>
    289 <input type="submit" value="<?php _e('Apply'); ?>" name="doaction" id="doaction" class="button-secondary action" />
     282<?php
     283        $actions = array('-1' => __('Actions'), 'delete' => __('Delete') );
     284        if ( isset($orphans) )
     285                $actions['attach'] = __('Attach to a post');
     286        print_table_actions( $actions, '', 'action', 'doaction', 'doaction', '', 'media');
     287?>
    290288<?php wp_nonce_field('bulk-media'); ?>
    291289
    292290<?php if ( isset($_GET['detached']) ) { ?>
    … …  
    395393?>
    396394
    397395<div class="alignleft">
    398 <select name="action2" class="select-action">
    399 <option value="-1" selected="selected"><?php _e('Actions'); ?></option>
    400 <option value="delete"><?php _e('Delete'); ?></option>
    401 <?php if ( isset($orphans) ) { ?>
    402 <option value="attach"><?php _e('Attach to a post'); ?></option>
    403 <?php } ?>
    404 </select>
    405 <input type="submit" value="<?php _e('Apply'); ?>" name="doaction2" id="doaction2" class="button-secondary action" />
     396<?php
     397        $actions = array('-1' => __('Actions'), 'delete' => __('Delete') );
     398        if ( isset($orphans) )
     399                $actions['attach'] = __('Attach to a post');
     400        print_table_actions( $actions, '', 'action2', 'doaction2', 'doaction2', '', 'media');
     401?>
    406402</div>
    407403
    408404<br class="clear" />

  • wp-admin/users.php

     
    316316<?php endif; ?>
    317317
    318318<div class="alignleft">
    319 <select name="action">
    320 <option value="" selected="selected"><?php _e('Actions'); ?></option>
    321 <option value="delete"><?php _e('Delete'); ?></option>
    322 </select>
    323 <input type="submit" value="<?php _e('Apply'); ?>" name="doaction" id="doaction" class="button-secondary action" />
     319<?php print_table_actions( array('' => __('Actions'), 'delete' => __('Delete') ), '', 'action', 'doaction', 'doaction', '', 'users'); ?>
    324320<label class="hidden" for="new_role"><?php _e('Change role to&hellip;') ?></label><select name="new_role" id="new_role"><option value=''><?php _e('Change role to&hellip;') ?></option><?php wp_dropdown_roles(); ?></select>
    325321<input type="submit" value="<?php _e('Change'); ?>" name="changeit" class="button-secondary" />
    326322<?php wp_nonce_field('bulk-users'); ?>
    … …  
    384380<?php endif; ?>
    385381
    386382<div class="alignleft">
    387 <select name="action2">
    388 <option value="" selected="selected"><?php _e('Actions'); ?></option>
    389 <option value="delete"><?php _e('Delete'); ?></option>
    390 </select>
    391 <input type="submit" value="<?php _e('Apply'); ?>" name="doaction2" id="doaction2" class="button-secondary action" />
     383<?php print_table_actions( array('' => __('Actions'), 'delete' => __('Delete') ), '', 'action2', 'doaction2', 'doaction2', '', 'users'); ?>
    392384</div>
    393385
    394386<br class="clear" />