Changeset 6129

Timestamp:

06/21/2012 08:42:47 PM (13 years ago)

Author:

djpaul

Message:

Fix 'number of columns' screen option. Fixes #4287.

• This was caused by a change in WP 3.4, and brings our admin screen back in line with core.
• ​#WP21042

Location:

trunk/bp-activity

Files:

• bp-activity-admin.php (modified) (4 diffs)
• bp-activity-akismet.php (modified) (1 diff)

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

@@ -201 +201 @@
         // Register metaboxes for the edit screen.
         add_meta_box( 'submitdiv',           _x( 'Status', 'activity admin edit screen', 'buddypress' ), 'bp_activity_admin_edit_metabox_status', 'toplevel_page_bp-activity', 'side', 'core' );
-        add_meta_box( 'bp_activity_itemids', _x( 'Primary Item/Secondary Item', 'activity admin edit screen', 'buddypress' ), 'bp_activity_admin_edit_metabox_itemids', 'toplevel_page_bp-activity', 'advanced', 'core' );
-        add_meta_box( 'bp_activity_link',    _x( 'Link', 'activity admin edit screen', 'buddypress' ), 'bp_activity_admin_edit_metabox_link', 'toplevel_page_bp-activity', 'advanced', 'core' );
-        add_meta_box( 'bp_activity_type',    _x( 'Type', 'activity admin edit screen', 'buddypress' ), 'bp_activity_admin_edit_metabox_type', 'toplevel_page_bp-activity', 'advanced', 'core' );
-        add_meta_box( 'bp_activity_userid',  _x( 'Author ID', 'activity admin edit screen', 'buddypress' ), 'bp_activity_admin_edit_metabox_userid', 'toplevel_page_bp-activity', 'advanced', 'core' );
+        add_meta_box( 'bp_activity_itemids', _x( 'Primary Item/Secondary Item', 'activity admin edit screen', 'buddypress' ), 'bp_activity_admin_edit_metabox_itemids', 'toplevel_page_bp-activity', 'normal', 'core' );
+        add_meta_box( 'bp_activity_link',    _x( 'Link', 'activity admin edit screen', 'buddypress' ), 'bp_activity_admin_edit_metabox_link', 'toplevel_page_bp-activity', 'normal', 'core' );
+        add_meta_box( 'bp_activity_type',    _x( 'Type', 'activity admin edit screen', 'buddypress' ), 'bp_activity_admin_edit_metabox_type', 'toplevel_page_bp-activity', 'normal', 'core' );
+        add_meta_box( 'bp_activity_userid',  _x( 'Author ID', 'activity admin edit screen', 'buddypress' ), 'bp_activity_admin_edit_metabox_userid', 'toplevel_page_bp-activity', 'normal', 'core' );
 
         // Enqueue javascripts
@@ -567 +567 @@
 
             <form action="<?php echo esc_attr( $form_url ); ?>" id="bp-activities-edit-form" method="post">
-                <div id="poststuff" class="metabox-holder<?php echo 2 == $screen_layout_columns ? ' has-right-sidebar' : ''; ?>">
-                    <div id="side-info-column" class="inner-sidebar">
-                        <?php do_meta_boxes( 'toplevel_page_bp-activity', 'side', $activity ); ?>
-                    </div>
-
-                    <div id="post-body" class="has-sidebar">
-                        <div id="post-body-content" class="has-sidebar-content">
+                <div id="poststuff">
+
+                    <div id="post-body" class="metabox-holder columns-<?php echo 1 == get_current_screen()->get_columns() ? '1' : '2'; ?>"> 
+                        <div id="post-body-content">
                             <div id="postdiv" class="postarea">
                                 <div id="bp_activity_action" class="postbox">
@@ -589 +586 @@
                                 </div>
                             </div>
-
+                        </div><!-- #post-body-content -->
+
+                        <div id="postbox-container-1" class="postbox-container">
+                            <?php do_meta_boxes( 'toplevel_page_bp-activity', 'side', $activity ); ?>
+                        </div>
+
+                        <div id="postbox-container-2" class="postbox-container">
+                            <?php do_meta_boxes( 'toplevel_page_bp-activity', 'normal', $activity ); ?>
                             <?php do_meta_boxes( 'toplevel_page_bp-activity', 'advanced', $activity ); ?>
                         </div>
-                    </div>
-                </div>
-
+                    </div><!-- #post-body -->
+
+                </div><!-- #poststuff -->
                 <?php wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); ?>
                 <?php wp_nonce_field( 'meta-box-order', 'meta-box-order-nonce', false ); ?>
@@ -604 +608 @@
         <?php endif; ?>
 
-    </div>
+    </div><!-- .wrap -->
 
 <?php

trunk/bp-activity/bp-activity-akismet.php

@@ -497 +497 @@
 
         // Display meta box with a low priority (low position on screen by default)
-        add_meta_box( 'bp_activity_history',  __( 'Activity History', 'buddypress' ), array( $this, 'history_metabox' ), 'toplevel_page_bp-activity', 'advanced', 'low' );
+        add_meta_box( 'bp_activity_history',  __( 'Activity History', 'buddypress' ), array( $this, 'history_metabox' ), 'toplevel_page_bp-activity', 'normal', 'low' );
     }