diff --git a/wp-admin/css/colors-classic.css b/wp-admin/css/colors-classic.css index b1bafbab5f..fe8a6df6c6 100644 --- a/wp-admin/css/colors-classic.css +++ b/wp-admin/css/colors-classic.css @@ -854,6 +854,7 @@ table.widefat span.spam a, } .welcome-panel { + background: #f7fcfe; border-color: #d1e5ee; } .welcome-panel p { @@ -863,7 +864,7 @@ table.widefat span.spam a, color: #464646; } .welcome-panel h3 { - text-shadow: 1px 1px 1px white; + text-shadow: 1px 1px 1px #fff; } .widget, diff --git a/wp-admin/css/colors-fresh.css b/wp-admin/css/colors-fresh.css index 67af31cda9..e7ae11633c 100644 --- a/wp-admin/css/colors-fresh.css +++ b/wp-admin/css/colors-fresh.css @@ -845,6 +845,12 @@ table.widefat span.spam a, } .welcome-panel { + background: #f5f5f5; + background-image: -webkit-gradient(linear, left bottom, left top, from(#f5f5f5), to(#fafafa)); + background-image: -webkit-linear-gradient(bottom, #f5f5f5, #fafafa); + background-image: -moz-linear-gradient(bottom, #f5f5f5, #fafafa); + background-image: -o-linear-gradient(bottom, #f5f5f5, #fafafa); + background-image: linear-gradient(to top, #f5f5f5, #fafafa); border-color: #dfdfdf; } .welcome-panel p { @@ -854,7 +860,7 @@ table.widefat span.spam a, color: #464646; } .welcome-panel h3 { - text-shadow: 1px 1px 1px white; + text-shadow: 1px 1px 1px #fff; } .widget, diff --git a/wp-admin/css/wp-admin-rtl.css b/wp-admin/css/wp-admin-rtl.css index 22c57929ad..578a521c46 100644 --- a/wp-admin/css/wp-admin-rtl.css +++ b/wp-admin/css/wp-admin-rtl.css @@ -590,11 +590,6 @@ form.upgrade .hint { float: right; } -.welcome-panel-content .about-description, .welcome-panel h3 { - margin-left: 0; - margin-right: 190px; -} - .welcome-panel .welcome-panel-column { margin: 0 -25px 0 5%; padding-left: 0; diff --git a/wp-admin/css/wp-admin.css b/wp-admin/css/wp-admin.css index b3d73fcce7..6f38e708d7 100644 --- a/wp-admin/css/wp-admin.css +++ b/wp-admin/css/wp-admin.css @@ -1370,7 +1370,7 @@ form.upgrade .hint { position: absolute; top: -1000em; left: 146px; - z-index: 999; + z-index: 10000; overflow: visible; border-width: 1px; border-style: solid; @@ -2176,24 +2176,32 @@ html.wp-toolbar { /* Welcome Panel */ .welcome-panel { - margin: 20px 8px; - padding: 30px 10px 20px; - border-width: 1px 0; - border-style: solid; position: relative; - line-height: 1.6em; overflow: auto; + margin: 20px 0; + padding: 23px 10px 12px; + border-width: 1px; + border-style: solid; + border-radius: 3px; + font-size: 13px; + line-height: 1.6em; } .welcome-panel h3 { + margin: 0; font-family: "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", sans-serif; font-size: 32px; font-weight: normal; line-height: 1.2; - margin: 0.1em 0 0.8em; } .welcome-panel h4 { - font-size: 14px; + margin: 1.33em 0 0; + font-size: 13px; +} + +.welcome-panel .about-description { + font-size: 18px; + margin: 0; } .welcome-panel .welcome-panel-close { @@ -2206,52 +2214,45 @@ html.wp-toolbar { } .welcome-panel .welcome-panel-close:before { - background: url('../images/xit.gif') 0 17% no-repeat; content: ' '; - height: 100%; - width: 10px; - left: -12px; position: absolute; + left: -12px; + width: 10px; + height: 100%; + background: url('../images/xit.gif') 0 17% no-repeat; } .welcome-panel .welcome-panel-close:hover:before { background-position: 100% 17%; } -.welcome-panel .wp-badge { - float: left; - margin-bottom: 20px; +.welcome-button { + margin: -9px 0 3px; + padding: 1em 3em; + font: normal 15px/1 sans-serif; } .welcome-panel-content { + margin-left: 13px; max-width: 1500px; } -.welcome-panel-content .about-description, -.welcome-panel h3 { - margin-left: 190px; -} - -.welcome-panel p.welcome-panel-dismiss { - clear: both; - padding: 1em 0 0 0; -} - .welcome-panel .welcome-panel-column-container { clear: both; overflow: hidden; position: relative; - padding-left: 26px; } .welcome-panel .welcome-panel-column { - margin: 0 5% 0 -25px; - padding-left: 25px; - width: 30%; + width: 32%; min-width: 200px; float: left; } +.welcome-panel .welcome-panel-column:first-child { + width: 36%; +} + .welcome-panel .welcome-panel-column.welcome-panel-last { margin-right: 0; } @@ -2260,8 +2261,12 @@ html.wp-toolbar { margin-left: -32px; } +.welcome-panel-column p { + margin-top: 5px; +} + .welcome-panel .welcome-panel-column ul { - margin: 1.6em 1em 1em 1.3em; + margin: 0.4em 1em 1em 1.3em; } .welcome-panel .welcome-panel-column li { @@ -2269,6 +2274,25 @@ html.wp-toolbar { padding-left: 2px; } +@media screen and (max-width: 870px) { + .welcome-button { + font-size: 14px; + padding: 1em 2.3em; + } + + .welcome-panel .welcome-panel-column, .welcome-panel .welcome-panel-column:first-child { + display: block; + float: none; + width: 100%; + } + .welcome-panel .welcome-panel-column li { + display: inline-block; + margin-right: 13px; + } + .welcome-panel .welcome-panel-column ul { + margin: 0.4em 0 0; + } +} /*------------------------------------------------------------------------------ 10.0 - List Posts (/Pages/etc) diff --git a/wp-admin/includes/dashboard.php b/wp-admin/includes/dashboard.php index afcf5b03c5..18738421f0 100644 --- a/wp-admin/includes/dashboard.php +++ b/wp-admin/includes/dashboard.php @@ -1232,92 +1232,45 @@ function wp_dashboard_empty() {} * @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 ); ?> -
- - -
-
-

-

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' ), admin_url( 'themes.php' ) ); ?>

+
-

-

+

    -
  • 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' ) . '', get_edit_post_link( get_option( 'page_on_front' ) ) ); ?>
    • +
  • ' . __( 'Add additional pages' ) . '', admin_url( 'post-new.php?post_type=page' ) ); ?>
    • + +
  • ' . __( 'Edit your front page' ) . '', get_edit_post_link( get_option( 'page_on_front' ) ) ); ?>
    • +
  • ' . __( 'Add additional pages' ) . '', admin_url( 'post-new.php?post_type=page' ) ); ?>
    • +
  • ' . __( 'Add a blog post' ) . '', admin_url( 'post-new.php' ) ); ?>
    • + +
  • ' . __( 'Write your first blog post' ) . '', admin_url( 'post-new.php' ) ); ?>
    • +
  • ' . __( 'Add an About page' ) . '', admin_url( 'post-new.php?post_type=page' ) ); ?>
    • + +
  • ' . __( 'View your site' ) . '', 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' ) . '', admin_url( 'media-new.php' ) ); ?>
    • +
  • ' . __( 'Add/remove widgets' ) . '', admin_url( 'widgets.php' ) ); ?>
    • +
  • ' . __( 'Edit your navigation menu' ) . '', admin_url( 'nav-menus.php' ) ); ?>
    • +
-

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

-
id && current_user_can( 'edit_theme_options' ) ) { + if ( 'dashboard' === $this->id && has_action( 'welcome_panel' ) && current_user_can( 'edit_theme_options' ) ) { if ( isset( $_GET['welcome'] ) ) { $welcome_checked = empty( $_GET['welcome'] ) ? 0 : 1; update_user_meta( get_current_user_id(), 'show_welcome_panel', $welcome_checked ); diff --git a/wp-admin/index.php b/wp-admin/index.php index c5853bafe9..8691f34c4d 100644 --- a/wp-admin/index.php +++ b/wp-admin/index.php @@ -106,7 +106,21 @@ $today = current_time('mysql', 1);

- +user_email != get_option( 'admin_email' ) ); + if ( $hide ) + $classes .= ' hidden'; ?> + +
+ + + +
+
diff --git a/wp-includes/default-filters.php b/wp-includes/default-filters.php index 6b283a2b5c..c0c078087c 100644 --- a/wp-includes/default-filters.php +++ b/wp-includes/default-filters.php @@ -257,6 +257,7 @@ add_action( 'wp_scheduled_auto_draft_delete', 'wp_delete_auto_drafts' add_action( 'admin_init', 'send_frame_options_header', 10, 0 ); add_action( 'importer_scheduled_cleanup', 'wp_delete_attachment' ); add_action( 'upgrader_scheduled_cleanup', 'wp_delete_attachment' ); +add_action( 'welcome_panel', 'wp_welcome_panel' ); // Navigation menu actions add_action( 'delete_post', '_wp_delete_post_menu_item' );