Changeset 15571 for trunk/wp-admin/includes/default-list-tables.php

Timestamp:

09/05/2010 04:53:59 PM (14 years ago)

Author:

scribu

Message:

Introduce WP_List_Table::row_actions(). See #14579

File:

• trunk/wp-admin/includes/default-list-tables.php (modified) (10 diffs)

trunk/wp-admin/includes/default-list-tables.php

@@ -456 +456 @@
 
                 $actions = apply_filters( $this->hierarchical_display ? 'page_row_actions' : 'post_row_actions', $actions, $post );
-                $action_count = count( $actions );
-                $i = 0;
-                echo '<div class="row-actions">';
-                foreach ( $actions as $action => $link ) {
-                    ++$i;
-                    ( $i == $action_count ) ? $sep = '' : $sep = ' | ';
-                    echo "<span class='$action'>$link$sep</span>";
-                }
-                echo '</div>';
+                echo $this->row_actions( $actions );
 
                 get_inline_data( $post );
@@ -1116 +1108 @@
         }
         $actions = apply_filters( 'media_row_actions', $actions, $post );
-        $action_count = count( $actions );
-        $i = 0;
-        echo '<div class="row-actions">';
-        foreach ( $actions as $action => $link ) {
-            $sep = ( ++$i == $action_count ) ? '' : ' | ';
-            echo "<span class='$action'>$link$sep</span>";
-        }
-        echo '</div>';
+        echo $this->row_actions( $actions );
 ?>
         </td>
@@ -1269 +1254 @@
                 echo strtoupper( str_replace( 'image/', '', get_post_mime_type() ) );
 ?>
-            <div class="row-actions">
 <?php
             $actions = array();
@@ -1286 +1270 @@
             $actions = apply_filters( 'media_row_actions', $actions, $post );
 
-            $action_count = count( $actions );
-            $i = 0;
-            foreach ( $actions as $action => $link ) {
-                $sep = ( ++$i == $action_count ) ? '' : ' | ';
-                echo "<span class='$action'>$link$sep</span>";
-            }
-?>
-            </div>
+            echo $this->row_actions( $actions );
+?>
         </td>
         <td class="author column-author">
@@ -1565 +1543 @@
                 case 'name':
                     $out .= '<td ' . $attributes . '><strong><a class="row-title" href="' . $edit_link . '" title="' . esc_attr( sprintf( __( 'Edit &#8220;%s&#8221;' ), $name ) ) . '">' . $name . '</a></strong><br />';
+
                     $actions = array();
                     if ( current_user_can( $tax->cap->edit_terms ) ) {
@@ -1576 +1555 @@
                     $actions = apply_filters( "${taxonomy}_row_actions", $actions, $tag );
 
-                    $action_count = count( $actions );
-                    $i = 0;
-                    $out .= '<div class="row-actions">';
-                    foreach ( $actions as $action => $link ) {
-                        ++$i;
-                        ( $i == $action_count ) ? $sep = '' : $sep = ' | ';
-                        $out .= "<span class='$action'>$link$sep</span>";
-                    }
-                    $out .= '</div>';
+                    $out .= $this->row_actions( $actions );
                     $out .= '<div class="hidden" id="inline_' . $qe_data->term_id . '">';
                     $out .= '<div class="name">' . $qe_data->name . '</div>';
@@ -1845 +1816 @@
                 $actions['remove'] = "<a class='submitdelete' href='" . wp_nonce_url( "users.php?action=remove&amp;user=$user_object->ID", 'bulk-users' ) . "'>" . __( 'Remove' ) . "</a>";
             $actions = apply_filters( 'user_row_actions', $actions, $user_object );
-            $action_count = count( $actions );
-            $i = 0;
-            $edit .= '<div class="row-actions">';
-            foreach ( $actions as $action => $link ) {
-                ++$i;
-                ( $i == $action_count ) ? $sep = '' : $sep = ' | ';
-                $edit .= "<span class='$action'>$link$sep</span>";
-            }
-            $edit .= '</div>';
+            $edit .= $this->row_actions( $actions );
 
             // Set up the checkbox ( because the user is editable, otherwise its empty )
@@ -2461 +2424 @@
                     case 'name':
                         echo "<td $attributes><strong><a class='row-title' href='$edit_link' title='" . esc_attr( sprintf( __( 'Edit &#8220;%s&#8221;' ), $link->link_name ) ) . "'>$link->link_name</a></strong><br />";
+
                         $actions = array();
                         $actions['edit'] = '<a href="' . $edit_link . '">' . __( 'Edit' ) . '</a>';
                         $actions['delete'] = "<a class='submitdelete' href='" . wp_nonce_url( "link.php?action=delete&amp;link_id=$link->link_id", 'delete-bookmark_' . $link->link_id ) . "' onclick=\"if ( confirm( '" . esc_js( sprintf( __( "You are about to delete this link '%s'\n  'Cancel' to stop, 'OK' to delete." ), $link->link_name ) ) . "' ) ) { return true;}return false;\">" . __( 'Delete' ) . "</a>";
-                        $action_count = count( $actions );
-                        $i = 0;
-                        echo '<div class="row-actions">';
-                        foreach ( $actions as $action => $linkaction ) {
-                            ++$i;
-                            ( $i == $action_count ) ? $sep = '' : $sep = ' | ';
-                            echo "<span class='$action'>$linkaction$sep</span>";
-                        }
-                        echo '</div>';
+                        echo $this->row_actions( $actions );
+
                         echo '</td>';
                         break;
@@ -2728 +2685 @@
                             $actions['visit']   = "<span class='view'><a href='" . esc_url( get_home_url( $blog['blog_id'] ) ) . "' rel='permalink'>" . __( 'Visit' ) . '</a></span>';
                             $actions = array_filter( $actions );
-                            if ( count( $actions ) ) : ?>
-                            <div class="row-actions">
-                                <?php echo implode( ' | ', $actions ); ?>
-                            </div>
-                            <?php endif; ?>
+                            echo $this->row_actions( $actions );
+                    ?>
                         </td>
                     <?php
@@ -2965 +2919 @@
                             ?></strong>
                             <br/>
-                            <div class="row-actions">
-                                <span class="edit"><a href="<?php echo esc_url( admin_url( $edit_link ) ); ?>"><?php _e( 'Edit' ); ?></a></span>
-                                <?php if ( ! in_array( $user['user_login'], $super_admins ) ) { ?>
-                                | <span class="delete"><a href="<?php echo $delete  = esc_url( network_admin_url( add_query_arg( '_wp_http_referer', urlencode( stripslashes( $_SERVER['REQUEST_URI'] ) ), wp_nonce_url( 'edit.php', 'deleteuser' ) . '&amp;action=deleteuser&amp;id=' . $user['ID'] ) ) ); ?>" class="delete"><?php _e( 'Delete' ); ?></a></span>
-                                <?php } ?>
+                            <?php
+                                $actions = array();
+                                $actions['edit'] = '<a href="' . esc_url( admin_url( $edit_link ) ) . '">' . __( 'Edit' ) . '</a>';
+
+                                if ( ! in_array( $user['user_login'], $super_admins ) ) {
+                                    $actions['delete'] = '<a href="' . $delete = esc_url( network_admin_url( add_query_arg( '_wp_http_referer', urlencode( stripslashes( $_SERVER['REQUEST_URI'] ) ), wp_nonce_url( 'edit.php', 'deleteuser' ) . '&amp;action=deleteuser&amp;id=' . $user['ID'] ) ) ) . '" class="delete">' . __( 'Delete' ) . '</a>';
+                                }
+
+                                echo $this->row_actions( $actions );
+                            ?>
                             </div>
                         </td>