Changeset 40607

Timestamp:

05/10/2017 08:03:01 PM (7 years ago)

Author:

azaozz

Message:

Dashboard: Update the existing WordPress News dashboard widget to also include upcoming meetup events and WordCamps near the current user’s location.

Props @afercia, @andreamiddleton, @azaozz, @camikaos, @coreymckrill, @chanthaboune, @courtneypk, @dd32, @iandunn, @iseulde, @mapk, @mayukojpn, @melchoyce, @nao, @obenland, @pento, @samuelsidler, @stephdau, @tellyworth.
See #40702.

Location:

trunk

Files:

• src/wp-admin/admin-ajax.php (modified) (1 diff)
• src/wp-admin/css/dashboard.css (modified) (6 diffs)
• src/wp-admin/includes/ajax-actions.php (modified) (1 diff)
• src/wp-admin/includes/class-wp-community-events.php (added)
• src/wp-admin/includes/dashboard.php (modified) (7 diffs)
• src/wp-admin/includes/deprecated.php (modified) (1 diff)
• src/wp-admin/includes/upgrade.php (modified) (2 diffs)
• src/wp-admin/index.php (modified) (2 diffs)
• src/wp-admin/js/dashboard.js (modified) (2 diffs)
• src/wp-admin/network/index.php (modified) (2 diffs)
• src/wp-includes/script-loader.php (modified) (1 diff)
• tests/phpunit/tests/admin/includesCommunityEvents.php (added)

trunk/src/wp-admin/admin-ajax.php

@@ -65 +65 @@
     'press-this-add-category', 'crop-image', 'generate-password', 'save-wporg-username', 'delete-plugin',
     'search-plugins', 'search-install-plugins', 'activate-plugin', 'update-theme', 'delete-theme',
-    'install-theme', 'get-post-thumbnail-html',
+    'install-theme', 'get-post-thumbnail-html',
 );
 

trunk/src/wp-admin/css/dashboard.css

@@ -302 +302 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 /* Dashboard WordPress news */
 
@@ -334 +473 @@
 
 #dashboard_primary .rss-widget {
-    border-bottom: 1px solid #eee;
     font-size: 13px;
-    padding: 8px 12px 10px;
+    padding: ;
 }
 
@@ -358 +496 @@
 
 #dashboard_primary .rss-widget ul li {
-    margin-bottom: 8px;
+    padding: 4px 0;
+    margin: 0;
 }
 
@@ -875 +1014 @@
 
 a.rsswidget {
-    font-size: 14px;
+    font-size: 1px;
     font-weight: 600;
-    line-height: 1.7em;
+    line-height: 1.em;
 }
 
@@ -1087 +1226 @@
         width: 30px;
         margin: 4px 10px 5px 0;
+
+
+
+
+
+
+
+
     }
 }
@@ -1111 +1258 @@
     }
 }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

trunk/src/wp-admin/includes/ajax-actions.php

@@ -295 +295 @@
 
     wp_die( wp_json_encode( $return ) );
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }
 

trunk/src/wp-admin/includes/dashboard.php

@@ -53 +53 @@
     }
 
-    // WordPress News
-    wp_add_dashboard_widget( 'dashboard_primary', __( 'WordPress News' ), 'wp_dashboard_primary' );
+    // WordPress News
+    wp_add_dashboard_widget( 'dashboard_primary', __( 'WordPress ' );
 
     if ( is_network_admin() ) {
@@ -128 +128 @@
     /** This action is documented in wp-admin/edit-form-advanced.php */
     do_action( 'do_meta_boxes', $screen->id, 'side', '' );
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }
 
@@ -1070 +1110 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 /**
  * WordPress News dashboard widget.
  *
  * @since 2.7.0
+
  */
 function wp_dashboard_primary() {
@@ -1106 +1309 @@
             'title'        => apply_filters( 'dashboard_primary_title', __( 'WordPress Blog' ) ),
             'items'        => 1,
-            'show_summary' => 1,
+            'show_summary' => ,
             'show_author'  => 0,
-            'show_date'    => 1,
+            'show_date'    => ,
         ),
         'planet' => array(
@@ -1153 +1356 @@
     );
 
-    if ( ( ! wp_disallow_file_mods( 'dashboard_widget' ) ) && ( ! is_multisite() && is_blog_admin() && current_user_can( 'install_plugins' ) ) || ( is_network_admin() && current_user_can( 'manage_network_plugins' ) && current_user_can( 'install_plugins' ) ) ) {
-        $feeds['plugins'] = array(
-            'link'         => '',
-            'url'          => array(
-                'popular' => 'http://wordpress.org/plugins/rss/browse/popular/',
-            ),
-            'title'        => '',
-            'items'        => 1,
-            'show_summary' => 0,
-            'show_author'  => 0,
-            'show_date'    => 0,
-        );
-    }
-
     wp_dashboard_cached_rss_widget( 'dashboard_primary', 'wp_dashboard_primary_output', $feeds );
 }
@@ -1174 +1363 @@
  *
  * @since 3.8.0
+
  *
  * @param string $widget_id Widget ID.
@@ -1182 +1372 @@
         $args['type'] = $type;
         echo '<div class="rss-widget">';
-        if ( $type === 'plugins' ) {
-            wp_dashboard_plugins_output( $args['url'], $args );
-        } else {
             wp_widget_rss_output( $args['url'], $args );
-        }
         echo "</div>";
     }
-}
-
-/**
- * Display plugins text for the WordPress news widget.
- *
- * @since 2.5.0
- *
- * @param string $rss  The RSS feed URL.
- * @param array  $args Array of arguments for this RSS feed.
- */
-function wp_dashboard_plugins_output( $rss, $args = array() ) {
-    // Plugin feeds plus link to install them
-    $popular = fetch_feed( $args['url']['popular'] );
-
-    if ( false === $plugin_slugs = get_transient( 'plugin_slugs' ) ) {
-        $plugin_slugs = array_keys( get_plugins() );
-        set_transient( 'plugin_slugs', $plugin_slugs, DAY_IN_SECONDS );
-    }
-
-    echo '<ul>';
-
-    foreach ( array( $popular ) as $feed ) {
-        if ( is_wp_error( $feed ) || ! $feed->get_item_quantity() )
-            continue;
-
-        $items = $feed->get_items(0, 5);
-
-        // Pick a random, non-installed plugin
-        while ( true ) {
-            // Abort this foreach loop iteration if there's no plugins left of this type
-            if ( 0 == count($items) )
-                continue 2;
-
-            $item_key = array_rand($items);
-            $item = $items[$item_key];
-
-            list($link, $frag) = explode( '#', $item->get_link() );
-
-            $link = esc_url($link);
-            if ( preg_match( '|/([^/]+?)/?$|', $link, $matches ) )
-                $slug = $matches[1];
-            else {
-                unset( $items[$item_key] );
-                continue;
-            }
-
-            // Is this random plugin's slug already installed? If so, try again.
-            reset( $plugin_slugs );
-            foreach ( $plugin_slugs as $plugin_slug ) {
-                if ( $slug == substr( $plugin_slug, 0, strlen( $slug ) ) ) {
-                    unset( $items[$item_key] );
-                    continue 2;
-                }
-            }
-
-            // If we get to this point, then the random plugin isn't installed and we can stop the while().
-            break;
-        }
-
-        // Eliminate some common badly formed plugin descriptions
-        while ( ( null !== $item_key = array_rand($items) ) && false !== strpos( $items[$item_key]->get_description(), 'Plugin Name:' ) )
-            unset($items[$item_key]);
-
-        if ( !isset($items[$item_key]) )
-            continue;
-
-        $raw_title = $item->get_title();
-
-        $ilink = wp_nonce_url('plugin-install.php?tab=plugin-information&plugin=' . $slug, 'install-plugin_' . $slug) . '&amp;TB_iframe=true&amp;width=600&amp;height=800';
-        echo '<li class="dashboard-news-plugin"><span>' . __( 'Popular Plugin' ) . ':</span> ' . esc_html( $raw_title ) .
-            '&nbsp;<a href="' . $ilink . '" class="thickbox open-plugin-details-modal" aria-label="' .
-            /* translators: %s: plugin name */
-            esc_attr( sprintf( __( 'Install %s' ), $raw_title ) ) . '">(' . __( 'Install' ) . ')</a></li>';
-
-        $feed->__destruct();
-        unset( $feed );
-    }
-
-    echo '</ul>';
 }
 

trunk/src/wp-admin/includes/deprecated.php

@@ -1296 +1296 @@
 
 /**
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
  * This was once used to move child posts to a new parent.
  *

trunk/src/wp-admin/includes/upgrade.php

@@ -565 +565 @@
     if ( $wp_current_db_version < 37965 )
         upgrade_460();
+
+
+
+
 
     maybe_disable_link_manager();
@@ -1734 +1738 @@
 
 /**
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
  * Executes network-level upgrade routines.
  *

trunk/src/wp-admin/index.php

@@ -16 +16 @@
 
 wp_enqueue_script( 'dashboard' );
+
+
 if ( current_user_can( 'edit_theme_options' ) )
     wp_enqueue_script( 'customize-loader' );
@@ -139 +141 @@
 
 <?php
+
+
 require( ABSPATH . 'wp-admin/admin-footer.php' );

trunk/src/wp-admin/js/dashboard.js

@@ -1 +1 @@
 /* global pagenow, ajaxurl, postboxes, wpActiveEditor:true */
 var ajaxWidgets, ajaxPopulateWidgets, quickPressLoad;
+
 
 jQuery(document).ready( function($) {
@@ -188 +189 @@
 
 } );
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

trunk/src/wp-admin/network/index.php

@@ -55 +55 @@
 
 wp_enqueue_script( 'dashboard' );
+
 wp_enqueue_script( 'plugin-install' );
 add_thickbox();
@@ -74 +75 @@
 </div><!-- wrap -->
 
-<?php include( ABSPATH . 'wp-admin/admin-footer.php' ); ?>
+<?php
+wp_print_community_events_templates();
+include( ABSPATH . 'wp-admin/admin-footer.php' );

trunk/src/wp-includes/script-loader.php

@@ -725 +725 @@
         ) );
 
-        $scripts->add( 'dashboard', "/wp-admin/js/dashboard$suffix.js", array( 'jquery', 'admin-comments', 'postbox' ), false, 1 );
+        $scripts->add( 'dashboard', "/wp-admin/js/dashboard$suffix.js", array( 'jquery', 'admin-comments', 'postbox' ), false, 1 );
 
         $scripts->add( 'list-revisions', "/wp-includes/js/wp-list-revisions$suffix.js" );