Changeset 5268

Timestamp:

02/10/2014 04:48:36 PM (12 years ago)

Author:

johnjamesjacoby

Message:

Deprecate dashboard metabox, and append forum statistics to existing "At a Glance" metabox instead. Fixes #2544.

Location:

trunk/includes/admin

Files:

• actions.php (modified) (1 diff)
• admin.php (modified) (2 diffs)
• css/admin.css (modified) (2 diffs)
• metaboxes.php (modified) (2 diffs)

trunk/includes/admin/actions.php

@@ -83 +83 @@
 // Add sample permalink filter
 add_filter( 'post_type_link', 'bbp_filter_sample_permalink', 10, 4 );
+
+// Add quick stats to dashboard glance elements
+add_filter( 'dashboard_glance_items', 'bbp_dashboard_at_a_glance' );
 
 /**

trunk/includes/admin/admin.php

@@ -137 +137 @@
         /** General Actions ***************************************************/
 
-        add_action( 'bbp_admin_menu',              array( $this, 'admin_menus'                )     ); // Add menu item to settings menu
-        add_action( 'bbp_admin_head',              array( $this, 'admin_head'                 )     ); // Add some general styling to the admin area
-        add_action( 'bbp_admin_notices',           array( $this, 'activation_notice'          )     ); // Add notice if not using a bbPress theme
-        add_action( 'bbp_register_admin_style',    array( $this, 'register_admin_style'       )     ); // Add green admin style
-        add_action( 'bbp_register_admin_settings', array( $this, 'register_admin_settings'    )     ); // Add settings
-        add_action( 'bbp_activation',              array( $this, 'new_install'                )     ); // Add menu item to settings menu
-        add_action( 'admin_enqueue_scripts',       array( $this, 'enqueue_styles'             )     ); // Add enqueued CSS
-        add_action( 'admin_enqueue_scripts',       array( $this, 'enqueue_scripts'            )     ); // Add enqueued JS
-        add_action( 'wp_dashboard_setup',          array( $this, 'dashboard_widget_right_now' )     ); // Forums 'Right now' Dashboard widget
-        add_action( 'admin_bar_menu',              array( $this, 'admin_bar_about_link'       ), 15 ); // Add a link to bbPress about page to the admin bar
+        add_action( 'bbp_admin_menu',              array( $this, 'admin_menus'             )     ); // Add menu item to settings menu
+        add_action( 'bbp_admin_head',              array( $this, 'admin_head'              )     ); // Add some general styling to the admin area
+        add_action( 'bbp_admin_notices',           array( $this, 'activation_notice'       )     ); // Add notice if not using a bbPress theme
+        add_action( 'bbp_register_admin_style',    array( $this, 'register_admin_style'    )     ); // Add green admin style
+        add_action( 'bbp_register_admin_settings', array( $this, 'register_admin_settings' )     ); // Add settings
+        add_action( 'bbp_activation',              array( $this, 'new_install'             )     ); // Add menu item to settings menu
+        add_action( 'admin_enqueue_scripts',       array( $this, 'enqueue_styles'          )     ); // Add enqueued CSS
+        add_action( 'admin_enqueue_scripts',       array( $this, 'enqueue_scripts'         )     ); // Add enqueued JS
+        add_action( 'admin_bar_menu',              array( $this, 'admin_bar_about_link'    ), 15 ); // Add a link to bbPress about page to the admin bar
 
         /** Ajax **************************************************************/
@@ -520 +519 @@
         // Add a few links to the existing links array
         return array_merge( $links, $new_links );
-    }
-
-    /**
-     * Add the 'Right now in Forums' dashboard widget
-     *
-     * @since bbPress (r2770)
-     *
-     * @uses wp_add_dashboard_widget() To add the dashboard widget
-     */
-    public static function dashboard_widget_right_now() {
-        wp_add_dashboard_widget( 'bbp-dashboard-right-now', __( 'Right Now in Forums', 'bbpress' ), 'bbp_dashboard_widget_right_now' );
     }
 

trunk/includes/admin/css/admin.css

@@ -28 +28 @@
         left: 0;
     }
+
+/* Dashicons */
+
+#dashboard_right_now a.bbp-glance-forums:before,
+#adminmenu #menu-posts-forum .wp-menu-image:before {
+    content: "\f449";
+}
+
+#dashboard_right_now a.bbp-glance-topics:before,
+#adminmenu #menu-posts-topic .wp-menu-image:before {
+    content: "\f450";
+}
+
+#dashboard_right_now a.bbp-glance-replies:before,
+#adminmenu #menu-posts-reply .wp-menu-image:before {
+    content: "\f451";
+}
+
+#dashboard_right_now a.bbp-glance-topic-tags:before {
+    content: '\f323';
+}
+
+/* Deprecated Dashboard Metabox */
 
 #bbp-dashboard-right-now p.sub,
@@ -153 +176 @@
         clear: left;
     }
-
-/* Dashicons */
-#adminmenu #menu-posts-forum .wp-menu-image:before {
-    content: "\f449";
-}
-
-#adminmenu #menu-posts-topic .wp-menu-image:before {
-    content: "\f450";
-}
-
-#adminmenu #menu-posts-reply .wp-menu-image:before {
-    content: "\f451";
-}
-
-/* Ratio 2x */
-@media only screen and (-webkit-min-device-pixel-ratio: 1.5) {
-    .bbp-badge {
-        background-image: url('../images/badge-2x.png');
-        background-size: 173px 194px;
-    }
-}

trunk/includes/admin/metaboxes.php

@@ -11 +11 @@
 
 /**
+ * Filter the Dashboard "at a glance" items and append bbPress elements to it.
+ *
+ * @since bbPress (r5268)
+ *
+ * @param array $elements
+ * @return array
+ */
+function bbp_dashboard_at_a_glance( $elements = array() ) {
+
+    // Get the statistics
+    $r = bbp_get_statistics();
+
+    // Forums
+    if ( current_user_can( 'publish_forums' ) ) {
+        $link       = add_query_arg( array( 'post_type' => bbp_get_forum_post_type() ), get_admin_url( null, 'edit.php' ) );
+        $text       = sprintf( _n( '%d Forum', '%d Forums', $r['forum_count'], 'bbpress' ), $r['forum_count'] );
+        $elements[] = '<a href="' . esc_url( $link ) . '" class="bbp-glance-forums">' . esc_html( $text ) . '</a>';
+    }
+    
+    // Topics
+    if ( current_user_can( 'publish_topics' ) ) {
+        $link       = add_query_arg( array( 'post_type' => bbp_get_topic_post_type() ), get_admin_url( null, 'edit.php' ) );
+        $text       = sprintf( _n( '%d Topic', '%d Topics', $r['topic_count'], 'bbpress' ), $r['topic_count'] );
+        $elements[] = '<a href="' . esc_url( $link ) . '" class="bbp-glance-topics">' . esc_html( $text ) . '</a>';
+    }
+
+    // Replies
+    if ( current_user_can( 'publish_replies' ) ) {
+        $link       = add_query_arg( array( 'post_type' => bbp_get_reply_post_type() ), get_admin_url( null, 'edit.php' ) );;
+        $text       = sprintf( _n( '%d Reply', '%d Replies', $r['reply_count'], 'bbpress' ), $r['reply_count'] );
+        $elements[] = '<a href="' . esc_url( $link ) . '" class="bbp-glance-replies">' . esc_html( $text ) . '</a>';
+    }
+
+    // Topic Tags
+    if ( bbp_allow_topic_tags() && current_user_can( 'manage_topic_tags' ) ) {
+        $link       = add_query_arg( array( 'taxonomy' => bbp_get_topic_tag_tax_id(), 'post_type' => bbp_get_topic_post_type() ), get_admin_url( null, 'edit-tags.php' ) );
+        $text       = sprintf( _n( '%d Topic Tags', '%d Topic Tags', $r['topic_tag_count'], 'bbpress' ), $r['topic_tag_count'] );
+        $elements[] = '<a href="' . esc_url( $link ) . '" class="bbp-glance-topic-tags">' . esc_html( $text ) . '</a>';
+    }
+
+    // Filter and return
+    return apply_filters( 'bbp_dashboard_at_a_glance', $elements, $r );
+}
+
+/**
  * bbPress Dashboard Right Now Widget
  *
@@ -16 +61 @@
  *
  * @since bbPress (r2770)
+ * @deprecated bbPress (r5268)
  *
  * @uses bbp_get_version() To get the current bbPress version