WordPress.org

Make WordPress Core

Changeset 8691


Ignore:
Timestamp:
08/20/2008 09:42:31 PM (10 years ago)
Author:
ryan
Message:

Collapse crazyhorse to trunk. Incoming! see #7552

Location:
trunk
Files:
53 edited
11 copied

Legend:

Unmodified
Added
Removed
  • 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));
     
    186154<br class="clear" />
    187155<?php endif; ?>
    188 <span id="autosave"></span>
    189 <span id="wp-word-count"></span>
     156-->
     157
    190158</p>
    191 
    192 <div class="side-info">
    193 <h5><?php _e('Related') ?></h5>
    194 
    195 <ul>
    196 <?php if ( 0 != $post_ID ): ?>
    197 <li><a href="edit.php?p=<?php echo $post_ID ?>"><?php _e('See Comments on this Post') ?></a></li>
    198 <?php endif; ?>
    199 <li><a href="edit-comments.php"><?php _e('Manage All Comments') ?></a></li>
    200 <li><a href="edit.php"><?php _e('Manage All Posts') ?></a></li>
    201 <li><a href="categories.php"><?php _e('Manage All Categories') ?></a></li>
    202 <li><a href="edit-tags.php"><?php _e('Manage All Tags') ?></a></li>
    203 <li><a href="edit.php?post_status=draft"><?php _e('View Drafts'); ?></a></li>
    204 <?php do_action('post_relatedlinks_list'); ?>
    205 </ul>
    206 
    207 <h5><?php _e('Shortcuts') ?></h5>
    208 <p><?php _e('Drag-and-drop the following link to your bookmarks bar or right click it and add it to your favorites for a posting shortcut.') ?>  <a href="<?php echo get_shortcut_link(); ?>" title="<?php echo attribute_escape(__('Press This')) ?>"><?php _e('Press This') ?></a></p>
    209 </div>
    210 
    211 <?php do_action('submitpost_box'); ?>
    212 </div>
    213 
    214 <div id="post-body">
    215 <div id="titlediv">
    216 <h3><label for="title"><?php _e('Title') ?></label></h3>
    217 <div id="titlewrap">
    218     <input type="text" name="post_title" size="30" tabindex="1" value="<?php echo attribute_escape($post->post_title); ?>" id="title" autocomplete="off" />
    219 </div>
    220 <div class="inside">
    221 <?php $sample_permalink_html = get_sample_permalink_html($post->ID); ?>
    222     <div id="edit-slug-box">
    223 <?php if ( ! empty($post->ID) && ! empty($sample_permalink_html) ) :
    224     echo $sample_permalink_html;
    225 endif; ?>
    226     </div>
    227 </div>
    228 </div>
    229 
    230 <div id="<?php echo user_can_richedit() ? 'postdivrich' : 'postdiv'; ?>" class="postarea">
    231 <h3><label for="content"><?php _e('Post') ?></label></h3>
    232 <?php the_editor($post->post_content); ?>
    233 <?php wp_nonce_field( 'autosave', 'autosavenonce', false ); ?>
    234 <?php wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); ?>
    235 <?php wp_nonce_field( 'getpermalink', 'getpermalinknonce', false ); ?>
    236 <?php wp_nonce_field( 'samplepermalink', 'samplepermalinknonce', false ); ?>
    237 </div>
    238 
    239 <?php echo $form_pingback ?>
    240 <?php echo $form_prevstatus ?>
    241 
    242 <?php
     159</div>
     160<?php
     161}
     162add_meta_box('submitdiv', __('Publish'), 'post_submit_meta_box', 'post', 'side', 'core');
     163
    243164function post_tags_meta_box($post) {
    244165?>
    245166<p id="jaxtag"><label class="hidden" for="newtag"><?php _e('Tags'); ?></label><input type="text" name="tags_input" class="tags-input" id="tags-input" size="40" tabindex="3" value="<?php echo get_tags_to_edit( $post->ID ); ?>" /></p>
    246167<div id="tagchecklist"></div>
    247 <?php
    248 }
    249 add_meta_box('tagsdiv', __('Tags'), 'post_tags_meta_box', 'post', 'normal', 'core');
     168<p><a href='#'><?php _e( 'Choose from tags' ); ?></a></p>
     169<?php
     170}
     171add_meta_box('tagsdiv', __('Tags'), 'post_tags_meta_box', 'post', 'side', 'core');
     172
     173function post_media_meta_box($post) {
     174    echo "<p><small><em>This feature isn't fully functional in this prototype.</em></small></p>";
     175
     176    if ( empty( $post->ID ) )
     177        return;
     178
     179    $atts = get_children( array(
     180        'post_parent' => $post->ID,
     181        'post_type' => 'attachment'
     182    ) );
     183
     184    if ( !$atts ) {
     185        _e( 'No media.' );
     186        return;
     187    }
     188
     189    foreach ( $atts as $att ) {
     190        if ( $thumb = wp_get_attachment_image( $att->ID, array(60, 45), true ) ) {
     191?>
     192            <a href="media.php?action=edit&amp;attachment_id=<?php echo $att->ID  ?>" title="<?php echo attribute_escape(sprintf(__('Edit "%s"'), $att->post_title)); ?>">
     193                <?php echo $thumb; ?>
     194            </a>
     195
     196<?php
     197        }
     198        echo "<h4>$att->post_title</h4>";
     199
     200        echo "<a href='#' class='no-crazy'>Remove</a> | ";
     201        echo "<a href='media.php?action=edit&amp;attachment_id=$att->ID'>Edit</a>";
     202
     203        echo "<br class='clear' />";
     204    }
     205
     206}
     207add_meta_box( 'mediadiv', __('Media added to this Post' ), 'post_media_meta_box', 'post', 'side', 'core' );
    250208
    251209function post_categories_meta_box($post) {
    252210?>
     211<ul id="category-tabs">
     212    <li class="ui-tabs-selected"><a href="#categories-all" tabindex="3"><?php _e( 'All Categories' ); ?></a></li>
     213    <li class="wp-no-js-hidden"><a href="#categories-pop" tabindex="3"><?php _e( 'Most Used' ); ?></a></li>
     214</ul>
     215
     216<div id="categories-pop" class="ui-tabs-panel" style="display: none;">
     217    <ul id="categorychecklist-pop" class="categorychecklist form-no-clear" >
     218        <?php $popular_ids = wp_popular_terms_checklist('category'); ?>
     219    </ul>
     220</div>
     221
     222<div id="categories-all" class="ui-tabs-panel">
     223    <ul id="categorychecklist" class="list:category categorychecklist form-no-clear">
     224        <?php wp_category_checklist($post->ID, false, false, $popular_ids) ?>
     225    </ul>
     226</div>
     227
    253228<div id="category-adder" class="wp-hidden-children">
    254229    <h4><a id="category-add-toggle" href="#category-add" class="hide-if-no-js" tabindex="3"><?php _e( '+ Add New Category' ); ?></a></h4>
     
    262237</div>
    263238
    264 <ul id="category-tabs">
    265     <li class="ui-tabs-selected"><a href="#categories-all" tabindex="3"><?php _e( 'All Categories' ); ?></a></li>
    266     <li class="wp-no-js-hidden"><a href="#categories-pop" tabindex="3"><?php _e( 'Most Used' ); ?></a></li>
    267 </ul>
    268 
    269 <div id="categories-pop" class="ui-tabs-panel" style="display: none;">
    270     <ul id="categorychecklist-pop" class="categorychecklist form-no-clear" >
    271         <?php $popular_ids = wp_popular_terms_checklist('category'); ?>
    272     </ul>
    273 </div>
    274 
    275 <div id="categories-all" class="ui-tabs-panel">
    276     <ul id="categorychecklist" class="list:category categorychecklist form-no-clear">
    277         <?php wp_category_checklist($post->ID, false, false, $popular_ids) ?>
    278     </ul>
    279 </div>
    280 <?php
    281 }
    282 add_meta_box('categorydiv', __('Categories'), 'post_categories_meta_box', 'post', 'normal', 'core');
    283 ?>
    284 
    285 <?php do_meta_boxes('post', 'normal', $post); ?>
    286 
    287 <?php do_action('edit_form_advanced'); ?>
    288 
    289 <h2><?php _e('Advanced Options'); ?></h2>
    290 
    291 <?php
     239<?php
     240}
     241add_meta_box('categorydiv', __('Categories'), 'post_categories_meta_box', 'post', 'side', 'core');
     242
    292243function post_excerpt_meta_box($post) {
    293244?>
     
    296247<?php
    297248}
    298 add_meta_box('postexcerpt', __('Excerpt'), 'post_excerpt_meta_box', 'post', 'advanced', 'core');
     249add_meta_box('postexcerpt', __('Excerpt'), 'post_excerpt_meta_box', 'post', 'normal', 'core');
    299250
    300251function post_trackback_meta_box($post) {
     
    310261
    311262?>
     263<p class="meta-options">
     264    <label for="ping_status" class="selectit"><input name="ping_status" type="checkbox" id="ping_status" value="open" <?php checked($post->ping_status, 'open'); ?> /> <?php _e('Allow <a href="http://codex.wordpress.org/Introduction_to_Blogging#Managing_Comments" target="_blank">trackbacks and pingbacks</a> on this post') ?></label>
     265</p>
    312266<p><label for="trackback"><?php _e('Send trackbacks to:'); ?></label> <?php echo $form_trackback; ?><br /> (<?php _e('Separate multiple URLs with spaces'); ?>)</p>
    313267<p><?php _e('Trackbacks are a way to notify legacy blog systems that you&#8217;ve linked to them. If you link other WordPress blogs they&#8217;ll be notified automatically using <a href="http://codex.wordpress.org/Introduction_to_Blogging#Managing_Comments" target="_blank">pingbacks</a>, no other action necessary.'); ?></p>
     
    316270    echo $pings;
    317271}
    318 add_meta_box('trackbacksdiv', __('Trackbacks'), 'post_trackback_meta_box', 'post', 'advanced', 'core');
     272add_meta_box('trackbacksdiv', __('Trackbacks and Pings'), 'post_trackback_meta_box', 'post', 'normal', 'core');
    319273
    320274function post_custom_meta_box($post) {
     
    336290<?php
    337291}
    338 add_meta_box('postcustom', __('Custom Fields'), 'post_custom_meta_box', 'post', 'advanced', 'core');
     292add_meta_box('postcustom', __('Custom Fields'), 'post_custom_meta_box', 'post', 'normal', 'core');
    339293
    340294do_action('dbx_post_advanced');
    341295
    342296function post_comment_status_meta_box($post) {
     297    global $wpdb, $post_ID;
    343298?>
    344299<input name="advanced_view" type="hidden" value="1" />
    345 <p><label for="comment_status" class="selectit">
    346 <input name="comment_status" type="checkbox" id="comment_status" value="open" <?php checked($post->comment_status, 'open'); ?> />
    347 <?php _e('Allow Comments') ?></label></p>
    348 <p><label for="ping_status" class="selectit"><input name="ping_status" type="checkbox" id="ping_status" value="open" <?php checked($post->ping_status, 'open'); ?> /> <?php _e('Allow Pings') ?></label></p>
    349 <p><?php _e('These settings apply to this post only. &#8220;Pings&#8221; are <a href="http://codex.wordpress.org/Introduction_to_Blogging#Managing_Comments" target="_blank">trackbacks and pingbacks</a>.'); ?></p>
    350 <?php
    351 }
    352 add_meta_box('commentstatusdiv', __('Comments &amp; Pings'), 'post_comment_status_meta_box', 'post', 'advanced', 'core');
     300<p class="meta-options">
     301    <label for="comment_status" class="selectit"> <input name="comment_status" type="checkbox" id="comment_status" value="open" <?php checked($post->comment_status, 'open'); ?> /><?php _e('Allow comments on this post') ?></label>
     302</p>
     303<?php
     304
     305
     306    if ( !$post_ID || $post_ID < 0 )
     307        return;
     308
     309    if ( !$comments = $wpdb->get_results( $wpdb->prepare("SELECT * FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_approved != 'spam' ORDER BY comment_date", $post_ID) ) )
     310        return;
     311
     312    // Make sure comments, post, and post_author are cached
     313//  update_comment_cache($comments);
     314?>
     315
     316<table class="widefat">
     317<thead>
     318    <tr>
     319        <th scope="col"><?php _e('Comments') ?></th>
     320        <th scope="col"><?php _e('Submitted') ?></th>
     321    </tr>
     322</thead>
     323<tbody id="the-comment-list" class="list:comment">
     324<?php
     325    foreach ($comments as $comment)
     326        _wp_comment_row( $comment, 'single', false, false );
     327?>
     328</tbody>
     329</table>
     330
     331
     332<?php
     333
     334
     335
     336}
     337add_meta_box('commentstatusdiv', __('Comments on this Post'), 'post_comment_status_meta_box', 'post', 'normal', 'core');
    353338
    354339function post_password_meta_box($post) {
    355340?>
    356 <p><label class="hidden" for="post_password"><?php _e('Password Protect This Post') ?></label><input name="post_password" type="text" size="25" id="post_password" value="<?php if ( isset( $post->post_password ) ) : echo attribute_escape( $post->post_password ); endif; ?>" /></p>
     341<p>
     342    <input id="post_status_private" name="post_status" type="checkbox" value="private" <?php checked($post->post_status, 'private'); ?> tabindex="4" /> <?php _e('Keep this post private') ?></label>
     343</p>
     344<h4><?php _e( 'Post Password' ); ?></h4>
     345<p><label class="hidden" for="post_password"><?php _e('Password Protect This Post') ?></label><input name="post_password" type="text" size="25" id="post_password" value="<?php echo attribute_escape( $post->post_password ); ?>" /></p>
    357346<p><?php _e('Setting a password will require people who visit your blog to enter the above password to view this post and its comments.'); ?></p>
    358347<?php
    359348}
    360 add_meta_box('passworddiv', __('Password Protect This Post'), 'post_password_meta_box', 'post', 'advanced', 'core');
     349add_meta_box('passworddiv', __('Privacy Options'), 'post_password_meta_box', 'post', 'normal', 'core');
    361350
    362351function post_slug_meta_box($post) {
     
    365354<?php
    366355}
    367 add_meta_box('slugdiv', __('Post Slug'), 'post_slug_meta_box', 'post', 'advanced', 'core');
     356add_meta_box('slugdiv', __('Post Slug'), 'post_slug_meta_box', 'post', 'normal', 'core');
    368357
    369358$authors = get_editable_user_ids( $current_user->id ); // TODO: ROLE SYSTEM
     
    380369<?php
    381370}
    382 add_meta_box('authordiv', __('Post Author'), 'post_author_meta_box', 'post', 'advanced', 'core');
     371add_meta_box('authordiv', __('Post Author'), 'post_author_meta_box', 'post', 'normal', 'core');
    383372endif;
    384373
     
    387376    wp_list_post_revisions();
    388377}
    389 add_meta_box('revisionsdiv', __('Post Revisions'), 'post_revisions_meta_box', 'post', 'advanced', 'core');
     378add_meta_box('revisionsdiv', __('Post Revisions'), 'post_revisions_meta_box', 'post', 'normal', 'core');
    390379endif;
    391380
     381?>
     382
     383<?php if ( $notice ) : ?>
     384<div id="notice" class="error"><p><?php echo $notice ?></p></div>
     385<?php endif; ?>
     386<?php if (isset($_GET['message'])) : ?>
     387<div id="message" class="updated fade"><p><?php echo $messages[$_GET['message']]; ?></p></div>
     388<?php endif; ?>
     389
     390<?php if ( (isset($mode) && 'bookmarklet' == $mode) || isset($_GET['popupurl']) ): ?>
     391<input type="hidden" name="mode" value="bookmarklet" />
     392<?php endif; ?>
     393
     394<div class="wrap">
     395<h2><?php
     396    if ( !isset($post_ID) || 0 == $post_ID)
     397        printf( __( '<a href="%s">Posts</a> / Write New Post' ), 'edit.php' );
     398    else
     399        printf( __( '<a href="%s">Posts</a> / Edit Post' ), 'edit.php' );
     400?></h2>
     401
     402<div id="previewview">
     403<?php if ( 'publish' == $post->post_status ) { ?>
     404<a class="button" href="<?php echo clean_url(get_permalink($post->ID)); ?>" target="_blank" tabindex="4"><?php _e('View this Post'); ?></a>
     405<?php } elseif ( 'edit' == $action ) { ?>
     406<a class="button" 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>
     407<?php } ?>
     408</div>
     409
     410<?php
     411
     412if ( 0 == $post_ID)
     413    wp_nonce_field('add-post');
     414else
     415    wp_nonce_field('update-post_' .  $post_ID);
     416
     417$form_pingback = '<input type="hidden" name="post_pingback" value="' . (int) get_option('default_pingback_flag') . '" id="post_pingback" />';
     418
     419$form_prevstatus = '<input type="hidden" name="prev_status" value="' . attribute_escape( $post->post_status ) . '" />';
     420
     421$saveasdraft = '<input name="save" type="submit" id="save" class="button" tabindex="3" value="' . attribute_escape( __('Save and Continue Editing') ) . '" />';
     422
     423?>
     424
     425<input type="hidden" id="user-id" name="user_ID" value="<?php echo (int) $user_ID ?>" />
     426<input type="hidden" id="hiddenaction" name="action" value="<?php echo $form_action ?>" />
     427<input type="hidden" id="originalaction" name="originalaction" value="<?php echo $form_action ?>" />
     428<input type="hidden" id="post_author" name="post_author" value="<?php echo attribute_escape( $post->post_author ); ?>" />
     429<input type="hidden" id="post_type" name="post_type" value="<?php echo $post->post_type ?>" />
     430<input type="hidden" id="original_post_status" name="original_post_status" value="<?php echo $post->post_status ?>" />
     431<input name="referredby" type="hidden" id="referredby" value="<?php echo clean_url(stripslashes(wp_get_referer())); ?>" />
     432<?php if ( 'draft' != $post->post_status ) wp_original_referer_field(true, 'previous'); ?>
     433
     434<?php echo $form_extra ?>
     435
     436<div id="poststuff">
     437
     438<div id="side-info" style="display: none;"><?php // TODO ?>
     439
     440<h5><?php _e('Related') ?></h5>
     441<ul>
     442<?php if ($post_ID): ?>
     443<li><a href="edit.php?p=<?php echo $post_ID ?>"><?php _e('See Comments on this Post') ?></a></li>
     444<?php endif; ?>
     445<li><a href="edit-comments.php"><?php _e('Manage All Comments') ?></a></li>
     446<li><a href="edit.php"><?php _e('Manage All Posts') ?></a></li>
     447<li><a href="categories.php"><?php _e('Manage All Categories') ?></a></li>
     448<li><a href="edit-tags.php"><?php _e('Manage All Tags') ?></a></li>
     449<li><a href="edit.php?post_status=draft"><?php _e('View Drafts'); ?></a></li>
     450<?php do_action('post_relatedlinks_list'); ?>
     451</ul>
     452
     453<h5><?php _e('Shortcuts') ?></h5>
     454<p><?php _e('Drag-and-drop the following link to your bookmarks bar or right click it and add it to your favorites for a posting shortcut.') ?>  <a href="<?php echo get_shortcut_link(); ?>" title="<?php echo attribute_escape(__('Press This')) ?>"><?php _e('Press This') ?></a></p>
     455</div>
     456
     457<div id="side-info-column" class="inner-sidebar">
     458
     459<?php do_action('submitpost_box'); ?>
     460
     461<?php $side_meta_boxes = do_meta_boxes('post', 'side', $post); ?>
     462
     463</div>
     464
     465<div id="post-body" class="<?php echo $side_meta_boxes ? 'has-sidebar' : ''; ?>">
     466<div id="post-body-content" class="has-sidebar-content">
     467<div id="titlediv">
     468<h3><label for="title"><?php _e('Title') ?></label></h3>
     469<div id="titlewrap">
     470    <input type="text" name="post_title" size="30" tabindex="1" value="<?php echo attribute_escape($post->post_title); ?>" id="title" autocomplete="off" />
     471</div>
     472<div class="inside">
     473<?php $sample_permalink_html = get_sample_permalink_html($post->ID); ?>
     474    <div id="edit-slug-box">
     475<?php if ( ! empty($post->ID) && ! empty($sample_permalink_html) ) :
     476    echo $sample_permalink_html;
     477endif; ?>
     478    </div>
     479</div>
     480</div>
     481
     482<div id="<?php echo user_can_richedit() ? 'postdivrich' : 'postdiv'; ?>" class="postarea">
     483
     484<div id="add-media-button"><a href="<?php echo clean_url( admin_url( 'media-upload.php?post_id=' . ( $post_ID ? $post_ID : $temp_ID ) . '&amp;type=image&amp;TB_iframe=true' ) ); ?>" class="thickbox button"><?php _e( 'Add Media' ); ?></a></div>
     485
     486<h3><?php _e('Post') ?></h3>
     487
     488<?php the_editor($post->post_content); ?>
     489
     490<div id="post-status-info">
     491    <span id="wp-word-count" class="alignleft"></span>
     492    <span class="alignright">
     493    <span id="autosave">&nbsp;</span>
     494<?php
     495    if ( $post_ID ) {
     496        echo '<span id="last-edit">';
     497        if ( $last_id = get_post_meta($post_ID, '_edit_last', true) ) {
     498            $last_user = get_userdata($last_id);
     499            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));
     500        } else {
     501            printf(__('Last edited on %1$s at %2$s'), mysql2date(get_option('date_format'), $post->post_modified), mysql2date(get_option('time_format'), $post->post_modified));
     502        }
     503        echo '</span>';
     504    }
     505?>
     506    </span>
     507    <br class="clear" />
     508</div>
     509
     510
     511<?php wp_nonce_field( 'autosave', 'autosavenonce', false ); ?>
     512<?php wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); ?>
     513<?php wp_nonce_field( 'getpermalink', 'getpermalinknonce', false ); ?>
     514<?php wp_nonce_field( 'samplepermalink', 'samplepermalinknonce', false ); ?>
     515<?php wp_nonce_field( 'meta-box-order', 'meta-box-order-nonce', false ); ?>
     516</div>
     517
     518<?php
     519
     520echo $form_pingback;
     521echo $form_prevstatus;
     522
     523do_meta_boxes('post', 'normal', $post);
     524
     525do_action('edit_form_advanced');
     526
    392527do_meta_boxes('post', 'advanced', $post);
    393528
    394529do_action('dbx_post_sidebar');
    395 ?>
    396 </div>
    397 </div>
    398 
     530
     531?>
     532
     533</div>
     534</div>
     535</div><!-- /poststuff -->
     536
     537</div>
     538<br class="clear" />
    399539</div>
    400540
  • trunk/wp-admin/edit-form-comment.php

    r8656 r8691  
    1717
    1818<form name="post" action="comment.php" method="post" id="post">
     19<div id="wpbody-content">
     20
    1921<?php wp_nonce_field('update-comment_' . $comment->comment_ID) ?>
    2022<div class="wrap">
    2123<h2><?php echo $toprow_title; ?></h2>
     24
     25<div id="previewview">
     26<a class="button" href="<?php echo get_comment_link(); ?>" target="_blank"><?php _e('View this Comment'); ?></a>
     27</div>
     28
    2229<input type="hidden" name="user_ID" value="<?php echo (int) $user_ID ?>" />
    2330<input type="hidden" name="action" value='<?php echo $form_action . $form_extra ?>' />
     31<?php
     32// All meta boxes should be defined and added before the first do_meta_boxes() call (or potentially during the do_meta_boxes action).
    2433
    25 <div id="poststuff">
    26 
     34function comment_submit_meta_box($comment) {
     35?>
    2736<div class="submitbox" id="submitcomment">
    28 
    29 <div id="previewview">
    30 <a href="<?php echo get_comment_link(); ?>" target="_blank"><?php _e('View this Comment'); ?></a>
    31 </div>
    32 
    33 <div class="inside">
     37<div class="inside-submitbox">
    3438
    3539<p><strong><label for='comment_status'><?php _e('Approval Status') ?></label></strong></p>
     
    6064?>
    6165</p>
     66</div>
     67<?php
     68}
     69add_meta_box('submitdiv', __('Save'), 'comment_submit_meta_box', 'comment', 'side', 'core');
     70?>
    6271
    63 <div class="side-info">
    64 <h5><?php _e('Related') ?></h5>
     72<div id="side-info-column" class="inner-sidebar">
    6573
    66 <ul>
    67 <li><a href="edit-comments.php"><?php _e('Manage All Comments') ?></a></li>
    68 <li><a href="edit-comments.php?comment_status=moderated"><?php _e('Moderate Comments') ?></a></li>
    69 <?php do_action('comment_relatedlinks_list'); ?>
    70 </ul>
    71 </div>
    72 <?php do_action('submitcomment_box'); ?>
     74<?php $side_meta_boxes = do_meta_boxes('comment', 'side', $comment); ?>
     75
    7376</div>
    7477
    75 <div id="post-body">
     78<div id="post-body" class="<?php echo $side_meta_boxes ? 'has-sidebar' : ''; ?>">
     79<div id="post-body-content" class="has-sidebar-content">
     80
    7681<div id="namediv" class="stuffbox">
    7782<h3><label for="name"><?php _e('Name') ?></label></h3>
     
    7984<input type="text" name="newcomment_author" size="30" value="<?php echo attribute_escape( $comment->comment_author ); ?>" tabindex="1" id="name" />
    8085</div>
     86</div>
     87
     88<div id="postdiv" class="postarea">
     89<h3><?php _e('Comment') ?></h3>
     90<?php the_editor($comment->comment_content, 'content', 'newcomment_author_url', false, 4); ?>
     91<?php wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); ?>
    8192</div>
    8293
     
    95106</div>
    96107
    97 <div id="postdiv" class="postarea">
    98 <h3><label for="content"><?php _e('Comment') ?></label></h3>
    99 <?php the_editor($comment->comment_content, 'content', 'newcomment_author_url', false, 4); ?>
    100 <?php wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); ?>
    101 </div>
    102 
    103108<?php do_meta_boxes('comment', 'normal', $comment); ?>
    104109
     
    108113<?php wp_original_referer_field(true, 'previous'); ?>
    109114<input type="hidden" name="noredir" value="1" />
     115
     116</div>
     117</div>
    110118</div>
    111119</div>
  • trunk/wp-admin/edit-link-form.php

    r8656 r8691  
    88
    99if ( ! empty($link_id) ) {
    10     /**
    11      * @var string
    12      */
    13     $heading = __('Edit Link');
     10    $heading = sprintf( __( '<a href="%s">Links</a> / Edit Link' ), 'link-manager.php' );
    1411    $submit_text = __('Save Changes');
    1512    $form = '<form name="editlink" id="editlink" method="post" action="link.php">';
    1613    $nonce_action = 'update-bookmark_' . $link_id;
    1714} else {
    18     $heading = __('Add Link');
     15    $heading = sprintf( __( '<a href="%s">Links</a> / Add New Link' ), 'link-manager.php' );
    1916    $submit_text = __('Add Link');
    2017    $form = '<form name="addlink" id="addlink" method="post" action="link.php">';
     
    4138?>
    4239
    43 <?php echo $form ?>
    44 <?php wp_nonce_field($nonce_action); ?>
    45 <?php wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); ?>
    46 
    47 <div class="wrap">
    48 <h2><?php echo $heading; ?></h2>
    49 
    50 <div id="poststuff">
    51 
     40<?php function link_submit_meta_box($link) { ?>
    5241<div class="submitbox" id="submitlink">
    5342
    54 <div id="previewview">
    55 <?php if ( !empty($link_id) ) { ?>
    56 <a href="<?php echo $link->link_url; ?>" target="_blank"><?php _e('Visit Link'); ?></a>
    57 <?php } ?>
    58 </div>
    59 
    60 <div class="inside">
     43<div class="inside-submitbox">
    6144<p><label for="link_private" class="selectit"><input id="link_private" name="link_visible" type="checkbox" value="N" <?php checked($link->link_visible, 'N'); ?> /> <?php _e('Keep this link private') ?></label></p>
    6245</div>
     
    6649<?php
    6750if ( ( 'edit' == $action) && current_user_can('manage_links') )
    68     echo "<a class='submitdelete' href='" . wp_nonce_url("link.php?action=delete&amp;link_id=$link_id", 'delete-bookmark_' . $link_id) . "' onclick=\"if ( confirm('" . js_escape( sprintf( __("You are about to delete this link '%s'\n'Cancel' to stop, 'OK' to delete."), $link->link_name )) . "') ) { return true;}return false;\">" . __('Delete&nbsp;link') . "</a>";
     51    echo "<a class='submitdelete' href='" . wp_nonce_url("link.php?action=delete&amp;link_id=$link->link_id", 'delete-bookmark_' . $link->link_id) . "' onclick=\"if ( confirm('" . js_escape( sprintf( __("You are about to delete this link '%s'\n'Cancel' to stop, 'OK' to delete."), $link->link_name )) . "') ) { return true;}return false;\">" . __('Delete&nbsp;link') . "</a>";
    6952?>
    7053</p>
    71 
    72 <div class="side-info">
    73 <h5><?php _e('Related') ?></h5>
    74 
    75 <ul>
    76 <li><a href="link-manager.php"><?php _e('Manage All Links') ?></a></li>
    77 <li><a href="edit-link-categories.php"><?php _e('Manage All Link Categories') ?></a></li>
    78 <li><a href="link-import.php"><?php _e('Import Links') ?></a></li>
    79 <?php do_action('link_relatedlinks_list'); ?>
    80 </ul>
    81 </div>
    8254<?php do_action('submitlink_box'); ?>
    8355</div>
    84 
    85 <div id="post-body">
    86 <div id="namediv" class="stuffbox">
    87 <h3><label for="link_name"><?php _e('Name') ?></label></h3>
    88 <div class="inside">
    89     <input type="text" name="link_name" size="30" tabindex="1" value="<?php echo $link->link_name; ?>" id="link_name" /><br />
    90     <?php _e('Example: Nifty blogging software'); ?>
    91 </div>
    92 </div>
    93 
    94 <div id="addressdiv" class="stuffbox">
    95 <h3><label for="link_url"><?php _e('Web Address') ?></label></h3>
    96 <div class="inside">
    97     <input type="text" name="link_url" size="30" tabindex="1" value="<?php echo $link->link_url; ?>" id="link_url" /><br />
    98     <?php _e('Example: <code>http://wordpress.org/</code> &#8212; don&#8217;t forget the <code>http://</code>'); ?>
    99 </div>
    100 </div>
    101 
    102 <div id="descriptiondiv" class="stuffbox">
    103 <h3><label for="link_description"><?php _e('Description') ?></label></h3>
    104 <div class="inside">
    105     <input type="text" name="link_description" size="30" tabindex="1" value="<?php echo ( isset( $link->link_description ) ? $link->link_description : ''); ?>" id="link_description" /><br />
    106     <?php _e('This will be shown when someone hovers over the link in the blogroll, or optionally below the link.'); ?>
    107 </div>
    108 </div>
    109 
    110 <?php function link_categories_meta_box($link) { ?>
     56<?php
     57}
     58add_meta_box('linksubmitdiv', __('Save'), 'link_submit_meta_box', 'link', 'side', 'core');
     59
     60function link_categories_meta_box($link) { ?>
    11161<div id="category-adder" class="wp-hidden-children">
    11262    <h4><a id="category-add-toggle" href="#category-add"><?php _e( '+ Add New Category' ); ?></a></h4>
     
    14494}
    14595add_meta_box('linkcategorydiv', __('Categories'), 'link_categories_meta_box', 'link', 'normal', 'core');
    146 ?>
    147 
    148 <?php do_meta_boxes('link', 'normal', $link); ?>
    149 
    150 <h2><?php _e('Advanced Options'); ?></h2>
    151 
    152 <?php function link_target_meta_box($link) { ?>
     96
     97function link_target_meta_box($link) { ?>
    15398<fieldset><legend class="hidden"><?php _e('Target') ?></legend>
    15499<label for="link_target_blank" class="selectit">
     
    165110<?php
    166111}
    167 add_meta_box('linktargetdiv', __('Target'), 'link_target_meta_box', 'link', 'advanced', 'core');
     112add_meta_box('linktargetdiv', __('Target'), 'link_target_meta_box', 'link', 'normal', 'core');
    168113
    169114function link_xfn_meta_box($link) {
     
    278223<?php
    279224}
    280 add_meta_box('linkxfndiv', __('Link Relationship (XFN)'), 'link_xfn_meta_box', 'link', 'advanced', 'core');
     225add_meta_box('linkxfndiv', __('Link Relationship (XFN)'), 'link_xfn_meta_box', 'link', 'normal', 'core');
    281226
    282227function link_advanced_meta_box($link) {
     
    311256<?php
    312257}
    313 add_meta_box('linkadvanceddiv', __('Advanced'), 'link_advanced_meta_box', 'link', 'advanced', 'core');
     258add_meta_box('linkadvanceddiv', __('Advanced'), 'link_advanced_meta_box', 'link', 'normal', 'core');
     259
     260?>
     261
     262<?php echo $form ?>
     263<div id="wpbody-content">
     264
     265<?php echo $link_added; ?>
     266
     267<?php wp_nonce_field($nonce_action); ?>
     268<?php wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); ?>
     269<?php wp_nonce_field( 'meta-box-order', 'meta-box-order-nonce', false ); ?>
     270
     271<div class="wrap">
     272<h2><?php echo $heading; ?></h2>
     273
     274<?php if ( !empty($link->link_id) ) { ?>
     275<div id="previewview">
     276<a class="button" href="<?php echo $link->link_url; ?>" target="_blank"><?php _e('Visit Link'); ?></a>
     277</div>
     278<?php } ?>
     279
     280<!--
     281<p id="big-add-button">
     282<span id="previewview">
     283<?php if ( !empty($link_id) ) { ?>
     284<a class="button" href="<?php echo $link->link_url; ?>" target="_blank"><?php _e('Visit Link'); ?></a>
     285<?php } ?>
     286</span>
     287</p>
     288-->
     289
     290<!-- TODO
     291<div class="inside">
     292<p><label for="link_private" class="selectit"><input id="link_private" name="link_visible" type="checkbox" value="N" <?php checked($link->link_visible, 'N'); ?> /> <?php _e('Keep this link private') ?></label></p>
     293</div>
     294
     295<div class="side-info">
     296<h5><?php _e('Related') ?></h5>
     297
     298<ul>
     299<li><a href="link-manager.php"><?php _e('Manage All Links') ?></a></li>
     300<li><a href="edit-link-categories.php"><?php _e('Manage All Link Categories') ?></a></li>
     301<li><a href="link-import.php"><?php _e('Import Links') ?></a></li>
     302<?php do_action('link_relatedlinks_list'); ?>
     303</ul>
     304</div>
     305-->
     306
     307<div id="poststuff">
     308
     309<div id="side-info-column" class="inner-sidebar">
     310<?php
     311
     312do_action('submitlink_box');
     313$side_meta_boxes = do_meta_boxes( 'link', 'side', $link );
     314
     315?>
     316</div>
     317
     318<div id="post-body" class="<?php echo $side_meta_boxes ? 'has-sidebar' : ''; ?>">
     319<div id="post-body-content" class="has-sidebar-content">
     320<div id="namediv" class="stuffbox">
     321<h3><label for="link_name"><?php _e('Name') ?></label></h3>
     322<div class="inside">
     323    <input type="text" name="link_name" size="30" tabindex="1" value="<?php echo $link->link_name; ?>" id="link_name" /><br />
     324    <?php _e('Example: Nifty blogging software'); ?>
     325</div>
     326</div>
     327
     328<div id="addressdiv" class="stuffbox">
     329<h3><label for="link_url"><?php _e('Web Address') ?></label></h3>
     330<div class="inside">
     331    <input type="text" name="link_url" size="30" tabindex="1" value="<?php echo $link->link_url; ?>" id="link_url" /><br />
     332    <?php _e('Example: <code>http://wordpress.org/</code> &#8212; don&#8217;t forget the <code>http://</code>'); ?>
     333</div>
     334</div>
     335
     336<div id="descriptiondiv" class="stuffbox">
     337<h3><label for="link_description"><?php _e('Description') ?></label></h3>
     338<div class="inside">
     339    <input type="text" name="link_description" size="30" tabindex="1" value="<?php echo $link->link_description; ?>" id="link_description" /><br />
     340    <?php _e('This will be shown when someone hovers over the link in the blogroll, or optionally below the link.'); ?>
     341</div>
     342</div>
     343
     344<?php
     345
     346do_meta_boxes('link', 'normal', $link);
    314347
    315348do_meta_boxes('link', 'advanced', $link);
     
    326359</div>
    327360</div>
    328 
     361</div>
     362
     363</div>
     364
     365<br class="clear" />
    329366</div>
    330367
  • trunk/wp-admin/edit-page-form.php

    r8656 r8691  
    4545$temp_ID = (int) $temp_ID;
    4646$user_ID = (int) $user_ID;
    47 
    48 ?>
     47?>
     48
     49<form name="post" action="page.php" method="post" id="post">
     50<div id="wpbody-content">
    4951
    5052<?php if ( $notice ) : ?>
     
    5557<?php endif; ?>
    5658
    57 <form name="post" action="page.php" method="post" id="post">
    58 <div class="wrap">
    59 <h2><?php _e('Write Page') ?></h2>
    60 
    61 <?php
    62 wp_nonce_field($nonce_action);
    63 
    64 if (isset($mode) && 'bookmarklet' == $mode)
    65     echo '<input type="hidden" name="mode" value="bookmarklet" />';
    66 ?>
    67 <input type="hidden" id="user-id" name="user_ID" value="<?php echo $user_ID ?>" />
    68 <input type="hidden" id="hiddenaction" name="action" value='<?php echo $form_action ?>' />
    69 <input type="hidden" id="originalaction" name="originalaction" value="<?php echo $form_action ?>" />
    70 <input type="hidden" id="post_author" name="post_author" value="<?php echo attribute_escape( $post->post_author ); ?>" />
    71 <?php echo $form_extra ?>
    72 <input type="hidden" id="post_type" name="post_type" value="<?php echo $post->post_type ?>" />
    73 <input type="hidden" id="original_post_status" name="original_post_status" value="<?php echo $post->post_status ?>" />
    74 <input name="referredby" type="hidden" id="referredby" value="<?php echo clean_url(stripslashes(wp_get_referer())); ?>" />
    75 <?php if ( 'draft' != $post->post_status ) wp_original_referer_field(true, 'previous'); ?>
    76 
    77 <div id="poststuff">
    78 
     59<?php
     60function page_submit_meta_box($post) {
     61    global $action;
     62?>
    7963<div class="submitbox" id="submitpage">
    8064
    81 <div id="previewview">
    82 <?php if ( 'publish' == $post->post_status ) { ?>
    83 <a href="<?php echo clean_url(get_permalink($post->ID)); ?>" target="_blank"  tabindex="4"><?php _e('View this Page'); ?></a>
    84 <?php } elseif ( 'edit' == $action ) { ?>
    85 <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 Page'); ?></a>
    86 <?php } ?>
    87 </div>
    88 
    89 <div class="inside">
     65<div class="inside-submitbox">
    9066<p><strong><label for='post_status'><?php _e('Publish Status') ?></label></strong></p>
    9167<p>
     
    10985
    11086<?php
    111 if ( 0 != $post_ID ) {
     87if ( 0 != $post->ID ) {
    11288    if ( 'future' == $post->post_status ) { // scheduled for publishing at a future date
    11389        $stamp = __('Scheduled for:<br />%1$s at %2$s');
     
    138114<input type="submit" name="save" class="button button-highlighted" value="<?php _e('Save'); ?>" tabindex="4" />
    139115<?php
    140 if ( !in_array( $post->post_status, array('publish', 'future') ) || 0 == $post_ID ) {
     116if ( !in_array( $post->post_status, array('publish', 'future') ) || 0 == $post->ID ) {
    141117?>
    142118<?php if ( current_user_can('publish_pages') ) : ?>
     
    148124}
    149125
    150 if ( ('edit' == $action) && current_user_can('delete_page', $post_ID) )
    151     echo "<a class='submitdelete' href='" . wp_nonce_url("page.php?action=delete&amp;post=$post_ID", 'delete-page_' . $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 page '%s'\n  'Cancel' to stop, 'OK' to delete."), $post->post_title )) . "') ) { return true;}return false;\">" . __('Delete&nbsp;page') . "</a>";
     126if ( ('edit' == $action) && current_user_can('delete_page', $post->ID) )
     127    echo "<a class='submitdelete' href='" . wp_nonce_url("page.php?action=delete&amp;post=$post->ID", 'delete-page_' . $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 page '%s'\n  'Cancel' to stop, 'OK' to delete."), $post->post_title )) . "') ) { return true;}return false;\">" . __('Delete&nbsp;page') . "</a>";
    152128?>
    153129<br class="clear" />
    154 <?php if ( 0 != $post_ID ) : ?>
    155 <?php if ( $last_id = get_post_meta($post_ID, '_edit_last', true) ) {
     130
     131<!-- moved under the editor
     132<?php if ( 0 != $post->ID ) : ?>
     133<?php if ( $last_id = get_post_meta($post->ID, '_edit_last', true) ) {
    156134    $last_user = get_userdata($last_id);
    157135    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));
     
    162140<br class="clear" />
    163141<?php endif; ?>
    164 <span id="autosave"></span>
    165 <span id="wp-word-count"></span>
     142-->
     143
    166144</p>
    167 
    168 <div class="side-info">
    169 <h5><?php _e('Related') ?></h5>
    170 
    171 <ul>
    172 <?php if ( 0 != $post_ID ) : ?>
    173 <li><a href="edit-pages.php?page_id=<?php echo $post_ID ?>"><?php _e('See Comments on this Page') ?></a></li>
    174 <?php endif; ?>
    175 <li><a href="edit-comments.php"><?php _e('Manage All Comments') ?></a></li>
    176 <li><a href="edit-pages.php"><?php _e('Manage All Pages') ?></a></li>
    177 <?php do_action('page_relatedlinks_list'); ?>
    178 </ul>
    179 </div>
    180 <?php do_action('submitpage_box'); ?>
    181 </div>
    182 
    183 <div id="post-body">
    184 <div id="titlediv">
    185 <h3><label for="title"><?php _e('Title') ?></label></h3>
    186 <div id="titlewrap">
    187   <input type="text" name="post_title" size="30" tabindex="1" value="<?php echo attribute_escape( $post->post_title ); ?>" id="title" autocomplete="off" />
    188 </div>
    189 <div class="inside">
    190 <?php $sample_permalink_html = get_sample_permalink_html($post->ID); ?>
    191     <div id="edit-slug-box">
    192 <?php if ( ! empty($post->ID) && ! empty($sample_permalink_html) ) :
    193     echo $sample_permalink_html;
    194 endif; ?>
    195     </div>
    196 </div>
    197 </div>
    198 
    199 <div id="<?php echo user_can_richedit() ? 'postdivrich' : 'postdiv'; ?>" class="postarea">
    200 <h3><label for="content"><?php _e('Page') ?></label></h3>
    201 <?php the_editor($post->post_content); ?>
    202 <?php wp_nonce_field( 'autosave', 'autosavenonce', false ); ?>
    203 <?php wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); ?>
    204 <?php wp_nonce_field( 'getpermalink', 'getpermalinknonce', false ); ?>
    205 <?php wp_nonce_field( 'samplepermalink', 'samplepermalinknonce', false ); ?>
    206 </div>
    207 
    208 <?php do_meta_boxes('page', 'normal', $post); ?>
    209 
    210 <?php do_action('edit_page_form'); ?>
    211 
    212 <h2><?php _e('Advanced Options'); ?></h2>
    213 
    214 
    215 <?php
     145</div>
     146<?php
     147}
     148add_meta_box('pagesubmitdiv', __('Publish'), 'page_submit_meta_box', 'page', 'side', 'core');
     149
    216150function page_custom_meta_box($post){
    217151?>
     
    232166<?php
    233167}
    234 add_meta_box('pagecustomdiv', __('Custom Fields'), 'page_custom_meta_box', 'page', 'advanced', 'core');
     168add_meta_box('pagecustomdiv', __('Custom Fields'), 'page_custom_meta_box', 'page', 'normal', 'core');
    235169
    236170function page_comments_status_meta_box($post){
     
    244178<?php
    245179}
    246 add_meta_box('pagecommentstatusdiv', __('Comments &amp; Pings'), 'page_comments_status_meta_box', 'page', 'advanced', 'core');
     180add_meta_box('pagecommentstatusdiv', __('Comments &amp; Pings'), 'page_comments_status_meta_box', 'page', 'normal', 'core');
    247181
    248182function page_password_meta_box($post){
     
    252186<?php
    253187}
    254 add_meta_box('pagepassworddiv', __('Password Protect This Page'), 'page_password_meta_box', 'page', 'advanced', 'core');
     188add_meta_box('pagepassworddiv', __('Password Protect This Page'), 'page_password_meta_box', 'page', 'normal', 'core');
    255189
    256190function page_slug_meta_box($post){
     
    259193<?php
    260194}
    261 add_meta_box('pageslugdiv', __('Page Slug'), 'page_slug_meta_box', 'page', 'advanced', 'core');
     195add_meta_box('pageslugdiv', __('Page Slug'), 'page_slug_meta_box', 'page', 'normal', 'core');
    262196
    263197function page_parent_meta_box($post){
     
    271205<?php
    272206}
    273 add_meta_box('pageparentdiv', __('Page Parent'), 'page_parent_meta_box', 'page', 'advanced', 'core');
     207add_meta_box('pageparentdiv', __('Page Parent'), 'page_parent_meta_box', 'page', 'normal', 'core');
    274208
    275209if ( 0 != count( get_page_templates() ) ) {
     
    283217<?php
    284218    }
    285     add_meta_box('pagetemplatediv', __('Page Template'), 'page_template_meta_box', 'page', 'advanced', 'core');
     219    add_meta_box('pagetemplatediv', __('Page Template'), 'page_template_meta_box', 'page', 'normal', 'core');
    286220}
    287221
     
    292226<?php
    293227}
    294 add_meta_box('pageorderdiv', __('Page Order'), 'page_order_meta_box', 'page', 'advanced', 'core');
     228add_meta_box('pageorderdiv', __('Page Order'), 'page_order_meta_box', 'page', 'normal', 'core');
    295229
    296230
     
    308242<?php
    309243    }
    310     add_meta_box('pageauthordiv', __('Page Author'), 'page_author_meta_box', 'page', 'advanced', 'core');
     244    add_meta_box('pageauthordiv', __('Page Author'), 'page_author_meta_box', 'page', 'normal', 'core');
    311245}
    312246
     
    316250    wp_list_post_revisions();
    317251}
    318 add_meta_box('revisionsdiv', __('Page Revisions'), 'page_revisions_meta_box', 'page', 'advanced', 'core');
     252add_meta_box('revisionsdiv', __('Page Revisions'), 'page_revisions_meta_box', 'page', 'normal', 'core');
    319253endif;
    320 
     254?>
     255
     256<div class="wrap">
     257<h2><?php
     258    if ( !isset($post_ID) || 0 == $post_ID )
     259        printf( __( '<a href="%s">Pages</a> / Write New Page' ), 'edit-pages.php' );
     260    else
     261        printf( __( '<a href="%s">Pages</a> / Edit Page' ), 'edit-pages.php' );
     262?></h2>
     263
     264<div id="previewview">
     265<?php if ( 'publish' == $post->post_status ) { ?>
     266<a class="button" href="<?php echo clean_url(get_permalink($post->ID)); ?>" target="_blank"  tabindex="4"><?php _e('View this Page'); ?></a>
     267<?php } elseif ( 'edit' == $action ) { ?>
     268<a class="button" 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 Page'); ?></a>
     269<?php } ?>
     270</div>
     271
     272<?php
     273wp_nonce_field($nonce_action);
     274
     275if (isset($mode) && 'bookmarklet' == $mode)
     276    echo '<input type="hidden" name="mode" value="bookmarklet" />';
     277?>
     278<input type="hidden" id="user-id" name="user_ID" value="<?php echo $user_ID ?>" />
     279<input type="hidden" id="hiddenaction" name="action" value='<?php echo $form_action ?>' />
     280<input type="hidden" id="originalaction" name="originalaction" value="<?php echo $form_action ?>" />
     281<input type="hidden" id="post_author" name="post_author" value="<?php echo attribute_escape( $post->post_author ); ?>" />
     282<?php echo $form_extra ?>
     283<input type="hidden" id="post_type" name="post_type" value="<?php echo $post->post_type ?>" />
     284<input type="hidden" id="original_post_status" name="original_post_status" value="<?php echo $post->post_status ?>" />
     285<input name="referredby" type="hidden" id="referredby" value="<?php echo clean_url(stripslashes(wp_get_referer())); ?>" />
     286<?php if ( 'draft' != $post->post_status ) wp_original_referer_field(true, 'previous'); ?>
     287
     288<!-- TODO
     289<div class="inside">
     290<p><strong><label for='post_status'><?php _e('Publish Status') ?></label></strong></p>
     291<p>
     292<select name='post_status' tabindex='4' id='post_status'>
     293<?php // Show publish in dropdown if user can publish or if they can re-publish this page ('edit_published_pages')
     294// 'publish' option will be selected for published AND private posts (checkbox overrides dropdown)
     295if ( current_user_can('publish_pages') OR ( $post->post_status == 'publish' AND current_user_can('edit_page', $post->ID) ) ) :
     296?>
     297<option<?php selected( $post->post_status, 'publish' ); selected( $post->post_status, 'private' );?> value='publish'><?php _e('Published') ?></option>
     298<?php endif; ?>
     299<?php if ( 'future' == $post->post_status ) : ?>
     300<option<?php selected( $post->post_status, 'future' ); ?> value='future'><?php _e('Pending') ?></option>
     301<?php endif; ?>
     302<option<?php selected( $post->post_status, 'pending' ); ?> value='pending'><?php _e('Pending Review') ?></option>
     303<option<?php selected( $post->post_status, 'draft' ); ?> value='draft'><?php _e('Unpublished') ?></option>
     304</select>
     305</p>
     306<?php if ( current_user_can( 'publish_posts' ) ) : ?>
     307<p><label for="post_status_private" class="selectit"><input id="post_status_private" name="post_status" type="checkbox" value="private" <?php checked($post->post_status, 'private'); ?> tabindex='4' /> <?php _e('Keep this page private') ?></label></p>
     308<?php endif; ?>
     309
     310<h5><?php _e('Related') ?></h5>
     311<ul>
     312<?php if ($post_ID): ?>
     313<li><a href="edit-pages.php?page_id=<?php echo $post_ID ?>"><?php _e('See Comments on this Page') ?></a></li>
     314<?php endif; ?>
     315<li><a href="edit-comments.php"><?php _e('Manage All Comments') ?></a></li>
     316<li><a href="edit-pages.php"><?php _e('Manage All Pages') ?></a></li>
     317<?php do_action('page_relatedlinks_list'); ?>
     318</ul>
     319
     320-->
     321
     322<div id="poststuff">
     323
     324<div id="side-info-column" class="inner-sidebar">
     325
     326<?php
     327
     328do_action('submitpage_box');
     329$side_meta_boxes = do_meta_boxes('page', 'side', $page);
     330
     331?>
     332</div>
     333
     334<div id="post-body" class="<?php echo $side_meta_boxes ? 'has-sidebar' : ''; ?>">
     335<div id="post-body-content" class="has-sidebar-content">
     336
     337<div id="titlediv">
     338<h3><label for="title"><?php _e('Title') ?></label></h3>
     339<div id="titlewrap">
     340  <input type="text" name="post_title" size="30" tabindex="1" value="<?php echo attribute_escape( $post->post_title ); ?>" id="title" autocomplete="off" />
     341</div>
     342<div class="inside">
     343<?php $sample_permalink_html = get_sample_permalink_html($post->ID); ?>
     344    <div id="edit-slug-box">
     345<?php if ( ! empty($post->ID) && ! empty($sample_permalink_html) ) :
     346    echo $sample_permalink_html;
     347endif; ?>
     348    </div>
     349</div>
     350</div>
     351
     352<div id="<?php echo user_can_richedit() ? 'postdivrich' : 'postdiv'; ?>" class="postarea">
     353
     354<div id="add-media-button"><a href="<?php echo clean_url( admin_url( 'media-upload.php?post_id=' . ( $post_ID ? $post_ID : $temp_ID ) . '&amp;type=image&amp;TB_iframe=true' ) ); ?>" class="thickbox button"><?php _e( 'Add Media' ); ?></a></div>
     355
     356<h3><?php _e('Page') ?></h3>
     357<?php the_editor($post->post_content); ?>
     358<div id="post-status-info">
     359    <span id="wp-word-count" class="alignleft"></span>
     360    <span class="alignright">
     361    <span id="autosave">&nbsp;</span>
     362
     363<?php
     364    if ($post_ID) {
     365        if ( $last_id = get_post_meta($post_ID, '_edit_last', true) ) {
     366            $last_user = get_userdata($last_id);
     367            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));
     368        } else {
     369            printf(__('Last edited on %1$s at %2$s'), mysql2date(get_option('date_format'), $post->post_modified), mysql2date(get_option('time_format'), $post->post_modified));
     370        }
     371    }
     372?>
     373    </span>
     374    <br class="clear" />
     375</div>
     376
     377
     378<?php wp_nonce_field( 'autosave', 'autosavenonce', false ); ?>
     379<?php wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); ?>
     380<?php wp_nonce_field( 'getpermalink', 'getpermalinknonce', false ); ?>
     381<?php wp_nonce_field( 'samplepermalink', 'samplepermalinknonce', false ); ?>
     382<?php wp_nonce_field( 'meta-box-order', 'meta-box-order-nonce', false ); ?>
     383</div>
     384
     385<?php
     386
     387do_meta_boxes('page', 'normal', $post);
     388do_action('edit_page_form');
    321389do_meta_boxes('page', 'advanced', $post);
    322 ?>
    323 
    324 </div>
    325 </div>
    326 
    327 </div>
    328 
     390
     391?>
     392
     393</div>
     394</div>
     395</div>
     396
     397</div>
     398
     399<br class="clear" />
     400</div>
    329401</form>
    330402
  • trunk/wp-admin/export.php

    r8618 r8691  
    1313require_once('includes/export.php');
    1414$title = __('Export');
    15 $parent_file = 'edit.php';
    1615
    1716if ( isset( $_GET['download'] ) ) {
  • trunk/wp-admin/import.php

    r8618 r8691  
    1010require_once ('admin.php');
    1111$title = __('Import');
    12 $parent_file = 'edit.php';
    1312require_once ('admin-header.php');
    1413?>
  • trunk/wp-admin/includes/comment.php

    r8645 r8691  
    127127}
    128128
     129function wp_get_inbox_items() {
     130    $r = array();
     131    $r[] = (object) array(
     132        'text' => 'Your take on the evolution of Dr. Who is ridiculous. The fact that the actors are getting younger has nothing to do with Gallifrey lore, and everything to do with celebrity culture.',
     133        'date' => '2008/09/07',
     134        'time' => '4:19pm',
     135        'from' => 'I. monroe',
     136        'type' => 'comment',
     137        'parent' => '1',
     138        'href' => '#'
     139    );
     140
     141    $r[] = (object) array(
     142        'text' => 'Announcement: WordPress introduces new features for mobile blogging.',
     143        'date' => '2008/09/06',
     144        'time' => '3:24pm',
     145        'from' => 'WordPress.org',
     146        'type' => 'announcement',
     147        'parent' => '0',
     148        'href' => '#'
     149    );
     150
     151    $r[] = (object) array(
     152        'text' => 'Great review. You left out a few things, but maybe you were trying to avoid spoilers? Will check back later in a week.',
     153        'date' => '2008/09/06',
     154        'time' => '2:46pm',
     155        'from' => 'matt',
     156        'type' => 'comment',
     157        'parent' => '2',
     158        'href' => '#'
     159    );
     160   
     161    $r[] = (object) array(
     162        'text' => 'nice picture!',
     163        'date' => '2008/08/05',
     164        'time' => '9:17am',
     165        'from' => 'caped crusader',
     166        'type' => 'comment',
     167        'parent' => '3',
     168        'href' => '#'
     169    );
     170
     171    return $r;
     172}
     173
    129174?>
  • trunk/wp-admin/includes/post.php

    r8646 r8691  
    692692    return _wp_put_post_revision( $_POST, true );
    693693}
     694
     695/**
     696 * wp_teeny_mce() - adds a trimmed down version of the tinyMCE editor used on the Write -> Post screen.
     697 *
     698 * @package WordPress
     699 * @since 2.6
     700 */
     701function wp_teeny_mce( $args = null ) {
     702    if ( !user_can_richedit() )
     703        return;
     704
     705    $defaults = array(
     706        'buttons1' => 'bold,italic,underline,blockquote,separator,strikethrough,bullist,numlist,undo,redo,link,unlink'
     707    );
     708    $args = wp_parse_args( $args, $defaults );
     709    if ( is_array( $args['buttons1'] ) )
     710        $args['buttons1'] = join( ',', $args['buttons1'] );
     711
     712    $language = ( '' == get_locale() ) ? 'en' : strtolower( substr(get_locale(), 0, 2) );
     713
     714?>
     715
     716<script type="text/javascript" src="<?php echo clean_url( site_url( 'wp-includes/js/tinymce/tiny_mce.js' ) ); ?>"></script>
     717<script type="text/javascript">
     718/* <![CDATA[ */
     719<?php
     720    // Add TinyMCE languages
     721    @include_once( ABSPATH . WPINC . '/js/tinymce/langs/wp-langs.php' );
     722
     723    if ( isset($strings) )
     724        echo $strings;
     725
     726?>
     727    (function() {
     728        var base = tinymce.baseURL, sl = tinymce.ScriptLoader, ln = "<?php echo $language; ?>";
     729
     730        sl.markDone(base + '/langs/' + ln + '.js');
     731        sl.markDone(base + '/themes/advanced/langs/' + ln + '.js');
     732        sl.markDone(base + '/themes/advanced/langs/' + ln + '_dlg.js');
     733    })();
     734   
     735    var wpTeenyMCEInit = function() {
     736    tinyMCE.init({
     737        mode: "textareas",
     738        editor_selector: "mceEditor",
     739        language : "<?php echo $language; ?>",
     740        width: "100%",
     741        theme : "advanced",
     742        theme_advanced_buttons1 : "<?php echo $args['buttons1']; ?>",
     743        theme_advanced_buttons2 : "",
     744        theme_advanced_buttons3 : "",
     745        theme_advanced_toolbar_location : "top",
     746        theme_advanced_toolbar_align : "left",
     747        theme_advanced_statusbar_location : "bottom",
     748        theme_advanced_resizing : true,
     749        theme_advanced_resize_horizontal : false,
     750        skin : "wp_theme",
     751        dialog_type : "modal",
     752        relative_urls : false,
     753        remove_script_host : false,
     754        convert_urls : false,
     755        apply_source_formatting : false,
     756        remove_linebreaks : true,
     757        accessibility_focus : false,
     758        tab_focus : ":next",
     759        plugins : "safari,inlinepopups",
     760        entities : "38,amp,60,lt,62,gt",
     761        force_p_newlines : true,
     762        save_callback : 'switchEditors.saveCallback'
     763    });
     764    };
     765    wpTeenyMCEInit();
     766/* ]]> */
     767</script>
     768
     769<?php
     770}
  • trunk/wp-admin/includes/update.php

    r8600 r8691  
    4646    echo "<div id='update-nag'>$msg</div>";
    4747}
    48 add_action( 'admin_notices', 'update_nag', 3 );
     48//add_action( 'admin_notices', 'update_nag', 3 ); // crazyhorse
    4949
    5050// Called directly from dashboard
  • trunk/wp-admin/index.php

    r8618 r8691  
    5454
    5555<div class="wrap">
    56 
    57 <h2><?php _e('Dashboard'); ?></h2>
    58 
    59 <div id="rightnow">
    60 <h3 class="reallynow">
    61     <span><?php _e('Right Now'); ?></span>
    62 
    63 <?php if ( $can_edit_posts = current_user_can( 'edit_posts' ) ) : ?>
    64     <a href="post-new.php" class="rbutton"><strong><?php _e('Write a New Post'); ?></strong></a>
    65 <?php endif; if ( $can_edit_pages = current_user_can( 'edit_pages' ) ) : ?>
    66     <a href="page-new.php" class="rbutton"><?php _e('Write a New Page'); ?></a>
    67 <?php endif; ?>
    68     <br class="clear" />
    69 </h3>
    70 
    71 <?php
    72 $num_posts = wp_count_posts( 'post' );
    73 $num_pages = wp_count_posts( 'page' );
    74 
    75 $num_cats  = wp_count_terms('category');
    76 
    77 $num_tags = wp_count_terms('post_tag');
    78 
    79 $num_comm = get_comment_count( );
    80 
    81 $post_type_texts = array();
    82 
    83 if ( !empty($num_posts->publish) ) { // with feeds, anyone can tell how many posts there are.  Just unlink if !current_user_can
    84     $post_text = sprintf( __ngettext( '%s post', '%s posts', $num_posts->publish ), number_format_i18n( $num_posts->publish ) );
    85     $post_type_texts[] = $can_edit_posts ? "<a href='edit.php'>$post_text</a>" : $post_text;
    86 }
    87 if ( $can_edit_pages && !empty($num_pages->publish) ) { // how many pages is not exposed in feeds.  Don't show if !current_user_can
    88     $post_type_texts[] = '<a href="edit-pages.php">'.sprintf( __ngettext( '%s page', '%s pages', $num_pages->publish ), number_format_i18n( $num_pages->publish ) ).'</a>';
    89 }
    90 if ( $can_edit_posts && !empty($num_posts->draft) ) {
    91     $post_type_texts[] = '<a href="edit.php?post_status=draft">'.sprintf( __ngettext( '%s draft', '%s drafts', $num_posts->draft ), number_format_i18n( $num_posts->draft ) ).'</a>';
    92 }
    93 if ( $can_edit_posts && !empty($num_posts->future) ) {
    94     $post_type_texts[] = '<a href="edit.php?post_status=future">'.sprintf( __ngettext( '%s scheduled post', '%s scheduled posts', $num_posts->future ), number_format_i18n( $num_posts->future ) ).'</a>';
    95 }
    96 
    97 if ( current_user_can('publish_posts') && !empty($num_posts->pending) ) {
    98     $pending_text = sprintf( __ngettext( 'There is <a href="%1$s">%2$s post</a> pending your review.', 'There are <a href="%1$s">%2$s posts</a> pending your review.', $num_posts->pending ), 'edit.php?post_status=pending', number_format_i18n( $num_posts->pending ) );
    99 } else {
    100     $pending_text = '';
    101 }
    102 
    103 $cats_text = sprintf( __ngettext( '%s category', '%s categories', $num_cats ), number_format_i18n( $num_cats ) );
    104 $tags_text = sprintf( __ngettext( '%s tag', '%s tags', $num_tags ), number_format_i18n( $num_tags ) );
    105 if ( current_user_can( 'manage_categories' ) ) {
    106     $cats_text = "<a href='categories.php'>$cats_text</a>";
    107     $tags_text = "<a href='edit-tags.php'>$tags_text</a>";
    108 }
    109 
    110 $total_comments = sprintf( __ngettext( '%1$s total', '%1$s total', $num_comm['total_comments'] ), number_format_i18n($num_comm['total_comments']) );
    111 $approved_comments = sprintf( __ngettext( '%1$s approved', '%1$s approved', $num_comm['approved'] ), number_format_i18n($num_comm['approved']) );
    112 $spam_comments = sprintf( __ngettext( '%1$s spam', '%1$s spam', $num_comm['spam'] ), number_format_i18n($num_comm['spam']) );
    113 $moderated_comments = sprintf( __ngettext( '%1$s awaiting moderation', '%1$s awaiting moderation', $num_comm['awaiting_moderation'] ), number_format_i18n($num_comm['awaiting_moderation']) );
    114 
    115 if( current_user_can( 'moderate_comments' ) ) {
    116     $total_comments = "<a href='edit-comments.php'>{$total_comments}</a>";
    117     $approved_comments = "<a href='edit-comments.php?comment_status=approved'>{$approved_comments}</a>";
    118     $moderated_comments = "<a href='edit-comments.php?comment_status=moderated'>{$moderated_comments}</a>";
    119 }
    120 
    121 $comm_text = sprintf( __ngettext( 'You have %1$s comment, %2$s, %3$s and %4$s.', 'You have %1$s comments, %2$s, %3$s and %4$s.', $num_comm['total_comments'] ), $total_comments, $approved_comments, $spam_comments, $moderated_comments );
    122 
    123 $post_type_text = implode(', ', $post_type_texts);
    124 
    125 // There is always a category
    126 $sentence = sprintf( __( 'You have %1$s, contained within %2$s and %3$s. %4$s %5$s' ), $post_type_text, $cats_text, $tags_text, $pending_text, $comm_text );
    127 $sentence = apply_filters( 'dashboard_count_sentence', $sentence, $post_type_text, $cats_text, $tags_text, $pending_text, $comm_text );
    128 
    129 ?>
    130 <p class="youhave"><?php echo $sentence; ?></p>
    131 <?php
    132 $ct = current_theme_info();
    133 $sidebars_widgets = wp_get_sidebars_widgets();
    134 $num_widgets = array_reduce( $sidebars_widgets, create_function( '$prev, $curr', 'return $prev+count($curr);' ), 0 );
    135 $widgets_text = sprintf( __ngettext( '%d widget', '%d widgets', $num_widgets ), $num_widgets );
    136 if ( $can_switch_themes = current_user_can( 'switch_themes' ) )
    137     $widgets_text = "<a href='widgets.php'>$widgets_text</a>";
    138 ?>
    139 <p class="youare">
    140     <?php printf( __( 'You are using the %1$s theme with %2$s.' ), $ct->title, $widgets_text ); ?>
    141     <?php if ( $can_switch_themes ) : ?>
    142         <a href="themes.php" class="rbutton"><?php _e('Change Theme'); ?></a>
    143     <?php endif; ?>
    144     <?php update_right_now_message(); ?>
    145 </p>
    146 <?php do_action( 'rightnow_end' ); ?>
    147 <?php do_action( 'activity_box_end' ); ?>
    148 </div><!-- rightnow -->
    149 
    150 <br class="clear" />
    151 
    15256<div id="dashboard-widgets-wrap">
    15357
  • trunk/wp-admin/js/comment.js

    r7529 r8691  
    11jQuery(document).ready( function() {
    2     add_postbox_toggles('comment');
     2    postboxes.add_postbox_toggles('comment');
    33
    44    // close postboxes that should be closed
     
    1111    jQuery('.edit-timestamp').click(function () {
    1212        if (jQuery('#timestampdiv').is(":hidden")) {
     13            jQuery('#curtime').slideUp("normal");
    1314            jQuery('#timestampdiv').slideDown("normal");
    14             jQuery('.edit-timestamp').text(commentL10n.cancel);
    1515        } else {
    16             jQuery('#timestampdiv').hide();
     16            jQuery('#timestampdiv').slideUp("normal");
    1717            jQuery('#mm').val(jQuery('#hidden_mm').val());
    1818            jQuery('#jj').val(jQuery('#hidden_jj').val());
     
    2020            jQuery('#hh').val(jQuery('#hidden_hh').val());
    2121            jQuery('#mn').val(jQuery('#hidden_mn').val());
    22             jQuery('.edit-timestamp').text(commentL10n.edit);
     22            jQuery('#curtime').slideDown("normal");
    2323        }
    2424        return false;
    25     });
     25    });
     26
     27    jQuery('.save-timestamp').click(function () { // crazyhorse - multiple ok cancels
     28        jQuery('#timestampdiv').hide();
     29        var link = jQuery('.timestamp a').clone( true );
     30        jQuery('.timestamp').show().html(
     31            jQuery( '#mm option[value=' + jQuery('#mm').val() + ']' ).text() + ' ' +
     32            jQuery('#jj').val() + ',' +
     33            jQuery('#aa').val() + '@' +
     34            jQuery('#hh').val() + ':' +
     35            jQuery('#mn').val() + ' '
     36        ).append( link );
     37        jQuery('#curtime').slideDown("normal");
     38        return false;
     39    });
    2640});
  • trunk/wp-admin/js/common.js

    r8600 r8691  
    55    // Reveal
    66    jQuery('.wp-no-js-hidden').removeClass( 'wp-no-js-hidden' );
     7   
     8    // show things that should be visible, hide what should be hidden
     9    jQuery('.hide-if-no-js').show();
     10    jQuery('.hide-if-js').hide();
    711
    812    // Basic form validation
     
    1014        jQuery('form.validate').submit( function() { return wpAjax.validateForm( jQuery(this) ); } );
    1115    }
     16
     17    jQuery('a.no-crazy').click( function() {
     18        alert( "This feature isn't enabled in this prototype." );
     19        return false;
     20    } );
    1221});
    1322
     
    2635
    2736            el.mouseover(function(e) {
    28                 txt = el.attr('tip'), o = el.offset();;
     37                txt = el.attr('tip'), o = el.offset();
    2938
    3039                clearTimeout(TT.sD);
     
    4352}(jQuery));
    4453
     54jQuery( function($) {
     55    var menuToggle = function(ul, effect) {
     56        if ( !effect ) {
     57            effect = 'slideToggle';
     58        }
     59        ul[effect]().parent().toggleClass( 'wp-menu-open' );
     60        return false;
     61    };
     62
     63    jQuery('#adminmenu li.wp-has-submenu > a').click( function() { return menuToggle( jQuery(this).siblings('ul') ); } );
     64
     65    jQuery('#dashmenu li.wp-has-submenu').bind( 'mouseenter mouseleave', function() { return menuToggle( jQuery(this).children('ul'), 'toggle' ); } );
     66
     67    // Temp
     68    if ( !$('#post-search, #widget-search').size() ) {
     69        $('#wphead').append( '<p id="post-search-prep"><input id="post-search-input" type="text" /><input class="button" type="button" value="Search" /></p>' );
     70    }
     71   
     72    // Temp 2
     73    var minH = $(window).height()-185+"px"
     74    $('#wpbody-content').css("min-height", minH);
     75
     76} );
     77
    4578jQuery(function(){jQuery('#media-buttons a').tTips();});
  • trunk/wp-admin/js/edit-comments.js

    r7462 r8691  
    5656        a.html( n.toString() );
    5757    });
     58    $('li span.spam-comment-count' ).each( function() {
     59        var a = $(this);
     60        var n = parseInt(a.html(),10);
     61        if ( $(settings.target).parents( 'span.spam' ).size() ) { // we marked a comment as spam
     62            n = n + 1;
     63        } else if ( $('#' + settings.element).is('.spam') ) { // we approved or deleted a comment marked as spam
     64            n = n - 1;
     65        }
     66        if ( n < 0 ) { n = 0; }
     67        a.html( n.toString() );
     68    });
    5869
    5970    if ( theExtraList.size() == 0 || theExtraList.children().size() == 0 ) {
  • trunk/wp-admin/js/link.js

    r8026 r8691  
    55    jQuery('#link_name').focus();
    66    // postboxes
    7     add_postbox_toggles('link');
     7    postboxes.add_postbox_toggles('link');
    88
    99    // category tabs
  • trunk/wp-admin/js/page.js

    r7529 r8691  
    11jQuery(document).ready( function() {
    2     add_postbox_toggles('page');
     2    postboxes.add_postbox_toggles('page');
    33    make_slugedit_clickable();
    44
    55    // close postboxes that should be closed
    66    jQuery('.if-js-closed').removeClass('if-js-closed').addClass('closed');
    7 
    8     // show things that should be visible, hide what should be hidden
    9     jQuery('.hide-if-no-js').show();
    10     jQuery('.hide-if-js').hide();
    117
    128    jQuery('#title').blur( function() { if ( (jQuery("#post_ID").val() > 0) || (jQuery("#title").val().length == 0) ) return; autosave(); } );
     
    1713    jQuery('.edit-timestamp').click(function () {
    1814        if (jQuery('#timestampdiv').is(":hidden")) {
     15            jQuery('#curtime').slideUp("normal");
    1916            jQuery('#timestampdiv').slideDown("normal");
    20             jQuery('.edit-timestamp').text(postL10n.cancel);
    2117        } else {
    22             jQuery('#timestampdiv').hide();
     18            jQuery('#timestampdiv').slideUp("normal");
    2319            jQuery('#mm').val(jQuery('#hidden_mm').val());
    2420            jQuery('#jj').val(jQuery('#hidden_jj').val());
     
    2622            jQuery('#hh').val(jQuery('#hidden_hh').val());
    2723            jQuery('#mn').val(jQuery('#hidden_mn').val());
    28             jQuery('.edit-timestamp').text(postL10n.edit);
     24            jQuery('#curtime').slideDown("normal");
    2925        }
    3026        return false;
    31     });
     27    });
     28
     29    jQuery('.save-timestamp').click(function () { // crazyhorse - multiple ok cancels
     30        jQuery('#timestampdiv').hide();
     31        var link = jQuery('.timestamp a').clone( true );
     32        jQuery('.timestamp').show().html(
     33            jQuery( '#mm option[value=' + jQuery('#mm').val() + ']' ).text() + ' ' +
     34            jQuery('#jj').val() + ',' +
     35            jQuery('#aa').val() + '@' +
     36            jQuery('#hh').val() + ':' +
     37            jQuery('#mn').val() + ' '
     38        ).append( link );
     39        jQuery('#curtime').slideDown("normal");
     40        return false;
     41    });
    3242});
  • trunk/wp-admin/js/post.js

    r8214 r8691  
    6565    jQuery('.if-js-closed').removeClass('if-js-closed').addClass('closed');
    6666
    67     // show things that should be visible, hide what should be hidden
    68     jQuery('.hide-if-no-js').show();
    69     jQuery('.hide-if-js').hide();
    70 
    7167    // postboxes
    72     add_postbox_toggles('post');
     68    postboxes.add_postbox_toggles('post');
    7369
    7470    // Editable slugs
     
    162158    jQuery('.edit-timestamp').click(function () {
    163159        if (jQuery('#timestampdiv').is(":hidden")) {
     160            jQuery('#curtime').slideUp("normal");
    164161            jQuery('#timestampdiv').slideDown("normal");
    165             jQuery('.edit-timestamp').text(postL10n.cancel);
    166162        } else {
    167             jQuery('#timestampdiv').hide();
     163            jQuery('#timestampdiv').slideUp("normal");
    168164            jQuery('#mm').val(jQuery('#hidden_mm').val());
    169165            jQuery('#jj').val(jQuery('#hidden_jj').val());
     
    171167            jQuery('#hh').val(jQuery('#hidden_hh').val());
    172168            jQuery('#mn').val(jQuery('#hidden_mn').val());
    173             jQuery('.edit-timestamp').text(postL10n.edit);
     169            jQuery('#curtime').slideDown("normal");
    174170        }
    175171        return false;
     172    });
    176173
     174    jQuery('.save-timestamp').click(function () { // crazyhorse - multiple ok cancels
     175        jQuery('#timestampdiv').hide();
     176        var link = jQuery('.timestamp a').clone( true );
     177        jQuery('.timestamp').show().html(
     178            jQuery( '#mm option[value=' + jQuery('#mm').val() + ']' ).text() + ' ' +
     179            jQuery('#jj').val() + ',' +
     180            jQuery('#aa').val() + '@' +
     181            jQuery('#hh').val() + ':' +
     182            jQuery('#mn').val() + ' '
     183        ).append( link );
     184        jQuery('#curtime').slideDown("normal");
     185        return false;
    177186    });
    178187
  • trunk/wp-admin/js/postbox.js

    r7290 r8691  
    1 function add_postbox_toggles(page) {
    2     jQuery('.postbox h3').prepend('<a class="togbox">+</a> ');
    3     jQuery('.postbox h3').click( function() { jQuery(jQuery(this).parent().get(0)).toggleClass('closed'); save_postboxes_state(page); } );
    4 }
     1
     2(function($) {
     3    postboxes = {
     4        add_postbox_toggles : function(page) {
     5            $('.postbox h3').before('<a class="togbox">+</a> ');
     6            $('.postbox a.togbox').click( function() { $($(this).parent().get(0)).toggleClass('closed'); save_postboxes_state(page); } );
     7
     8            if ( $.browser.msie ) {
     9                $('#side-sortables').append( '<div id="make-it-tall"></div>' );
     10            } else {
     11                $('#side-sortables').append( '<div id="make-it-tall" style="margin-bottom: -2000px; padding-bottom: 2001px"></div>' );
     12            }
     13            $('#wpbody-content').css( 'overflow', 'hidden' );
     14           
     15            this.init(page);
     16        },
     17   
     18        expandSidebar : function( doIt ) {
     19            if ( doIt || $.trim( $( '#side-info-column' ).text() ) ) {
     20                $( '#post-body' ).addClass( 'has-sidebar' );
     21                $( '#side-sortables' ).css('z-index','0');
     22            } else {
     23                $( '#post-body' ).removeClass( 'has-sidebar' );
     24                $( '#side-sortables' ).css('z-index','-1');
     25            }
     26        },
     27
     28        init : function(page) {
     29            jQuery('.meta-box-sortables').sortable( {
     30                connectWith: [ '.meta-box-sortables' ],
     31                items: '> .postbox',
     32                handle: 'h3',
     33                stop: function() {
     34                    if ( 'side-sortables' == this.id ) { // doing this with jQuery doesn't work for some reason: make-it-tall gets duplicated
     35                        var makeItTall = document.getElementById( 'make-it-tall' );
     36                        var sideSort = makeItTall.parentNode;
     37                        sideSort.removeChild( makeItTall );
     38                        sideSort.appendChild( makeItTall );
     39                       
     40                    }
     41                    var postVars = {
     42                        action: 'meta-box-order',
     43                        _ajax_nonce: jQuery('#meta-box-order-nonce').val(),
     44                        page: page
     45                    }
     46                    jQuery('.meta-box-sortables').each( function() {
     47                        postVars["order[" + this.id.split('-')[0] + "]"] = jQuery(this).sortable( 'toArray' ).join(',');
     48                    } );
     49                    jQuery.post( postboxL10n.requestFile, postVars, function() {
     50                        postboxes.expandSidebar();
     51                    } );
     52                },
     53                over: function(e, ui) {
     54                    if ( !ui.element.is( '#side-sortables' ) )
     55                        return;
     56                    postboxes.expandSidebar( true );
     57                }
     58            } );
     59        }
     60    }
     61}(jQuery));
     62
     63jQuery(document).ready(function(){postboxes.expandSidebar();});
    564
    665function save_postboxes_state(page) {
  • trunk/wp-admin/link-add.php

    r8645 r8691  
    1212$title = __('Add Link');
    1313$this_file = 'link-manager.php';
    14 $parent_file = 'post-new.php';
     14$parent_file = 'edit.php';
     15$submenu_file = 'link-manager.php';
    1516
    1617
     
    2324wp_enqueue_script('xfn');
    2425
     26$link_added = ( isset($_GET['added']) && '' != $_POST['link_name'] ) ?
     27    '<div id="message" class="updated fade"><p>' . __('Link added.') . '</p></div>' : '';
     28
     29$fixed_bar = true;
    2530require('admin-header.php');
    2631?>
  • trunk/wp-admin/link.php

    r8645 r8691  
    107107            wp_die(__('Link not found.'));
    108108
     109        $fixed_bar = true;
    109110        include_once ('admin-header.php');
    110111        include ('edit-link-form.php');
  • trunk/wp-admin/menu-header.php

    r8645 r8691  
    2121get_admin_page_parent();
    2222
    23 // We're going to do this loop three times
    24 ?>
     23function _wp_menu_output( &$menu, &$submenu, $submenu_as_parent = true ) {
     24    global $self, $parent_file, $submenu_file, $plugin_page;
    2525
    26 <ul id="dashmenu">
    27 <?php
    28 foreach ( $menu as $key => $item ) {
    29     if ( 3 < $key ) // get each menu item before 3
    30         continue;
    31     $class = '';
    32     // 0 = name, 1 = capability, 2 = file
    33     if (( strcmp($self, $item[2]) == 0 && empty($parent_file)) || ($parent_file && ($item[2] == $parent_file))) $class = ' class="current"';
     26    $first = true;
     27    // 0 = name, 1 = capability, 2 = file, 3 = class
     28    foreach ( $menu as $key => $item ) {
     29        $class = array();
     30        if ( $first ) {
     31            $class[] = 'wp-first-item';
     32            $first = false;
     33        }
     34        if ( !empty($submenu[$item[2]]) )
     35            $class[] = 'wp-has-submenu';
    3436
    35     if ( !empty($submenu[$item[2]]) ) {
    36         $submenu[$item[2]] = array_values($submenu[$item[2]]);  // Re-index.
    37         $menu_hook = get_plugin_page_hook($submenu[$item[2]][0][2], $item[2]);
    38         if ( file_exists(WP_PLUGIN_DIR . "/{$submenu[$item[2]][0][2]}") || !empty($menu_hook))
    39             echo "\n\t<li><a href='admin.php?page={$submenu[$item[2]][0][2]}'$class>{$item[0]}</a></li>";
    40         else
    41             echo "\n\t<li><a href='{$submenu[$item[2]][0][2]}'$class>{$item[0]}</a></li>";
    42     } else if ( current_user_can($item[1]) ) {
    43         $menu_hook = get_plugin_page_hook($item[2], 'admin.php');
    44         if ( file_exists(WP_PLUGIN_DIR . "/{$item[2]}") || !empty($menu_hook) )
    45             echo "\n\t<li><a href='admin.php?page={$item[2]}'$class>{$item[0]}</a></li>";
    46         else
    47             echo "\n\t<li><a href='{$item[2]}'$class>{$item[0]}</a></li>";
    48     }
    49 }
    50 do_action( 'dashmenu' );
    51 ?>
    52 </ul>
     37        if ( ( $parent_file && $item[2] == $parent_file ) || strcmp($self, $item[2]) == 0 ) {
     38            if ( !empty($submenu[$item[2]]) )
     39                $class[] = 'wp-has-current-submenu wp-menu-open';
     40            else
     41                $class[] = 'current';
     42        }
    5343
    54 <ul id="adminmenu">
    55 <?php
    56 foreach ( $menu as $key => $item ) {
    57     if ( 5 > $key || $key > 25 ) // get each menu item before 3
    58         continue;
     44        if ( isset($item[3]) )
     45            $class[] = $item[3];
    5946
    60     $class = '';
     47        $class = $class ? ' class="' . join( ' ', $class ) . '"' : '';
    6148
    62     // 0 = name, 1 = capability, 2 = file
    63     if (( strcmp($self, $item[2]) == 0 && empty($parent_file)) || ($parent_file && ($item[2] == $parent_file))) $class = ' class="current"';
     49        echo "\n\t<li$class>";
    6450
    65     if ( !empty($submenu[$item[2]]) ) {
    66         $submenu[$item[2]] = array_values($submenu[$item[2]]);  // Re-index.
    67         $menu_hook = get_plugin_page_hook($submenu[$item[2]][0][2], $item[2]);
    68         if ( file_exists(WP_PLUGIN_DIR . "/{$submenu[$item[2]][0][2]}") || !empty($menu_hook))
    69             echo "\n\t<li><a href='admin.php?page={$submenu[$item[2]][0][2]}'$class>{$item[0]}</a></li>";
    70         else
    71             echo "\n\t<li><a href='{$submenu[$item[2]][0][2]}'$class>{$item[0]}</a></li>";
    72     } else if ( current_user_can($item[1]) ) {
    73         $menu_hook = get_plugin_page_hook($item[2], 'admin.php');
    74         if ( file_exists(WP_PLUGIN_DIR . "/{$item[2]}") || !empty($menu_hook) )
    75             echo "\n\t<li><a href='admin.php?page={$item[2]}'$class>{$item[0]}</a></li>";
    76         else
    77             echo "\n\t<li><a href='{$item[2]}'$class>{$item[0]}</a></li>";
     51        if ( $submenu_as_parent && !empty($submenu[$item[2]]) ) {
     52            $submenu[$item[2]] = array_values($submenu[$item[2]]);  // Re-index.
     53            $menu_hook = get_plugin_page_hook($submenu[$item[2]][0][2], $item[2]);
     54            if ( file_exists(WP_PLUGIN_DIR . "/{$submenu[$item[2]][0][2]}") || !empty($menu_hook))
     55                echo "<a href='admin.php?page={$submenu[$item[2]][0][2]}'$class>{$item[0]}</a>";
     56            else
     57                echo "\n\t<a href='{$submenu[$item[2]][0][2]}'$class>{$item[0]}</a>";
     58        } else if ( current_user_can($item[1]) ) {
     59            $menu_hook = get_plugin_page_hook($item[2], 'admin.php');
     60            if ( file_exists(WP_PLUGIN_DIR . "/{$item[2]}") || !empty($menu_hook) )
     61                echo "\n\t<a href='admin.php?page={$item[2]}'$class>{$item[0]}</a>";
     62            else
     63                echo "\n\t<a href='{$item[2]}'$class>{$item[0]}</a>";
     64        }
     65
     66        if ( !empty($submenu[$item[2]]) ) {
     67            echo "\n\t<ul class='wp-submenu'>";
     68            $first = true;
     69            foreach ( $submenu[$item[2]] as $sub_key => $sub_item ) {
     70                if ( !current_user_can($sub_item[1]) )
     71                    continue;
     72
     73                $class = array();
     74                if ( $first ) {
     75                    $class[] = 'wp-first-item';
     76                    $first = false;
     77                }
     78                if ( isset($submenu_file) ) {
     79                    if ( $submenu_file == $sub_item[2] )
     80                        $class[] = 'current';
     81                } else if ( (isset($plugin_page) && $plugin_page == $sub_item[2]) || (!isset($plugin_page) && $self == $sub_item[2]) ) {
     82                    $class[] = 'current';
     83                }
     84
     85                $class = $class ? ' class="' . join( ' ', $class ) . '"' : '';
     86
     87                $menu_hook = get_plugin_page_hook($sub_item[2], $item[2]);
     88
     89                if ( file_exists(WP_PLUGIN_DIR . "/{$sub_item[2]}") || ! empty($menu_hook) ) {
     90                    if ( 'admin.php' == $pagenow )
     91                        echo "\n\t\t<li$class><a href='admin.php?page={$sub_item[2]}'$class>{$sub_item[0]}</a></li>";
     92                    else
     93                        echo "\n\t\t<li$class><a href='{$item[2]}?page={$sub_item[2]}'$class>{$sub_item[0]}</a></li>";
     94                } else {
     95                    echo "\n\t\t<li$class><a href='{$sub_item[2]}'$class>{$sub_item[0]}</a></li>";
     96                }
     97            }
     98            echo "\n\t</ul>";
     99        }
     100        echo "</li>";
    78101    }
    79102}
    80103
    81 foreach ( $menu as $key => $item ) {
    82     if ( $key < 41 ) // there is a more efficient way to do this!
    83         continue;
     104?>
    84105
    85     $class = '';
     106<ul id="dashmenu" class="wp-menu">
    86107
    87     // 0 = name, 1 = capability, 2 = file
    88     if (( strcmp($self, $item[2]) == 0 && empty($parent_file)) || ($parent_file && ($item[2] == $parent_file))) $class = ' class="current"';
     108<?php
    89109
    90     if ( !empty($submenu[$item[2]]) ) {
    91         $submenu[$item[2]] = array_values($submenu[$item[2]]);  // Re-index.
    92         $menu_hook = get_plugin_page_hook($submenu[$item[2]][0][2], $item[2]);
    93         if ( file_exists(WP_PLUGIN_DIR . "/{$submenu[$item[2]][0][2]}") || !empty($menu_hook))
    94             echo "\n\t<li><a href='admin.php?page={$submenu[$item[2]][0][2]}'$class>{$item[0]}</a></li>";
    95         else
    96             echo "\n\t<li><a href='{$submenu[$item[2]][0][2]}'$class>{$item[0]}</a></li>";
    97     } else if ( current_user_can($item[1]) ) {
    98         $menu_hook = get_plugin_page_hook($item[2], 'admin.php');
    99         if ( file_exists(WP_PLUGIN_DIR . "/{$item[2]}") || !empty($menu_hook) )
    100             echo "\n\t<li><a href='admin.php?page={$item[2]}'$class>{$item[0]}</a></li>";
    101         else
    102             echo "\n\t<li><a href='{$item[2]}'$class>{$item[0]}</a></li>";
    103     }
    104 }
     110_wp_menu_output( $top_menu, $top_submenu, false );
     111do_action( 'dashmenu' );
    105112
    106 do_action( 'adminmenu' );
    107113?>
    108 </ul>
    109114
    110 <ul id="sidemenu">
    111 <?php
    112 $side_items = array();
    113 foreach ( $menu as $key => $item ) {
    114     if ( 26 > $key || $key > 40 )
    115         continue;
    116115
    117     $class = '';
    118 
    119     // 0 = name, 1 = capability, 2 = file
    120     if (( strcmp($self, $item[2]) == 0 && empty($parent_file)) || ($parent_file && ($item[2] == $parent_file))) $class = ' class="current"';
    121 
    122     if ( !empty($submenu[$item[2]]) ) {
    123         $submenu[$item[2]] = array_values($submenu[$item[2]]);  // Re-index.
    124         $menu_hook = get_plugin_page_hook($submenu[$item[2]][0][2], $item[2]);
    125         if ( file_exists(WP_PLUGIN_DIR . "/{$submenu[$item[2]][0][2]}") || !empty($menu_hook))
    126             $side_items[] = "\n\t<li><a href='admin.php?page={$submenu[$item[2]][0][2]}'$class>{$item[0]}</a>";
    127         else
    128             $side_items[] = "\n\t<li><a href='{$submenu[$item[2]][0][2]}'$class>{$item[0]}</a>";
    129     } else if ( current_user_can($item[1]) ) {
    130         $menu_hook = get_plugin_page_hook($item[2], 'admin.php');
    131         if ( file_exists(WP_PLUGIN_DIR . "/{$item[2]}") || !empty($menu_hook) )
    132             $side_items[] = "\n\t<li><a href='admin.php?page={$item[2]}'$class>{$item[0]}</a>";
    133         else
    134             $side_items[] = "\n\t<li><a href='{$item[2]}'$class>{$item[0]}</a>";
    135     }
    136 }
    137 echo implode(' </li>', $side_items) . '</li>';
    138 unset($side_items);
    139 do_action( 'sidemenu' );
    140 ?>
    141116</ul>
    142117
    143118
     119<ul id="adminmenu" class="wp-menu">
     120
     121<li class="write-new-button"><a class="button-secondary" href="post-new.php">Write New Post</a></li>
     122
    144123<?php
    145 // Sub-menu
    146 if ( isset($submenu["$parent_file"]) ) :
    147 ?>
    148 <ul id="submenu">
    149 <?php
    150 foreach ($submenu["$parent_file"] as $item) :
    151      if ( !current_user_can($item[1]) )
    152          continue;
    153124
    154 if ( isset($submenu_file) ) {
    155     if ( $submenu_file == $item[2] ) $class = ' class="current"';
    156     else $class = '';
    157 } else if ( (isset($plugin_page) && $plugin_page == $item[2]) || (!isset($plugin_page) && $self == $item[2]) ) $class = ' class="current"';
    158 else $class = '';
     125_wp_menu_output( $menu, $submenu );
     126do_action( 'adminmenu' );
    159127
    160 $menu_hook = get_plugin_page_hook($item[2], $parent_file);
    161 
    162 if (file_exists(WP_PLUGIN_DIR . "/{$item[2]}") || ! empty($menu_hook)) {
    163     if ( 'admin.php' == $pagenow )
    164         echo "\n\t<li><a href='admin.php?page={$item[2]}'$class>{$item[0]}</a></li>";
    165     else
    166         echo "\n\t<li><a href='{$parent_file}?page={$item[2]}'$class>{$item[0]}</a></li>";
    167  } else {
    168     echo "\n\t<li><a href='{$item[2]}'$class>{$item[0]}</a></li>";
    169  }
    170 endforeach;
    171128?>
    172129
     130
    173131</ul>
     132
    174133<?php
    175 else :
    176 ?>
    177 <div id="minisub"></div>
    178 <?php
    179 
    180 endif;
    181134
    182135do_action('admin_notices');
  • trunk/wp-admin/menu.php

    r8645 r8691  
    1919 * @var array
    2020 */
    21 $menu[0] = array(__('Dashboard'), 'read', 'index.php');
    22 
    23 if (strpos($_SERVER['REQUEST_URI'], 'edit-pages.php') !== false)
    24     $menu[5] = array(__('Write'), 'edit_pages', 'page-new.php');
    25 elseif (strpos($_SERVER['REQUEST_URI'], 'link-manager.php') !== false)
    26     $menu[5] = array(__('Write'), 'manage_links', 'link-add.php');
    27 else
    28     $menu[5] = array(__('Write'), 'edit_posts', 'post-new.php');
    29 
    30 if (strpos($_SERVER['REQUEST_URI'], 'page-new.php') !== false)
    31     $menu[10] = array(__('Manage'), 'edit_pages', 'edit-pages.php');
    32 elseif (strpos($_SERVER['REQUEST_URI'], 'link-add.php') !== false)
    33     $menu[10] = array(__('Manage'), 'manage_links', 'link-manager.php');
    34 else
    35     $menu[10] = array(__('Manage'), 'edit_posts', 'edit.php');
    3621
    3722$awaiting_mod = wp_count_comments();
    3823$awaiting_mod = $awaiting_mod->moderated;
    39 $menu[15] = array(__('Design'), 'switch_themes', 'themes.php');
    40 $menu[20] = array( sprintf( __('Comments %s'), "<span id='awaiting-mod' class='count-$awaiting_mod'><span class='comment-count'>" . number_format_i18n($awaiting_mod) . "</span></span>" ), 'edit_posts', 'edit-comments.php');
    41 $menu[30] = array(__('Settings'), 'manage_options', 'options-general.php');
    4224
    43 $update_plugins = get_option( 'update_plugins' );
    44 $update_count = 0;
    45 if ( isset( $update_plugins->response ) )
    46     $update_count = count( $update_plugins->response );
     25$inbox_num = count( wp_get_inbox_items() );
     26$awaiting_mod = wp_count_comments();
     27$awaiting_mod = $awaiting_mod->moderated;
    4728
    48 $menu[35] = array( sprintf( __('Plugins %s'), "<span id='update-plugins' class='count-$update_count'><span class='plugin-count'>" . number_format_i18n($update_count) . "</span></span>" ), 'activate_plugins', 'plugins.php');
    49 if ( current_user_can('edit_users') )
    50     $menu[40] = array(__('Users'), 'edit_users', 'users.php');
    51 else
    52     $menu[40] = array(__('Profile'), 'read', 'profile.php');
     29$top_menu = $top_submenu = $menu = $submenu = array();
    5330
    54 $_wp_real_parent_file['post.php'] = 'post-new.php'; // Back-compat
    55 $submenu['post-new.php'][5] = array(__('Post'), 'edit_posts', 'post-new.php');
    56 $submenu['post-new.php'][10] = array(__('Page'), 'edit_pages', 'page-new.php');
    57 $submenu['post-new.php'][15] = array(__('Link'), 'manage_links', 'link-add.php');
     31$top_menu[5]  = array( __('My Account'), 'read', 'profile.php' );
     32$top_menu[10] = array( __('My Dashboard'), 'read', 'index.php' );
     33$top_menu[15] = array( __('New Post'), 'edit_posts', 'post-new.php', 'highlighted' );
     34//$top_menu[20] = array( sprintf( __('Inbox (%s)'), "<span id='inbox-num' class='count-$inbox_num'><span class='inbox-count'>" . number_format_i18n($inbox_num) . "</span></span>" ), 'edit_posts', 'inbox.php' );
     35$top_menu[20] = array( sprintf( __('Comments (%s)'), "<span id='awaiting-mod' class='count-$awaiting_mod'><span class='comment-count'>" . number_format_i18n($awaiting_mod) . "</span></span>" ), 'edit_posts', 'edit-comments.php');
     36$top_menu[25] = array( __('Help'), 'read', 'index.php?help' ); // place holder
    5837
    59 $submenu['edit-comments.php'][5] = array(__('Comments'), 'edit_posts', 'edit-comments.php');
     38$top_submenu['profile.php'][5]  = array( __('Profile'), 'read', 'profile.php' );
     39$top_submenu['profile.php'][10] = array( __('Stats'), 'read', 'inbox.php?page=stats' ); // place holder
    6040
    61 $submenu['edit.php'][5] = array(__('Posts'), 'edit_posts', 'edit.php');
    62 $submenu['edit.php'][10] = array(__('Pages'), 'edit_pages', 'edit-pages.php');
    63 $submenu['edit.php'][15] = array(__('Links'), 'manage_links', 'link-manager.php');
    64 $submenu['edit.php'][20] = array(__('Categories'), 'manage_categories', 'categories.php');
    65 $submenu['edit.php'][25] = array(__('Tags'), 'manage_categories', 'edit-tags.php');
    66 $submenu['edit.php'][30] = array(__('Link Categories'), 'manage_categories', 'edit-link-categories.php');
    67 $submenu['edit.php'][35] = array(__('Media Library'), 'upload_files', 'upload.php');
    68 $submenu['edit.php'][40] = array(__('Import'), 'import', 'import.php');
    69 $submenu['edit.php'][45] = array(__('Export'), 'import', 'export.php');
    7041
    71 if ( current_user_can('edit_users') ) {
    72     $_wp_real_parent_file['profile.php'] = 'users.php'; // Back-compat for plugins adding submenus to profile.php.
    73     $submenu['users.php'][5] = array(__('Authors &amp; Users'), 'edit_users', 'users.php');
    74     $submenu['users.php'][10] = array(__('Your Profile'), 'read', 'profile.php');
    75 } else {
    76     $_wp_real_parent_file['users.php'] = 'profile.php';
    77     $submenu['profile.php'][5] = array(__('Your Profile'), 'read', 'profile.php');
    78 }
     42$menu[0] = array( __('Dashboard'), 'read', 'index.php' );
    7943
    80 $submenu['options-general.php'][10] = array(__('General'), 'manage_options', 'options-general.php');
    81 $submenu['options-general.php'][15] = array(__('Writing'), 'manage_options', 'options-writing.php');
    82 $submenu['options-general.php'][20] = array(__('Reading'), 'manage_options', 'options-reading.php');
    83 $submenu['options-general.php'][25] = array(__('Discussion'), 'manage_options', 'options-discussion.php');
    84 $submenu['options-general.php'][30] = array(__('Privacy'), 'manage_options', 'options-privacy.php');
    85 $submenu['options-general.php'][35] = array(__('Permalinks'), 'manage_options', 'options-permalink.php');
    86 $submenu['options-general.php'][40] = array(__('Miscellaneous'), 'manage_options', 'options-misc.php');
     44$menu[5] = array( __('Content'), 'edit_posts', 'edit.php', 'wp-menu-open' );
     45    $submenu['edit.php'][5]  = array( __('Posts'), 'edit_posts', 'edit.php' );
     46    $submenu['edit.php'][10] = array( __('Comments'), 'edit_posts', 'edit-comments.php' );
     47    $submenu['edit.php'][15] = array( __('Media Library'), 'upload_files', 'upload.php' );
     48    $submenu['edit.php'][20] = array( __('Links'), 'manage_links', 'link-manager.php' );
     49    $submenu['edit.php'][25] = array( __('Pages'), 'edit_pages', 'edit-pages.php' );
    8750
    88 $submenu['plugins.php'][5] = array(__('Plugins'), 'activate_plugins', 'plugins.php');
    89 $submenu['plugins.php'][10] = array(__('Plugin Editor'), 'edit_plugins', 'plugin-editor.php');
     51$menu[10] = array( __('Templates'), 'switch_themes', 'themes.php' );
     52    $submenu['themes.php'][5]  = array(__('Themes'), 'switch_themes', 'themes.php');
     53    $submenu['themes.php'][10] = array(__('Theme Editor'), 'edit_themes', 'theme-editor.php');
    9054$submenu['plugins.php'][15] = array(__('Install Plugins'), 'install_plugins', 'plugin-install.php');
    9155
    92 $submenu['themes.php'][5] = array(__('Themes'), 'switch_themes', 'themes.php');
    93 $submenu['themes.php'][10] = array(__('Theme Editor'), 'edit_themes', 'theme-editor.php');
     56$menu[15] = array( __('Utilities'), 'read', 'users.php' ); // placeholder - should be inbox
     57    $submenu['users.php'][5]  = array( __('Inbox'), 'read', 'inbox.php' );
     58    $submenu['users.php'][10] = array( __('Tags'), 'manage_categories', 'edit-tags.php' );
     59    $submenu['users.php'][15] = array( __('Categories'), 'manage_categories', 'categories.php' );
     60    $submenu['users.php'][20] = array( __('Link Categories'), 'manage_categories', 'edit-link-categories.php' );
     61    $submenu['users.php'][25] = array( __('Users'), 'edit_users', 'users.php' );
     62    $submenu['users.php'][30] = array( __('Import'), 'import', 'import.php' );
     63    $submenu['users.php'][35] = array( __('Export'), 'import', 'export.php' );
     64    $submenu['users.php'][40] = array( __('Settings'), 'manage_options', 'options-general.php' );
     65        $_wp_real_parent_file['options-general.php'] = 'users.php';
     66        $submenu['options-general.php'][10] = array( __('General'), 'manage_options', 'options-general.php' );
     67        $submenu['options-general.php'][15] = array( __('Writing'), 'manage_options', 'options-writing.php' );
     68        $submenu['options-general.php'][20] = array( __('Reading'), 'manage_options', 'options-reading.php' );
     69        $submenu['options-general.php'][25] = array( __('Discussion'), 'manage_options', 'options-discussion.php' );
     70        $submenu['options-general.php'][30] = array( __('Privacy'), 'manage_options', 'options-privacy.php' );
     71        $submenu['options-general.php'][35] = array( __('Permalinks'), 'manage_options', 'options-permalink.php' );
     72        $submenu['options-general.php'][40] = array( __('Miscellaneous'), 'manage_options', 'options-misc.php' );
     73
     74$menu[20] = array( __('Plugins'), 'activate_plugins', 'plugins.php' );
     75    $submenu['plugins.php'][5]  = array( __('Plugins'), 'activate_plugins', 'plugins.php' );
     76    $submenu['plugins.php'][10] = array( __('Plugin Editor'), 'edit_plugins', 'plugin-editor.php' );
    9477
    9578do_action('_admin_menu');
     
    10386$_wp_menu_nopriv = array();
    10487// Loop over submenus and remove pages for which the user does not have privs.
    105 foreach ($submenu as $parent => $sub) {
    106     foreach ($sub as $index => $data) {
    107         if ( ! current_user_can($data[1]) ) {
    108             unset($submenu[$parent][$index]);
    109             $_wp_submenu_nopriv[$parent][$data[2]] = true;
     88foreach ( array( 'top_submenu', 'submenu' ) as $sub_loop ) {
     89    foreach ($$sub_loop as $parent => $sub) {
     90        foreach ($sub as $index => $data) {
     91            if ( ! current_user_can($data[1]) ) {
     92                unset(${$sub_loop}[$parent][$index]);
     93                $_wp_submenu_nopriv[$parent][$data[2]] = true;
     94            }
    11095        }
     96
     97        if ( empty(${$sub_loop}[$parent]) )
     98            unset(${$sub_loop}[$parent]);
    11199    }
    112 
    113     if ( empty($submenu[$parent]) )
    114         unset($submenu[$parent]);
    115100}
    116101
  • trunk/wp-admin/options-discussion.php

    r8656 r8691  
    1717
    1818<div class="wrap">
     19<ul class="wp-menu">
     20<?php $array = array(); _wp_menu_output( $submenu['options-general.php'], $array ); unset($array); ?>
     21</ul>
    1922<h2><?php _e('Discussion Settings') ?></h2>
    2023<form method="post" action="options.php">
  • trunk/wp-admin/options-general.php

    r8656 r8691  
    1111
    1212$title = __('General Settings');
    13 $parent_file = 'options-general.php';
    1413
    1514include('./admin-header.php');
     
    1716
    1817<div class="wrap">
     18<ul class="wp-menu">
     19<?php $array = array(); _wp_menu_output( $submenu['options-general.php'], $array ); unset($array); ?>
     20</ul>
    1921<h2><?php _e('General Settings') ?></h2>
    2022<form method="post" action="options.php">
  • trunk/wp-admin/options-misc.php

    r8656 r8691  
    1818
    1919<div class="wrap">
     20<ul class="wp-menu">
     21<?php $array = array(); _wp_menu_output( $submenu['options-general.php'], $array ); unset($array); ?>
     22</ul>
    2023<h2><?php _e('Miscellaneous Settings') ?></h2>
    2124<form method="post" action="options.php">
  • trunk/wp-admin/options-permalink.php

    r8656 r8691  
    124124
    125125<div class="wrap">
     126<ul class="wp-menu">
     127<?php $array = array(); _wp_menu_output( $submenu['options-general.php'], $array ); unset($array); ?>
     128</ul>
    126129  <h2><?php _e('Customize Permalink Structure') ?></h2>
    127130<form name="form" action="options-permalink.php" method="post">
  • trunk/wp-admin/options-privacy.php

    r8645 r8691  
    1717
    1818<div class="wrap">
     19<ul class="wp-menu">
     20<?php $array = array(); _wp_menu_output( $submenu['options-general.php'], $array ); unset($array); ?>
     21</ul>
    1922<h2><?php _e('Privacy Settings') ?></h2>
    2023<form method="post" action="options.php">
  • trunk/wp-admin/options-reading.php

    r8656 r8691  
    1717
    1818<div class="wrap">
     19<ul class="wp-menu">
     20<?php $array = array(); _wp_menu_output( $submenu['options-general.php'], $array ); unset($array); ?>
     21</ul>
    1922<h2><?php _e('Reading Settings') ?></h2>
    2023<form name="form1" method="post" action="options.php">
  • trunk/wp-admin/options-writing.php

    r8656 r8691  
    1717
    1818<div class="wrap">
     19<ul class="wp-menu">
     20<?php $array = array(); _wp_menu_output( $submenu['options-general.php'], $array ); unset($array); ?>
     21</ul>
    1922<h2><?php _e('Writing Settings') ?></h2>
    2023<form method="post" action="options.php">
  • trunk/wp-admin/options.php

    r8656 r8691  
    5959
    6060<div class="wrap">
     61<ul class="wp-menu">
     62<?php $array = array(); _wp_menu_output( $submenu['options-general.php'], $array ); unset($array); ?>
     63</ul>
    6164  <h2><?php _e('All Settings'); ?></h2>
    6265  <form name="form" action="options.php" method="post" id="all-options">
  • trunk/wp-admin/page-new.php

    r8656 r8691  
    1010require_once('admin.php');
    1111$title = __('New Page');
    12 $parent_file = 'post-new.php';
     12$parent_file = 'edit.php';
     13$submenu_file = 'edit-pages.php';
    1314$editing = true;
    1415wp_enqueue_script('autosave');
  • trunk/wp-admin/plugins.php

    r8656 r8691  
    1818}
    1919
    20 if( isset($_GET['action']) )
    21     $action = $_GET['action'];
     20if( isset($_REQUEST['action']) )
     21    $action = $_REQUEST['action'];
    2222
    2323$plugin = isset($_REQUEST['plugin']) ? $_REQUEST['plugin'] : '';
     
    328328<div class="tablenav">
    329329    <div class="alignleft">
    330         <input type="submit" name="deactivate-selected" value="<?php _e('Deactivate') ?>" class="button-secondary" />
     330        <select name="action">
     331            <option value="" selected><?php _e('Actions'); ?></option>
     332            <option value="deactivate-selected"><?php _e('Deactivate'); ?></option>
     333        </select>
     334        <input type="submit" name="doaction" value="<?php _e('Apply'); ?>" class="button-secondary action" />
    331335    </div>
    332336</div>
     
    346350<div class="tablenav">
    347351    <div class="alignleft">
    348         <input type="submit" name="activate-selected" value="<?php _e('Activate') ?>" class="button-secondary" />
     352        <select name="action">
     353            <option value="" selected><?php _e('Actions'); ?></option>
     354            <option value="activate-selected"><?php _e('Activate'); ?></option>
    349355<?php if( current_user_can('delete_plugins') ) : ?>
    350         <input type="submit" name="delete-selected" value="<?php _e('Delete') ?>" class="button-secondary" />
    351 <?php endif; ?>
     356            <option value="delete-selected"><?php _e('Delete'); ?></option>
     357<?php endif; ?>
     358        </select>
     359        <input type="submit" value="<?php _e('Apply'); ?>" name="doaction" class="button-secondary action" />
    352360        <input type="submit" name="clear-recent-list" value="<?php _e('Clear List') ?>" class="button-secondary" />
    353361    </div>
  • trunk/wp-admin/post-new.php

    r8645 r8691  
    1010require_once('admin.php');
    1111$title = __('Create New Post');
    12 $parent_file = 'post-new.php';
     12$parent_file = 'edit.php';
     13$submenu_file = 'edit.php';
    1314$editing = true;
    1415wp_enqueue_script('autosave');
  • trunk/wp-admin/post.php

    r8656 r8691  
    3636    } elseif ( !empty($_POST['mode']) && 'sidebar' == $_POST['mode'] ) {
    3737        $location = 'sidebar.php?a=b';
    38     } elseif ( isset($_POST['save']) && ( empty($referredby) || $referredby == $referer || 'redo' != $referredby ) ) {
     38    } elseif ( ( isset($_POST['save']) || isset($_POST['publish']) ) && ( empty($referredby) || $referredby == $referer || 'redo' != $referredby ) ) {
    3939        if ( $_POST['_wp_original_http_referer'] && strpos( $_POST['_wp_original_http_referer'], '/wp-admin/post.php') === false && strpos( $_POST['_wp_original_http_referer'], '/wp-admin/post-new.php') === false )
    4040            $location = add_query_arg( array(
     
    4343            ), get_edit_post_link( $post_ID, 'url' ) );
    4444        else
    45             $location = add_query_arg( 'message', 4, get_edit_post_link( $post_ID, 'url' ) );
     45            $location = add_query_arg( 'message', 6, get_edit_post_link( $post_ID, 'url' ) );
    4646    } elseif (isset($_POST['addmeta']) && $_POST['addmeta']) {
    4747        $location = add_query_arg( 'message', 2, wp_get_referer() );
     
    6363    } elseif ($action == 'editattachment') {
    6464        $location = 'attachments.php';
     65    } elseif ( 'post-quickpress-save-cont' == $_POST['action'] ) {
     66        $location = "post.php?action=edit&post=$post_ID&message=7";
    6567    } else {
    6668        $location = add_query_arg( 'message', 4, get_edit_post_link( $post_ID, 'url' ) );
     
    7678case 'postajaxpost':
    7779case 'post':
     80case 'post-quickpress-publish':
     81case 'post-quickpress-save':
     82case 'post-quickpress-save-cont':
    7883    check_admin_referer('add-post');
    7984
    80     $post_ID = 'post' == $action ? write_post() : edit_post();
     85    if ( 'post-quickpress-publish' == $action )
     86        $_POST['publish'] = 'publish'; // tell write_post() to publish
     87
     88    if ( !empty( $_POST['quickpress_post_ID'] ) ) {
     89        $_POST['post_ID'] = (int) $_POST['quickpress_post_ID'];
     90        $post_ID = edit_post();
     91    } else {
     92        $post_ID = 'postajaxpost' == $action ? edit_post() : write_post();
     93    }
     94
     95    if ( 'post-quickpress-save-cont' != $action && 0 === strpos( $action, 'post-quickpress' ) ) {
     96        $_POST['post_ID'] = $post_ID;
     97        // output the quickpress dashboard widget
     98        require_once(ABSPATH . 'wp-admin/includes/dashboard.php');
     99        add_filter( 'wp_dashboard_widgets', create_function( '$a', 'return array( "dashboard_quick_press" );' ) );
     100        wp_dashboard_setup();
     101        wp_dashboard();
     102        exit;
     103    }
    81104
    82105    redirect_post($post_ID);
  • trunk/wp-admin/press-this.php

    r8656 r8691  
    335335    wp_enqueue_style('press-this-ie');
    336336    wp_enqueue_style( 'colors' );
    337     wp_enqueue_script('post');
     337    wp_enqueue_script( 'post' );
    338338    wp_enqueue_script('editor_functions');
     339
     340//  wp_teeny_mce();
    339341
    340342    do_action('admin_print_styles');
  • trunk/wp-admin/rtl.css

    r8663 r8691  
    102102    padding: 11px 12px 16px 170px;
    103103}
     104
     105#curtime
     106{
     107    background-position:right 2px;
     108    padding-left:0;
     109    padding-right: 9px;
     110}
     111
    104112#dashmenu {
    105113    right:0;
  • trunk/wp-admin/users.php

    r8656 r8691  
    2323
    2424if ( empty($action) ) {
    25     if ( isset($_GET['deleteit']) )
    26         $action = 'delete';
    27     elseif ( isset($_GET['changeit']) && !empty($_GET['new_role']) )
     25    if ( isset($_GET['changeit']) && !empty($_GET['new_role']) )
    2826        $action = 'promote';
    2927}
     
    259257<form id="posts-filter" action="" method="get">
    260258    <?php if ( $wp_user_search->is_search() ) : ?>
    261         <h2><?php printf(__('Users Matching "%s"'), wp_specialchars($wp_user_search->search_term)); ?></h2>
     259        <h2><?php printf( current_user_can('create_users') ? __('Users Matching "%2$s" (<a href="%1$s">Add New</a>)') : __('Add New'), '#add-new-user', wp_specialchars($wp_user_search->search_term) ); ?></h2>
    262260    <?php else : ?>
    263         <h2><?php _e('Manage Users'); ?></h2>
     261        <h2><?php printf( current_user_can('create_users') ? __('Users (<a href="%s">Add New</a>)') : __('Add New'), '#add-new-user' ); ?></h2>
    264262    <?php endif; ?>
    265263
     
    302300?>
    303301</ul>
     302
    304303    <p id="post-search">
    305304    <label class="hidden" for="post-search-input"><?php _e( 'Search Users' ); ?>:</label>
     
    315314
    316315<div class="alignleft">
    317 <input type="submit" value="<?php _e('Delete'); ?>" name="deleteit" class="button-secondary delete" />
     316<select name="action">
     317<option value="" selected><?php _e('Actions'); ?></option>
     318<option value="delete"><?php _e('Delete'); ?></option>
     319</select>
     320<input type="submit" value="<?php _e('Apply'); ?>" name="doaction" class="button-secondary action" />
    318321<label class="hidden" for="new_role"><?php _e('Change role to&hellip;') ?></label><select name="new_role" id="new_role"><option value=''><?php _e('Change role to&hellip;') ?></option>"<?php wp_dropdown_roles(); ?></select>
    319322<input type="submit" value="<?php _e('Change'); ?>" name="changeit" class="button-secondary" />
  • trunk/wp-admin/wp-admin.css

    r8682 r8691  
    247247}
    248248
    249 .unapproved .approve {
     249.unapproved .approve, .spam .approve {
    250250    display: inline;
    251251}
     
    280280
    281281#postdiv, #titlediv, #guiddiv, #poststuff .stuffbox {
    282     margin: 0 8px 0 0;
    283     padding: 0;
    284 }
    285 
    286 #titlediv, #namediv, #poststuff #namediv {
    287     margin-top: 10px;
     282    margin: 0;
     283    padding: 0;
     284}
     285
     286#emaildiv input, #uridiv input {
     287    width: 94%;
    288288}
    289289
     
    408408#postcustomstuff table #addmetasub {
    409409    width: auto;
    410 }
    411 
    412 #poststuff #post-body {
    413     margin-right: 230px;
    414410}
    415411
     
    508504
    509505.comment-column {
    510     margin-left: 5px;
     506    width: 50%;
     507}
     508
     509.comment-column p {
     510    margin-top: 0;
     511}
     512
     513.author-column {
     514    width: 20%;
     515}
     516
     517.response-column {
     518    width: 20%;
     519}
     520
     521.author-column img {
     522    float: left;
     523    margin-right: 10px;
     524    margin-top: 3px;
    511525}
    512526
     
    587601    position: absolute;
    588602    right: 15px;
    589     top: 11px;
     603    top: 0;
    590604    font-size: 11px;
     605    line-height: 31px;
     606    height: 31px;
    591607}
    592608
     
    594610    margin: 0;
    595611    padding: 0;
     612    line-height: 31px;
    596613}
    597614
    598615#wphead {
    599     border-top-width: 30px;
    600     border-top-style: solid;
    601 }
    602 
    603 #wphead a, #dashmenu a, #adminmenu a, #submenu a, #sidemenu a, #taglist a, #catlist a {
     616    border-width: 31px 0 0;
     617    border-style: solid;
     618}
     619
     620#wphead a, #dashmenu a, #adminmenu a, #sidemenu a, #taglist a, #catlist a {
    604621    text-decoration: none;
    605622}
     
    623640}
    624641
     642ul#adminmenu li.write-new-button {
     643    margin: -10px 18px 12px;
     644}
     645ul#adminmenu li.write-new-button a {
     646    line-height: 1.2em;
     647    font: 12px "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif;
     648    padding: 6px 4px;
     649    letter-spacing: normal;
     650    border-width: 1px;
     651    border-style: solid;
     652    -moz-border-radius: 3px;
     653    -khtml-border-radius: 3px;
     654    -webkit-border-radius: 3px;
     655    border-radius: 3px;
     656    text-indent: 0;
     657    text-align: center;
     658    color: #246;
     659}
     660   
     661
    625662#wphead h1 {
    626663    font: normal 36px Georgia, "Times New Roman", Times, serif;
     
    632669/* menu stuff */
    633670
     671#dashmenu .wp-submenu, #adminmenu .wp-submenu {
     672    display: none;
     673    list-style: none;
     674    margin: 2px 0 0;
     675    padding: 0;
     676}
     677
     678#adminmenu li.wp-menu-open .wp-submenu {
     679    display: block;
     680}
     681
    634682#dashmenu {
    635     margin: 0;
     683    margin: 0 0 0 12px;
     684    background: url(images/logo-ghost.png) no-repeat center left;
    636685    list-style: none;
    637686    position: absolute;
    638     top: 7px;
     687    top: 0;
    639688    left: 0;
     689    height: 31px;
    640690    font-size: 11px;
    641     padding-left: 9px;
     691    padding: 0 0 0 30px;
     692}
     693
     694#dashmenu li {
     695    display: block;
     696    float: left;
     697    list-style: none;
     698    white-space: nowrap;
     699    margin: 0 5px 0 0;
     700    padding: 0;
     701    position: relative;
     702}
     703
     704#dashmenu li.highlighted {
     705    margin-left: 6px;
     706    text-align: center;
     707    padding: 1  px 0;
     708}
     709
     710#dashmenu li.highlighted a {
     711    background: #666;
     712    border: 1px solid #888;
     713    -webkit-border-radius: 3px;
     714    -moz-border-radius: 3px;
     715    -border-radius: 3px;
     716    color: #ddd;
     717    margin-top: 4px;
     718    display: block;
     719    padding: 5px 10px;
     720    line-height: 1em;
     721}
     722
     723#dashmenu li.highlighted a:hover {
     724    color: #fff;
     725    border-color: #aaa;
     726}
     727
     728/* Temp */
     729#dashmenu li.wp-has-submenu > a:after {
     730    content: " \25BC";
    642731}
    643732
    644733#dashmenu a {
    645734    padding: 5px 6px;
    646     line-height: 220%;
    647     margin-right: 8px;
    648 }
    649 
    650 #dashmenu a.current {
     735    line-height: 31px;
     736}
     737
     738#dashmenu ul {
     739    position: absolute;
     740    top: 29px;
     741    left: 0;
     742    min-width: 100%;
     743}
     744
     745#dashmenu ul {
     746    background: #fff;
     747    border: 1px solid #c6d9e9;
     748    -webkit-border-bottom-left-radius:7px;
     749    -webkit-border-bottom-right-radius:7px;
     750    -webkit-box-shadow:0 2px 6px rgba(0,0,0,0.2);
     751    -moz-border-radius-bottomleft: 7px;
     752    -moz-border-radius-bottomright: 7px;
     753    -moz-box-shadow:0 2px 6px rgba(0,0,0,0.2);
     754}
     755
     756#dashmenu ul a {
     757    color: #2583ad;
     758    display: block;
     759    padding: 0 4px;
     760}
     761
     762#dashmenu ul a:hover {
     763    color: #d54e21;
     764}
     765
     766#dashmenu ul li {
     767    float: none;
     768    margin-left: 5px;
     769}
     770
     771#adminmenu {
     772    margin: 0;
     773    padding: 10px 0 0 10px;
     774    list-style: none;
     775}
     776
     777#adminmenu li {
     778    margin-bottom: 10px;
     779}
     780
     781#adminmenu li.current {
     782    border-width: 1px;
     783    border-style: solid;
     784    position: relative;
     785    right: -1px;
     786    padding: 2px 0;
     787}
     788
     789#adminmenu li .wp-submenu {
     790    margin-top: 4px;
     791}
     792
     793#adminmenu li .wp-submenu li {
     794    padding: 3px 0 3px 1px;
     795    margin-bottom: 0;
     796}
     797
     798#adminmenu li .wp-submenu li.current {
     799    padding: 2px 0;
     800}
     801
     802#adminmenu li.wp-has-submenu > a {
     803    background-image: url(images/menu-closed.png);
     804    background-repeat: no-repeat;
     805    background-position: left center;
     806}
     807
     808#adminmenu li.wp-menu-open > a {
     809    background-image: url(images/menu-open.png);
     810}
     811
     812#adminmenu a {
     813    font-size: 13px;
     814    padding: 0px 7px 0px 36px;
     815    line-height: 1.1;
     816    display: block;
     817    text-indent: -18px;
     818}
     819
     820#adminmenu li.current a {
     821    padding-left: 34px;
     822}
     823
     824#adminmenu li a #awaiting-mod, #sidemenu li a #update-plugins {
     825    position: absolute;
     826    margin-top: 0.2em;
     827    font-size: 0.7em;
     828    background-repeat: no-repeat;
     829    background-position: 0 bottom;
     830    height: 0.9em;
     831    width: 1em;
     832}
     833
     834#adminmenu li a .count-0, #sidemenu li a .count-0 {
     835    display: none;
     836}
     837
     838.post-com-count-wrapper {
     839    min-width: 22px;
     840}
     841
     842.post-com-count {
     843    height: 1.3em;
     844    line-height: 1.1em;
     845    display: block;
     846    text-decoration: none;
     847    padding: 0 0 6px;
     848    cursor: pointer;
     849    background-position: center -80px;
     850    background-repeat: no-repeat;
     851}
     852
     853.post-com-count span {
     854    height: 1.3em;
     855    line-height: 1.2em;
     856    padding: 0 0.5em;
     857    background-color: #bbb;
     858    display: inline-block;
     859    cursor: pointer;
     860    -moz-border-radius: 3px;
     861    -khtml-border-radius: 3px;
     862    -webkit-border-radius: 3px;
     863    border-radius: 3px;
     864}
     865
     866strong .post-com-count {
     867    background-position: center -55px;
     868}
     869
     870.post-com-count:hover {
     871    background-position: center -3px;
     872}
     873
     874#adminmenu li a:hover #awaiting-mod, #sidemenu li a:hover #update-plugins {
     875    background-position: -80px bottom;
     876}
     877
     878#adminmenu li a #awaiting-mod span, #sidemenu li a #update-plugins span {
     879    top: -0.8em;
     880    right: 0;
     881    position: absolute;
     882    display: block;
     883    height: 1.3em;
     884    line-height: 1.3em;
     885    padding: 0 0.6em;
     886    -moz-border-radius: 3px;
     887    -khtml-border-radius: 3px;
     888    -webkit-border-radius: 3px;
     889    border-radius: 3px;
     890}
     891
     892#wpbody ul.wp-menu {
     893    list-style: none;
     894    margin: 10px 0;
     895    padding: 0;
     896    font-size: 16px;
     897}
     898
     899#wpbody ul.wp-menu li {
     900    display: inline;
     901}
     902
     903#wpbody ul.wp-menu li:before {
     904    content: " | ";
     905}
     906
     907#wpbody ul.wp-menu li.wp-first-item:before {
     908    content: "";
     909}
     910
     911#wpbody ul.wp-menu li.current a {
     912    text-decoration: none;
     913    color: #666;
     914}
     915
     916/* end menu stuff */
     917
     918/* Admin Footer */
     919
     920html, body {
     921    height:100%;
     922}
     923#wpwrap {
     924    position: relative;
     925    min-height: 100%;
     926}
     927#footer {
     928    clear: both;
     929    height: 65px;
     930    padding: 10px 0 0 60px;
     931    margin: 0;
     932    position: relative;
     933    margin-top: -75px;
     934    font-size: 12px;
     935}
     936
     937#footer p {
     938    margin: 0;
     939    padding: 7px 0;
     940}
     941
     942#footer p a {
     943    text-decoration: none;
     944}
     945
     946#footer p a:hover {
     947    text-decoration: underline;
     948}
     949
     950/* Tables used on comment.php and option/setting pages */
     951
     952.form-table {
     953    border-collapse: collapse;
     954    margin-top: 1em;
     955    width: 100%;
     956    margin-bottom: -8px;
     957}
     958
     959.form-table td {
     960    margin-bottom: 9px;
     961    padding: 10px;
     962    line-height: 20px;
     963    border-bottom-width: 8px;
     964    border-bottom-style: solid;
     965    font-size: 11px;
     966}
     967
     968.form-table th {
     969    vertical-align: top;
     970    text-align: left;
     971    padding: 10px;
     972    width: 150px;
     973    border-bottom-width: 8px;
     974    border-bottom-style: solid;
     975}
     976
     977.form-table th.th-full {
     978    width: auto;
     979}
     980
     981.form-table input, .form-table textarea {
     982    border-width: 1px;
     983    border-style: solid;
     984}
     985
     986.form-table div.color-option {
     987    display: block;
     988    clear: both;
     989}
     990
     991.form-table input.tog {
     992    margin-top: 2px;
     993    margin-right: 2px;
     994    float: left;
     995}
     996
     997.form-table table.color-palette {
     998    vertical-align: bottom;
     999    float: left;
     1000    margin: -3px 3px 8px;
     1001}
     1002
     1003.form-table .color-palette td {
     1004    border-bottom: none;
     1005    border: 1px solid #fff;
     1006    font-size: 1px;
     1007    line-height: 1px;
     1008}
     1009
     1010#profile-page .form-table textarea {
     1011    width: 500px;
     1012    margin-bottom: 6px;
     1013}
     1014
     1015#profile-page .form-table input[type=text] {
     1016    width: 300px;
     1017}
     1018
     1019#pass-strength-result {
     1020    width: 197px;
     1021    float: left;
     1022    margin-right: 5px;
     1023    border: 1px solid #ccc !important;
     1024}
     1025
     1026#profile-page .form-table #rich_editing {
     1027    margin-right: 5px
     1028}
     1029
     1030.form-table .pre {
     1031    padding: 8px;
     1032    margin: 0;
     1033}
     1034
     1035.pre {
     1036    /* http://www.longren.org/2006/09/27/wrapping-text-inside-pre-tags/ */
     1037    white-space: pre-wrap; /* css-3 */
     1038    white-space: -moz-pre-wrap !important; /* Mozilla, since 1999 */
     1039    white-space: -pre-wrap; /* Opera 4-6 */
     1040    white-space: -o-pre-wrap; /* Opera 7 */
     1041    word-wrap: break-word; /* Internet Explorer 5.5+ */
     1042}
     1043
     1044table.form-table td .updated {
     1045    font-size: 13px;
     1046}
     1047
     1048/* Post Screen */
     1049
     1050#normal-sortables {
     1051    min-height: 50px;
     1052}
     1053
     1054.postbox {
     1055    position: relative;
     1056    min-width: 195px;
     1057}
     1058
     1059
     1060#mediadiv img {
     1061    float: left;
     1062    margin-right: 1em;
     1063}
     1064
     1065#mediadiv h4 {
     1066    margin: 0 0 .5em;
     1067}
     1068
     1069#post-body #tagsdiv #newtag {
     1070    margin-right: 5px;
     1071    width: 16em;
     1072}
     1073
     1074#side-info-column input#post_password {
     1075    width: 94%
     1076}
     1077
     1078#side-info-column #tagsdiv #newtag {
     1079    width: 68%;
     1080}
     1081
     1082#post-status-info {
     1083    font-size: 12px;
     1084    line-height: 2;
     1085    padding: 0 7px;
     1086    border: 1px solid;
     1087    border-top: none;
     1088}
     1089
     1090#editorcontent #post-status-info {
     1091    border: none;
     1092}
     1093
     1094#submitdiv div.inside {
     1095    padding: 0;
     1096    margin: 0;
     1097}
     1098
     1099.submitbox {
     1100/*  margin: 1em 0; */
     1101}
     1102
     1103.submitbox p {
     1104/*  padding: 0;
     1105    margin: 0; */
     1106}
     1107
     1108.submitbox .submit {
     1109    text-align: left;
     1110    padding: 12px 10px 10px;
     1111    font-size: 11px;
     1112}
     1113
     1114.submitbox .submitdelete {
     1115    border-bottom-width: 1px;
     1116    border-bottom-style: solid;
     1117    text-decoration: none;
     1118    margin-left: 8px;
     1119    padding-bottom: 1px;
     1120}
     1121
     1122.submitbox .submit a:hover {
     1123    border-bottom-width: 1px;
     1124    border-bottom-style: solid;
     1125}
     1126
     1127.submitbox .submit input {
     1128    margin-bottom: 8px;
     1129    margin-right: 3px;
     1130    padding: 6px 4px;
     1131    border: none;
     1132}
     1133
     1134
     1135#tagchecklist {
     1136    margin-left: 10px;
     1137
     1138    font-size: 12px;
     1139    overflow: auto;
     1140}
     1141
     1142#tagchecklist strong {
     1143    margin-left: -8px;
     1144    position: absolute;
     1145}
     1146
     1147#tagchecklist span {
     1148    margin-right: 25px;
     1149    display: block;
     1150    float: left;
     1151    font-size: 11px;
     1152    line-height: 1.8em;
     1153    white-space: nowrap;
     1154    cursor: default;
     1155}
     1156
     1157#tagchecklist span a {
     1158    margin: 6px 0pt 0pt -9px;
     1159    cursor: pointer;
     1160    width: 10px;
     1161    height: 10px;
     1162    display: block;
     1163    float: left;
     1164    text-indent: -9999px;
     1165    overflow: hidden;
     1166    position: absolute;
     1167}
     1168
     1169.howto {
     1170    font-style: italic;
     1171    display: block;
     1172}
     1173
     1174.ac_results {
     1175    padding: 0;
     1176    margin: 0;
     1177    list-style: none;
     1178    position: absolute;
     1179    z-index: 10000;
     1180    display: none;
     1181    border-width: 1px;
     1182    border-style: solid;
     1183}
     1184
     1185.ac_results li {
     1186    padding: 2px 5px;
     1187    white-space: nowrap;
     1188    text-align: left;
     1189}
     1190
     1191.ac_over {
     1192    cursor: pointer;
     1193}
     1194
     1195.ac_match {
     1196    text-decoration: underline;
     1197}
     1198
     1199#poststuff h2 {
     1200    margin-top: 20px;
     1201    font-size: 1.5em;
     1202    margin-bottom: 15px;
     1203    padding: 0 0 3px;
     1204    clear: left;
     1205}
     1206
     1207#poststuff h3 {
     1208    font-size: 14px;
     1209    font-weight: bold;
     1210    padding: 7px;
     1211    margin: 0 0 10px;
     1212}
     1213
     1214#poststuff .postbox, #poststuff .stuffbox {
     1215    padding: 2px;
     1216    margin-bottom: 20px;
     1217    border-width: 1px;
     1218    border-style: solid;
     1219}
     1220
     1221#poststuff .inside {
     1222    font-size:11px;
     1223    margin:0 12px 12px;
     1224}
     1225
     1226#titlediv, #poststuff .postarea {
     1227    margin-bottom: 20px;
     1228}
     1229
     1230#titlediv {
     1231    margin-bottom: 20px;
     1232}
     1233
     1234#titlediv div.inside {
     1235    margin: 0;
     1236}
     1237
     1238#titlediv #title {
     1239    border: 0;
     1240    padding: 0;
     1241    font-size: 1.7em;
     1242    width: 100%;
     1243    outline: none;
     1244}
     1245
     1246#poststuff #titlewrap {
     1247    padding: 2px 3px;
     1248    border-width: 1px;
     1249    border-style: solid;
     1250}
     1251
     1252#poststuff .inside-submitbox {
     1253    margin: 0 12px 12px;
     1254    font-size: 11px;
     1255}
     1256
     1257#link_name, #link_url, #link_description {
     1258    font-size: 1.7em;
     1259    padding: 4px 3px;
     1260    width: 98%;
     1261}
     1262
     1263#edit-slug-box {
     1264    margin-top: 8px;
     1265}
     1266
     1267#editable-post-name-full {display: none;}
     1268
     1269#editable-post-name input {width: 16em;}
     1270
     1271#edit-slug-buttons a.save {
     1272    padding: 6px 4px;
     1273    margin-right: 4px;
     1274    text-decoration: none;
     1275    border-width: 1px;
     1276    border-style: solid;
     1277    -moz-border-radius: 3px;
     1278    -khtml-border-radius: 3px;
     1279    -webkit-border-radius: 3px;
     1280    border-radius: 3px;
     1281    font-weight: bold;
     1282}
     1283
     1284.postarea h3 label {
     1285    float: left;
     1286}
     1287
     1288.postarea #add-media-button {
     1289    float:right;
     1290    margin:7px 0pt 0pt;
     1291    position:relative;
     1292    right:10px;
     1293}
     1294
     1295#poststuff #editor-toolbar {
     1296    clear: both;
     1297    position: relative;
     1298    margin-top: -10px;
     1299}
     1300#poststuff #editor-toolbar #edButtonHTML, #poststuff #editor-toolbar #edButtonPreview {
     1301    position: relative;
     1302    top: -5px;
     1303}
     1304
     1305#poststuff #edButtonPreview, #poststuff #edButtonHTML {
     1306    display: block;
     1307    height: 20px;
     1308    padding: 5px 5px 1px;
     1309    margin: 5px 8px 0 0;
     1310    float: right;
     1311    cursor: pointer;
     1312}
     1313
     1314#poststuff #editor-toolbar .active {
     1315    font-weight: bold;
     1316    -moz-border-radius-bottomright: 3px;
     1317    -khtml-border-top-bottom-radius: 3px;
     1318    -webkit-border-bottom-right-radius: 3px;
     1319    border-bottom-right-radius: 3px;
     1320    -moz-border-radius-bottomleft: 3px;
     1321    -khtml-border-bottom-left-radius: 3px;
     1322    -webkit-border-bottom-left-radius: 3px;
     1323    border-bottom-left-radius: 3px;
     1324}
     1325
     1326#poststuff #media-buttons {
     1327    float: right;
     1328    margin-right: 20px;
     1329    margin-top: 8px;
     1330    cursor: default;
     1331    line-height: 1;
     1332    height: 1.1em;
     1333}
     1334
     1335#poststuff #media-buttons a {
     1336    cursor: pointer;
     1337    padding: 0 5px 2px 2px;
     1338}
     1339
     1340#poststuff #media-buttons img {
     1341    vertical-align: middle;
     1342}
     1343
     1344#poststuff .togbox {
     1345    background-position: -10px 16px;
     1346    background-repeat: no-repeat;
     1347    display: block;
     1348    height: 37px;
     1349    margin-left: -14px;
     1350    margin-top: -3px;
     1351    overflow: hidden;
     1352    position: absolute;
     1353    text-indent: -9999px;
     1354    width: 12px;
     1355    -moz-border-radius-topleft: 3px;
     1356    -khtml-border-top-left-radius: 3px;
     1357    -webkit-border-top-left-radius: 3px;
     1358    border-top-left-radius: 3px;
     1359    -moz-border-radius-bottomleft: 3px;
     1360    -khtml-border-bottom-left-radius: 3px;
     1361    -webkit-border-bottom-left-radius: 3px;
     1362    border-bottom-left-radius: 3px;
     1363}
     1364
     1365#poststuff .closed .inside {
     1366    display: none;
     1367}
     1368
     1369#poststuff .closed h3 {
     1370    margin: 0;
     1371}
     1372
     1373#poststuff .closed .togbox {
     1374    background-position: 4px 15px;
     1375}
     1376
     1377#side-info-column #side-sortables {
     1378    height: 100%;
     1379}
     1380
     1381.submitbox .submitdelete {
     1382    border-bottom-width: 1px;
     1383    border-bottom-style: solid;
     1384    text-decoration: none;
     1385    margin-left: 8px;
     1386    padding-bottom: 1px;
     1387}
     1388
     1389.submitbox .submit a:hover {
     1390    border-bottom-width: 1px;
     1391    border-bottom-style: solid;
     1392}
     1393
     1394.submitbox .submit input {
     1395    margin-bottom: 8px;
     1396    margin-right: 3px;
     1397    padding: 6px;
     1398}
     1399
     1400/* Categories */
     1401
     1402#category-adder {
     1403    margin-left: 120px;
     1404    padding: 4px 0;
     1405}
     1406
     1407#category-adder h4 {
     1408    margin: 0 0 8px;
     1409}
     1410
     1411#side-info-column #category-adder {
     1412    margin: 0;
     1413}
     1414
     1415#post-body #category-add input, #category-add select {
     1416    width: 30%;
     1417}
     1418
     1419#side-info-column #category-add input {
     1420    width: 94%;
     1421}
     1422
     1423#side-info-column #category-add select {
     1424    width: 100%;
     1425}
     1426
     1427#category-add input#category-add-sumbit {
     1428    width: auto;
     1429}
     1430
     1431#post-body ul#category-tabs {
     1432    float: left;
     1433    width: 120px;
     1434    text-align: right;
     1435    /* Negative margin for the sake of those without JS: all tabs display */
     1436    margin: 0 -120px 0 0;
     1437    padding: 0;
     1438}
     1439
     1440#post-body ul#category-tabs li {
     1441    padding: 8px;
     1442}
     1443
     1444#post-body ul#category-tabs li.ui-tabs-selected {
     1445    -moz-border-radius-topleft: 3px;
     1446    -khtml-border-top-left-radius: 3px;
     1447    -webkit-border-top-left-radius: 3px;
     1448    border-top-left-radius: 3px;
     1449    -moz-border-radius-bottomleft: 3px;
     1450    -khtml-border-bottom-left-radius: 3px;
     1451    -webkit-border-bottom-left-radius: 3px;
     1452    border-bottom-left-radius: 3px;
     1453}
     1454
     1455#post-body ul#category-tabs li.ui-tabs-selected a {
     1456    color: #333;
     1457    font-weight: bold;
     1458    text-decoration: none;
     1459}
     1460
     1461#categorydiv div.ui-tabs-panel, #linkcategorydiv div.ui-tabs-panel {
     1462    padding: .5em .9em;
     1463}
     1464
     1465#post-body #categorydiv div.ui-tabs-panel, #post-body #linkcategorydiv div.ui-tabs-panel {
     1466    margin: 0 5px 0 120px;
     1467    height: 10em;
     1468    overflow: auto;
     1469    border-width: 4px;
     1470    border-style: solid;
     1471}
     1472
     1473#side-info-column #category-tabs, #side-info-column #categories-pop {
     1474    display: none;
     1475}
     1476
     1477#categorydiv ul, #linkcategorydiv ul {
     1478    list-style: none;
     1479    padding: 0;
     1480    margin: 0;
     1481}
     1482
     1483#categorydiv ul.categorychecklist ul, #linkcategorydiv ul.categorychecklist ul {
     1484    margin-left: 18px;
     1485}
     1486
     1487ul.categorychecklist li {
     1488    margin: 0;
     1489    padding: 0;
     1490    line-height: 19px;
     1491}
     1492
     1493/* positioning etc. */
     1494form#tags-filter {
     1495        position: relative;
     1496}
     1497
     1498p#tag-search {
     1499        position: absolute;
     1500        right: 0;
     1501        top: 0;
     1502        margin: 0;
     1503}
     1504
     1505form#posts-filter {
     1506        position: relative;
     1507}
     1508
     1509p#big-add-button {
     1510        position: absolute;
     1511        right: 0;
     1512        top: 0;
     1513        margin: 0;
     1514}
     1515
     1516p#big-add-button .button {
     1517    font-size: 18px;
     1518    padding: 3px 30px;
     1519}
     1520
     1521p#post-search {
     1522    position: absolute;
     1523    right: 0;
     1524    top: -64px;
     1525    margin: 0;
     1526}
     1527
     1528#post-search .button, #widget-search .button {
     1529    padding: 3px;
     1530    font-size: 13px;
     1531}
     1532
     1533#post-search-input {
     1534    margin-right: 2px;
     1535    border-width: 1px;
     1536    border-style: solid;
     1537}
     1538
     1539#posts-filter fieldset {
     1540    float: left;
     1541    margin: 0 1.5ex 1em 0;
     1542    padding: 0;
     1543}
     1544
     1545#posts-filter fieldset legend {
     1546    padding: 0 0 .2em 1px;
     1547}
     1548
     1549.bordertitle {
     1550    padding-bottom: 5px;
     1551    border-bottom-width: 1px;
     1552    border-bottom-style: solid;
     1553}
     1554
     1555/* Edit posts */
     1556
     1557td.post-title strong {
     1558    display: block;
     1559    margin-bottom: .2em;
     1560}
     1561
     1562td.post-title p {
     1563    margin: 0;
     1564}
     1565
     1566/* Global classes */
     1567.wp-hidden-children .wp-hidden-child { display: none; }
     1568.wp-no-js-hidden { display: none; }
     1569.ui-tabs-hide { display: none; }
     1570
     1571.commentlist .avatar {
     1572    vertical-align:text-top;
     1573}
     1574
     1575.defaultavatarpicker .avatar {
     1576    margin: 2px 0;
     1577    vertical-align: middle;
     1578}
     1579
     1580body.minwidth {
     1581    min-width: 808px;
     1582}
     1583
     1584ul.view-switch {
     1585    float: right;
     1586    list-style: none;
     1587    margin: -23px 5px -2px 0;
     1588    position: relative;
     1589}
     1590
     1591ul.view-switch li {
     1592    float: left;
     1593    margin: 0;
     1594    font-size: 11px;
     1595    padding: 4px 6px;
     1596    font-weight: bold;
     1597}
     1598
     1599ul.view-switch a {
     1600    text-decoration: none;
     1601}
     1602
     1603ul.view-switch li.current {
    6511604    border: none;
    6521605    -moz-border-radius-topleft: 3px;
     
    6601613}
    6611614
    662 #adminmenu {
    663     margin: 0;
    664     list-style: none;
    665     padding-left: 11px;
     1615
     1616#the-comment-list .comment a {
     1617    padding-bottom: 1px;
     1618    text-decoration: none;
    6661619    border-bottom-width: 1px;
    6671620    border-bottom-style: solid;
    6681621}
    6691622
    670 #adminmenu a {
    671     font-size: 16px;
    672     padding: 5px 7px;
    673     line-height: 30px;
    674 }
    675 
    676 #adminmenu a.current, #sidemenu a.current {
     1623
     1624#the-comment-list td.comment p.comment-author {
     1625    margin-top: 0;
     1626    margin-left: 0 ;
     1627}
     1628
     1629#the-comment-list p.comment-author img {
     1630    float: left;
     1631    margin-right: 8px;
     1632}
     1633
     1634#the-comment-list p.comment-author strong a {
     1635    border: none;
     1636}
     1637
     1638#the-comment-list td {
     1639    vertical-align: top;
     1640}
     1641
     1642#the-comment-list td.comment {
     1643    width: 65%;
     1644    max-width: 460px;
     1645    word-wrap: break-word;
     1646}
     1647
     1648#the-comment-list .check-column {
     1649    padding-top: 8px;
     1650}
     1651
     1652#templateside ul li a {
     1653    text-decoration: none;
     1654}
     1655
     1656#submitpost p.curtime {
     1657    background-image: url(images/date-button.gif);
     1658    background-repeat: no-repeat;
     1659    background-position: left 4px;
     1660    padding-left: 18px;
     1661    padding-top: 2px;
     1662}
     1663
     1664.tablenav .delete {
     1665    margin-right: 20px;
     1666}
     1667
     1668#tTips {
     1669    display: none;
     1670    position: absolute;
     1671    margin: 0;
     1672    padding: 0 0 8px 0;
     1673    background-image: url(images/tail.gif);
     1674    background-repeat: no-repeat;
     1675    background-position: 15px bottom;
     1676    background-color: transparent;
     1677}
     1678
     1679#tTips p#tTips_inside {
     1680    margin: 0;
     1681    padding: 8px 12px;
     1682    text-align: center;
     1683    -moz-border-radius: 8px;
     1684    -khtml-border-radius: 8px;
     1685    -webkit-border-radius: 8px;
     1686    border-radius: 8px;
     1687}
     1688
     1689td.action-links, th.action-links {
     1690    text-align: right;
     1691}
     1692
     1693.hide-if-no-js {
     1694    display: none;
     1695}
     1696
     1697/* Diff */
     1698
     1699table.diff {
     1700    width: 100%;
     1701}
     1702
     1703table.diff col.content {
     1704    width: 50%;
     1705}
     1706
     1707table.diff tr {
     1708    background-color: transparent;
     1709}
     1710
     1711table.diff td, table.diff th {
     1712    padding: .5em;
     1713    font-family: monospace;
     1714    border: none;
     1715}
     1716
     1717table.diff .diff-deletedline del, table.diff .diff-addedline ins {
     1718    text-decoration: none;
     1719}
     1720
     1721#wp-word-count {
     1722    display: block;
     1723}
     1724
     1725fieldset {
     1726    border: 0;
     1727    padding: 0;
     1728    margin: 0;
     1729}
     1730
     1731.info-box {
     1732    top: 100px;
     1733    left: 50%;
     1734    margin-left: -225px;
     1735    height: 300px;
     1736    width: 450px;
     1737    border: 5px solid #ddd;
     1738    background: #f8f8f8;
     1739    position: absolute;
     1740    padding: 15px 15px 10px;
     1741    z-index: 1000;
     1742    display: none;
     1743}
     1744
     1745.info-box .submit {
     1746    position: absolute;
     1747    bottom: 15px;
     1748    width: 450px;
     1749    padding: 15px 0 0;
     1750}
     1751
     1752.info-box .gears-img {
     1753    float: right;
     1754    margin: 10px;
     1755}
     1756
     1757.info-box-title {
     1758    line-height: 2;
     1759    margin: 0;
     1760    padding: 0 7px;
     1761}
     1762
     1763#wp_editbtns {
     1764    padding: 2px;
     1765    position: absolute;
     1766    display: none;
     1767    z-index: 999998;
     1768}
     1769
     1770#wp_editimgbtn, #wp_delimgbtn {
     1771    margin: 2px;
     1772    padding: 2px;
     1773    border: 1px solid #999;
     1774    background-color: #eee;
     1775    -moz-border-radius: 3px;
     1776    -khtml-border-radius: 3px;
     1777    -webkit-border-radius: 3px;
     1778    border-radius: 3px;
     1779}
     1780
     1781#wp_editimgbtn:hover, #wp_delimgbtn:hover {
     1782    border-color: #555;
     1783    background-color: #ccc;
     1784}
     1785
     1786.settings-toggle {
     1787    text-align: right;
     1788    margin: 5px 7px 15px 0;
     1789    font-size: 12px;
     1790}
     1791
     1792.settings-toggle h3 {
     1793    margin: 0;
     1794}
     1795
     1796p.meta-options {
     1797    border: 1px solid;
     1798    padding: 1em .5em;
     1799}
     1800
     1801.ui-sortable .postbox h3 {
     1802    cursor:move;
     1803}
     1804
     1805a.togbox {
     1806    cursor: pointer;
     1807}
     1808
     1809
     1810/* fixed bottom bar */
     1811.postarea h3 label {
     1812
     1813}
     1814
     1815#footer {
     1816    z-index: -1;
     1817}
     1818
     1819#fixedbar {
     1820    bottom:0pt;
     1821    height:80px;
     1822    position:fixed;
     1823    width:100%;
     1824    z-index: 100;
     1825}
     1826
     1827#fixedbar #submitpost {
     1828   
     1829}
     1830
     1831#fixedbar .submit {
     1832    padding-top: 10px;
     1833}
     1834
     1835#fixedbar .button {
     1836    border: none;
     1837    -moz-border-radius: 6px;
     1838    -khtml-border-radius: 6px;
     1839    -webkit-border-radius: 6px;
     1840    border-radius: 6px;
     1841}
     1842
     1843#fixedbar .button:hover {
     1844    background: #fff;
     1845}
     1846
     1847#fixedbar #publish {
     1848    font-weight:bold;
     1849    width:160px;
     1850}
     1851
     1852#fixedbar #save-post {
     1853    width:80px;
     1854    font-weight:normal;
     1855}
     1856
     1857#fixedbar .submitbox {
     1858    padding: 14px 18px;
     1859    border-left: 1px solid #aaa;
     1860    width: 690px;
     1861}
     1862
     1863#fixedbar #post-time-info,
     1864#fixedbar #comment-time-info {
     1865    margin-top: 16px;
     1866}
     1867
     1868#fixedbar #timestampdiv input,
     1869#fixedbar #timestampdiv select {
     1870    background-color:#464646;
     1871    border:1px solid #777777;
     1872    color:#CCCCCC;
     1873    padding:2px;
     1874}
     1875
     1876#fixedbar-wrap {
     1877    width: 100%;
     1878}
     1879
     1880#preview-link {
     1881    text-align: right;
     1882}
     1883
     1884#preview-link a {
     1885    padding-right:10px;
     1886}
     1887
     1888p#post-search-prep {
     1889    margin:0pt;
     1890    position:absolute;
     1891    right:20px;
     1892    top:50px;
     1893}
     1894
     1895#jj, #hh, #mn {
     1896    width: 1.5em;
     1897}
     1898
     1899#aa {
     1900    width: 2.7em;
     1901}
     1902
     1903#inbox-filter .actions {
     1904    margin-left: 6px;
     1905    background: url(images/archive-link.png) 0px 12px no-repeat;
     1906    padding-left: 16px;
     1907}
     1908
     1909#inbox-filter .actions .button {
     1910    font-size: 11px;
     1911    padding: 2px;
     1912}
     1913
     1914/* media popup 0819 */
     1915
     1916#sidemenu {
     1917    margin: -30px 15px 0 315px;
     1918    list-style: none;
     1919    position: relative;
     1920    float: right;
     1921    padding-left: 10px;
     1922    font-size:12px;
     1923}
     1924
     1925#sidemenu a {
     1926    padding: 0 7px;
     1927    display: block;
     1928    float: left;
     1929    line-height: 28px;
     1930    border-top-width: 1px;
     1931    border-top-style: solid;
     1932    border-bottom-width: 1px;
     1933    border-bottom-style: solid;
     1934}
     1935
     1936#sidemenu li {
     1937    display: inline;
     1938    line-height: 200%;
     1939    list-style: none;
     1940    text-align: center;
     1941    white-space: nowrap;
     1942    margin: 0;
     1943    padding: 0;
     1944}
     1945
     1946#sidemenu a.current {
    6771947    font-weight: normal;
    6781948    padding-left: 6px;
     
    6901960}
    6911961
    692 #adminmenu a.current {
    693     border-bottom-width: 2px;
    694 }
    695 
    6961962#sidemenu {
    6971963    margin: -30px 15px 0 315px;
     
    7141980}
    7151981
    716 #dashmenu li, #adminmenu li, #submenu li, #sidemenu li {
    717     display: inline;
    718     line-height: 200%;
    719     list-style: none;
    720     text-align: center;
    721     white-space: nowrap;
    722     margin: 0;
    723     padding: 0;
    724 }
    725 
    726 #submenu li {
    727     padding: 0 0 8px 17px;
    728 }
    729 
    730 #adminmenu li a #awaiting-mod, #sidemenu li a #update-plugins {
    731     position: absolute;
    732     margin-left: -0.4em;
    733     margin-top: 0.2em;
    734     font-size: 0.7em;
    735     background-repeat: no-repeat;
    736     background-position: 0 bottom;
    737     height: 0.9em;
    738     width: 1em;
    739 }
    740 
    741 #adminmenu li a .count-0, #sidemenu li a .count-0 {
     1982#sidemenu li a .count-0 {
    7421983    display: none;
    7431984}
    7441985
    745 .post-com-count-wrapper {
    746     min-width: 22px;
    747 }
    748 
    749 .post-com-count {
    750     height: 1.3em;
    751     line-height: 1.1em;
    752     display: block;
    753     text-decoration: none;
    754     padding: 0 0 6px;
    755     cursor: pointer;
    756     background-position: center -80px;
    757     background-repeat: no-repeat;
    758 }
    759 
    760 .post-com-count span {
    761     height: 1.3em;
    762     line-height: 1.2em;
    763     padding: 0 0.5em;
    764     background-color: #bbb;
    765     display: inline-block;
    766     cursor: pointer;
    767     -moz-border-radius: 3px;
    768     -khtml-border-radius: 3px;
    769     -webkit-border-radius: 3px;
    770     border-radius: 3px;
    771 }
    772 
    773 strong .post-com-count {
    774     background-position: center -55px;
    775 }
    776 
    777 .post-com-count:hover {
    778     background-position: center -3px;
    779 }
    780 
    781 #adminmenu li a:hover #awaiting-mod, #sidemenu li a:hover #update-plugins {
    782     background-position: -80px bottom;
    783 }
    784 
    785 #adminmenu li a #awaiting-mod span, #sidemenu li a #update-plugins span {
    786     top: -0.8em;
    787     right: 0;
    788     position: absolute;
    789     display: block;
    790     height: 1.3em;
    791     line-height: 1.3em;
    792     padding: 0 0.6em;
    793     -moz-border-radius: 3px;
    794     -khtml-border-radius: 3px;
    795     -webkit-border-radius: 3px;
    796     border-radius: 3px;
    797 }
    798 
    799 #submenu {
    800     margin: 0;
    801     list-style: none;
    802     padding: 6px 0 3px 0;
    803 }
    804 
    805 #submenu li {
    806     font-size: 14px;
    807 }
    808 
    809 #minisub { /* for empty submenus */
    810     height: 15px;
    811 }
    812 
    813 /* end menu stuff */
    814 
    815 /* Admin Footer */
    816 
    817 html, body {
    818     height:100%;
    819 }
    820 #wpwrap {
    821     position: relative;
    822     min-height: 100%;
    823 }
    824 #wpcontent{
    825     padding-bottom: 95px;
    826 }
    827 #footer {
    828     clear: both;
    829     height: 65px;
    830     padding: 10px 0 0 60px;
    831     margin: 0;
    832     position: relative;
    833     margin-top: -75px;
    834     font-size: 12px;
    835 }
    836 
    837 #footer p {
    838     margin: 0;
    839     padding: 7px 0;
    840 }
    841 
    842 #footer p a {
    843     text-decoration: none;
    844 }
    845 
    846 #footer p a:hover {
    847     text-decoration: underline;
    848 }
    849 
    850 /* Tables used on comment.php and option/setting pages */
    851 
    852 .form-table {
    853     border-collapse: collapse;
    854     margin-top: 1em;
    855     width: 100%;
    856     margin-bottom: -8px;
    857 }
    858 
    859 .form-table td {
    860     margin-bottom: 9px;
    861     padding: 10px;
    862     line-height: 20px;
    863     border-bottom-width: 8px;
    864     border-bottom-style: solid;
    865     font-size: 11px;
    866 }
    867 
    868 .form-table th {
    869     vertical-align: top;
    870     text-align: left;
    871     padding: 10px;
    872     width: 150px;
    873     border-bottom-width: 8px;
    874     border-bottom-style: solid;
    875 }
    876 
    877 .form-table th.th-full {
    878     width: auto;
    879 }
    880 
    881 .form-table input, .form-table textarea {
    882     border-width: 1px;
    883     border-style: solid;
    884 }
    885 
    886 .form-table div.color-option {
    887     display: block;
    888     clear: both;
    889 }
    890 
    891 .form-table input.tog {
    892     margin-top: 2px;
    893     margin-right: 2px;
    894     float: left;
    895 }
    896 
    897 .form-table table.color-palette {
    898     vertical-align: bottom;
    899     float: left;
    900     margin: -3px 3px 8px;
    901 }
    902 
    903 .form-table .color-palette td {
    904     border-bottom: none;
    905     border: 1px solid #fff;
    906     font-size: 1px;
    907     line-height: 1px;
    908 }
    909 
    910 #profile-page .form-table textarea {
    911     width: 500px;
    912     margin-bottom: 6px;
    913 }
    914 
    915 #profile-page .form-table input[type=text] {
    916     width: 300px;
    917 }
    918 
    919 #pass-strength-result {
    920     width: 197px;
    921     float: left;
    922     margin-right: 5px;
    923     border: 1px solid #ccc !important;
    924 }
    925 
    926 #profile-page .form-table #rich_editing {
    927     margin-right: 5px
    928 }
    929 
    930 .form-table .pre {
    931     padding: 8px;
    932     margin: 0;
    933 }
    934 
    935 .pre {
    936     /* http://www.longren.org/2006/09/27/wrapping-text-inside-pre-tags/ */
    937     white-space: pre-wrap; /* css-3 */
    938     white-space: -moz-pre-wrap !important; /* Mozilla, since 1999 */
    939     white-space: -pre-wrap; /* Opera 4-6 */
    940     white-space: -o-pre-wrap; /* Opera 7 */
    941     word-wrap: break-word; /* Internet Explorer 5.5+ */
    942 }
    943 
    944 table.form-table td .updated {
    945     font-size: 13px;
    946 }
    947 
    948 /* Post Screen */
    949 
    950 #tagsdiv #newtag {
    951     margin-right: 5px;
    952     width: 16em;
    953 }
    954 
    955 #tagchecklist {
    956     margin-left: 10px;
    957 
    958     font-size: 12px;
    959     overflow: auto;
    960 }
    961 
    962 #tagchecklist strong {
    963     margin-left: -8px;
    964     position: absolute;
    965 }
    966 
    967 #tagchecklist span {
    968     margin-right: 25px;
    969     display: block;
    970     float: left;
    971     font-size: 11px;
    972     line-height: 1.8em;
    973     white-space: nowrap;
    974     cursor: default;
    975 }
    976 
    977 #tagchecklist span a {
    978     margin: 6px 0pt 0pt -9px;
    979     cursor: pointer;
    980     width: 10px;
    981     height: 10px;
    982     display: block;
    983     float: left;
    984     text-indent: -9999px;
    985     overflow: hidden;
    986     position: absolute;
    987 }
    988 
    989 .howto {
    990     font-style: italic;
    991     display: block;
    992 }
    993 
    994 .ac_results {
    995     padding: 0;
    996     margin: 0;
    997     list-style: none;
    998     position: absolute;
    999     z-index: 10000;
    1000     display: none;
    1001     border-width: 1px;
    1002     border-style: solid;
    1003 }
    1004 
    1005 .ac_results li {
    1006     padding: 2px 5px;
    1007     white-space: nowrap;
    1008     text-align: left;
    1009 }
    1010 
    1011 .ac_over {
    1012     cursor: pointer;
    1013 }
    1014 
    1015 .ac_match {
    1016     text-decoration: underline;
    1017 }
    1018 
    1019 #poststuff h2 {
    1020     margin-top: 20px;
    1021     font-size: 1.5em;
    1022     margin-bottom: 15px;
    1023     padding: 0 0 3px;
    1024     clear: left;
    1025 }
    1026 
    1027 #poststuff h3 {
    1028     font-size: 14px;
    1029     font-weight: bold;
    1030     padding: 7px;
    1031     margin: 0 0 10px;
    1032 }
    1033 
    1034 #poststuff .postbox, #poststuff .stuffbox {
    1035     margin-left: 20px;
    1036     padding: 2px;
    1037     margin-bottom: 20px;
    1038     margin-right: 8px;
    1039     border-width: 1px;
    1040     border-style: solid;
    1041 }
    1042 
    1043 #titlediv, #poststuff .postarea {
    1044     margin-left: 20px;
    1045     margin-bottom: 20px;
    1046     margin-right: 8px;
    1047 }
    1048 
    1049 #titlediv {
    1050     margin-bottom: 20px;
    1051 }
    1052 
    1053 #titlediv div.inside {
    1054     margin: 0;
    1055 }
    1056 
    1057 #titlediv #title {
    1058     border: 0;
    1059     padding: 0;
    1060     font-size: 1.7em;
    1061     width: 100%;
    1062     outline: none;
    1063 }
    1064 
    1065 #poststuff #titlewrap {
    1066     padding: 2px 3px;
    1067     border-width: 1px;
    1068     border-style: solid;
    1069 }
    1070 
    1071 #poststuff .inside {
    1072     margin: 0 12px 12px;
    1073     font-size: 11px;
    1074 }
    1075 
    1076 #link_name, #link_url, #link_description {
    1077     font-size: 1.7em;
    1078     padding: 4px 3px;
    1079     width: 98%;
    1080 }
    1081 
    1082 #edit-slug-box {
    1083     margin-top: 8px;
    1084 }
    1085 
    1086 #editable-post-name-full {display: none;}
    1087 
    1088 #editable-post-name input {width: 16em;}
    1089 
    1090 #edit-slug-buttons a.save {
    1091     padding: 6px 4px;
    1092     margin-right: 4px;
    1093     text-decoration: none;
    1094     border-width: 1px;
    1095     border-style: solid;
    1096     -moz-border-radius: 3px;
    1097     -khtml-border-radius: 3px;
    1098     -webkit-border-radius: 3px;
    1099     border-radius: 3px;
    1100     font-weight: bold;
    1101 }
    1102 
    1103 #poststuff #editor-toolbar {
    1104     position: relative;
    1105     height: 30px;
    1106     margin-top: -41px;
    1107 }
    1108 
    1109 #poststuff #edButtonPreview, #poststuff #edButtonHTML {
    1110     display: block;
    1111     height: 20px;
    1112     padding: 5px 5px 1px;
    1113     margin: 5px 8px 0 0;
    1114     float: right;
    1115     cursor: pointer;
    1116 }
    1117 
    1118 #poststuff #editor-toolbar .active {
    1119     font-weight: bold;
    1120     -moz-border-radius-topright: 3px;
    1121     -khtml-border-top-right-radius: 3px;
    1122     -webkit-border-top-right-radius: 3px;
    1123     border-top-right-radius: 3px;
    1124     -moz-border-radius-topleft: 3px;
    1125     -khtml-border-top-left-radius: 3px;
    1126     -webkit-border-top-left-radius: 3px;
    1127     border-top-left-radius: 3px;
    1128 }
    1129 
    1130 #poststuff #media-buttons {
    1131     float: right;
    1132     margin-right: 20px;
    1133     margin-top: 8px;
    1134     cursor: default;
    1135     line-height: 1;
    1136     height: 1.1em;
    1137 }
    1138 
    1139 #poststuff #media-buttons a {
    1140     cursor: pointer;
    1141     padding: 0 5px 2px 2px;
    1142 }
    1143 
    1144 #poststuff #media-buttons img {
    1145     vertical-align: middle;
    1146 }
    1147 
    1148 #poststuff .togbox {
    1149     background-position: -10px 16px;
    1150     background-repeat: no-repeat;
    1151     display: block;
    1152     height: 37px;
    1153     margin-left: -21px;
    1154     margin-top: -10px;
    1155     overflow: hidden;
    1156     position: absolute;
    1157     text-indent: -9999px;
    1158     width: 12px;
    1159     -moz-border-radius-topleft: 3px;
    1160     -khtml-border-top-left-radius: 3px;
    1161     -webkit-border-top-left-radius: 3px;
    1162     border-top-left-radius: 3px;
    1163     -moz-border-radius-bottomleft: 3px;
    1164     -khtml-border-bottom-left-radius: 3px;
    1165     -webkit-border-bottom-left-radius: 3px;
    1166     border-bottom-left-radius: 3px;
    1167 }
    1168 
    1169 #poststuff .closed .inside {
    1170     display: none;
    1171 }
    1172 
    1173 #poststuff .closed h3 {
    1174     margin: 0;
    1175 }
    1176 
    1177 #poststuff .closed .togbox {
    1178     background-position: 4px 15px;
    1179 }
    1180 
    1181 .submitbox {
    1182     width: 220px;
    1183     float: right;
    1184 }
    1185 
    1186 .submitbox .inside strong {
    1187     font-size: 14px;
    1188 }
    1189 
    1190 .submitbox .submitdelete {
    1191     border-bottom-width: 1px;
    1192     border-bottom-style: solid;
    1193     text-decoration: none;
    1194     margin-left: 8px;
    1195     padding-bottom: 1px;
    1196 }
    1197 
    1198 
    1199 .submitbox #previewview {
    1200     padding: 15px 10px;
    1201     -moz-border-radius-topleft: 3px;
    1202     -khtml-border-top-left-radius: 3px;
    1203     -webkit-border-top-left-radius: 3px;
    1204     border-top-left-radius: 3px;
    1205     -moz-border-radius-topright: 3px;
    1206     -khtml-border-top-right-radius: 3px;
    1207     -webkit-border-top-right-radius: 3px;
    1208     border-top-right-radius: 3px;
    1209 }
    1210 
    1211 .submitbox #previewview a {
    1212     padding: 6px;
    1213     text-decoration: none;
    1214     font-weight: normal;
    1215     border-bottom: none;
    1216     font-size: 14px;
    1217     -moz-border-radius: 3px;
    1218     -khtml-border-radius: 3px;
    1219     -webkit-border-radius: 3px;
    1220     border-radius: 3px;
    1221 }
    1222 
    1223 .submitbox .submit {
    1224     text-align: left;
    1225     padding: 12px 10px 10px 10px;
    1226     font-size: 11px;
    1227 }
    1228 
    1229 .submitbox .submit a:hover {
    1230     border-bottom-width: 1px;
    1231     border-bottom-style: solid;
    1232 }
    1233 
    1234 .submitbox .submit input {
    1235     margin-bottom: 8px;
    1236     margin-right: 3px;
    1237     padding: 6px 4px;
    1238     border: none;
    1239 }
    1240 
    1241 .submitbox #autosave .error {
    1242     margin-top: 10px;
    1243 }
    1244 
    1245 /* Categories */
    1246 
    1247 #categorydiv #category-adder {
    1248     margin-left: 120px;
    1249     padding: 4px 0;
    1250 }
    1251 
    1252 #category-add input, #category-add select {
    1253     width: 30%;
    1254 }
    1255 
    1256 #category-add input#category-add-sumbit {
    1257     width: auto;
    1258 }
    1259 
    1260 #categorydiv ul#category-tabs {
    1261     float: left;
    1262     width: 120px;
    1263     text-align: right;
    1264     /* Negative margin for the sake of those without JS: all tabs display */
    1265     margin: 0 -120px 0 0;
    1266     padding: 0;
    1267 }
    1268 
    1269 ul#category-tabs li {
    1270     padding: 8px;
    1271 }
    1272 
    1273 ul#category-tabs li.ui-tabs-selected {
    1274     -moz-border-radius-topleft: 3px;
    1275     -khtml-border-top-left-radius: 3px;
    1276     -webkit-border-top-left-radius: 3px;
    1277     border-top-left-radius: 3px;
    1278     -moz-border-radius-bottomleft: 3px;
    1279     -khtml-border-bottom-left-radius: 3px;
    1280     -webkit-border-bottom-left-radius: 3px;
    1281     border-bottom-left-radius: 3px;
    1282 }
    1283 
    1284 ul#category-tabs li.ui-tabs-selected a {
    1285     color: #333;
    1286     font-weight: bold;
    1287     text-decoration: none;
    1288 }
    1289 
    1290 div.ui-tabs-panel {
    1291     margin: 0 5px 0 120px;
    1292     padding: .5em .9em;
    1293     height: 10em;
    1294     overflow: auto;
    1295     border-width: 4px;
    1296     border-style: solid;
    1297 }
    1298 
    1299 #categorydiv ul {
    1300     list-style: none;
    1301     padding: 0;
    1302     margin: 0;
    1303 }
    1304 
    1305 #categorydiv ul.categorychecklist ul {
    1306     margin-left: 18px;
    1307 }
    1308 
    1309 ul.categorychecklist li {
    1310     margin: 0;
    1311     padding: 0;
    1312     line-height: 19px;
    1313 }
    1314 
    1315 #linkcategorydiv #category-adder {
    1316     margin-left: 120px;
    1317     padding: 4px 0;
    1318 }
    1319 
    1320 #category-adder h4 {
    1321     margin: 0;
    1322 }
    1323 
    1324 #linkcategorydiv ul#category-tabs {
    1325     float: left;
    1326     width: 120px;
    1327     text-align: right;
    1328     /* Negative margin for the sake of those without JS: all tabs display */
    1329     margin: 0 -120px 0 0;
    1330     padding: 0;
    1331 }
    1332 
    1333 #linkcategorydiv ul {
    1334     list-style: none;
    1335     padding: 0;
    1336     margin: 0;
    1337 }
    1338 
    1339 #linkcategorydiv ul.categorychecklist ul {
    1340     margin-left: 18px;
    1341 }
    1342 
    1343 /* pasitioning etc. */
    1344 form#tags-filter {
    1345         position: relative;
    1346 }
    1347 
    1348 p#tag-search {
    1349         position: absolute;
    1350         right: 0;
    1351         top: 0;
    1352         margin: 0;
    1353 }
    1354 
    1355 form#posts-filter {
    1356         position: relative;
    1357 }
    1358 
    1359 p#post-search {
    1360         position: absolute;
    1361         right: 0;
    1362         top: 0;
    1363         margin: 0;
    1364 }
    1365 
    1366 #post-search .button, #widget-search .button {
    1367     padding: 3px;
    1368     font-size: 13px;
    1369 }
    1370 
    1371 #posts-filter fieldset {
    1372     float: left;
    1373     margin: 0 1.5ex 1em 0;
    1374     padding: 0;
    1375 }
    1376 
    1377 #posts-filter fieldset legend {
    1378     padding: 0 0 .2em 1px;
    1379 }
    1380 
    1381 .bordertitle {
    1382     padding-bottom: 5px;
    1383     border-bottom-width: 1px;
    1384     border-bottom-style: solid;
    1385 }
    1386 
    1387 /* Edit posts */
    1388 
    1389 td.post-title strong {
    1390     display: block;
    1391     margin-bottom: .2em;
    1392 }
    1393 
    1394 td.post-title p {
    1395     margin: 0;
    1396 }
    1397 
    1398 /* Global classes */
    1399 .wp-hidden-children .wp-hidden-child { display: none; }
    1400 .wp-no-js-hidden { display: none; }
    1401 .ui-tabs-hide { display: none; }
    1402 
    1403 .commentlist .avatar {
    1404     vertical-align:text-top;
    1405 }
    1406 
    1407 .defaultavatarpicker .avatar {
    1408     margin: 2px 0;
    1409     vertical-align: middle;
    1410 }
    1411 
    1412 body.minwidth {
    1413     min-width: 808px;
    1414 }
    1415 
    1416 ul.view-switch {
    1417     float: right;
    1418     list-style: none;
    1419     margin: -23px 5px -2px 0;
    1420     position: relative;
    1421 }
    1422 
    1423 ul.view-switch li {
    1424     float: left;
    1425     margin: 0;
    1426     font-size: 11px;
    1427     padding: 4px 6px;
    1428     font-weight: bold;
    1429 }
    1430 
    1431 ul.view-switch a {
    1432     text-decoration: none;
    1433 }
    1434 
    1435 ul.view-switch li.current {
    1436     border: none;
    1437     -moz-border-radius-topleft: 3px;
    1438     -khtml-border-top-left-radius: 3px;
    1439     -webkit-border-top-left-radius: 3px;
    1440     border-top-left-radius: 3px;
    1441     -moz-border-radius-topright: 3px;
    1442     -khtml-border-top-right-radius: 3px;
    1443     -webkit-border-top-right-radius: 3px;
    1444     border-top-right-radius: 3px;
    1445 }
    1446 
    1447 
    1448 #the-comment-list .comment a {
    1449     padding-bottom: 1px;
    1450     text-decoration: none;
    1451     border-bottom-width: 1px;
    1452     border-bottom-style: solid;
    1453 }
    1454 
    1455 
    1456 #the-comment-list td.comment p.comment-author {
    1457     margin-top: 0;
    1458     margin-left: 0 ;
    1459 }
    1460 
    1461 #the-comment-list p.comment-author img {
    1462     float: left;
    1463     margin-right: 8px;
    1464 }
    1465 
    1466 #the-comment-list p.comment-author strong a {
    1467     border: none;
    1468 }
    1469 
    1470 #the-comment-list td {
    1471     vertical-align: top;
    1472 }
    1473 
    1474 #the-comment-list td.comment {
    1475     width: 65%;
    1476     max-width: 460px;
    1477     word-wrap: break-word;
    1478 }
    1479 
    1480 #the-comment-list td.comment p {
    1481     margin-left: 8px;
    1482 }
    1483 
    1484 #the-comment-list .check-column {
    1485     padding-top: 8px;
    1486 }
    1487 
    1488 #templateside ul li a {
    1489     text-decoration: none;
    1490 }
    1491 
    1492 .curtime {
    1493     background-image: url(images/date-button.gif);
    1494     background-repeat: no-repeat;
    1495     background-position: left 2px;
    1496     padding-left: 18px;
    1497 }
    1498 
    1499 .tablenav .delete {
    1500     margin-right: 20px;
    1501 }
    1502 
    1503 #tTips {
    1504     display: none;
    1505     position: absolute;
    1506     margin: 0;
    1507     padding: 0 0 8px 0;
    1508     background-image: url(images/tail.gif);
    1509     background-repeat: no-repeat;
    1510     background-position: 15px bottom;
    1511     background-color: transparent;
    1512 }
    1513 
    1514 #tTips p#tTips_inside {
    1515     margin: 0;
    1516     padding: 8px 12px;
    1517     text-align: center;
    1518     -moz-border-radius: 8px;
    1519     -khtml-border-radius: 8px;
    1520     -webkit-border-radius: 8px;
    1521     border-radius: 8px;
    1522 }
    1523 
    1524 td.action-links, th.action-links {
    1525     text-align: right;
    1526 }
    1527 
    1528 #poststuff h3, #poststuff .closed h3 {
    1529     cursor: pointer;
    1530 }
    1531 
    1532 .hide-if-no-js {
    1533     display: none;
    1534 }
    1535 
    1536 /* Diff */
    1537 
    1538 table.diff {
    1539     width: 100%;
    1540 }
    1541 
    1542 table.diff col.content {
    1543     width: 50%;
    1544 }
    1545 
    1546 table.diff tr {
    1547     background-color: transparent;
    1548 }
    1549 
    1550 table.diff td, table.diff th {
    1551     padding: .5em;
    1552     font-family: monospace;
    1553     border: none;
    1554 }
    1555 
    1556 table.diff .diff-deletedline del, table.diff .diff-addedline ins {
    1557     text-decoration: none;
    1558 }
    1559 
    1560 #wp-word-count {
    1561     display: block;
    1562 }
    1563 
    1564 fieldset {
    1565     border: 0;
    1566     padding: 0;
    1567     margin: 0;
    1568 }
    1569 
    1570 .info-box {
    1571     top: 100px;
    1572     left: 50%;
    1573     margin-left: -225px;
    1574     height: 300px;
    1575     width: 450px;
    1576     border: 5px solid #ddd;
    1577     background: #f8f8f8;
    1578     position: absolute;
    1579     padding: 15px 15px 10px;
    1580     z-index: 1000;
    1581     display: none;
    1582 }
    1583 
    1584 .info-box .submit {
    1585     position: absolute;
    1586     bottom: 15px;
    1587     width: 450px;
    1588     padding: 15px 0 0;
    1589 }
    1590 
    1591 .info-box .gears-img {
    1592     float: right;
    1593     margin: 10px;
    1594 }
    1595 
    1596 .info-box-title {
    1597     line-height: 2;
    1598     margin: 0;
    1599     padding: 0 7px;
    1600 }
    1601 
    1602 #wp_editbtns {
    1603     padding: 2px;
    1604     position: absolute;
    1605     display: none;
    1606     z-index: 999998;
    1607 }
    1608 
    1609 #wp_editimgbtn, #wp_delimgbtn {
    1610     margin: 2px;
    1611     padding: 2px;
    1612     border: 1px solid #999;
    1613     background-color: #eee;
    1614     -moz-border-radius: 3px;
    1615     -khtml-border-radius: 3px;
    1616     -webkit-border-radius: 3px;
    1617     border-radius: 3px;
    1618 }
    1619 
    1620 #wp_editimgbtn:hover, #wp_delimgbtn:hover {
    1621     border-color: #555;
    1622     background-color: #ccc;
    1623 }
     1986#previewview {
     1987    float:right;
     1988    margin-top:-53px;
     1989}
     1990
     1991#previewview a {
     1992    display:block;
     1993    font-size:16px;
     1994    font-weight:normal;
     1995    padding:4px 8px;
     1996    text-align:center;
     1997    text-decoration:none;
     1998    width:200px;
     1999}
  • trunk/wp-includes/general-template.php

    r8673 r8691  
    970970    }
    971971
    972     if ( $media_buttons ) { ?>
     972/*  if ( $media_buttons ) { ?>
    973973        <div id="media-buttons" class="hide-if-no-js">
    974974        <?php do_action( 'media_buttons' ); ?>
    975975        </div>
    976     <?php } ?>
     976    <?php } */ ?>
    977977    </div>
    978978
  • trunk/wp-includes/js/autosave.js

    r8600 r8691  
    108108            getpermalinknonce: jQuery('#getpermalinknonce').val()
    109109        }, function(permalink) {
    110             jQuery('#previewview').html('<a target="_blank" href="'+permalink+'" tabindex="4">'+previewText+'</a>');
     110            jQuery('#previewview').html('<a class="button" target="_blank" href="'+permalink+'" tabindex="4">'+previewText+'</a>');
    111111
    112112            // Autosave when the preview button is clicked.
  • trunk/wp-includes/js/tinymce/plugins/wpeditimage/editimage.html

    r8517 r8691  
    88<script type="text/javascript" src="../../utils/form_utils.js?ver=311b"></script>
    99
     10<link rel="stylesheet" href="css/media26.css?ver=2.6" type="text/css" media="all" />
    1011<link rel="stylesheet" href="css/editimage.css?ver=311f" type="text/css" media="all" />
    11 <link rel="stylesheet" href="../../../../../wp-admin/css/media.css?ver=20080709" type="text/css" media="all" />
     12
    1213<script type="text/javascript">
    1314if ( 'rtl' == tinyMCEPopup.editor.getParam('directionality','') )
  • trunk/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.js

    r8517 r8691  
    1111            // Register the command so that it can be invoked by using tinyMCE.activeEditor.execCommand('...');
    1212            ed.addCommand('WP_EditImage', function() {
    13                 var el = ed.selection.getNode();
     13                var el = ed.selection.getNode(), vp = tinymce.DOM.getViewPort(), H = vp.h, W = ( 720 < vp.w ) ? 720 : vp.w;
    1414
    1515                if ( ed.dom.getAttrib(el, 'class').indexOf('mceItem') != -1 || el.nodeName != 'IMG' )
     
    1717
    1818                tb_show('', url + '/editimage.html?ver=311f&TB_iframe=true');
     19                tinymce.DOM.setStyles('TB_window', {
     20                    'top':'20px',
     21                    'marginTop':'0',
     22                    'width':( W - 50 )+'px',
     23                    'height':( H - 45 )+'px',
     24                    'margin-left':'-'+parseInt((( W - 50 ) / 2),10) + 'px'
     25                });
     26                tinymce.DOM.setStyles('TB_iframeContent', {
     27                    'width':( W - 50 )+'px',
     28                    'height':( H - 75 )+'px'
     29                });
    1930                tinymce.DOM.setStyle( ['TB_overlay','TB_window','TB_load'], 'z-index', '999999' );
    2031            });
  • trunk/wp-includes/script-loader.php

    r8601 r8691  
    4949    ) );
    5050
    51     $scripts->add( 'autosave', '/wp-includes/js/autosave.js', array('schedule', 'wp-ajax-response'), '20080622' );
     51    $scripts->add( 'autosave', '/wp-includes/js/autosave.js', array('schedule', 'wp-ajax-response'), '20080701' );
    5252
    5353    $scripts->add( 'wp-lists', '/wp-includes/js/wp-lists.js', array('wp-ajax-response'), '20080729' );
     
    129129        $scripts->add( 'xfn', '/wp-admin/js/xfn.js', false, '3517' );
    130130        $scripts->add( 'upload', '/wp-admin/js/upload.js', array('jquery'), '20070518' );
    131         $scripts->add( 'postbox', '/wp-admin/js/postbox.js', array('jquery'), '20080128' );
     131        $scripts->add( 'postbox', '/wp-admin/js/postbox.js', array('jquery-ui-sortable'), '20080723' );
    132132        $scripts->localize( 'postbox', 'postboxL10n', array(
    133133            'requestFile' => admin_url('admin-ajax.php'),
     
    139139            'cancel' => __('Cancel'),
    140140        ) );
    141         $scripts->add( 'post', '/wp-admin/js/post.js', array('suggest', 'jquery-ui-tabs', 'wp-lists', 'postbox', 'slug'), '20080629' );
     141        $scripts->add( 'post', '/wp-admin/js/post.js', array('suggest', 'jquery-ui-tabs', 'wp-lists', 'postbox', 'slug'), '20080701' );
    142142        $scripts->localize( 'post', 'postL10n', array(
    143143            'tagsUsed' =>  __('Tags used on this post:'),
     
    160160        ) );
    161161        $scripts->add( 'admin-gallery', '/wp-admin/js/gallery.js', array( 'jquery-ui-sortable' ), '20080709' );
    162         $scripts->add( 'media-upload', '/wp-admin/js/media-upload.js', array( 'thickbox' ), '20080710' );
     162        $scripts->add( 'media-upload', '/wp-admin/js/media-upload.js', array( 'thickbox' ), '20080723' );
    163163        $scripts->localize( 'upload', 'uploadL10n', array(
    164164            'browseTitle' => attribute_escape(__('Browse your files')),
  • trunk/wp-includes/version.php

    r8653 r8691  
    99 * @global string $wp_version
    1010 */
    11 $wp_version = '2.7-bleeding';
     11$wp_version = '2.7-hemorrhage';
    1212
    1313/**
Note: See TracChangeset for help on using the changeset viewer.