<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[22018] trunk: New design and content for the welcome panel.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/22018">22018</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2012-09-26 19:44:43 +0000 (Wed, 26 Sep 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>New design and content for the welcome panel. First pass.
props lessbloat, helenyhou, georgestephanis, sabreuse, ryelle.
see <a href="http://core.trac.wordpress.org/ticket/21368">#21368</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmincsscolorsclassiccss">trunk/wp-admin/css/colors-classic.css</a></li>
<li><a href="#trunkwpadmincsscolorsfreshcss">trunk/wp-admin/css/colors-fresh.css</a></li>
<li><a href="#trunkwpadmincsswpadminrtlcss">trunk/wp-admin/css/wp-admin-rtl.css</a></li>
<li><a href="#trunkwpadmincsswpadmincss">trunk/wp-admin/css/wp-admin.css</a></li>
<li><a href="#trunkwpadminincludesdashboardphp">trunk/wp-admin/includes/dashboard.php</a></li>
<li><a href="#trunkwpadminincludesscreenphp">trunk/wp-admin/includes/screen.php</a></li>
<li><a href="#trunkwpadminindexphp">trunk/wp-admin/index.php</a></li>
<li><a href="#trunkwpincludesdefaultfiltersphp">trunk/wp-includes/default-filters.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadmincsscolorsclassiccss"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/css/colors-classic.css (22017 => 22018)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/css/colors-classic.css 2012-09-26 19:35:36 UTC (rev 22017)
+++ trunk/wp-admin/css/colors-classic.css 2012-09-26 19:44:43 UTC (rev 22018)
</span><span class="lines">@@ -854,6 +854,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .welcome-panel {
</span><ins>+ background: #f7fcfe;
</ins><span class="cx"> border-color: #d1e5ee;
</span><span class="cx"> }
</span><span class="cx"> .welcome-panel p {
</span><span class="lines">@@ -863,7 +864,7 @@
</span><span class="cx"> color: #464646;
</span><span class="cx"> }
</span><span class="cx"> .welcome-panel h3 {
</span><del>- text-shadow: 1px 1px 1px white;
</del><ins>+ text-shadow: 1px 1px 1px #fff;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .widget,
</span></span></pre></div>
<a id="trunkwpadmincsscolorsfreshcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/css/colors-fresh.css (22017 => 22018)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/css/colors-fresh.css 2012-09-26 19:35:36 UTC (rev 22017)
+++ trunk/wp-admin/css/colors-fresh.css 2012-09-26 19:44:43 UTC (rev 22018)
</span><span class="lines">@@ -845,6 +845,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .welcome-panel {
</span><ins>+ 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);
</ins><span class="cx"> border-color: #dfdfdf;
</span><span class="cx"> }
</span><span class="cx"> .welcome-panel p {
</span><span class="lines">@@ -854,7 +860,7 @@
</span><span class="cx"> color: #464646;
</span><span class="cx"> }
</span><span class="cx"> .welcome-panel h3 {
</span><del>- text-shadow: 1px 1px 1px white;
</del><ins>+ text-shadow: 1px 1px 1px #fff;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .widget,
</span></span></pre></div>
<a id="trunkwpadmincsswpadminrtlcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/css/wp-admin-rtl.css (22017 => 22018)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/css/wp-admin-rtl.css 2012-09-26 19:35:36 UTC (rev 22017)
+++ trunk/wp-admin/css/wp-admin-rtl.css 2012-09-26 19:44:43 UTC (rev 22018)
</span><span class="lines">@@ -590,11 +590,6 @@
</span><span class="cx"> float: right;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.welcome-panel-content .about-description, .welcome-panel h3 {
- margin-left: 0;
- margin-right: 190px;
-}
-
</del><span class="cx"> .welcome-panel .welcome-panel-column {
</span><span class="cx"> margin: 0 -25px 0 5%;
</span><span class="cx"> padding-left: 0;
</span></span></pre></div>
<a id="trunkwpadmincsswpadmincss"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/css/wp-admin.css (22017 => 22018)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/css/wp-admin.css 2012-09-26 19:35:36 UTC (rev 22017)
+++ trunk/wp-admin/css/wp-admin.css 2012-09-26 19:44:43 UTC (rev 22018)
</span><span class="lines">@@ -1370,7 +1370,7 @@
</span><span class="cx"> position: absolute;
</span><span class="cx"> top: -1000em;
</span><span class="cx"> left: 146px;
</span><del>- z-index: 999;
</del><ins>+ z-index: 10000;
</ins><span class="cx"> overflow: visible;
</span><span class="cx"> border-width: 1px;
</span><span class="cx"> border-style: solid;
</span><span class="lines">@@ -2176,26 +2176,34 @@
</span><span class="cx">
</span><span class="cx"> /* Welcome Panel */
</span><span class="cx"> .welcome-panel {
</span><del>- margin: 20px 8px;
- padding: 30px 10px 20px;
- border-width: 1px 0;
</del><ins>+ position: relative;
+ overflow: auto;
+ margin: 20px 0;
+ padding: 23px 10px 12px;
+ border-width: 1px;
</ins><span class="cx"> border-style: solid;
</span><del>- position: relative;
</del><ins>+ border-radius: 3px;
+ font-size: 13px;
</ins><span class="cx"> line-height: 1.6em;
</span><del>- overflow: auto;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .welcome-panel h3 {
</span><ins>+ margin: 0;
</ins><span class="cx"> font-family: "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", sans-serif;
</span><span class="cx"> font-size: 32px;
</span><span class="cx"> font-weight: normal;
</span><span class="cx"> line-height: 1.2;
</span><del>- margin: 0.1em 0 0.8em;
</del><span class="cx"> }
</span><span class="cx"> .welcome-panel h4 {
</span><del>- font-size: 14px;
</del><ins>+ margin: 1.33em 0 0;
+ font-size: 13px;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+.welcome-panel .about-description {
+ font-size: 18px;
+ margin: 0;
+}
+
</ins><span class="cx"> .welcome-panel .welcome-panel-close {
</span><span class="cx"> position: absolute;
</span><span class="cx"> top: 0;
</span><span class="lines">@@ -2206,52 +2214,45 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .welcome-panel .welcome-panel-close:before {
</span><del>- background: url('../images/xit.gif') 0 17% no-repeat;
</del><span class="cx"> content: ' ';
</span><ins>+ position: absolute;
+ left: -12px;
+ width: 10px;
</ins><span class="cx"> height: 100%;
</span><del>- width: 10px;
- left: -12px;
- position: absolute;
</del><ins>+ background: url('../images/xit.gif') 0 17% no-repeat;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .welcome-panel .welcome-panel-close:hover:before {
</span><span class="cx"> background-position: 100% 17%;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.welcome-panel .wp-badge {
- float: left;
- margin-bottom: 20px;
</del><ins>+.welcome-button {
+ margin: -9px 0 3px;
+ padding: 1em 3em;
+ font: normal 15px/1 sans-serif;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .welcome-panel-content {
</span><ins>+ margin-left: 13px;
</ins><span class="cx"> max-width: 1500px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.welcome-panel-content .about-description,
-.welcome-panel h3 {
- margin-left: 190px;
-}
-
-.welcome-panel p.welcome-panel-dismiss {
- clear: both;
- padding: 1em 0 0 0;
-}
-
</del><span class="cx"> .welcome-panel .welcome-panel-column-container {
</span><span class="cx"> clear: both;
</span><span class="cx"> overflow: hidden;
</span><span class="cx"> position: relative;
</span><del>- padding-left: 26px;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .welcome-panel .welcome-panel-column {
</span><del>- margin: 0 5% 0 -25px;
- padding-left: 25px;
- width: 30%;
</del><ins>+ width: 32%;
</ins><span class="cx"> min-width: 200px;
</span><span class="cx"> float: left;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+.welcome-panel .welcome-panel-column:first-child {
+ width: 36%;
+}
+
</ins><span class="cx"> .welcome-panel .welcome-panel-column.welcome-panel-last {
</span><span class="cx"> margin-right: 0;
</span><span class="cx"> }
</span><span class="lines">@@ -2260,8 +2261,12 @@
</span><span class="cx"> margin-left: -32px;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+.welcome-panel-column p {
+ margin-top: 5px;
+}
+
</ins><span class="cx"> .welcome-panel .welcome-panel-column ul {
</span><del>- margin: 1.6em 1em 1em 1.3em;
</del><ins>+ margin: 0.4em 1em 1em 1.3em;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .welcome-panel .welcome-panel-column li {
</span><span class="lines">@@ -2269,7 +2274,26 @@
</span><span class="cx"> padding-left: 2px;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+@media screen and (max-width: 870px) {
+ .welcome-button {
+ font-size: 14px;
+ padding: 1em 2.3em;
+ }
</ins><span class="cx">
</span><ins>+ .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;
+ }
+}
+
</ins><span class="cx"> /*------------------------------------------------------------------------------
</span><span class="cx"> 10.0 - List Posts (/Pages/etc)
</span><span class="cx"> ------------------------------------------------------------------------------*/
</span></span></pre></div>
<a id="trunkwpadminincludesdashboardphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/dashboard.php (22017 => 22018)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/dashboard.php 2012-09-26 19:35:36 UTC (rev 22017)
+++ trunk/wp-admin/includes/dashboard.php 2012-09-26 19:44:43 UTC (rev 22018)
</span><span class="lines">@@ -1232,92 +1232,45 @@
</span><span class="cx"> * @since 3.3.0
</span><span class="cx"> */
</span><span class="cx"> function wp_welcome_panel() {
</span><del>- 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 );
</del><span class="cx"> ?>
</span><del>- <div id="welcome-panel" class="<?php echo esc_attr( $classes ); ?>">
- <?php wp_nonce_field( 'welcome-panel-nonce', 'welcomepanelnonce', false ); ?>
- <a class="welcome-panel-close" href="<?php echo esc_url( admin_url( '?welcome=0' ) ); ?>"><?php _e('Dismiss'); ?></a>
- <div class="wp-badge"><?php printf( __( 'Version %s' ), $display_version ); ?></div>
-
</del><span class="cx"> <div class="welcome-panel-content">
</span><del>- <h3><?php _e( 'Welcome to your new WordPress site!' ); ?></h3>
- <p class="about-description"><?php _e( 'If you need help getting started, check out our documentation on <a href="http://codex.wordpress.org/First_Steps_With_WordPress">First Steps with WordPress</a>. If you&#8217;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.' ); ?></p>
</del><ins>+ <h3><?php _e( 'Welcome to WordPress!' ); ?></h3>
+ <p class="about-description"><?php _e( 'We&#8217;ve assembled some links to get you started:' ); ?></p>
</ins><span class="cx"> <div class="welcome-panel-column-container">
</span><span class="cx"> <div class="welcome-panel-column">
</span><del>- <h4><span class="icon16 icon-settings"></span> <?php _e( 'Basic Settings' ); ?></h4>
- <p><?php _e( 'Here are a few easy things you can do to get your feet wet. Make sure to click Save on each Settings screen.' ); ?></p>
- <ul>
- <li><?php echo sprintf( __( '<a href="%s">Select your tagline and time zone</a>' ), esc_url( admin_url('options-general.php') ) ); ?></li>
- <li><?php echo sprintf( __( '<a href="%s">Turn comments on or off</a>' ), esc_url( admin_url('options-discussion.php') ) ); ?></li>
- <li><?php echo sprintf( __( '<a href="%s">Fill in your profile</a>' ), esc_url( get_edit_profile_url( get_current_user_id() ) ) ); ?></li>
- </ul>
</del><ins>+ <h4><?php _e( 'Get Started' ); ?></h4>
+ <p><?php _e( 'First, tweak the look of your site:' ); ?></p>
+ <a class="button-primary welcome-button" href="<?php echo add_query_arg( 'url', urlencode( admin_url( '/' ) ), wp_customize_url() ); ?>"><?php _e( 'Customize Your Site' ); ?></a>
+ <?php if ( current_user_can( 'install_themes' ) || ( current_user_can( 'switch_themes' ) && count( wp_get_themes( array( 'allowed' => true ) ) ) > 1 ) ) : ?>
+ <p><?php printf( __( 'or, <a href="%s">change your theme completely</a>' ), admin_url( 'themes.php' ) ); ?></p>
+ <?php endif; ?>
</ins><span class="cx"> </div>
</span><span class="cx"> <div class="welcome-panel-column">
</span><del>- <h4><span class="icon16 icon-page"></span> <?php _e( 'Add Real Content' ); ?></h4>
- <p><?php _e( 'Check out the sample page & post editors to see how it all works, then delete the default content and write your own!' ); ?></p>
</del><ins>+ <h4><?php _e( 'Next Steps' ); ?></h4>
</ins><span class="cx"> <ul>
</span><del>- <li><?php echo sprintf( __( 'View the <a href="%1$s">sample page</a> and <a href="%2$s">post</a>' ), esc_url( get_permalink( 2 ) ), esc_url( get_permalink( 1 ) ) ); ?></li>
- <li><?php echo sprintf( __( 'Delete the <a href="%1$s">sample page</a> and <a href="%2$s">post</a>' ), esc_url( admin_url('edit.php?post_type=page') ), esc_url( admin_url('edit.php') ) ); ?></li>
- <li><?php echo sprintf( __( '<a href="%s">Create an About Me page</a>' ), esc_url( admin_url('edit.php?post_type=page') ) ); ?></li>
- <li><?php echo sprintf( __( '<a href="%s">Write your first post</a>' ), esc_url( admin_url('post-new.php') ) ); ?></li>
</del><ins>+ <?php if ( 'page' == get_option( 'show_on_front' ) && ! get_option( 'page_for_posts' ) ) : ?>
+ <li><?php printf( '<a href="%s">' . __( 'Edit your front page' ) . '</a>', get_edit_post_link( get_option( 'page_on_front' ) ) ); ?></li>
+ <li><?php printf( '<a href="%s">' . __( 'Add additional pages' ) . '</a>', admin_url( 'post-new.php?post_type=page' ) ); ?></li>
+ <?php elseif ( 'page' == get_option( 'show_on_front' ) ) : ?>
+ <li><?php printf( '<a href="%s">' . __( 'Edit your front page' ) . '</a>', get_edit_post_link( get_option( 'page_on_front' ) ) ); ?></li>
+ <li><?php printf( '<a href="%s">' . __( 'Add additional pages' ) . '</a>', admin_url( 'post-new.php?post_type=page' ) ); ?></li>
+ <li><?php printf( '<a href="%s">' . __( 'Add a blog post' ) . '</a>', admin_url( 'post-new.php' ) ); ?></li>
+ <?php else : ?>
+ <li><?php printf( '<a href="%s">' . __( 'Write your first blog post' ) . '</a>', admin_url( 'post-new.php' ) ); ?></li>
+ <li><?php printf( '<a href="%s">' . __( 'Add an About page' ) . '</a>', admin_url( 'post-new.php?post_type=page' ) ); ?></li>
+ <?php endif; ?>
+ <li><?php printf( '<a href="%s">' . __( 'View your site' ) . '</a>', home_url( '/' ) ); ?></li>
</ins><span class="cx"> </ul>
</span><span class="cx"> </div>
</span><span class="cx"> <div class="welcome-panel-column welcome-panel-last">
</span><del>- <h4><span class="icon16 icon-appearance"></span> <?php _e( 'Customize Your Site' ); ?></h4>
- <?php
- $theme = wp_get_theme();
- if ( $theme->errors() ) :
- echo '<p>';
- printf( __( '<a href="%s">Install a theme</a> to get started customizing your site.' ), esc_url( admin_url( 'themes.php' ) ) );
- echo '</p>';
- else:
- $customize_links = array();
- if ( 'twentyeleven' == $theme->get_stylesheet() )
- $customize_links[] = sprintf( __( '<a href="%s">Choose light or dark</a>' ), esc_url( admin_url( 'themes.php?page=theme_options' ) ) );
-
- if ( current_theme_supports( 'custom-background' ) )
- $customize_links[] = sprintf( __( '<a href="%s">Set a background color</a>' ), esc_url( admin_url( 'themes.php?page=custom-background' ) ) );
-
- if ( current_theme_supports( 'custom-header' ) )
- $customize_links[] = sprintf( __( '<a href="%s">Select a new header image</a>' ), esc_url( admin_url( 'themes.php?page=custom-header' ) ) );
-
- if ( current_theme_supports( 'widgets' ) )
- $customize_links[] = sprintf( __( '<a href="%s">Add some widgets</a>' ), esc_url( admin_url( 'widgets.php' ) ) );
-
- if ( ! empty( $customize_links ) ) {
- echo '<p>';
- printf( __( 'Use the current theme &mdash; %1$s &mdash; or <a href="%2$s">choose a new one</a>. 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 '</p>';
- ?>
- <ul>
- <?php foreach ( $customize_links as $customize_link ) : ?>
- <li><?php echo $customize_link ?></li>
- <?php endforeach; ?>
- </ul>
- <?php
- } else {
- echo '<p>';
- printf( __( 'Use the current theme &mdash; %1$s &mdash; or <a href="%2$s">choose a new one</a>.' ), $theme->display('Name'), esc_url( admin_url( 'themes.php' ) ) );
- echo '</p>';
- }
- endif; ?>
</del><ins>+ <h4><?php _e( 'Learn How To' ); ?></h4>
+ <ul>
+ <li><?php printf( '<a id="wp350_add_images" href="%s">' . __( 'Add image/media' ) . '</a>', admin_url( 'media-new.php' ) ); ?></li>
+ <li><?php printf( '<a id="wp350_widgets" href="%s">' . __( 'Add/remove widgets' ) . '</a>', admin_url( 'widgets.php' ) ); ?></li>
+ <li><?php printf( '<a id="wp350_edit_menu" href="%s">' . __( 'Edit your navigation menu' ) . '</a>', admin_url( 'nav-menus.php' ) ); ?></li>
+ </ul>
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><del>- <p class="welcome-panel-dismiss"><?php printf( __( 'Already know what you&#8217;re doing? <a href="%s">Dismiss this message</a>.' ), esc_url( admin_url( '?welcome=0' ) ) ); ?></p>
</del><span class="cx"> </div>
</span><del>- </div>
</del><span class="cx"> <?php
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminincludesscreenphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/screen.php (22017 => 22018)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/screen.php 2012-09-26 19:35:36 UTC (rev 22017)
+++ trunk/wp-admin/includes/screen.php 2012-09-26 19:44:43 UTC (rev 22018)
</span><span class="lines">@@ -937,7 +937,7 @@
</span><span class="cx"> <?php
</span><span class="cx"> meta_box_prefs( $this );
</span><span class="cx">
</span><del>- if ( 'dashboard' === $this->id && current_user_can( 'edit_theme_options' ) ) {
</del><ins>+ if ( 'dashboard' === $this->id && has_action( 'welcome_panel' ) && current_user_can( 'edit_theme_options' ) ) {
</ins><span class="cx"> if ( isset( $_GET['welcome'] ) ) {
</span><span class="cx"> $welcome_checked = empty( $_GET['welcome'] ) ? 0 : 1;
</span><span class="cx"> update_user_meta( get_current_user_id(), 'show_welcome_panel', $welcome_checked );
</span></span></pre></div>
<a id="trunkwpadminindexphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/index.php (22017 => 22018)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/index.php 2012-09-26 19:35:36 UTC (rev 22017)
+++ trunk/wp-admin/index.php 2012-09-26 19:44:43 UTC (rev 22018)
</span><span class="lines">@@ -106,8 +106,22 @@
</span><span class="cx"> <?php screen_icon(); ?>
</span><span class="cx"> <h2><?php echo esc_html( $title ); ?></h2>
</span><span class="cx">
</span><del>-<?php wp_welcome_panel(); ?>
</del><ins>+<?php if ( has_action( 'welcome_panel' ) && current_user_can( 'edit_theme_options' ) ) :
+ $classes = 'welcome-panel';
</ins><span class="cx">
</span><ins>+ $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'; ?>
+
+ <div id="welcome-panel" class="<?php echo esc_attr( $classes ); ?>">
+ <?php wp_nonce_field( 'welcome-panel-nonce', 'welcomepanelnonce', false ); ?>
+ <a class="welcome-panel-close" href="<?php echo esc_url( admin_url( '?welcome=0' ) ); ?>"><?php _e( 'Dismiss' ); ?></a>
+ <?php do_action( 'welcome_panel' ); ?>
+ </div>
+<?php endif; ?>
+
</ins><span class="cx"> <div id="dashboard-widgets-wrap">
</span><span class="cx">
</span><span class="cx"> <?php wp_dashboard(); ?>
</span></span></pre></div>
<a id="trunkwpincludesdefaultfiltersphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/default-filters.php (22017 => 22018)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/default-filters.php 2012-09-26 19:35:36 UTC (rev 22017)
+++ trunk/wp-includes/default-filters.php 2012-09-26 19:44:43 UTC (rev 22018)
</span><span class="lines">@@ -257,6 +257,7 @@
</span><span class="cx"> add_action( 'admin_init', 'send_frame_options_header', 10, 0 );
</span><span class="cx"> add_action( 'importer_scheduled_cleanup', 'wp_delete_attachment' );
</span><span class="cx"> add_action( 'upgrader_scheduled_cleanup', 'wp_delete_attachment' );
</span><ins>+add_action( 'welcome_panel', 'wp_welcome_panel' );
</ins><span class="cx">
</span><span class="cx"> // Navigation menu actions
</span><span class="cx"> add_action( 'delete_post', '_wp_delete_post_menu_item' );
</span></span></pre>
</div>
</div>
</body>
</html>