Changeset 8613

Timestamp:

07/15/2014 07:42:39 PM (12 years ago)

Author:

johnjamesjacoby

Message:

Break activity action filters up into groups in Activity admin. (We'll likely expand on this further with helper functions and more appropriate labeling later.)

File:

• trunk/src/bp-activity/bp-activity-admin.php (modified) (1 diff)

trunk/src/bp-activity/bp-activity-admin.php

@@ -1273 +1273 @@
      */
     function extra_tablenav( $which ) {
-        if ( 'bottom' == $which )
+
+        // Bail on bottom table nav
+        if ( 'bottom' === $which ) {
             return;
-
-        $selected = !empty( $_REQUEST['activity_type'] ) ? $_REQUEST['activity_type'] : '';
-
-        // Get all types of activities, and sort alphabetically.
-        $actions  = bp_activity_get_types();
-        natsort( $actions );
-    ?>
+        }
+
+        // Is any filter currently selected?
+        $selected = ( ! empty( $_REQUEST['activity_type'] ) ) ? $_REQUEST['activity_type'] : '';
+
+        // Get the actions
+        $activity_actions = buddypress()->activity->actions; ?>
 
         <div class="alignleft actions">
             <select name="activity_type">
-                <option value="" <?php selected( !$selected ); ?>><?php _e( 'Show all activity types', 'buddypress' ); ?></option>
-
-                <?php foreach ( $actions as $k => $v ) : ?>
-                    <option value="<?php echo esc_attr( $k ); ?>" <?php selected( $k,  $selected ); ?>><?php echo esc_html( $v ); ?></option>
+                <option value="" <?php selected( ! $selected ); ?>><?php _e( 'View all actions', 'buddypress' ); ?></option>
+
+                <?php foreach ( $activity_actions as $component => $actions ) : ?>
+
+                    <optgroup label="<?php echo ucfirst( $component ); ?>">
+
+                        <?php foreach ( $actions as $action_key => $action_values ) : ?>
+
+                            <option value="<?php echo esc_attr( $action_key ); ?>" <?php selected( $action_key,  $selected ); ?>><?php echo esc_html( $action_values[ 'value' ] ); ?></option>
+
+                        <?php endforeach; ?>
+
+                    </optgroup>
+
                 <?php endforeach; ?>
+
             </select>