Changeset 8691

Show
Ignore:
Timestamp:
08/20/08 21:42:31 (3 months ago)
Author:
ryan
Message:

Collapse crazyhorse to trunk. Incoming! see #7552

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/wp-admin/admin-ajax.php

    r8618 r8691  
    183183        die('1'); 
    184184 
    185     if ( 'unapproved' == $current ) { 
     185    if ( in_array( $current, array( 'unapproved', 'spam' ) ) ) { 
    186186        check_ajax_referer( "approve-comment_$id" ); 
    187187        if ( wp_set_comment_status( $comment->comment_ID, 'approve' ) ) 
    …… 
    649649    die(get_sample_permalink_html($post_id, $title, $slug)); 
    650650break; 
     651case 'meta-box-order': 
     652    check_ajax_referer( 'meta-box-order' ); 
     653    update_user_option( $GLOBALS['current_user']->ID, "meta-box-order_$_POST[page]", $_POST['order'] ); 
     654    die('1'); 
     655    break; 
    651656default : 
    652657    do_action( 'wp_ajax_' . $_POST['action'] ); 

  • trunk/wp-admin/admin-footer.php

    r8618 r8691  
    66 * @subpackage Administration 
    77 */ 
    8 ?> 
     8 
     9if ( ! $fixed_bar ) { ?> 
     10<br class="clear" /></div><!-- wpbody-content --> 
     11<?php } ?> 
     12 
    913</div><!-- wpbody --> 
    1014</div><!-- wpcontent --> 

  • trunk/wp-admin/admin-header.php

    r8645 r8691  
    99@header('Content-Type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset')); 
    1010if (!isset($_GET["page"])) require_once('admin.php'); 
    11 if ( $editing ) { 
    12     if ( user_can_richedit() ) 
    13         wp_enqueue_script( 'wp_tiny_mce' ); 
    14 } 
    1511wp_enqueue_script( 'wp-gears' ); 
    1612 
    …… 
    3329        add_filter( 'admin_body_class', 'add_minwidth' ); 
    3430} 
     31 
     32$fixed_bar_pages = array( 'post.php', 'post-new.php', 'page.php', 'page-new.php' ); 
     33if ( ! isset($fixed_bar) ) $fixed_bar = in_array( $the_current_page, $fixed_bar_pages ) ? true : false; 
    3534 
    3635get_admin_page_title(); 
    …… 
    144143?> 
    145144<div id="wpbody"> 
     145 
     146<?php if ( ! $fixed_bar ) { ?> 
     147<div id="wpbody-content"> 
     148<?php } ?> 

  • trunk/wp-admin/admin.php

    r8618 r8691  
    106106    } 
    107107 
    108     $parent_file = 'edit.php'; 
     108    $parent_file = 'users.php'; 
    109109    $submenu_file = 'import.php'; 
    110110    $title = __('Import'); 

  • trunk/wp-admin/comment.php

    r8618 r8691  
    3535 
    3636    wp_enqueue_script('comment'); 
     37    $fixed_bar = true; 
    3738 
    3839    require_once('admin-header.php'); 

  • trunk/wp-admin/css/colors-classic.css

    r8600 r8691  
     1#wpcontent, #wpbody { 
     2    background-color: #14568A; 
     3} 
     4#wpbody-content { 
     5    background-color: #fff; 
     6} 
    17a.page-numbers:hover { 
    28    border-color: #999; 
    …… 
    1218} 
    1319 
    14 div#current-widgets, #postcustomstuff table, #your-profile fieldset, a.page-numbers, #rightnow, div.dashboard-widget, .widefat { 
     20div#current-widgets, #postcustomstuff table, #your-profile fieldset, 
     21a.page-numbers, #rightnow, div.dashboard-widget, 
     22#dashboard-widgets p.dashboard-widget-links, .widefat { 
    1523    border-color: #ccc; 
    1624} 
    …… 
    2836} 
    2937 
     38div.ui-tabs-panel { 
     39    border-color: #F0F6FB; 
     40} 
     41 
    3042input.disabled, textarea.disabled { 
    3143    background-color: #ccc; 
    3244} 
    3345 
    34 #user_info a:hover, li.widget-list-control-item h4.widget-title a:hover, .submit a, #dashmenu a:hover, #footer a, #upload-menu li a.upload-tab-link, li.widget-list-control-item h4.widget-title a, 
     46#user_info a:hover, li.widget-list-control-item h4.widget-title a:hover, 
     47#dashmenu a:hover, #footer a, #upload-menu li a.upload-tab-link,  
     48li.widget-list-control-item h4.widget-title a, 
    3549#dragHelper li.widget-list-control-item h4.widget-title a, 
    36 #draghelper li.widget-list-control-item h4.widget-title a:visited, .login #backtoblog a:hover, 
    37 #plugin-information .action-button a, #plugin-information .action-button a:hover, #plugin-information .action-button a:visited { 
    38     color: #fff; 
    39 } 
    40  
    41 ul#category-tabs li.ui-tabs-selected, li.widget-list-control-item, div.nav, .tablenav, .submitbox, h3.dashboard-widget-title, h3.dashboard-widget-title span, h3.dashboard-widget-title small, ul.view-switch li.current, .form-table tr, #poststuff h3, .login form, h3.info-box-title { 
     50#draghelper li.widget-list-control-item h4.widget-title a:visited, 
     51.login #backtoblog a:hover, #plugin-information .action-button a,  
     52#plugin-information .action-button a:hover, #plugin-information .action-button a:visited { 
     53    color: #fff; 
     54} 
     55 
     56li.widget-list-control-item, div.nav, .tablenav, #dashboard-widgets p.dashboard-widget-links, 
     57ul.view-switch li.current, .form-table tr, #poststuff h3, 
     58.login form, h3.info-box-title, #post-status-info { 
    4259    background-color: #cfebf7; 
    43 } 
    44  
    45 div.ui-tabs-panel { 
    46     border-color: #cfebf7; 
    4760} 
    4861 
    …… 
    5669} 
    5770 
    58 .button-secondary, #login form .submit input { 
     71#post-body ul#category-tabs li.ui-tabs-selected, .button-secondary, 
     72#quicktags, #login form .submit input, #post-search .button, 
     73#post-search-prep .button { 
    5974    background-color: #8ebddc !important; 
    6075} 
    …… 
    134149} 
    135150 
    136 .howto, .nonessential, #sidemenu, #edit-slug-box, .form-input-tip, #dashboard_primary span.rss-date, .subsubsub, #dashboard_secondary div.dashboard-widget-content ul li a cite { 
     151.howto, .nonessential, #edit-slug-box, .form-input-tip, #dashboard_primary span.rss-date, .subsubsub, #dashboard_secondary div.dashboard-widget-content ul li a cite { 
    137152    color: #999; 
    138 } 
    139  
    140 #dashmenu a, #user_info a { 
    141     color: #88b4d7; 
    142153} 
    143154 
    …… 
    198209} 
    199210 
    200 .tablenav .button-secondary { 
    201     border-color: #5396c5; 
    202 } 
    203  
    204211.submit input:hover, .button:hover, #edit-slug-buttons a.save:hover { 
    205212    border-color: #535353; 
    206213} 
    207214 
    208 .submit input:hover, .button:hover, .button-secondary:hover, #wphead #viewsite a:hover, #submenu a.current, #submenu a:hover, .submitbox #previewview a:hover, #the-comment-list .comment a:hover, #rightnow a:hover, a:hover, .subsubsub a:hover, .subsubsub a.current:hover, #login form .submit input:hover, div.dashboard-widget-submit input:hover, #edit-slug-buttons a.save:hover, #media-upload a.del-link:hover { 
     215.submit input:hover, .button:hover, .button-secondary:hover, #wphead #viewsite a:hover, 
     216#adminmenu a:hover, #adminmenu ul.wp-submenu a:hover, #the-comment-list .comment a:hover, 
     217#rightnow a:hover, a:hover, .subsubsub a:hover, .subsubsub a.current:hover, 
     218#login form .submit input:hover, div.dashboard-widget-submit input:hover, 
     219#edit-slug-buttons a.save:hover, #media-upload a.delete:hover, 
     220#media-upload a.del-link:hover, .ui-tabs-nav a:hover { 
    209221    color: #d54e21; 
    210 } 
    211  
    212 #adminmenu a:hover, #sidemenu a:hover, .ui-tabs-nav a:hover { 
    213     color: #97c4d8; 
    214222} 
    215223 
    …… 
    284292} 
    285293 
     294h3.dashboard-widget-title small a { 
     295    color: #d7d7d7; 
     296} 
     297 
     298h3.dashboard-widget-title small a:hover { 
     299    color: #fff; 
     300} 
     301 
    286302.widget-control-save, .widget-control-remove { 
    287303    background-color: #83b4d5; 
    …… 
    302318} 
    303319 
    304 #submenu a { 
    305     color: #2782af 
    306 } 
    307320/* Because we don't want visited on these links */ 
    308 #adminmenu a.current, #sidemenu a.current, body.press-this .ui-tabs-selected a, body.press-this .ui-tabs-selected a:hover { 
     321#adminmenu li.current a, #sidemenu a.current, body.press-this .ui-tabs-selected a, body.press-this .ui-tabs-selected a:hover { 
    309322    background-color: #fff; 
    310323    border-color: #07273e; 
    …… 
    314327} 
    315328 
    316 #adminmenu li a #awaiting-mod, #sidemenu li a #update-plugins { 
     329#adminmenu li.current { 
     330    background-color: #fff; 
     331    border-right-color: #fff; 
     332} 
     333 
     334#adminmenu li a #awaiting-mod { 
    317335    background-image: url(../images/comment-stalk-classic.gif); 
    318336} 
    …… 
    333351} 
    334352 
    335 #adminmenu, div#media-upload-header, div#plugin-information-header { 
     353div#media-upload-header, div#plugin-information-header { 
    336354    background-color: #14568a; 
    337355    border-bottom-color: #07273e; 
    …… 
    352370input.readonly { 
    353371    background-color: #ddd; 
    354 } 
    355  
    356 #dashmenu a.current { 
    357     background-color: #14568a; 
    358     color: #cfebf6; 
    359372} 
    360373 
    …… 
    433446} 
    434447 
     448#poststuff #editor-toolbar { 
     449    background-color: #83b4d5; 
     450} 
     451 
    435452#poststuff #editor-toolbar .active { 
    436     background-color: #83b4d5; 
     453    background-color: #CFEBF7; 
    437454    color: #333; 
    438455} 
    …… 
    464481#rightnow a { 
    465482    color: #448abd; 
    466 } 
    467  
    468 #sidemenu a { 
    469     background-color: #14568a; 
    470     border-bottom-color: #07273e; 
    471     border-top-color: #14568a; 
    472     color: #cfebf6; 
    473483} 
    474484 
    …… 
    545555} 
    546556 
    547 #wphead h1, #dashmenu a.current:hover { 
     557#wphead h1, #wphead h1 a, #login form input { 
     558    color: #555; 
     559} 
     560 
     561#wphead h1 { 
    548562    color: #cfebf6; 
     563} 
     564 
     565#media-upload a.delete { 
     566    color: #888; 
    549567} 
    550568 
    …… 
    716734} 
    717735 
     736#att-info { 
     737    background-color: #E4F2FD; 
     738} 
     739 
    718740/* Diff */ 
    719741 
    …… 
    730752    background-color: #99ff99; 
    731753} 
     754 
     755/* media popup 0819 */ 
     756#sidemenu a { 
     757    background-color: #14568a; 
     758    border-bottom-color: #07273e; 
     759    border-top-color: #14568a; 
     760    color: #CFEBF6; 
     761} 
     762 
     763.submitbox .submitdelete { 
     764    color: #fff; 
     765} 

  • trunk/wp-admin/css/colors-fresh.css

    r8600 r8691  
     1#wpcontent, #wpbody { 
     2    background-color: #e4f2fd; 
     3} 
     4#wpbody-content { 
     5    background-color: #fff; 
     6} 
    17a.page-numbers:hover { 
    28    border-color: #999; 
    …… 
    1218} 
    1319 
    14 div#current-widgets, #postcustomstuff table, #your-profile fieldset, a.page-numbers, #rightnow, div.dashboard-widget, .widefat { 
     20div#current-widgets, #postcustomstuff table, #your-profile fieldset, 
     21a.page-numbers, #rightnow, div.dashboard-widget, 
     22#dashboard-widgets p.dashboard-widget-links, .widefat { 
    1523    border-color: #ccc; 
    1624} 
    …… 
    3644} 
    3745 
    38 #user_info a:hover, li.widget-list-control-item h4.widget-title a:hover, .submit a, #dashmenu a:hover, #footer a, #upload-menu li a.upload-tab-link, li.widget-list-control-item h4.widget-title a, 
     46#user_info a:hover, li.widget-list-control-item h4.widget-title a:hover, 
     47#dashmenu a:hover, #footer a, #upload-menu li a.upload-tab-link,  
     48li.widget-list-control-item h4.widget-title a, 
    3949#dragHelper li.widget-list-control-item h4.widget-title a, 
    40 #draghelper li.widget-list-control-item h4.widget-title a:visited, .login #backtoblog a:hover, 
    41 #plugin-information .action-button a, #plugin-information .action-button a:hover, #plugin-information .action-button a:visited { 
    42     color: #fff; 
    43 } 
    44  
    45 li.widget-list-control-item, div.nav, .tablenav, .submitbox, h3.dashboard-widget-title, h3.dashboard-widget-title span, h3.dashboard-widget-title small, ul.view-switch li.current, .form-table tr, #poststuff h3, .login form, h3.info-box-title { 
     50#draghelper li.widget-list-control-item h4.widget-title a:visited, 
     51.login #backtoblog a:hover, #plugin-information .action-button a,  
     52#plugin-information .action-button a:hover, #plugin-information .action-button a:visited { 
     53    color: #fff; 
     54} 
     55 
     56li.widget-list-control-item, div.nav, .tablenav, #dashboard-widgets p.dashboard-widget-links, 
     57ul.view-switch li.current, .form-table tr, #poststuff h3, 
     58.login form, h3.info-box-title, #post-status-info { 
    4659    background-color: #eaf3fa; 
    4760} 
    …… 
    5669} 
    5770 
    58 ul#category-tabs li.ui-tabs-selected, .button-secondary, #quicktags, #login form .submit input { 
     71#post-body ul#category-tabs li.ui-tabs-selected, .button-secondary, 
     72#quicktags, #login form .submit input, #post-search .button, 
     73#post-search-prep .button { 
    5974    background-color: #cee1ef !important; 
    6075} 
    …… 
    121136} 
    122137 
    123 .form-table input, .form-table textarea { 
     138.form-table input, .form-table textarea, #post-search-input { 
    124139    border-color: #c6d9e9; 
    125140} 
    …… 
    134149} 
    135150 
    136 #user_info, .howto, .nonessential, #dashmenu a, #sidemenu, #edit-slug-box, .form-input-tip, #dashboard_primary span.rss-date, .subsubsub, #dashboard_secondary div.dashboard-widget-content ul li a cite { 
     151#user_info, .howto, .nonessential, #dashmenu a, #edit-slug-box, .form-input-tip, #dashboard_primary span.rss-date, .subsubsub, #dashboard_secondary div.dashboard-widget-content ul li a cite { 
    137152    color: #999; 
    138153} 
    …… 
    198213} 
    199214 
    200 .submit input:hover, .button:hover, .button-secondary:hover, #wphead #viewsite a:hover, #adminmenu a:hover, #sidemenu a:hover, #submenu a.current, #submenu a:hover, .submitbox #previewview a:hover, #the-comment-list .comment a:hover, #rightnow a:hover, a:hover, .subsubsub a:hover, .subsubsub a.current:hover, #login form .submit input:hover, div.dashboard-widget-submit input:hover, #edit-slug-buttons a.save:hover, #media-upload a.delete:hover, #media-upload a.del-link:hover, .ui-tabs-nav a:hover { 
     215.submit input:hover, .button:hover, .button-secondary:hover, #wphead #viewsite a:hover, 
     216#adminmenu a:hover, #adminmenu ul.wp-submenu a:hover, #the-comment-list .comment a:hover, 
     217#rightnow a:hover, a:hover, .subsubsub a:hover, .subsubsub a.current:hover, 
     218#login form .submit input:hover, div.dashboard-widget-submit input:hover, 
     219#edit-slug-buttons a.save:hover, #media-upload a.delete:hover, 
     220#media-upload a.del-link:hover, .ui-tabs-nav a:hover { 
    201221    color: #d54e21; 
    202222} 
    …… 
    206226} 
    207227 
    208 .submitbox #autosave .error, ul.view-switch li.current a { 
     228ul.view-switch li.current a { 
    209229    color: #333; 
    210230} 
    211231 
    212 .submitbox #previewview { 
    213     background-color: #2683ae; 
    214 } 
    215  
    216 .submitbox #previewview a, #rightnow .rbutton { 
     232#rightnow .rbutton { 
    217233    background-color: #ebebeb; 
    218234    color: #264761; 
    …… 
    266282} 
    267283 
    268 .widefat thead, .thead { 
     284.widefat thead, .thead, h3.dashboard-widget-title, h3.dashboard-widget-title span, h3.dashboard-widget-title small { 
    269285    background-color: #464646; 
    270286    color: #d7d7d7; 
     287} 
     288 
     289h3.dashboard-widget-title small a { 
     290    color: #d7d7d7; 
     291} 
     292 
     293h3.dashboard-widget-title small a:hover { 
     294    color: #fff; 
    271295} 
    272296 
    …… 
    281305} 
    282306 
    283 #adminmenu a, #submenu a, #poststuff #edButtonPreview, #poststuff #edButtonHTML, #the-comment-list p.comment-author strong a, #media-upload a.del-link, #media-upload a.delete, .ui-tabs-nav a, a { 
     307#adminmenu li.wp-has-submenu a { 
     308    color: #333; 
     309} 
     310 
     311#adminmenu a, #adminmenu ul.wp-submenu a, #poststuff #edButtonPreview, #poststuff #edButtonHTML, #the-comment-list p.comment-author strong a, #media-upload a.del-link, #media-upload a.delete, .ui-tabs-nav a, a { 
    284312    color: #2583ad; 
    285313} 
    286314 
    287315/* Because we don't want visited on these links */ 
    288 #adminmenu a.current, #sidemenu a.current, body.press-this .ui-tabs-selected a, body.press-this .ui-tabs-selected a:hover { 
     316#adminmenu li.current a, #sidemenu a.current, body.press-this .ui-tabs-selected a, body.press-this .ui-tabs-selected a:hover { 
    289317    background-color: #fff; 
    290318    border-color: #c6d9e9; 
    …… 
    293321} 
    294322 
    295 #adminmenu li a #awaiting-mod, #sidemenu li a #update-plugins { 
     323#adminmenu li.current { 
     324    background-color: #fff; 
     325    border-color: #c6d9e9; 
     326    border-right-color: #fff; 
     327} 
     328 
     329#adminmenu li a #awaiting-mod { 
    296330    background-image: url(../images/comment-stalk-fresh.gif); 
    297331} 
    …… 
    306340} 
    307341 
    308 #adminmenu, div#media-upload-header, div#plugin-information-header { 
     342div#media-upload-header, div#plugin-information-header { 
    309343    background-color: #e4f2fd; 
    310344    border-bottom-color: #c6d9e9; 
    …… 
    325359input.readonly { 
    326360    background-color: #ddd; 
    327 } 
    328  
    329 #dashmenu a.current { 
    330     background-color: #e4f2fd; 
    331     color: #555; 
    332361} 
    333362 
    …… 
    402431} 
    403432 
     433#poststuff #editor-toolbar { 
     434    background-color: #cee1ef; 
     435} 
     436 
    404437#poststuff #editor-toolbar .active { 
    405     background-color: #cee1ef; 
     438    background-color: #EAF3FA; 
    406439    color: #333; 
    407440} 
    …… 
    433466#rightnow a { 
    434467    color: #448abd; 
    435 } 
    436  
    437 #sidemenu a { 
    438     background-color: #e4f2fd; 
    439     border-bottom-color: #c6d9e9; 
    440     border-top-color: #e4f2fd; 
    441468} 
    442469 
    …… 
    491518} 
    492519 
    493 .login #backtoblog a, .curtime, #user_info a { 
     520.login #backtoblog a, #curtime, #user_info a, #dashmenu a { 
    494521    color: #ccc; 
    495522} 
    …… 
    513540} 
    514541 
    515 #wphead h1, #dashmenu a.current:hover, #login form input { 
     542#wphead h1, #wphead h1 a, #login form input { 
    516543    color: #555; 
     544} 
     545 
     546#wphead h1 a:hover { 
     547    text-decoration: underline; 
    517548} 
    518549 
    …… 
    675706} 
    676707 
    677 #editorcontainer { 
     708#editorcontainer, #post-status-info { 
    678709    border-color: #ccc; 
    679710} 
    …… 
    683714} 
    684715 
    685 .curtime { 
     716#curtime { 
    686717    color: #666; 
    687718} 
    …… 
    706737    background-color: #99ff99; 
    707738} 
     739 
     740#adminmenu, 
     741#att-info { 
     742    background-color: #E4F2FD; 
     743} 
     744 
     745 
     746/* fixed tool bar */ 
     747#fixedbar { 
     748    background-color:#464646; 
     749    color: #ccc; 
     750} 
     751 
     752#html-upload-help { 
     753    color: #328AB2; 
     754} 
     755 
     756#fixedbar #last-edit { 
     757     
     758} 
     759 
     760#fixedbar a, 
     761#fixedbar #curtime { 
     762    color: #ccc; 
     763} 
     764 
     765#fixedbar a:hover { 
     766    color: #fff; 
     767} 
     768 
     769#fixedbar a.button { 
     770    color: #246; 
     771} 
     772 
     773#fixedbar a.button:hover { 
     774    color: #d54e21; 
     775} 
     776 
     777#timestampdiv { 
     778    color: #ccc; 
     779} 
     780 
     781/* media popup 0819 */ 
     782#sidemenu a { 
     783    background-color: #e4f2fd; 
     784    border-bottom-color: #c6d9e9; 
     785    border-top-color: #e4f2fd; 
     786} 
     787 
     788.submitbox .submitdelete { 
     789    color: #fff; 
     790} 

  • trunk/wp-admin/css/dashboard.css

    r8600 r8691  
    1 /* Right Now */ 
    2  
    3 #rightnow { 
     1form .input-text-wrap { 
     2    border-style: solid; 
    43    border-width: 1px; 
     4    padding: 2px 3px; 
     5    border-color: #CCCCCC; 
     6} 
     7 
     8form .input-text-wrap input { 
     9    border: 0pt none; 
     10    outline-color: -moz-use-text-color; 
     11    outline-style: none; 
     12    outline-width: medium; 
     13    padding: 0pt; 
     14    width: 99%; 
    515    border-style: solid; 
     16    color: #333333; 
     17} 
     18 
     19form .textarea-wrap { 
     20    border-style: solid; 
     21    border-width: 1px; 
    622    padding: 2px; 
    7     margin-top: 10px; 
    8     margin-right: 7px; 
    9 } 
    10  
    11 #rightnow .reallynow { 
    12     padding: 6px; 
    13     font-size: 15px; 
    14     line-height: 2; 
    15     margin: 0; 
    16 } 
    17  
    18 #rightnow .rbutton { 
    19     font-weight: normal; 
    20     padding: 6px; 
    21     border-bottom: none; 
    22     -moz-border-radius: 2px; 
    23     -khtml-border-radius: 2px; 
    24     -webkit-border-radius: 2px; 
    25     border-radius: 2px; 
    26     text-decoration: none; 
    27 } 
    28  
    29 #rightnow .reallynow span { 
    30     display: block; 
    31     text-align: left; 
    32     float: left; 
    33     padding: 0 6px; 
    34 } 
    35  
    36 #rightnow .reallynow a { 
    37     display: block; 
    38     text-align: right; 
    39     float: right; 
    40     padding: 0 6px; 
    41     font-size: 14px; 
    42     margin: 1px 6px 0 0; 
    43 } 
    44  
    45 #rightnow .youhave { 
    46     font-size:  14px; 
    47     padding: 10px; 
    48 } 
    49  
    50 #rightnow h3, #rightnow p { 
    51     padding: 0 10px; 
    52 } 
    53  
    54 #rightnow a { 
    55     font-weight: bold; 
    56 } 
     23    border-color: #CCCCCC; 
     24} 
     25 
     26form .textarea-wrap textarea { 
     27    border: 0pt none; 
     28    padding: 0; 
     29    width: 99%; 
     30} 
     31 
    5732 
    5833/* Widgets */ 
    5934 
    6035div#dashboard-widgets-wrap { 
    61     margin-top: -20px; 
    6236    margin-right: -13px; /* 20 (div.dashboard-widget margin-right) - 7 (#rightnow margin-right) */ 
    6337} 
    …… 
    8761div.dashboard-widget-holder.double div.dashboard-widget { 
    8862    height: 54em; 
    89    padding-bottom: 28px /* lame */ 
     63        padding-bottom: 28px /* lame */ 
    9064} 
    9165 
    …… 
    9569    border-width: 1px; 
    9670    border-style: solid; 
    97     padding: 2px; 
    9871    height: 27em; 
    9972    overflow: auto; 
    …… 
    10174} 
    10275 
     76#dashboard-widgets p.dashboard-widget-links { 
     77    padding: 2px; 
     78    font-size: 11px; 
     79    line-height: 2; 
     80    border-width: 1px; 
     81    margin: 0 20px 0 0; 
     82    padding: 0 7px; 
     83    border: 1px solid; 
     84    border-top: none; 
     85} 
     86 
    10387h3.dashboard-widget-title  { 
    104     margin: 0; 
     88    margin: 2px; 
    10589    padding: 0 7px; 
    10690    font-size: 14px; 
    …… 
    122106} 
    123107 
    124 h3.dashboard-widget-title img.rss-icon { 
     108p.dashboard-widget-links img.rss-icon { 
    125109    vertical-align: middle; 
    126     margin: .5em 0; 
    127110} 
    128111 
    …… 
    279262} 
    280263 
    281 .widget-loading { 
    282 } 
     264#dashboard_inbox div.dashboard-widget, #dashboard_quick_press div.dashboard-widget { 
     265    height: 35em; 
     266    padding-bottom: 0; 
     267} 
     268 
     269#dashboard_quick_press div.dashboard-widget-content { 
     270    padding-bottom: 0; 
     271} 
     272 
     273#dashboard_inbox p.actions { 
     274    margin-bottom:0pt; 
     275    margin-top: 0; 
     276    float:left; 
     277} 
     278 
     279#dashboard_quick_press h3 { 
     280    margin-bottom: 3px; 
     281} 
     282 
     283#dashboard_quick_press h3#quick-post-title { 
     284    margin-top: 0; 
     285} 
     286 
     287#dashboard_quick_press p.field-tip { 
     288    margin-top: 0; 
     289    font-style: italic; 
     290} 
     291 
     292#dashboard_quick_press .submit { 
     293    padding: 0 0 1em 0; 
     294    border-top: none; 
     295    border-bottom: 1px solid #ccc; 
     296} 
     297 
     298#dashboard_quick_press p#recent-drafts { 
     299    margin: 0; 
     300} 

  • trunk/wp-admin/css/global.css

    r7907 r8691  
     1/* 2 column liquid layout */ 
     2div#wpbody { 
     3    float: right; 
     4    clear: right; 
     5    width: 100%; 
     6    margin-left: -185px; 
     7} 
     8 
     9div#wpbody-content { 
     10    margin-left: 175px; 
     11    border-width: 1px 0 0 1px; 
     12    border-style: solid; 
     13    border-color: #c6d9e9; 
     14    padding-top: 10px; 
     15} 
     16 
     17ul#adminmenu { 
     18    float: left; 
     19    clear: left; 
     20    width: 165px; /* + 10 padding */ 
     21    position: relative; 
     22} 
     23 
     24/* inner 2 column liquid layout */ 
     25 
     26.inner-sidebar { 
     27    float: right; 
     28    clear: right; 
     29    width: 220px; 
     30    position: relative; 
     31} 
     32 
     33.has-sidebar { 
     34    float: left; 
     35    clear: left; 
     36    width: 100%; 
     37    margin-right: -240px; 
     38} 
     39 
     40.has-sidebar .has-sidebar-content { 
     41    margin-right: 245px; 
     42} 
     43 
     44 
    145/* styles for use by people extending the WordPress interface */ 
    2  
    346 
    447body    { 
    …… 
    91134 
    92135.subsubsub li { display: inline; margin: 0; padding: 0; } 
     136 
     137/* make it small? */ 
     138.subsubsub li.spam { 
     139    font-size: .9em; 
     140} 
    93141 
    94142.widefat { 
    …… 
    152200} 
    153201 
     202#wpbody .wrap { 
     203    position: relative; 
     204} 
     205 
    154206.wrap, .updated, .error { 
    155     margin: 0; 
    156     margin-left: 15px; 
    157     margin-right: 15px; 
    158     padding: 0; 
    159     max-width: 980px; 
     207    margin: 0 15px; 
     208    padding: 0; 
    160209} 
    161210 
    …… 
    164213    border-style: solid; 
    165214    padding: 0 0.6em; 
    166     max-width: 950px; 
    167215    margin-bottom: 1em; 
    168216} 
    …… 
    190238    clear: both; 
    191239    font: 24px Georgia, "Times New Roman", Times, serif; 
    192     margin: 5px 0 0 -4px; 
     240    margin: 5px 0 10px -4px; 
    193241    padding: 0; 
    194242    padding-bottom: 7px; 

  • trunk/wp-admin/edit-form-advanced.php

    r8656 r8691  
    2222$messages[3] = __('Custom field deleted.'); 
    2323$messages[4] = __('Post updated.'); 
     24$messages[6] = __('Post published.'); 
     25$messages[7] = __('Post saved.'); 
    2426 
    2527if ( isset($_GET['revision']) ) 
    …… 
    5355 
    5456?> 
    55 <?php if ( $notice ) : ?> 
    56 <div id="notice" class="error"><p><?php echo $notice ?></p></div> 
    57 <?php endif; ?> 
    58 <?php if (isset($_GET['message'])) : ?> 
    59 <div id="message" class="updated fade"><p><?php echo $messages[$_GET['message']]; ?></p></div> 
    60 <?php endif; ?> 
    6157 
    6258<form name="post" action="post.php" method="post" id="post"> 
    63 <?php if ( (isset($mode) && 'bookmarklet' == $mode) || isset($_GET['popupurl']) ): ?> 
    64 <input type="hidden" name="mode" value="bookmarklet" /> 
    65 <?php endif; ?> 
    66  
    67 <div class="wrap"> 
    68 <h2><?php _e('Write Post') ?></h2> 
    69 <?php 
    70  
    71 if ( 0 == $post_ID) 
    72     wp_nonce_field('add-post'); 
    73 else 
    74     wp_nonce_field('update-post_' .  $post_ID); 
    75  
    76 $form_pingback = '<input type="hidden" name="post_pingback" value="' . (int) get_option('default_pingback_flag') . '" id="post_pingback" />'; 
    77  
    78 $form_prevstatus = '<input type="hidden" name="prev_status" value="' . attribute_escape( $post->post_status ) . '" />'; 
    79  
    80 $saveasdraft = '<input name="save" type="submit" id="save" class="button" tabindex="3" value="' . attribute_escape( __('Save and Continue Editing') ) . '" />'; 
    81  
    82 ?> 
    83  
    84 <input type="hidden" id="user-id" name="user_ID" value="<?php echo (int) $user_ID ?>" /> 
    85 <input type="hidden" id="hiddenaction" name="action" value="<?php echo $form_action ?>" /> 
    86 <input type="hidden" id="originalaction" name="originalaction" value="<?php echo $form_action ?>" /> 
    87 <input type="hidden" id="post_author" name="post_author" value="<?php echo attribute_escape( $post->post_author ); ?>" /> 
    88 <input type="hidden" id="post_type" name="post_type" value="<?php echo $post->post_type ?>" /> 
    89 <input type="hidden" id="original_post_status" name="original_post_status" value="<?php echo $post->post_status ?>" /> 
    90 <input name="referredby" type="hidden" id="referredby" value="<?php echo clean_url(stripslashes(wp_get_referer())); ?>" /> 
    91 <?php if ( 'draft' != $post->post_status ) wp_original_referer_field(true, 'previous'); ?> 
    92  
    93 <?php echo $form_extra ?> 
    94  
    95 <div id="poststuff"> 
    96  
     59<div id="wpbody-content"> 
     60 
     61 
     62<?php 
     63 
     64// All meta boxes should be defined and added before the first do_meta_boxes() call (or potentially during the do_meta_boxes action). 
     65 
     66function post_submit_meta_box($post) { 
     67    global $action; 
     68?> 
    9769<div class="submitbox" id="submitpost"> 
    9870 
    99 <div id="previewview"> 
    100 <?php if ( 'publish' == $post->post_status ) { ?> 
    101 <a href="<?php echo clean_url(get_permalink($post->ID)); ?>" target="_blank" tabindex="4"><?php _e('View this Post'); ?></a> 
    102 <?php } elseif ( 'edit' == $action ) { ?> 
    103 <a href="<?php echo clean_url(apply_filters('preview_post_link', add_query_arg('preview', 'true', get_permalink($post->ID)))); ?>" target="_blank"  tabindex="4"><?php _e('Preview this Post'); ?></a> 
    104 <?php } ?> 
    105 </div> 
    106  
    107 <div class="inside"> 
     71 
     72 
     73<div class="inside-submitbox"> 
    10874 
    10975<p><strong><label for='post_status'><?php _e('Publish Status') ?></label></strong></p> 
    …… 
    13197<?php endif; ?> 
    13298<?php 
    133 if ( 0 != $post_ID ) { 
     99if ( 0 != $post->ID ) { 
    134100    if ( 'future' == $post->post_status ) { // scheduled for publishing at a future date 
    135101        $stamp = __('Scheduled for:<br />%1$s at %2$s'); 
    …… 
    162128<input type="submit" name="save" id="save-post" value="<?php _e('Save'); ?>" tabindex="4" class="button button-highlighted" /> 
    163129<?php 
    164 if ( !in_array( $post->post_status, array('publish', 'future') ) || 0 == $post_ID ) { 
     130if ( !in_array( $post->post_status, array('publish', 'future') ) || 0 == $post->ID ) { 
    165131?> 
    166132<?php if ( current_user_can('publish_posts') ) : ?> 
    …… 
    172138} 
    173139 
    174 if ( ( 'edit' == $action) && current_user_can('delete_post', $post_ID) ) 
    175     echo "<a class='submitdelete' href='" . wp_nonce_url("post.php?action=delete&amp;post=$post_ID", 'delete-post_' . $post_ID) . "' onclick=\"if ( confirm('" . js_escape(sprintf( ('draft' == $post->post_status) ? __("You are about to delete this draft '%s'\n  'Cancel' to stop, 'OK' to delete.") : __("You are about to delete this post '%s'\n  'Cancel' to stop, 'OK' to delete."), $post->post_title )) . "') ) { return true;}return false;\">" . __('Delete&nbsp;post') . "</a>"; 
     140if ( ( 'edit' == $action) && current_user_can('delete_post', $post->ID) ) 
     141    echo "<a class='submitdelete' href='" . wp_nonce_url("post.php?action=delete&amp;post=$post->ID", 'delete-post_' . $post->ID) . "' onclick=\"if ( confirm('" . js_escape(sprintf( ('draft' == $post->post_status) ? __("You are about to delete this draft '%s'\n  'Cancel' to stop, 'OK' to delete.") : __("You are about to delete this post '%s'\n  'Cancel' to stop, 'OK' to delete."), $post->post_title )) . "') ) { return true;}return false;\">" . __('Delete&nbsp;post') . "</a>"; 
    176142?> 
    177143<br class="clear" /> 
    178 <?php if ( 0 != $post_ID ): ?> 
    179 <?php if ( $last_id = get_post_meta($post_ID, '_edit_last', true) ) { 
     144 
     145<!-- moved under the editor 
     146<?php if ( 0 != $post->ID ): ?> 
     147<?php if ( $last_id = get_post_meta($post->ID, '_edit_last', true) ) { 
    180148    $last_user = get_userdata($last_id); 
    181149    printf(__('Last edited by %1$s on %2$s at %3$s'), wp_specialchars( $last_user->display_name ), mysql2date(get_option('date_format'), $post->post_modified), mysql2date(get_option('time_format'), $post->post_modified));