<!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>[19345] trunk: Welcome Screen: remove white space, make the second dismiss link work, see #11651</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/19345">19345</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2011-11-19 00:42:22 +0000 (Sat, 19 Nov 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Welcome Screen: remove white space, make the second dismiss link work, see <a href="http://core.trac.wordpress.org/ticket/11651">#11651</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesdashboardphp">trunk/wp-admin/includes/dashboard.php</a></li>
<li><a href="#trunkwpadminjsdashboarddevjs">trunk/wp-admin/js/dashboard.dev.js</a></li>
<li><a href="#trunkwpadminjsdashboardjs">trunk/wp-admin/js/dashboard.js</a></li>
<li><a href="#trunkwpincludesscriptloaderphp">trunk/wp-includes/script-loader.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesdashboardphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/dashboard.php (19344 => 19345)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/dashboard.php 2011-11-19 00:35:13 UTC (rev 19344)
+++ trunk/wp-admin/includes/dashboard.php 2011-11-19 00:42:22 UTC (rev 19345)
</span><span class="lines">@@ -1282,149 +1282,76 @@
</span><span class="cx"> list( $display_version ) = explode( '-', $wp_version );
</span><span class="cx"> ?>
</span><span class="cx"> <div id="welcome-panel" class="<?php echo esc_attr( $classes ); ?>">
</span><ins>+ <?php wp_nonce_field( 'welcome-panel-nonce', 'welcomepanelnonce', false ); ?>
+ <a class="welcome-panel-close" href="#"><?php _e('Dismiss'); ?></a>
+ <div class="wp-badge"><?php printf( __( 'Version %s' ), $display_version ); ?></div>
</ins><span class="cx">
</span><del>- <?php wp_nonce_field( 'welcome-panel-nonce', 'welcomepanelnonce', false ); ?>
</del><ins>+ <div class="welcome-panel-content">
+ <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>
+ <div class="welcome-panel-column-container">
+ <div class="welcome-panel-column">
+ <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">Choose your privacy setting</a>' ), esc_url( admin_url('options-privacy.php') ) ); ?></li>
+ <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( admin_url('profile.php') ) ); ?></li>
+ </ul>
+ </div>
+ <div class="welcome-panel-column">
+ <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>
+ <ul>
+ <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>
+ </ul>
+ </div>
+ <div class="welcome-panel-column">
+ <h4><span class="icon16 icon-appearance"></span> <?php _e( 'Customize Your Site' ); ?></h4>
+ <?php
+ $ct = current_theme_info();
+ if ( empty ( $ct->stylesheet_dir ) ) :
+ 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:
+ 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 %3$s, here are a few ways to make your site look unique.' ), $ct->title, esc_url( admin_url( 'themes.php' ) ), $ct->title );
+ echo '</p>';
+ ?>
+ <ul>
+ <?php
+ if ( 'twentyeleven' == $ct->stylesheet ) : ?>
+ <li><?php echo sprintf( __( '<a href="%s">Choose light or dark</a>' ), esc_url( admin_url( 'themes.php?page=theme_options' ) ) ); ?></li>
+ <?php
+ endif;
</ins><span class="cx">
</span><del>- <a class="welcome-panel-close" href="#"><?php _e('Dismiss'); ?></a>
</del><ins>+ if ( current_theme_supports( 'custom-background' ) ) : ?>
+ <li><?php echo sprintf( __( '<a href="%s">Set a background color</a>' ), esc_url( admin_url( 'themes.php?page=custom-background' ) ) ); ?></li>
+ <?php
+ endif;
</ins><span class="cx">
</span><del>- <div class="wp-badge"><?php printf( __( 'Version %s' ), $display_version ); ?></div>
-
- <div class="welcome-panel-content">
-
- <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>
-
- <div class="welcome-panel-column-container">
- <div class="welcome-panel-column">
- <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">Choose your privacy setting</a>' ),
- esc_url( admin_url('options-privacy.php') )
- ); ?>
- </li>
- <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( admin_url('profile.php') )
- ); ?>
- </li>
- </ul>
- </div>
- <div class="welcome-panel-column">
- <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>
- <ul>
- <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>
- </ul>
- </div>
- <div class="welcome-panel-column">
- <h4>
- <span class="icon16 icon-appearance"></span>
- <?php _e( 'Customize Your Site' ); ?>
- </h4>
- <?php
- $ct = current_theme_info();
- if ( empty ( $ct->stylesheet_dir ) ) :
- 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:
- 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 %3$s, here are a few ways to make your site look unique.' ), $ct->title, esc_url( admin_url( 'themes.php' ) ), $ct->title );
- echo '</p>';
- ?>
- <ul>
- <?php if ( 'twentyeleven' == $ct->stylesheet ) : ?>
- <li>
- <?php echo sprintf(
- __( '<a href="%s">Choose light or dark</a>' ),
- esc_url( admin_url( 'themes.php?page=theme_options' ) )
- ); ?>
- </li>
- <?php
- endif;
- if ( current_theme_supports( 'custom-background' ) ) :
- ?>
- <li>
- <?php echo sprintf(
- __( '<a href="%s">Set a background color</a>' ),
- esc_url( admin_url( 'themes.php?page=custom-background' ) )
- ); ?>
- </li>
- <?php
- endif;
- if ( current_theme_supports( 'custom-header' ) ) :
- ?>
- <li>
- <?php echo sprintf(
- __( '<a href="%s">Select a new header image</a>' ),
- esc_url( admin_url( 'themes.php?page=custom-header' ) )
- ); ?>
- </li>
- <?php
- endif;
- if ( current_theme_supports( 'widgets' ) ) :
- ?>
- <li>
- <?php echo sprintf(
- __( '<a href="%s">Add some widgets</a>' ),
- esc_url( admin_url( 'widgets.php' ) )
- ); ?>
- </li>
- <?php endif; ?>
- </ul>
- <?php endif; ?>
- </div>
- </div>
- <p class="welcome-panel-dismiss"><?php printf( __( 'Already know what you&#8217;re doing? <a href="%s">Dismiss this message</a>.' ), '#' ) ?></p>
- </div>
</del><ins>+ if ( current_theme_supports( 'custom-header' ) ) : ?>
+ <li><?php echo sprintf( __( '<a href="%s">Select a new header image</a>' ), esc_url( admin_url( 'themes.php?page=custom-header' ) ) ); ?></li>
+ <?php
+ endif;
+
+ if ( current_theme_supports( 'widgets' ) ) : ?>
+ <li><?php echo sprintf( __( '<a href="%s">Add some widgets</a>' ), esc_url( admin_url( 'widgets.php' ) ) ); ?></li>
+ <?php
+ endif; ?>
+ </ul>
+ <?php
+ endif; ?>
</ins><span class="cx"> </div>
</span><ins>+ </div>
+ <p class="welcome-panel-dismiss"><?php _e( 'Already know what you&#8217;re doing? <a href="#">Dismiss this message</a>.' ); ?></p>
+ </div>
+ </div>
</ins><span class="cx"> <?php
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminjsdashboarddevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/dashboard.dev.js (19344 => 19345)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/dashboard.dev.js 2011-11-19 00:35:13 UTC (rev 19344)
+++ trunk/wp-admin/js/dashboard.dev.js 2011-11-19 00:42:22 UTC (rev 19345)
</span><span class="lines">@@ -15,7 +15,7 @@
</span><span class="cx"> if ( welcomePanel.hasClass('hidden') && welcomePanelHide.prop('checked') )
</span><span class="cx"> welcomePanel.removeClass('hidden');
</span><span class="cx">
</span><del>- $('.welcome-panel-close', welcomePanel).click( function() {
</del><ins>+ $('.welcome-panel-close, .welcome-panel-dismiss a', welcomePanel).click( function() {
</ins><span class="cx"> welcomePanel.addClass('hidden');
</span><span class="cx"> updateWelcomePanel( 0 );
</span><span class="cx"> $('#wp_welcome_panel-hide').prop('checked', false);
</span></span></pre></div>
<a id="trunkwpadminjsdashboardjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/dashboard.js (19344 => 19345)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/dashboard.js 2011-11-19 00:35:13 UTC (rev 19344)
+++ trunk/wp-admin/js/dashboard.js 2011-11-19 00:42:22 UTC (rev 19345)
</span><span class="lines">@@ -1 +1 @@
</span><del>-var ajaxWidgets,ajaxPopulateWidgets,quickPressLoad;jQuery(document).ready(function(c){var d=c("#welcome-panel"),a=c("#wp_welcome_panel-hide"),b=function(e){c.post(ajaxurl,{action:"update-welcome-panel",visible:e,welcomepanelnonce:c("#welcomepanelnonce").val()})};if(d.hasClass("hidden")&&a.prop("checked")){d.removeClass("hidden")}c(".welcome-panel-close",d).click(function(){d.addClass("hidden");b(0);c("#wp_welcome_panel-hide").prop("checked",false)});a.click(function(){d.toggleClass("hidden",!this.checked);b(this.checked?1:0)});ajaxWidgets=["dashboard_incoming_links","dashboard_primary","dashboard_secondary","dashboard_plugins"];ajaxPopulateWidgets=function(f){function e(g,k){var j,h=c("#"+k+" div.inside:visible").find(".widget-loading");if(h.length){j=h.parent();setTim
eout(function(){j.load(ajaxurl.replace("/admin-ajax.php","")+"/index-extra.php?jax="+k,"",function(){j.hide().slideDown("normal",function(){c(this).css("display","")})})},g*500)}}if(f){f=f.toString();if(c.inArray(f,ajaxWidgets)!=-1){e(0,f)}}else{c.each(ajaxWidgets,e)}};ajaxPopulateWidgets();postboxes.add_postbox_toggles(pagenow,{pbshow:ajaxPopulateWidgets});quickPressLoad=function(){var e=c("#quickpost-action"),f;f=c("#quick-press").submit(function(){c("#dashboard_quick_press #publishing-action img.waiting").css("visibility","visible");c('#quick-press .submit input[type="submit"], #quick-press .submit input[type="reset"]').prop("disabled",true);if("post"==e.val()){e.val("post-quickpress-publish")}c("#dashboard_quick_press div.inside").load(f.attr("action"),f.serializeArray(),function(){c(
"#dashboard_quick_press #publishing-action img.waiting").css("visibility","hidden");c('#quick-press .submit input[type="submit"], #quick-press .submit input[type="reset"]').prop("disabled",false);c("#dashboard_quick_press ul").next("p").remove();c("#dashboard_quick_press ul").find("li").each(function(){c("#dashboard_recent_drafts ul").prepend(this)}).end().remove();quickPressLoad()});return false});c("#publish").click(function(){e.val("post-quickpress-publish")})};quickPressLoad()});
</del><span class="cx">\ No newline at end of file
</span><ins>+var ajaxWidgets,ajaxPopulateWidgets,quickPressLoad;jQuery(document).ready(function(c){var d=c("#welcome-panel"),a=c("#wp_welcome_panel-hide"),b=function(e){c.post(ajaxurl,{action:"update-welcome-panel",visible:e,welcomepanelnonce:c("#welcomepanelnonce").val()})};if(d.hasClass("hidden")&&a.prop("checked")){d.removeClass("hidden")}c(".welcome-panel-close, .welcome-panel-dismiss a",d).click(function(){d.addClass("hidden");b(0);c("#wp_welcome_panel-hide").prop("checked",false)});a.click(function(){d.toggleClass("hidden",!this.checked);b(this.checked?1:0)});ajaxWidgets=["dashboard_incoming_links","dashboard_primary","dashboard_secondary","dashboard_plugins"];ajaxPopulateWidgets=function(f){function e(g,k){var j,h=c("#"+k+" div.inside:visible").find(".widget-loading");if(h.l
ength){j=h.parent();setTimeout(function(){j.load(ajaxurl.replace("/admin-ajax.php","")+"/index-extra.php?jax="+k,"",function(){j.hide().slideDown("normal",function(){c(this).css("display","")})})},g*500)}}if(f){f=f.toString();if(c.inArray(f,ajaxWidgets)!=-1){e(0,f)}}else{c.each(ajaxWidgets,e)}};ajaxPopulateWidgets();postboxes.add_postbox_toggles(pagenow,{pbshow:ajaxPopulateWidgets});quickPressLoad=function(){var e=c("#quickpost-action"),f;f=c("#quick-press").submit(function(){c("#dashboard_quick_press #publishing-action img.waiting").css("visibility","visible");c('#quick-press .submit input[type="submit"], #quick-press .submit input[type="reset"]').prop("disabled",true);if("post"==e.val()){e.val("post-quickpress-publish")}c("#dashboard_quick_press div.inside").load(f.attr("action"),f.seri
alizeArray(),function(){c("#dashboard_quick_press #publishing-action img.waiting").css("visibility","hidden");c('#quick-press .submit input[type="submit"], #quick-press .submit input[type="reset"]').prop("disabled",false);c("#dashboard_quick_press ul").next("p").remove();c("#dashboard_quick_press ul").find("li").each(function(){c("#dashboard_recent_drafts ul").prepend(this)}).end().remove();quickPressLoad()});return false});c("#publish").click(function(){e.val("post-quickpress-publish")})};quickPressLoad()});
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpincludesscriptloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/script-loader.php (19344 => 19345)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/script-loader.php 2011-11-19 00:35:13 UTC (rev 19344)
+++ trunk/wp-includes/script-loader.php 2011-11-19 00:42:22 UTC (rev 19345)
</span><span class="lines">@@ -367,7 +367,7 @@
</span><span class="cx">
</span><span class="cx"> $scripts->add( 'farbtastic', '/wp-admin/js/farbtastic.js', array('jquery'), '1.2' );
</span><span class="cx">
</span><del>- $scripts->add( 'dashboard', "/wp-admin/js/dashboard$suffix.js", array( 'jquery', 'admin-comments', 'postbox' ), '20111103', 1 );
</del><ins>+ $scripts->add( 'dashboard', "/wp-admin/js/dashboard$suffix.js", array( 'jquery', 'admin-comments', 'postbox' ), '20111118', 1 );
</ins><span class="cx">
</span><span class="cx"> $scripts->add( 'hoverIntent', "/wp-includes/js/hoverIntent$suffix.js", array('jquery'), '20090102', 1 );
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>