WordPress.org

Make WordPress Core

Ticket #8070: 8070.diff

File 8070.diff, 16.0 KB (added by mdawaffe, 6 years ago)
  • wp-includes/script-loader.php

     
    328328 
    329329        $rtl_styles = array( 'global', 'colors', 'dashboard', 'ie', 'install', 'login', 'media', 'theme-editor', 'upload', 'widgets', 'press-this', 'press-this-ie' ); 
    330330 
    331         $styles->add( 'wp-admin', '/wp-admin/wp-admin.css', array(), '20081103' ); 
     331        $styles->add( 'wp-admin', '/wp-admin/wp-admin.css', array(), '20081105' ); 
    332332        $styles->add_data( 'wp-admin', 'rtl', '/wp-admin/rtl.css' ); 
    333333 
    334334        $styles->add( 'ie', '/wp-admin/css/ie.css' ); 
     
    341341        $styles->add( 'global', '/wp-admin/css/global.css', array(), '20081030' ); 
    342342        $styles->add( 'media', '/wp-admin/css/media.css', array(), '20080709' ); 
    343343        $styles->add( 'widgets', '/wp-admin/css/widgets.css' ); 
    344         $styles->add( 'dashboard', '/wp-admin/css/dashboard.css', array(), '20081030' ); 
     344        $styles->add( 'dashboard', '/wp-admin/css/dashboard.css', array(), '20081105' ); 
    345345        $styles->add( 'install', '/wp-admin/css/install.css', array(), '20080708' ); 
    346346        $styles->add( 'theme-editor', '/wp-admin/css/theme-editor.css' ); 
    347347        $styles->add( 'press-this', '/wp-admin/css/press-this.css', array(), '20080922' ); 
  • wp-admin/wp-admin.css

     
    16551655        /*font-weight: bold;*/ 
    16561656} 
    16571657 
    1658 #poststuff #media-buttons { 
     1658#media-buttons { 
    16591659        cursor: default; 
    16601660        padding: 8px 8px 0; 
    16611661} 
    16621662 
    1663 #poststuff #media-buttons a { 
     1663#media-buttons a { 
    16641664        cursor: pointer; 
    16651665        padding: 0 0 5px 10px; 
    16661666        vertical-align: middle; 
    16671667} 
    16681668 
    1669 #poststuff #media-buttons img { 
     1669#media-buttons img { 
    16701670        vertical-align: middle; 
    16711671} 
    16721672 
  • wp-admin/includes/dashboard.php

     
    2828        wp_add_dashboard_widget( 'dashboard_right_now', __( 'Right Now' ), 'wp_dashboard_right_now' ); 
    2929 
    3030        // Recent Comments Widget 
    31         wp_add_dashboard_widget( 'dashboard_recent_comments', __( 'Recent Comments' ), 'wp_dashboard_recent_comments' ); 
     31        wp_add_dashboard_widget( 'dashboard_recent_comments', sprintf( __( 'Recent Comments <a href="%s">View all</a>' ), 'edit-comments.php' ), 'wp_dashboard_recent_comments' ); 
    3232 
    3333        // Incoming Links Widget 
    3434        if ( !isset( $widget_options['dashboard_incoming_links'] ) || !isset( $widget_options['dashboard_incoming_links']['home'] ) || $widget_options['dashboard_incoming_links']['home'] != get_option('home') ) { 
     
    5151        wp_add_dashboard_widget( 'dashboard_quick_press', __( 'QuickPress' ), 'wp_dashboard_quick_press' ); 
    5252 
    5353        // Recent Drafts 
    54         wp_add_dashboard_widget( 'dashboard_recent_drafts', __( 'Recent Drafts' ), 'wp_dashboard_recent_drafts' ); 
     54        wp_add_dashboard_widget( 'dashboard_recent_drafts', sprintf( __( 'Recent Drafts <a href="%s">View all</a>' ), 'edit.php?post_status=draft' ), 'wp_dashboard_recent_drafts' ); 
    5555 
    5656 
    5757        // Primary feed (Dev Blog) Widget 
     
    311311                        <input type="text" name="post_title" id="title" autocomplete="off" value="<?php echo attribute_escape( $post->post_title ); ?>" /> 
    312312                </div> 
    313313 
    314                 <div id="add-media-button" class="alignright"> 
    315                         <a class="thickbox button" href="<?php echo clean_url( admin_url('media-upload.php?TB_iframe=true') ) ?>" id="add-media-link"><?php _e( 'Insert Media' ); ?></a> 
     314                <div id="media-buttons" class="hide-if-no-js"> 
     315                        <?php do_action( 'media_buttons' ); ?> 
    316316                </div> 
    317317 
    318                 <h4 id="content-label"><label for="content"><?php _e('Post') ?></label></h4> 
     318                <h4 id="content-label"><label for="content"><?php _e('Content') ?></label></h4> 
    319319                <div class="textarea-wrap"> 
    320320                        <textarea name="content" id="content" class="mceEditor" rows="3" cols="15"><?php echo $post->post_content; ?></textarea> 
    321321                </div> 
     
    324324                <div class="input-text-wrap"> 
    325325                        <input type="text" name="tags_input" id="tags-input" value="<?php echo get_tags_to_edit( $post->ID ); ?>" /> 
    326326                </div> 
    327                 <p class='field-tip'><?php _e('Separate tags with commas'); ?></p> 
    328327 
    329328                <p class="submit"> 
    330329                        <input type="hidden" name="action" id="quickpost-action" value="post-quickpress-save" /> 
    331330                        <input type="hidden" name="quickpress_post_ID" value="<?php echo (int) $post->ID; ?>" /> 
    332331                        <?php wp_nonce_field('add-post'); ?> 
    333                         <input type="submit" name="save" id="save-post" class="button alignleft" value="<?php _e('Save Draft'); ?>" /> 
    334                         <input type="submit" name="publish" id="publish" accesskey="p" class="button button-highlighted alignright" value="<?php _e('Publish'); ?>" /> 
     332                        <input type="submit" name="save" id="save-post" class="button" value="<?php _e('Save Draft'); ?>" /> 
     333                        <input type="reset" value="<?php _e( 'Cancel' ); ?>" class="cancel" /> 
     334                        <input type="submit" name="publish" id="publish" accesskey="p" class="button button-highlighted" value="<?php _e('Publish'); ?>" /> 
    335335                        <br class="clear" /> 
    336336                </p> 
    337337 
     
    362362                foreach ( $drafts as $draft ) { 
    363363                        $url = get_edit_post_link( $draft->ID ); 
    364364                        $title = _draft_or_post_title( $draft->ID ); 
    365                         $list[] = '<abbr title="' . get_the_time(__('Y/m/d g:i:s A'), $draft) . '">' . get_the_time( get_option( 'date_format' ), $draft ) . "</abbr> <a href='$url' title='" . sprintf( __( 'Edit "%s"' ), attribute_escape( $title ) ) . "'>$title</a>"; 
     365                        $item = "<h4><a href='$url' title='" . sprintf( __( 'Edit "%s"' ), attribute_escape( $title ) ) . "'>$title</a> <abbr title='" . get_the_time(__('Y/m/d g:i:s A'), $draft) . "'>" . get_the_time( get_option( 'date_format' ), $draft ) . '</abbr></h4>'; 
     366                        if ( $the_content = preg_split( '#\s#', strip_tags( $draft->post_content ), 11, PREG_SPLIT_NO_EMPTY ) ) 
     367                                $item .= '<p>' . join( ' ', array_slice( $the_content, 0, 10 ) ) . ( 10 < count( $the_content ) ? '&hellip;' : '' ) . '</p>'; 
     368                        $list[] = $item; 
    366369                } 
    367370?> 
    368371        <ul> 
     
    387390?> 
    388391 
    389392                <div id="the-comment-list" class="list:comment"> 
    390                 <p class="view-all"><a href="edit-comments.php"><?php _e( 'View All Comments' ); ?></a></p> 
    391393<?php 
    392394                foreach ( $comments as $comment ) 
    393395                        _wp_dashboard_recent_comments_row( $comment ); 
     
    408410} 
    409411 
    410412function _wp_dashboard_recent_comments_row( &$comment, $show_date = true ) { 
    411         static $date = false; 
    412         static $today = false; 
    413         static $yesterday = false; 
    414  
    415413        $GLOBALS['comment'] =& $comment; 
    416414 
    417         if ( $show_date ) { 
    418                 if ( !$today ) 
    419                         $today = gmdate( get_option( 'date_format' ), time() + get_option( 'gmt_offset' ) ); 
    420                 if ( !$yesterday ) 
    421                         $yesterday = gmdate( get_option( 'date_format' ), strtotime( 'yesterday' ) + get_option( 'gmt_offset' ) ); 
    422                 $wordy_dates = array( $today => __( 'Today' ), $yesterday => __( 'Yesterday' ) ); 
    423          
    424                 $comment_date = gmdate( get_option( 'date_format' ), strtotime( $comment->comment_date ) + get_option( 'gmt_offset' ) ); 
    425                 if ( $comment_date != $date ) { 
    426                         $date = $comment_date; 
    427                         echo '<h4>' . ( isset( $wordy_dates[$date] ) ? $wordy_dates[$date] : $date ) . ":</h4>\n"; 
    428                 } 
    429         } 
    430  
    431415        $comment_post_url = get_edit_post_link( $comment->comment_post_ID ); 
    432416        $comment_post_title = get_the_title( $comment->comment_post_ID ); 
    433417        $comment_post_link = "<a href='$comment_post_url'>$comment_post_title</a>"; 
     
    444428                $actions['approve'] = "<a href='$approve_url' class='dim:the-comment-list:comment-$comment->comment_ID:unapproved:e7e7d3:e7e7d3:new=approved vim-a' title='" . __( 'Approve this comment' ) . "'>" . __( 'Approve' ) . '</a>'; 
    445429                $actions['unapprove'] = "<a href='$unapprove_url' class='dim:the-comment-list:comment-$comment->comment_ID:unapproved:e7e7d3:e7e7d3:new=unapproved vim-u' title='" . __( 'Unapprove this comment' ) . "'>" . __( 'Unapprove' ) . '</a>'; 
    446430                $actions['edit'] = "<a href='comment.php?action=editcomment&amp;c={$comment->comment_ID}' title='" . __('Edit comment') . "'>". __('Edit') . '</a>'; 
    447                 $actions['spam'] = "<a href='$spam_url' class='delete:the-comment-list:comment-$comment->comment_ID::spam=1 vim-s vim-destructive' title='" . __( 'Mark this comment as spam' ) . "'>" . __( 'Spam' ) . '</a>'; 
    448                 $actions['delete'] = "<a href='$delete_url' class='delete:the-comment-list:comment-$comment->comment_ID delete vim-d vim-destructive'>" . __('Delete') . '</a>'; 
    449431                $actions['quickedit'] = '<a onclick="commentReply.open(\''.$comment->comment_ID.'\',\''.$comment->comment_post_ID.'\',\'edit\');return false;" class="vim-q" title="'.__('Quick Edit').'" href="#">' . __('Quick&nbsp;Edit') . '</a>'; 
    450432                $actions['reply'] = '<a onclick="commentReply.open(\''.$comment->comment_ID.'\',\''.$comment->comment_post_ID.'\');return false;" class="vim-r hide-if-no-js" title="'.__('Reply to this comment').'" href="#">' . __('Reply') . '</a>'; 
     433                $actions['spam'] = "<a href='$spam_url' class='delete:the-comment-list:comment-$comment->comment_ID::spam=1 vim-s vim-destructive' title='" . __( 'Mark this comment as spam' ) . "'>" . __( 'Spam' ) . '</a>'; 
     434                $actions['delete'] = "<a href='$delete_url' class='delete:the-comment-list:comment-$comment->comment_ID delete vim-d vim-destructive'>" . __('Delete') . '</a>'; 
    451435 
    452436                $actions = apply_filters( 'comment_row_actions', $actions, $comment ); 
    453437 
     
    458442                        ( ( ('approve' == $action || 'unapprove' == $action) && 2 === $i ) || 1 === $i ) ? $sep = '' : $sep = ' | '; 
    459443 
    460444                        // Reply and quickedit need a hide-if-no-js span 
    461                         if ( 'reply' == $action ) 
     445                        if ( 'reply' == $action || 'quickedit' == $action ) 
    462446                                $action .= ' hide-if-no-js'; 
    463                         elseif ( 'quickedit' == $action ) 
    464                                 $action .= ' hide-if-no-js hide-if-js'; // hah 
    465447 
    466448                        $actions_string .= "<span class='$action'>$sep$link</span>"; 
    467449                } 
     
    472454                <div id="comment-<?php echo $comment->comment_ID; ?>" <?php comment_class( array( 'comment-item', wp_get_comment_status($comment->comment_ID) ) ); ?>> 
    473455                        <?php if ( !$comment->comment_type || 'comment' == $comment->comment_type ) : ?> 
    474456 
    475                         <?php echo get_avatar( $comment, 32 ); ?> 
    476                         <span class="comment-meta"><?php printf( __( '%1$s in response to %2$s:' ), '<cite>' . get_comment_author() . '</cite>', $comment_post_link ); ?></span> 
     457                        <?php echo get_avatar( $comment, 50 ); ?> 
     458                        <h4 class="comment-meta"><?php printf( __( 'From %1$s on %2$s%3$s' ), '<cite class="comment-author">' . get_comment_author_link() . '</cite>', $comment_post_link, ' <span class="approve">' . __( '[Awaiting Moderation]' ) . '</span>' ); ?></h4> 
    477459 
    478460                        <?php 
    479461                        else : 
     
    490472                                $type = wp_specialchars( $type ); 
    491473                        ?> 
    492474 
    493                         <span class="comment-meta"><?php printf( __( '%3$s on %2$s: %1$s' ), '<cite>' . get_comment_author() . '</cite>', $comment_post_link, "<strong>$type</strong>" ); ?></span> 
     475                        <h4 class="comment-meta"><?php printf( __( '%1$s on %2$s' ), "<strong>$type</strong>", $comment_post_link ); ?></h4> 
     476                        <p class="comment-author"><?php comment_author_link(); ?></p> 
    494477 
    495478                        <?php endif; // comment_type ?> 
    496479                        <blockquote><p><?php comment_excerpt(); ?></p></blockquote> 
  • wp-admin/css/colors-fresh.css

     
    148148        color: #101010; 
    149149} 
    150150 
    151 .alternate { 
     151.alternate, .alt { 
    152152        background-color: #f9f9f9; 
    153153} 
    154154 
     
    205205        color: #d54e21; 
    206206} 
    207207 
    208 .howto, .nonessential, #edit-slug-box, .form-input-tip, #dashboard_primary span.rss-date, .subsubsub, #dashboard_secondary div.dashboard-widget-content ul li a cite { 
     208.howto, .nonessential, #edit-slug-box, .form-input-tip, .rss-widget span.rss-date, .subsubsub { 
    209209        color: #999; 
    210210} 
    211211 
  • wp-admin/css/colors-classic.css

     
    148148        color: #101010; 
    149149} 
    150150 
    151 .alternate { 
     151.alternate, .alt { 
    152152        background-color: #f9f9f9; 
    153153} 
    154154 
     
    205205        color: #d54e21; 
    206206} 
    207207 
    208 .howto, .nonessential, #edit-slug-box, .form-input-tip, #dashboard_primary span.rss-date, .subsubsub, #dashboard_secondary div.dashboard-widget-content ul li a cite { 
     208.howto, .nonessential, #edit-slug-box, .form-input-tip, .rss-widget span.rss-date, .subsubsub { 
    209209        color: #999; 
    210210} 
    211211 
  • wp-admin/css/dashboard.css

     
    3838        box-sizing: border-box; 
    3939} 
    4040 
    41 form p.field-tip { 
    42         font-size: .9em; 
    43         font-style: italic; 
    44         margin: 0; 
    45         padding: 0; 
    46 } 
    47  
    4841#dashboard-widgets .postbox form .submit { 
    4942        float: none; 
    5043        margin: .5em 0 0; 
     
    7770        position: relative; 
    7871} 
    7972 
    80 .view-all { 
    81         position: absolute; 
    82         top: 0; 
    83         right: 0; 
    84         padding: 0; 
    85         margin: 0; 
     73#dashboard-widgets a { 
     74        text-decoration: none; 
    8675} 
    8776 
     77#dashboard-widgets h3 a { 
     78        text-decoration: underline; 
     79} 
     80 
    8881#dashboard-widgets h4 { 
    8982        font-size: 1em; 
    9083        margin: 0 0 .2em; 
     
    130123        border-top: none; 
    131124} 
    132125 
    133 #dashboard_right_now  a { 
    134         text-decoration: none; 
    135 } 
    136  
    137126#dashboard_right_now .b, #dashboard_right_now .b a { 
    138127        color: #2583ad; 
    139128} 
     
    199188 
    200189/* Recent Comments */ 
    201190 
     191#dashboard_recent_comments h3 { 
     192        margin-bottom: 0; 
     193} 
     194 
    202195#the-comment-list { 
    203196        position: relative; 
    204197} 
    205198 
    206199#the-comment-list .comment-item { 
    207         padding: 5px 5px 5px 47px; 
     200        padding: 1em 10px 1em 70px; 
     201        border-top: 1px solid; 
    208202} 
    209203 
     204#the-comment-list .comment-item, #the-comment-list #replyrow { 
     205        margin: 0 -10px; 
     206} 
     207 
     208#the-comment-list .comment-item:first-child { 
     209        border-top: none; 
     210} 
     211 
    210212#the-comment-list .comment-item .avatar { 
    211213        position: absolute; 
    212         left: 5px; 
     214        left: 0; 
    213215} 
    214216 
     217#the-comment-list .comment-item h4 { 
     218        line-height: 1.4; 
     219        margin-top: -.2em; 
     220        font-weight: normal; 
     221        color: #999; 
     222} 
     223 
     224#the-comment-list .comment-item h4 cite, #the-comment-list .comment-item h4 strong { 
     225        font-style: normal; 
     226        color: #333; 
     227} 
     228 
     229#the-comment-list .comment-item p.comment-author { 
     230        margin: 0.2em 0; 
     231} 
     232 
    215233#the-comment-list .comment-item blockquote, #the-comment-list .comment-item blockquote p { 
    216234        margin: 0; 
    217235        padding: 0; 
     
    227245        padding: 0; 
    228246} 
    229247 
    230 /* QuickPress */ 
     248#the-comment-list .approve a { 
     249        color: green; 
     250} 
    231251 
    232 #quick-press #add-media-button { 
    233         margin: .5em 0; 
     252#the-comment-list .unapprove a { 
     253        color: orange; 
    234254} 
    235255 
    236 #quick-press #content-label { 
    237         margin-top: 1em; 
     256#the-comment-list .delete a { 
     257        color: red; 
    238258} 
    239259 
    240 #quick-press .textarea-wrap { 
     260/* QuickPress */ 
     261 
     262#dashboard_quick_press h4 { 
     263        float: left; 
     264        width: 5em; 
    241265        clear: both; 
     266        font-weight: normal; 
     267        font-style: italic; 
     268        font-family: Georgia, serif; 
     269        text-align: right; 
    242270} 
    243271 
     272#dashboard_quick_press h4 label { 
     273        margin-right: 10px; 
     274} 
     275 
     276#dashboard_quick_press .input-text-wrap, #dashboard_quick_press .textarea-wrap { 
     277        margin: 0 0 1em 5em; 
     278} 
     279 
     280#dashboard_quick_press #media-buttons { 
     281        margin: 0 0 .5em 5em; 
     282        padding: 0 0 0 2px; 
     283} 
     284 
     285#dashboard-widgets #dashboard_quick_press form p.submit { 
     286        border-top: 1px solid; 
     287        padding: 1em 1em 1em 5em; 
     288        margin: 0 -10px -10px; 
     289} 
     290 
     291#dashboard-widgets #dashboard_quick_press form p.submit input { 
     292        float: left; 
     293} 
     294 
     295#dashboard-widgets #dashboard_quick_press form p.submit #save-post { 
     296        margin: 0 1em 0 10px; 
     297} 
     298 
     299#dashboard-widgets #dashboard_quick_press form p.submit .cancel { 
     300        padding-left: 0; 
     301        padding-right: 0; 
     302        border: none; 
     303        background-color: transparent; 
     304        text-decoration: underline; 
     305        color: red; 
     306} 
     307 
     308#dashboard-widgets #dashboard_quick_press form p.submit .cancel:hover { 
     309        text-decoration: none; 
     310} 
     311 
     312 
     313#dashboard-widgets #dashboard_quick_press form p.submit #publish { 
     314        float: right; 
     315} 
     316 
    244317/* Recent Drafts */ 
    245318#dashboard_recent_drafts ul { 
    246319        margin: 0; 
     
    248321        list-style: none; 
    249322} 
    250323 
     324#dashboard_recent_drafts ul li { 
     325        margin-bottom: 0.6em; 
     326} 
     327 
     328#dashboard_recent_drafts h4 { 
     329        font-weight: normal; 
     330} 
     331 
     332#dashboard_recent_drafts h4 abbr { 
     333        font-family: Georgia, serif; 
     334        color: #999; 
     335} 
     336 
     337#dashboard_recent_drafts p { 
     338        margin: 0; 
     339        padding: 0; 
     340} 
     341 
    251342/* Feeds */ 
    252343 
    253344.rss-widget ul { 
     
    256347        list-style: none; 
    257348} 
    258349 
    259 .rss-widget a.rsswidget, 
    260350.rss-widget span.rss-date { 
    261         font-size: 14px; 
     351        font-family: Georgia, serif; 
    262352} 
    263353 
    264354.rss-widget cite {