Changeset 6606

Timestamp:

12/10/2012 02:04:33 PM (12 years ago)

Author:

johnjamesjacoby

Message:

Add .min scripts for Groups Admin. Fix bug in min filenames. Fixes #4617.

Location:

trunk/bp-groups

Files:

• admin/css/admin.min.css (added)
• admin/js/admin.js (modified) (1 diff)
• admin/js/admin.min.js (added)
• bp-groups-admin.php (modified) (10 diffs)

trunk/bp-groups/admin/js/admin.js

@@ -22 +22 @@
             open:      function() { $(this).addClass('open'); },
             close:     function() { $(this).removeClass('open'); $(this).val(''); },
-            select:    function( event, ui ) { add_member_to_list( event, ui ); },
-
+            select:    function( event, ui ) { add_member_to_list( event, ui ); }
         });
         

trunk/bp-groups/bp-groups-admin.php

@@ -54 +54 @@
  */
 function bp_groups_admin_load() {
-    global $bp, $bp_groups_list_table;
+    global $bp_groups_list_table;
 
     // Build redirection URL
@@ -60 +60 @@
 
     // Decide whether to load the dev version of the CSS and JavaScript
-    $min = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
+    $min = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : 'min.';
 
     // Decide whether to load the index or edit screen
@@ -233 +233 @@
         if ( ! empty( $user_names ) ) {
 
-            foreach( $user_names as $user_key => $user_name ) {
+            foreach( array_values( $user_names ) as $user_name ) {
                 $un = trim( $user_name );
 
@@ -398 +398 @@
  * Display the single groups edit screen
  *
- * @global int $screen_layout_columns Number of columns shown on this admin page
  * @since 1.7
  */
 function bp_groups_admin_edit() {
-    global $screen_layout_columns;
 
     if ( ! is_super_admin() )
@@ -459 +457 @@
 
     // Call an action for plugins to modify the group before we display the edit form
-    do_action_ref_array( 'bp_groups_admin_edit', array( &$group ) );
-?>
+    do_action_ref_array( 'bp_groups_admin_edit', array( &$group ) ); ?>
 
     <div class="wrap">
@@ -891 +888 @@
  */
 class BP_Groups_List_Table extends WP_List_Table {
+
     /**
      * What type of view is being displayed? e.g. "All", "Pending", "Approved", "Spam"...
@@ -979 +977 @@
         $this->group_type_ids = BP_Groups_Group::get_group_type_ids();
 
+        // Pass a dummy array if there are no groups of this type
         $include = false;
         if ( 'all' != $this->view && isset( $this->group_type_ids[ $this->view ] ) ) {
-            // Pass a dummy array if there are no groups of this type
             $include = ! empty( $this->group_type_ids[ $this->view ] ) ? $this->group_type_ids[ $this->view ] : array( 0 );
         }
@@ -1056 +1054 @@
         extract( $this->_args );
 
-        $this->display_tablenav( 'top' );
-    ?>
+        $this->display_tablenav( 'top' ); ?>
 
         <table class="<?php echo implode( ' ', $this->get_table_classes() ); ?>" cellspacing="0">
@@ -1089 +1086 @@
     function single_row( $item ) {
         static $row_class = '';
-        $row_class = ( $row_class == '' ? ' class="alternate"' : '' );
+
+        if ( empty( $row_class ) ) {
+            $row_class = ( $row_class == '' ) ? ' class="alternate"' : '';
+        }
 
         echo '<tr' . $row_class . ' id="activity-' . esc_attr( $item['id'] ) . '" data-parent_id="' . esc_attr( $item['id'] ) . '" data-root_id="' . esc_attr( $item['id'] ) . '">';
@@ -1102 +1102 @@
      */
     function get_views() {
-        $url_base = remove_query_arg( array( 'orderby', 'order', 'group_status' ), $_SERVER['REQUEST_URI'] );
-        //$redirect_to = remove_query_arg( array( 'activity_status', 'aid', 'deleted', 'error', 'spammed', 'unspammed', 'updated', ), $_SERVER['REQUEST_URI'] );
-    ?>
+        $url_base = remove_query_arg( array( 'orderby', 'order', 'group_status' ), $_SERVER['REQUEST_URI'] ); ?>
         <ul class="subsubsub">
             <li class="all"><a href="<?php echo esc_attr( esc_url( $url_base ) ); ?>" class="<?php if ( 'all' == $this->view ) echo 'current'; ?>"><?php _e( 'All', 'buddypress' ); ?></a> |</li>