More dash updates.

* Shuffle around some pixels.
 * Rename some things that weren't caught in [26220].
 * Revert default-widgets.php change from [26144].
props lessbloat.
see #25824.

Built from https://develop.svn.wordpress.org/trunk@26230


git-svn-id: http://core.svn.wordpress.org/trunk@26137 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Nacin 2013-11-15 22:23:09 +00:00
parent 7b06d5b0a9
commit 791e807f08
8 changed files with 77 additions and 77 deletions

View File

@ -2578,7 +2578,7 @@ html.wp-toolbar {
} }
.postbox .inside { .postbox .inside {
margin: 12px 0; margin: 11px 0;
position: relative; position: relative;
} }
@ -2653,7 +2653,7 @@ html.wp-toolbar {
position: relative; position: relative;
overflow: auto; overflow: auto;
margin: 16px 0; margin: 16px 0;
padding: 23px 10px 12px; padding: 23px 10px 0;
font-size: 13px; font-size: 13px;
line-height: 2.1em; line-height: 2.1em;
} }
@ -2683,7 +2683,7 @@ html.wp-toolbar {
position: absolute; position: absolute;
top: 5px; top: 5px;
left: 10px; left: 10px;
padding: 8px 3px; padding: 20px 3px 0 15px;
font-size: 13px; font-size: 13px;
text-decoration: none; text-decoration: none;
line-height: 1; line-height: 1;
@ -2814,13 +2814,13 @@ html.wp-toolbar {
/* Dashboard WordPress news */ /* Dashboard WordPress news */
#dashboard_rss .inside { #dashboard_primary .inside {
margin: 0; margin: 0;
padding: 0; padding: 0;
} }
#dashboard_rss .widget-loading, #dashboard_primary .widget-loading,
#dashboard_rss .dashboard-widget-control-form { #dashboard_primary .dashboard-widget-control-form {
padding: 12px 12px 0; padding: 12px 12px 0;
} }
@ -2841,31 +2841,31 @@ body #dashboard-widgets .postbox form .submit {
margin-top: 4px; margin-top: 4px;
} }
.rss-widget { #dashboard_primary .rss-widget {
border-bottom: 1px solid #eee; border-bottom: 1px solid #eee;
font-size: 13px; font-size: 13px;
padding: 8px 12px 12px; padding: 8px 12px 10px;
} }
.rss-widget:last-child { #dashboard_primary .rss-widget:last-child {
border-bottom: none; border-bottom: none;
padding-bottom: 0; padding-bottom: 8px;
} }
.rss-widget a { #dashboard_primary .rss-widget a {
font-weight: normal; font-weight: normal;
} }
.rss-widget span, #dashboard_primary .rss-widget span,
.rss-widget span.rss-date { #dashboard_primary .rss-widget span.rss-date {
color: #bbb; color: #bbb;
} }
.rss-widget span.rss-date { #dashboard_primary .rss-widget span.rss-date {
margin-right: 12px; margin-right: 12px;
} }
.rss-widget ul li { #dashboard_primary .rss-widget ul li {
margin-bottom: 8px; margin-bottom: 8px;
} }
@ -2889,7 +2889,7 @@ body #dashboard-widgets .postbox form .submit {
} }
#dash-right-now .main { #dash-right-now .main {
padding: 0 12px; padding: 0 12px 11px;
} }
#dash-right-now .main p { #dash-right-now .main p {
@ -2909,9 +2909,8 @@ body #dashboard-widgets .postbox form .submit {
#dash-right-now .sub { #dash-right-now .sub {
color: #bfbbbb; color: #bfbbbb;
background: #f5f5f5; background: #f5f5f5;
border-top-color: #dedede; border-top: 1px solid #eee;
padding: 12px 12px 6px 12px; padding: 10px 12px 6px 12px;
border-top: 1px solid;
} }
#dash-right-now .sub h4 { #dash-right-now .sub h4 {
@ -2969,6 +2968,11 @@ body #dashboard-widgets .postbox form .submit {
/* Dashboard Quick Draft */ /* Dashboard Quick Draft */
#dashboard_quick_press .inside {
margin: 0;
padding: 0;
}
#dashboard_quick_press div.updated { #dashboard_quick_press div.updated {
margin-bottom: 10px; margin-bottom: 10px;
border: 1px solid #eee; border: 1px solid #eee;
@ -2976,18 +2980,13 @@ body #dashboard-widgets .postbox form .submit {
} }
#dashboard_quick_press form { #dashboard_quick_press form {
padding: 0 12px 1px 12px;
overflow: hidden; overflow: hidden;
margin: 12px 12px 0;
} }
#dashboard_quick_press .drafts, #dashboard_quick_press .drafts,
#dashboard_quick_press .easy-blogging { #dashboard_quick_press .easy-blogging {
padding: 8px 12px 0; padding: 10px 0 0;
}
#dashboard-widgets .postbox .inside {
margin: 10px 0;
padding: 0;
} }
/* Dashboard Quick Draft - Form styling */ /* Dashboard Quick Draft - Form styling */
@ -3080,21 +3079,21 @@ form.initial-form.quickpress-open input#title {
} }
#dashboard_quick_press .drafts h4 { #dashboard_quick_press .drafts h4 {
margin: 0 0 8px 0; margin: 0 12px 8px;
font-weight: normal; font-weight: normal;
} }
#dashboard_quick_press .drafts .view-all { #dashboard_quick_press .drafts .view-all {
float: left; float: left;
margin-top: 0; margin: 0 0 0 12px;
} }
#dashboard_rss a.rsswidget { #dashboard_primary a.rsswidget {
font-weight: normal; font-weight: normal;
} }
#dashboard_quick_press .drafts ul { #dashboard_quick_press .drafts ul {
margin: 0; margin: 0 12px;
} }
#dashboard_quick_press .drafts li { #dashboard_quick_press .drafts li {
@ -3188,12 +3187,13 @@ form.initial-form.quickpress-open input#title {
float: none; float: none;
border-top: 1px solid #eeeeee; border-top: 1px solid #eeeeee;
margin-top: 0; margin-top: 0;
padding: 8px 12px 0 12px; padding: 8px 12px 4px;
} }
#future-posts .show-more, #future-posts .show-more,
#published-posts .show-more { #published-posts .show-more {
float: left; float: left;
margin-left: 12px;
} }
#future-posts ul, #future-posts ul,
@ -3219,7 +3219,7 @@ form.initial-form.quickpress-open input#title {
.activity-block { .activity-block {
border-bottom: 1px solid #eee; border-bottom: 1px solid #eee;
overflow: hidden; overflow: hidden;
padding: 8px 0 0; padding: 8px 0 4px;
} }
.activity-block:last-child { .activity-block:last-child {
@ -7832,7 +7832,7 @@ table.form-table td .updated {
#poststuff h3, #poststuff h3,
.metabox-holder h3 { .metabox-holder h3 {
font-size: 14px; font-size: 14px;
padding: 7px 12px; padding: 8px 12px;
margin: 0; margin: 0;
line-height: 1.4; line-height: 1.4;
} }
@ -8276,7 +8276,7 @@ h3:hover .edit-box {
} }
#title-wrap #title-prompt-text { #title-wrap #title-prompt-text {
font-size: 1em; font-size: 1.1em;
padding: 5px 8px; padding: 5px 8px;
} }

File diff suppressed because one or more lines are too long

View File

@ -2578,7 +2578,7 @@ html.wp-toolbar {
} }
.postbox .inside { .postbox .inside {
margin: 12px 0; margin: 11px 0;
position: relative; position: relative;
} }
@ -2653,7 +2653,7 @@ html.wp-toolbar {
position: relative; position: relative;
overflow: auto; overflow: auto;
margin: 16px 0; margin: 16px 0;
padding: 23px 10px 12px; padding: 23px 10px 0;
font-size: 13px; font-size: 13px;
line-height: 2.1em; line-height: 2.1em;
} }
@ -2683,7 +2683,7 @@ html.wp-toolbar {
position: absolute; position: absolute;
top: 5px; top: 5px;
right: 10px; right: 10px;
padding: 8px 3px; padding: 20px 15px 0 3px;
font-size: 13px; font-size: 13px;
text-decoration: none; text-decoration: none;
line-height: 1; line-height: 1;
@ -2814,13 +2814,13 @@ html.wp-toolbar {
/* Dashboard WordPress news */ /* Dashboard WordPress news */
#dashboard_rss .inside { #dashboard_primary .inside {
margin: 0; margin: 0;
padding: 0; padding: 0;
} }
#dashboard_rss .widget-loading, #dashboard_primary .widget-loading,
#dashboard_rss .dashboard-widget-control-form { #dashboard_primary .dashboard-widget-control-form {
padding: 12px 12px 0; padding: 12px 12px 0;
} }
@ -2841,31 +2841,31 @@ body #dashboard-widgets .postbox form .submit {
margin-top: 4px; margin-top: 4px;
} }
.rss-widget { #dashboard_primary .rss-widget {
border-bottom: 1px solid #eee; border-bottom: 1px solid #eee;
font-size: 13px; font-size: 13px;
padding: 8px 12px 12px; padding: 8px 12px 10px;
} }
.rss-widget:last-child { #dashboard_primary .rss-widget:last-child {
border-bottom: none; border-bottom: none;
padding-bottom: 0; padding-bottom: 8px;
} }
.rss-widget a { #dashboard_primary .rss-widget a {
font-weight: normal; font-weight: normal;
} }
.rss-widget span, #dashboard_primary .rss-widget span,
.rss-widget span.rss-date { #dashboard_primary .rss-widget span.rss-date {
color: #bbb; color: #bbb;
} }
.rss-widget span.rss-date { #dashboard_primary .rss-widget span.rss-date {
margin-left: 12px; margin-left: 12px;
} }
.rss-widget ul li { #dashboard_primary .rss-widget ul li {
margin-bottom: 8px; margin-bottom: 8px;
} }
@ -2889,7 +2889,7 @@ body #dashboard-widgets .postbox form .submit {
} }
#dash-right-now .main { #dash-right-now .main {
padding: 0 12px; padding: 0 12px 11px;
} }
#dash-right-now .main p { #dash-right-now .main p {
@ -2909,9 +2909,8 @@ body #dashboard-widgets .postbox form .submit {
#dash-right-now .sub { #dash-right-now .sub {
color: #bfbbbb; color: #bfbbbb;
background: #f5f5f5; background: #f5f5f5;
border-top-color: #dedede; border-top: 1px solid #eee;
padding: 12px 12px 6px 12px; padding: 10px 12px 6px 12px;
border-top: 1px solid;
} }
#dash-right-now .sub h4 { #dash-right-now .sub h4 {
@ -2969,6 +2968,11 @@ body #dashboard-widgets .postbox form .submit {
/* Dashboard Quick Draft */ /* Dashboard Quick Draft */
#dashboard_quick_press .inside {
margin: 0;
padding: 0;
}
#dashboard_quick_press div.updated { #dashboard_quick_press div.updated {
margin-bottom: 10px; margin-bottom: 10px;
border: 1px solid #eee; border: 1px solid #eee;
@ -2976,18 +2980,13 @@ body #dashboard-widgets .postbox form .submit {
} }
#dashboard_quick_press form { #dashboard_quick_press form {
padding: 0 12px 1px 12px;
overflow: hidden; overflow: hidden;
margin: 12px 12px 0;
} }
#dashboard_quick_press .drafts, #dashboard_quick_press .drafts,
#dashboard_quick_press .easy-blogging { #dashboard_quick_press .easy-blogging {
padding: 8px 12px 0; padding: 10px 0 0;
}
#dashboard-widgets .postbox .inside {
margin: 10px 0;
padding: 0;
} }
/* Dashboard Quick Draft - Form styling */ /* Dashboard Quick Draft - Form styling */
@ -3080,21 +3079,21 @@ form.initial-form.quickpress-open input#title {
} }
#dashboard_quick_press .drafts h4 { #dashboard_quick_press .drafts h4 {
margin: 0 0 8px 0; margin: 0 12px 8px;
font-weight: normal; font-weight: normal;
} }
#dashboard_quick_press .drafts .view-all { #dashboard_quick_press .drafts .view-all {
float: right; float: right;
margin-top: 0; margin: 0 12px 0 0;
} }
#dashboard_rss a.rsswidget { #dashboard_primary a.rsswidget {
font-weight: normal; font-weight: normal;
} }
#dashboard_quick_press .drafts ul { #dashboard_quick_press .drafts ul {
margin: 0; margin: 0 12px;
} }
#dashboard_quick_press .drafts li { #dashboard_quick_press .drafts li {
@ -3188,12 +3187,13 @@ form.initial-form.quickpress-open input#title {
float: none; float: none;
border-top: 1px solid #eeeeee; border-top: 1px solid #eeeeee;
margin-top: 0; margin-top: 0;
padding: 8px 12px 0 12px; padding: 8px 12px 4px;
} }
#future-posts .show-more, #future-posts .show-more,
#published-posts .show-more { #published-posts .show-more {
float: right; float: right;
margin-right: 12px;
} }
#future-posts ul, #future-posts ul,
@ -3219,7 +3219,7 @@ form.initial-form.quickpress-open input#title {
.activity-block { .activity-block {
border-bottom: 1px solid #eee; border-bottom: 1px solid #eee;
overflow: hidden; overflow: hidden;
padding: 8px 0 0; padding: 8px 0 4px;
} }
.activity-block:last-child { .activity-block:last-child {
@ -7832,7 +7832,7 @@ table.form-table td .updated {
#poststuff h3, #poststuff h3,
.metabox-holder h3 { .metabox-holder h3 {
font-size: 14px; font-size: 14px;
padding: 7px 12px; padding: 8px 12px;
margin: 0; margin: 0;
line-height: 1.4; line-height: 1.4;
} }
@ -8276,7 +8276,7 @@ h3:hover .edit-box {
} }
#title-wrap #title-prompt-text { #title-wrap #title-prompt-text {
font-size: 1em; font-size: 1.1em;
padding: 5px 8px; padding: 5px 8px;
} }

File diff suppressed because one or more lines are too long

View File

@ -62,12 +62,12 @@ jQuery(document).ready( function($) {
quickPressLoad = function() { quickPressLoad = function() {
var act = $('#quickpost-action'), t; var act = $('#quickpost-action'), t;
t = $('#quick-press').submit( function() { t = $('#quick-press').submit( function() {
$('#dashboard_quick_draft #publishing-action .spinner').show(); $('#dashboard_quick_press #publishing-action .spinner').show();
$('#quick-press .submit input[type="submit"], #quick-press .submit input[type="reset"]').prop('disabled', true); $('#quick-press .submit input[type="submit"], #quick-press .submit input[type="reset"]').prop('disabled', true);
$.post( t.attr( 'action' ), t.serializeArray(), function( data ) { $.post( t.attr( 'action' ), t.serializeArray(), function( data ) {
// Replace the form, and prepend the published post. // Replace the form, and prepend the published post.
$('#dashboard_quick_draft .inside').html( data ); $('#dashboard_quick_press .inside').html( data );
$('#quick-press').removeClass('initial-form'); $('#quick-press').removeClass('initial-form');
quickPressLoad(); quickPressLoad();
highlightLatestPost(); highlightLatestPost();
@ -75,7 +75,7 @@ jQuery(document).ready( function($) {
}); });
function highlightLatestPost () { function highlightLatestPost () {
var latestPost = $('#draft-list li').first(); var latestPost = $('.drafts ul li').first();
latestPost.css('background', '#fffbe5'); latestPost.css('background', '#fffbe5');
setTimeout(function () { setTimeout(function () {
latestPost.css('background', 'none'); latestPost.css('background', 'none');

View File

@ -1 +1 @@
var ajaxWidgets,ajaxPopulateWidgets,quickPressLoad;jQuery(document).ready(function(a){function b(){var a=1,b=parseInt(jQuery(window).width());b>799&&1299>b&&(a=2),b>1300&&1799>b&&(a=3),b>1800&&(a=4),jQuery(".metabox-holder").attr("class",jQuery(".metabox-holder").attr("class").replace(/columns-\d+/,"columns-"+a))}var c=a("#welcome-panel"),d=a("#wp_welcome_panel-hide"),e=function(b){a.post(ajaxurl,{action:"update-welcome-panel",visible:b,welcomepanelnonce:a("#welcomepanelnonce").val()})};c.hasClass("hidden")&&d.prop("checked")&&c.removeClass("hidden"),a(".welcome-panel-close, .welcome-panel-dismiss a",c).click(function(b){b.preventDefault(),c.addClass("hidden"),e(0),a("#wp_welcome_panel-hide").prop("checked",!1)}),d.click(function(){c.toggleClass("hidden",!this.checked),e(this.checked?1:0)}),ajaxWidgets=["dashboard_primary"],ajaxPopulateWidgets=function(b){function c(b,c){var d,e=a("#"+c+" div.inside:visible").find(".widget-loading");e.length&&(d=e.parent(),setTimeout(function(){d.load(ajaxurl+"?action=dashboard-widgets&widget="+c+"&pagenow="+pagenow,"",function(){d.hide().slideDown("normal",function(){a(this).css("display","")})})},500*b))}b?(b=b.toString(),-1!=a.inArray(b,ajaxWidgets)&&c(0,b)):a.each(ajaxWidgets,c)},ajaxPopulateWidgets(),postboxes.add_postbox_toggles(pagenow,{pbshow:ajaxPopulateWidgets}),quickPressLoad=function(){var b,c=a("#quickpost-action");b=a("#quick-press").submit(function(){function c(){var b=a("#draft-list li").first();b.css("background","#fffbe5"),setTimeout(function(){b.css("background","none")},1e3)}return a("#dashboard_quick_draft #publishing-action .spinner").show(),a('#quick-press .submit input[type="submit"], #quick-press .submit input[type="reset"]').prop("disabled",!0),a.post(b.attr("action"),b.serializeArray(),function(b){a("#dashboard_quick_draft .inside").html(b),a("#quick-press").removeClass("initial-form"),quickPressLoad(),c(),a("#title").focus()}),!1}),a("#publish").click(function(){c.val("post-quickpress-publish")}),a("#title, #tags-input, #content").each(function(){var b=a(this),c=a("#"+this.id+"-prompt-text");""===this.value&&c.removeClass("screen-reader-text"),c.click(function(){a(this).addClass("screen-reader-text"),b.focus()}),b.blur(function(){""===this.value&&c.removeClass("screen-reader-text")}),b.focus(function(){c.addClass("screen-reader-text")})}),a("#quick-press").on("click focusin",function(){a(this).addClass("quickpress-open"),a("#description-wrap, p.submit").slideDown(200),wpActiveEditor="content"})},quickPressLoad(),a(".show-more a").on("click",function(b){a(this).fadeOut().closest(".activity-block").find("li.hidden").fadeIn().removeClass("hidden"),b.preventDefault()}),jQuery(document).ready(function(){b()}),jQuery(window).resize(_.debounce(function(){b()},30))}); var ajaxWidgets,ajaxPopulateWidgets,quickPressLoad;jQuery(document).ready(function(a){function b(){var a=1,b=parseInt(jQuery(window).width());b>799&&1299>b&&(a=2),b>1300&&1799>b&&(a=3),b>1800&&(a=4),jQuery(".metabox-holder").attr("class",jQuery(".metabox-holder").attr("class").replace(/columns-\d+/,"columns-"+a))}var c=a("#welcome-panel"),d=a("#wp_welcome_panel-hide"),e=function(b){a.post(ajaxurl,{action:"update-welcome-panel",visible:b,welcomepanelnonce:a("#welcomepanelnonce").val()})};c.hasClass("hidden")&&d.prop("checked")&&c.removeClass("hidden"),a(".welcome-panel-close, .welcome-panel-dismiss a",c).click(function(b){b.preventDefault(),c.addClass("hidden"),e(0),a("#wp_welcome_panel-hide").prop("checked",!1)}),d.click(function(){c.toggleClass("hidden",!this.checked),e(this.checked?1:0)}),ajaxWidgets=["dashboard_primary"],ajaxPopulateWidgets=function(b){function c(b,c){var d,e=a("#"+c+" div.inside:visible").find(".widget-loading");e.length&&(d=e.parent(),setTimeout(function(){d.load(ajaxurl+"?action=dashboard-widgets&widget="+c+"&pagenow="+pagenow,"",function(){d.hide().slideDown("normal",function(){a(this).css("display","")})})},500*b))}b?(b=b.toString(),-1!=a.inArray(b,ajaxWidgets)&&c(0,b)):a.each(ajaxWidgets,c)},ajaxPopulateWidgets(),postboxes.add_postbox_toggles(pagenow,{pbshow:ajaxPopulateWidgets}),quickPressLoad=function(){var b,c=a("#quickpost-action");b=a("#quick-press").submit(function(){function c(){var b=a(".drafts ul li").first();b.css("background","#fffbe5"),setTimeout(function(){b.css("background","none")},1e3)}return a("#dashboard_quick_press #publishing-action .spinner").show(),a('#quick-press .submit input[type="submit"], #quick-press .submit input[type="reset"]').prop("disabled",!0),a.post(b.attr("action"),b.serializeArray(),function(b){a("#dashboard_quick_press .inside").html(b),a("#quick-press").removeClass("initial-form"),quickPressLoad(),c(),a("#title").focus()}),!1}),a("#publish").click(function(){c.val("post-quickpress-publish")}),a("#title, #tags-input, #content").each(function(){var b=a(this),c=a("#"+this.id+"-prompt-text");""===this.value&&c.removeClass("screen-reader-text"),c.click(function(){a(this).addClass("screen-reader-text"),b.focus()}),b.blur(function(){""===this.value&&c.removeClass("screen-reader-text")}),b.focus(function(){c.addClass("screen-reader-text")})}),a("#quick-press").on("click focusin",function(){a(this).addClass("quickpress-open"),a("#description-wrap, p.submit").slideDown(200),wpActiveEditor="content"})},quickPressLoad(),a(".show-more a").on("click",function(b){a(this).fadeOut().closest(".activity-block").find("li.hidden").fadeIn().removeClass("hidden"),b.preventDefault()}),jQuery(document).ready(function(){b()}),jQuery(window).resize(_.debounce(function(){b()},30))});

View File

@ -105,14 +105,14 @@ case 'post-quickdraft-save':
$error_msg = "Oops, you don't have access to add new drafts."; $error_msg = "Oops, you don't have access to add new drafts.";
if ( $error_msg ) if ( $error_msg )
return wp_dashboard_quick_draft( $error_msg ); return wp_dashboard_quick_press( $error_msg );
$post = get_post( $_REQUEST['post_ID'] ); $post = get_post( $_REQUEST['post_ID'] );
check_admin_referer( 'add-' . $post->post_type ); check_admin_referer( 'add-' . $post->post_type );
edit_post(); edit_post();
// output the quickdraft dashboard widget // output the quickdraft dashboard widget
require_once(ABSPATH . 'wp-admin/includes/dashboard.php'); require_once(ABSPATH . 'wp-admin/includes/dashboard.php');
wp_dashboard_quick_draft(); wp_dashboard_quick_press();
exit; exit;
break; break;

View File

@ -904,7 +904,7 @@ function wp_widget_rss_output( $rss, $args = array() ) {
if ( $link == '' ) { if ( $link == '' ) {
echo "<li>$title{$date}{$summary}{$author}</li>"; echo "<li>$title{$date}{$summary}{$author}</li>";
} else { } else {
echo "<li><div class='rss-title-row'><a class='rsswidget' href='$link' title='$desc'>$title</a>{$date}</div>{$summary}{$author}</li>"; echo "<li><a class='rsswidget' href='$link' title='$desc'>$title</a>{$date}{$summary}{$author}</li>";
} }
} }
echo '</ul>'; echo '</ul>';