Index: wp-includes/default-filters.php =================================================================== --- wp-includes/default-filters.php (revision 21959) +++ wp-includes/default-filters.php (working copy) @@ -284,4 +284,7 @@ // If the upgrade hasn't run yet, assume link manager is used. add_filter( 'default_option_link_manager_enabled', '__return_true' ); +// Welcome Panel +add_action( 'welcome_panel', 'wp_welcome_panel' ); + unset($filter, $action); Index: wp-admin/index.php =================================================================== --- wp-admin/index.php (revision 21959) +++ wp-admin/index.php (working copy) @@ -106,8 +106,25 @@

- +user_email != get_option( 'admin_email' ) ); + if ( $hide ) + $classes .= ' hidden'; ?> + +
+ + + +
+
Index: wp-admin/includes/template.php =================================================================== --- wp-admin/includes/template.php (revision 21959) +++ wp-admin/includes/template.php (working copy) @@ -1727,10 +1727,12 @@ */ $registered_pointers = array( - 'index.php' => 'wp330_toolbar', - 'post-new.php' => 'wp330_media_uploader', - 'post.php' => 'wp330_media_uploader', - 'themes.php' => array( 'wp330_saving_widgets', 'wp340_customize_current_theme_link' ), + 'index.php' => array( 'wp330_toolbar', 'wp350_add_images', 'wp350_edit_menu', 'wp350_widgets' ), + 'post-new.php' => array( 'wp330_media_uploader', 'wp350_add_images_2' ), + 'post.php' => 'wp330_media_uploader', + 'themes.php' => array( 'wp330_saving_widgets', 'wp340_customize_current_theme_link', 'wp350_change_theme' ), + 'widgets.php' => 'wp350_widgets_2', + 'nav-menus.php' => 'wp350_edit_menu_2', 'appearance_page_custom-header' => 'wp340_choose_image_from_library', 'appearance_page_custom-background' => 'wp340_choose_image_from_library', ); @@ -1746,6 +1748,7 @@ 'wp330_saving_widgets' => array( 'edit_theme_options', 'switch_themes' ), 'wp340_customize_current_theme_link' => array( 'edit_theme_options' ), 'wp340_choose_image_from_library' => array( 'edit_theme_options' ), + 'wp350_change_theme' => array( 'install_themes' ), ); // Get dismissed pointers @@ -1795,6 +1798,8 @@ if ( ! options ) return; + + options = $.extend( options, { close: function() { $.post( ajaxurl, { @@ -1804,15 +1809,31 @@ } }); + + setup = function() { $('').pointer( options ).pointer('open'); + + $('').attr( 'href', function( index, href ) { + return href + ( -1 == href.indexOf('?') ? '?' : '&' ) + 'walkthrough='; + }); + + return false; }; + + if ( options.position && options.position.defer_loading ) $(window).bind( 'load.wp-pointers', setup ); else $(document).ready( setup ); + + + $('').click( setup ); + + + })( jQuery ); //]]> @@ -1893,6 +1914,103 @@ ) ); } + public static function pointer_wp350_add_images() { + $content = '

' . __( 'Use the add new menu' ) . '

'; + $content .= '

' . __( 'Select “Post” from the add new menu.' ) . '

'; + + WP_Internal_Pointers::print_js( 'pointer_wp350_add_images', '#wp-admin-bar-new-content', array( + 'content' => $content, + 'position' => array( 'edge' => 'top', 'align' => is_rtl() ? 'right' : 'left' ), + 'persistent' => true, + 'onclick_selector' => '#wp350_add_images', + 'link_selector' => '#wp-admin-bar-new-post a', + ) ); + } + + public static function pointer_wp350_add_images_2() { + if( ! isset( $_GET['walkthrough'] ) ) + return; + + $content = '

' . __( 'Add images/media' ) . '

'; + $content .= '

' . __( 'You can add images, videos, pdfs, and other documents to your posts and pages by clicking this button.' ) . '

'; + + WP_Internal_Pointers::print_js( 'pointer_wp350_add_images_2', '#wp-content-media-buttons a', array( + 'content' => $content, + 'position' => array( 'edge' => is_rtl() ? 'right' : 'left', 'align' => is_rtl() ? 'right' : 'left' ), + 'persistent' => true, + ) ); + } + + public static function pointer_wp350_widgets() { + $content = '

' . __( 'Under appearance' ) . '

'; + $content .= '

' . __( 'Click the “Widgets” link under the appearance menu.' ) . '

'; + + WP_Internal_Pointers::print_js( 'pointer_wp350_widgets', '#menu-appearance', array( + 'content' => $content, + 'position' => array( 'edge' => is_rtl() ? 'right' : 'left', 'align' => is_rtl() ? 'right' : 'left' ), + 'persistent' => true, + 'onclick_selector' => '#wp350_widgets', + 'link_selector' => '#menu-appearance a[href$="widgets.php"]', + ) ); + } + + public static function pointer_wp350_widgets_2() { + if( ! isset( $_GET['walkthrough'] ) ) + return; + + $content = '

' . __( 'Add/remove widgets' ) . '

'; + $content .= '

' . __( 'To add new widgets, drag them from "Available widgets" to this container. Remove widgets by dragging them from this container.' ) . '

'; + + WP_Internal_Pointers::print_js( 'pointer_wp350_widgets_2', 'div.widget-liquid-right', array( + 'content' => $content, + 'position' => array( 'edge' => is_rtl() ? 'left' : 'right', 'align' => is_rtl() ? 'left' : 'right', 'offset' => '0 -200' ), + 'persistent' => true, + ) ); + } + + public static function pointer_wp350_edit_menu() { + $content = '

' . __( 'Under appearance' ) . '

'; + $content .= '

' . __( 'Click the “Menus” link under the appearance menu.' ) . '

'; + + WP_Internal_Pointers::print_js( 'pointer_wp350_edit_menu', '#menu-appearance', array( + 'content' => $content, + 'position' => array( 'edge' => is_rtl() ? 'right' : 'left', 'align' => is_rtl() ? 'right' : 'left' ), + 'persistent' => true, + 'onclick_selector' => '#wp350_edit_menu', + 'link_selector' => '#menu-appearance a[href$="nav-menus.php"]', + ) ); + } + + public static function pointer_wp350_edit_menu_2() { + if( ! isset( $_GET['walkthrough'] ) ) + return; + if( isset( $_GET['menu'] ) && intval( $_GET['menu'] ) ) + return; + + $content = '

' . __( 'Create a new menu' ) . '

'; + $content .= '

' . __( 'Give your new menu a name, and then click the “Create Menu” button.' ) . '

'; + + WP_Internal_Pointers::print_js( 'pointer_wp350_edit_menu_2', '#menu-name', array( + 'content' => $content, + 'position' => array( 'edge' => 'top', 'align' => is_rtl() ? 'right' : 'left' ), + 'persistent' => true, + ) ); + } + + public static function pointer_wp350_change_theme() { + if( ! isset( $_GET['walkthrough'] ) ) + return; + + $content = '

' . __( 'Install a new theme' ) . '

'; + $content .= '

' . __( 'Optionally, select the “Install Themes” tab to select new themes.' ) . '

'; + + WP_Internal_Pointers::print_js( 'pointer_wp350_change_theme', '.nav-tab:not(.nav-tab-active)', array( + 'content' => $content, + 'position' => array( 'edge' => 'top', 'align' => is_rtl() ? 'right' : 'left' ), + 'persistent' => true, + ) ); + } + /** * Prevents new users from seeing existing 'new feature' pointers. * Index: wp-admin/includes/screen.php =================================================================== --- wp-admin/includes/screen.php (revision 21959) +++ wp-admin/includes/screen.php (working copy) @@ -930,7 +930,7 @@ id && current_user_can( 'edit_theme_options' ) ) { + if ( 'dashboard' === $this->id && current_user_can( 'edit_theme_options' ) && has_action( 'welcome_panel' ) ) { if ( isset( $_GET['welcome'] ) ) { $welcome_checked = empty( $_GET['welcome'] ) ? 0 : 1; update_user_meta( get_current_user_id(), 'show_welcome_panel', $welcome_checked ); Index: wp-admin/includes/dashboard.php =================================================================== --- wp-admin/includes/dashboard.php (revision 21959) +++ wp-admin/includes/dashboard.php (working copy) @@ -1231,93 +1231,45 @@ * * @since 3.3.0 */ -function wp_welcome_panel() { - global $wp_version; - - if ( ! current_user_can( 'edit_theme_options' ) ) - return; - - $classes = 'welcome-panel'; - - $option = get_user_meta( get_current_user_id(), 'show_welcome_panel', true ); - // 0 = hide, 1 = toggled to show or single site creator, 2 = multisite site owner - $hide = 0 == $option || ( 2 == $option && wp_get_current_user()->user_email != get_option( 'admin_email' ) ); - if ( $hide ) - $classes .= ' hidden'; - - list( $display_version ) = explode( '-', $wp_version ); - ?> -
- - -
- +function wp_welcome_panel() { ?>
-

-

First Steps with WordPress. If you’d rather dive right in, here are a few things most people do first when they set up a new WordPress site. If you need help, use the Help tabs in the upper right corner to get information on how to use your current screen and where to go for more assistance.' ); ?>

+

+

-

-

-
    -
  • Select your tagline and time zone' ), esc_url( admin_url('options-general.php') ) ); ?>
    • -
  • Turn comments on or off' ), esc_url( admin_url('options-discussion.php') ) ); ?>
    • -
  • Fill in your profile' ), esc_url( get_edit_profile_url( get_current_user_id() ) ) ); ?>
    • -
+

+

+ + 'true') ) ) > 1 ) ) : ?> +

' . __( 'change your theme completely' ) . '', esc_url( admin_url( 'themes.php?walkthrough=pointer_wp350_change_theme' ) ) ); ?>

+
-

-

+

    -
  • sample page and post' ), esc_url( get_permalink( 2 ) ), esc_url( get_permalink( 1 ) ) ); ?>
    • -
  • sample page and post' ), esc_url( admin_url('edit.php?post_type=page') ), esc_url( admin_url('edit.php') ) ); ?>
    • -
  • Create an About Me page' ), esc_url( admin_url('edit.php?post_type=page') ) ); ?>
    • -
  • Write your first post' ), esc_url( admin_url('post-new.php') ) ); ?>
    • + +
  • ' . __( 'Edit your front page' ) . '', esc_url( admin_url( 'post.php?post=' . get_option( 'page_on_front' ) . '&action=edit' ) ) ); ?>
    • +
  • ' . __( 'Add additional pages' ) . '', esc_url( admin_url( 'post-new.php?post_type=page' ) ) ); ?>
    • + +
  • ' . __( 'Edit your front page' ) . '', esc_url( admin_url( 'post.php?post=' . get_option( 'page_on_front' ) . '&action=edit' ) ) ); ?>
    • +
  • ' . __( 'Add additional pages' ) . '', esc_url( admin_url( 'post-new.php?post_type=page' ) ) ); ?>
    • +
  • ' . __( 'Add a blog post' ) . '', esc_url( admin_url( 'post-new.php' ) ) ); ?>
    • + +
  • ' . __( 'Write your first blog post' ) . '', esc_url( admin_url( 'post-new.php' ) ) ); ?>
    • +
  • ' . __( 'Add an About page' ) . '', esc_url( admin_url( 'post-new.php?post_type=page' ) ) ); ?>
    • + +
  • ' . __( 'View your site' ) . '', esc_url( home_url() ) ); ?>
-

- errors() ) : - echo '

'; - printf( __( 'Install a theme to get started customizing your site.' ), esc_url( admin_url( 'themes.php' ) ) ); - echo '

'; - else: - $customize_links = array(); - if ( 'twentyeleven' == $theme->get_stylesheet() ) - $customize_links[] = sprintf( __( 'Choose light or dark' ), esc_url( admin_url( 'themes.php?page=theme_options' ) ) ); - - if ( current_theme_supports( 'custom-background' ) ) - $customize_links[] = sprintf( __( 'Set a background color' ), esc_url( admin_url( 'themes.php?page=custom-background' ) ) ); - - if ( current_theme_supports( 'custom-header' ) ) - $customize_links[] = sprintf( __( 'Select a new header image' ), esc_url( admin_url( 'themes.php?page=custom-header' ) ) ); - - if ( current_theme_supports( 'widgets' ) ) - $customize_links[] = sprintf( __( 'Add some widgets' ), esc_url( admin_url( 'widgets.php' ) ) ); - - if ( ! empty( $customize_links ) ) { - echo '

'; - printf( __( 'Use the current theme — %1$s — or choose a new one. If you stick with %1$s, here are a few ways to make your site look unique.' ), $theme->display('Name'), esc_url( admin_url( 'themes.php' ) ) ); - echo '

'; - ?> -
    - -
    • - -
- '; - printf( __( 'Use the current theme — %1$s — or choose a new one.' ), $theme->display('Name'), esc_url( admin_url( 'themes.php' ) ) ); - echo '

'; - } - endif; ?> +

+
    +
  • ' . __( 'Add image/media' ) . '', esc_url( admin_url( 'media-new.php' ) ) ); ?>
    • +
  • ' . __( 'Add/remove widgets' ) . '', esc_url( admin_url( 'widgets.php' ) ) ); ?>
    • +
  • ' . __( 'Edit your navigation menu' ) . '', esc_url( admin_url( 'nav-menus.php' ) ) ); ?>
    • +
-

Dismiss this message.' ), esc_url( admin_url( '?welcome=0' ) ) ); ?>

-