Changeset 6544

Show
Ignore:
Timestamp:
01/03/08 08:03:29 (8 months ago)
Author:
matt
Message:

Post screen improvementsHHH, er, changes. Will file tickets for todos.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r6482 r6544  
    33if (!isset($_GET["page"])) require_once('admin.php'); 
    44if ( $editing ) { 
    5     wp_enqueue_script( array('dbx-admin-key?pagenow=' . attribute_escape($pagenow),'admin-custom-fields') ); 
    65    if ( current_user_can('manage_categories') ) 
    76        wp_enqueue_script( 'ajaxcat' ); 

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

    r6542 r6544  
    6969<div id="poststuff"> 
    7070 
    71 <div id="moremeta"> 
    72 <div id="grabit" class="dbx-group"> 
    73  
    74 <fieldset id="categorydiv" class="dbx-box"> 
    75 <h3 class="dbx-handle"><?php _e('Categories') ?></h3> 
    76 <div class="dbx-content"> 
    77 <p id="jaxcat"><?php wp_nonce_field( 'add-category', '_ajax_nonce', false ); ?></p> 
    78 <ul id="categorychecklist" class="list:category"><?php dropdown_categories(); ?></ul></div> 
    79 </fieldset> 
    80  
    81 <fieldset id="commentstatusdiv" class="dbx-box"> 
    82 <h3 class="dbx-handle"><?php _e('Discussion') ?></h3> 
    83 <div class="dbx-content"> 
    84 <input name="advanced_view" type="hidden" value="1" /> 
    85 <label for="comment_status" class="selectit"> 
    86 <input name="comment_status" type="checkbox" id="comment_status" value="open" <?php checked($post->comment_status, 'open'); ?> /> 
    87 <?php _e('Allow Comments') ?></label> 
    88 <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> 
    89 </div> 
    90 </fieldset> 
    91  
    92 <fieldset id="passworddiv" class="dbx-box"> 
    93 <h3 class="dbx-handle"><?php _e('Post Password') ?></h3> 
    94 <div class="dbx-content"><input name="post_password" type="text" size="13" id="post_password" value="<?php echo attribute_escape( $post->post_password ); ?>" /></div> 
    95 </fieldset> 
    96  
    97 <fieldset id="slugdiv" class="dbx-box"> 
    98 <h3 class="dbx-handle"><?php _e('Post Slug') ?></h3> 
    99 <div class="dbx-content"><input name="post_name" type="text" size="13" id="post_name" value="<?php echo attribute_escape( $post->post_name ); ?>" /></div> 
    100 </fieldset> 
    101  
    102 <fieldset id="poststatusdiv" class="dbx-box"> 
    103 <h3 class="dbx-handle"><?php _e('Post Status') ?></h3> 
    104 <div class="dbx-content"> 
    105 <?php if ( current_user_can('publish_posts') ) : ?> 
    106     <label for="post_status_publish" class="selectit"><input id="post_status_publish" name="post_status" type="radio" value="publish" <?php checked($post->post_status, 'publish'); checked($post->post_status, 'future'); ?> /> <?php _e('Published') ?></label> 
    107 <?php endif; ?> 
    108     <label for="post_status_pending" class="selectit"><input id="post_status_pending" name="post_status" type="radio" value="pending" <?php checked($post->post_status, 'pending'); ?> /> <?php _e('Pending Review') ?></label> 
    109       <label for="post_status_draft" class="selectit"><input id="post_status_draft" name="post_status" type="radio" value="draft" <?php checked($post->post_status, 'draft'); ?> /> <?php _e('Draft') ?></label> 
    110       <label for="post_status_private" class="selectit"><input id="post_status_private" name="post_status" type="radio" value="private" <?php checked($post->post_status, 'private'); ?> /> <?php _e('Private') ?></label></div> 
    111 </fieldset> 
    112  
    113 <?php if ( current_user_can('edit_posts') ) : ?> 
    114 <fieldset id="posttimestampdiv" class="dbx-box"> 
    115 <h3 class="dbx-handle"><?php _e('Post Timestamp'); ?></h3> 
    116 <div class="dbx-content"><?php touch_time(($action == 'edit')); ?></div> 
    117 </fieldset> 
    118 <?php endif; ?> 
    119  
    120 <?php 
    121 $authors = get_editable_user_ids( $current_user->id ); // TODO: ROLE SYSTEM 
    122 if ( $post->post_author && !in_array($post->post_author, $authors) ) 
    123     $authors[] = $post->post_author; 
    124 if ( $authors && count( $authors ) > 1 ) : 
    125 ?> 
    126 <fieldset id="authordiv" class="dbx-box"> 
    127 <h3 class="dbx-handle"><?php _e('Post Author'); ?></h3> 
    128 <div class="dbx-content"> 
    129 <?php wp_dropdown_users( array('include' => $authors, 'name' => 'post_author_override', 'selected' => empty($post_ID) ? $user_ID : $post->post_author) ); ?> 
    130 </div> 
    131 </fieldset> 
    132 <?php endif; ?> 
    133  
    134 <?php do_action('dbx_post_sidebar'); ?> 
    135  
    136 </div> 
    137 </div> 
    138  
    139 <fieldset id="titlediv"> 
    140     <legend><?php _e('Title') ?></legend> 
    141     <div><input type="text" name="post_title" size="30" tabindex="1" value="<?php echo attribute_escape($post->post_title); ?>" id="title" /></div> 
    142 </fieldset> 
    143  
    144 <fieldset id="<?php echo user_can_richedit() ? 'postdivrich' : 'postdiv'; ?>"> 
    145 <legend><?php _e('Post') ?> 
    146  
     71<div id="titlediv"> 
     72<h3><?php _e('Title') ?></h3> 
     73<div class="inside"><input type="text" name="post_title" size="30" tabindex="1" value="<?php echo attribute_escape($post->post_title); ?>" id="title" /></div> 
     74</div> 
     75 
     76<div id="<?php echo user_can_richedit() ? 'postdivrich' : 'postdiv'; ?>" class="postarea"> 
     77<h3><?php _e('Post') ?></h3> 
     78<?php the_editor($post->post_content); ?> 
     79</div> 
     80 
     81<?php echo $form_pingback ?> 
     82<?php echo $form_prevstatus ?> 
     83 
     84<p class="submit"> 
    14785<?php if ( 'publish' == $post->post_status ) { ?> 
    14886<a href="<?php echo clean_url(get_permalink($post->ID)); ?>" class="view-link" target="_blank"><?php _e('View &raquo;'); ?></a> 
    …… 
    15088<a href="<?php echo clean_url(apply_filters('preview_post_link', add_query_arg('preview', 'true', get_permalink($post->ID)))); ?>" class="view-link" target="_blank"><?php _e('Preview &raquo;'); ?></a> 
    15189<?php } ?> 
    152 </legend> 
    153  
    154     <?php the_editor($post->post_content); ?> 
    155 </fieldset> 
    156  
    157 <?php echo $form_pingback ?> 
    158 <?php echo $form_prevstatus ?> 
    159  
    160 <p class="submit"> 
    16190<span id="autosave"></span> 
    16291<?php echo $saveasdraft; ?> 
    …… 
    182111?>" /></p> 
    183112 
     113<div id="tagsdiv" class="postbox"> 
     114<h3><?php _e('Tags'); ?></h3> 
     115<div class="inside"> 
     116<p id="jaxtag"><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> 
     117<p id="tagchecklist"></p> 
     118</div> 
     119</div> 
     120 
     121<div id="categorydiv" class="postbox"> 
     122<h3><?php _e('Categories') ?></h3> 
     123<div class="inside"> 
     124<p id="jaxcat"><?php wp_nonce_field( 'add-category', '_ajax_nonce', false ); ?></p> 
     125<ul id="categorychecklist" class="list:category"><?php dropdown_categories(); ?></ul> 
     126</div> 
     127</div> 
     128 
    184129<?php do_action('edit_form_advanced'); ?> 
    185130 
    186131<?php 
    187 if (current_user_can('upload_files')) { 
     132if (current_user_can('upload_files') && false) { 
    188133    $uploading_iframe_ID = (int) (0 == $post_ID ? $temp_ID : $post_ID); 
    189134    $uploading_iframe_src = wp_nonce_url("upload.php?style=inline&amp;tab=upload&amp;post_id=$uploading_iframe_ID", 'inlineuploading'); 
    …… 
    194139?> 
    195140 
    196 <div id="advancedstuff" class="dbx-group" > 
    197  
    198 <div class="dbx-b-ox-wrapper"> 
    199 <fieldset id="tagdiv" class="dbx-box"> 
    200 <div class="dbx-h-andle-wrapper"> 
    201 <h3 class="dbx-handle"><?php _e('Tags (separate multiple tags with commas: cats, pet food, dogs)'); ?></h3> 
    202 </div> 
    203 <div class="dbx-c-ontent-wrapper"> 
    204 <div class="dbx-content"> 
    205 <p id="jaxtag"> 
    206 <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 ); ?>" /> 
    207 </p> 
    208 <p id="tagchecklist"></p> 
    209 </div></div> 
    210 </fieldset> 
    211 </div> 
    212  
    213 <div class="dbx-b-ox-wrapper"> 
    214 <fieldset id="postexcerpt" class="dbx-box"> 
    215 <div class="dbx-h-andle-wrapper"> 
    216 <h3 class="dbx-handle"><?php _e('Optional Excerpt') ?></h3> 
    217 </div> 
    218 <div class="dbx-c-ontent-wrapper"> 
    219 <div class="dbx-content"><textarea rows="1" cols="40" name="excerpt" tabindex="6" id="excerpt"><?php echo $post->post_excerpt ?></textarea> 
    220 </div></div> 
    221 </fieldset> 
    222 </div> 
    223  
    224 <div class="dbx-b-ox-wrapper"> 
    225 <fieldset id="trackbacksdiv" class="dbx-box"> 
    226 <div class="dbx-h-andle-wrapper"> 
    227 <h3 class="dbx-handle"><?php _e('Trackbacks') ?></h3> 
    228 </div> 
    229 <div class="dbx-c-ontent-wrapper"> 
    230 <div class="dbx-content"><?php _e('Send trackbacks to:'); ?> <?php echo $form_trackback; ?> (<?php _e('Separate multiple URLs with spaces'); ?>) 
     141<h2><?php _e('Advanced Options'); ?></h2> 
     142 
     143<div id="postexcerpt" class="postbox"> 
     144<h3><?php _e('Optional Excerpt') ?></h3> 
     145<div class="inside"><textarea rows="1" cols="40" name="excerpt" tabindex="6" id="excerpt"><?php echo $post->post_excerpt ?></textarea></div> 
     146</div> 
     147 
     148<div id="trackbacksdiv" class="postbox"> 
     149<h3><?php _e('Trackbacks') ?></h3> 
     150<div class="inside"> 
     151<?php _e('Send trackbacks to:'); ?> <?php echo $form_trackback; ?> (<?php _e('Separate multiple URLs with spaces'); ?>) 
    231152<?php 
    232153if ( ! empty($pings) ) 
    …… 
    235156</div> 
    236157</div> 
    237 </fieldset> 
    238 </div> 
    239  
    240 <div class="dbx-b-ox-wrapper"> 
    241 <fieldset id="postcustom" class="dbx-box"> 
    242 <div class="dbx-h-andle-wrapper"> 
    243 <h3 class="dbx-handle"><?php _e('Custom Fields') ?></h3> 
    244 </div> 
    245 <div class="dbx-c-ontent-wrapper"> 
    246 <div id="postcustomstuff" class="dbx-content"> 
     158 
     159<div id="postcustom" class="postbox"> 
     160<h3><?php _e('Custom Fields') ?></h3> 
     161<div class="inside"> 
     162<div id="postcustomstuff"> 
    247163<table cellpadding="3"> 
    248164<?php 
    …… 
    258174</div> 
    259175</div> 
    260 </fieldset> 
    261176</div> 
    262177 
    263178<?php do_action('dbx_post_advanced'); ?> 
     179 
     180<div id="commentstatusdiv" class="postbox"> 
     181<h3><?php _e('Discussion') ?></h3> 
     182<div class="inside"> 
     183<input name="advanced_view" type="hidden" value="1" /> 
     184<label for="comment_status" class="selectit"> 
     185<input name="comment_status" type="checkbox" id="comment_status" value="open" <?php checked($post->comment_status, 'open'); ?> /> 
     186<?php _e('Allow Comments') ?></label> 
     187<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> 
     188</div> 
     189</div> 
     190 
     191<div id="passworddiv" class="postbox"> 
     192<h3><?php _e('Post Password') ?></h3> 
     193<div class="inside"> 
     194<input name="post_password" type="text" size="13" id="post_password" value="<?php echo attribute_escape( $post->post_password ); ?>" /> 
     195</div> 
     196</div> 
     197 
     198<div id="slugdiv" class="postbox"> 
     199<h3><?php _e('Post Slug') ?></h3> 
     200<div class="inside"> 
     201<input name="post_name" type="text" size="13" id="post_name" value="<?php echo attribute_escape( $post->post_name ); ?>" /> 
     202</div> 
     203</div> 
     204 
     205<div id="poststatusdiv" class="postbox"> 
     206<h3><?php _e('Post Status') ?></h3> 
     207<div class="inside"> 
     208<?php if ( current_user_can('publish_posts') ) : ?> 
     209<label for="post_status_publish" class="selectit"><input id="post_status_publish" name="post_status" type="radio" value="publish" <?php checked($post->post_status, 'publish'); checked($post->post_status, 'future'); ?> /> <?php _e('Published') ?></label> 
     210<?php endif; ?> 
     211<label for="post_status_pending" class="selectit"><input id="post_status_pending" name="post_status" type="radio" value="pending" <?php checked($post->post_status, 'pending'); ?> /> <?php _e('Pending Review') ?></label> 
     212  <label for="post_status_draft" class="selectit"><input id="post_status_draft" name="post_status" type="radio" value="draft" <?php checked($post->post_status, 'draft'); ?> /> <?php _e('Draft') ?></label> 
     213  <label for="post_status_private" class="selectit"><input id="post_status_private" name="post_status" type="radio" value="private" <?php checked($post->post_status, 'private'); ?> /> <?php _e('Private') ?></label> 
     214</div> 
     215</div> 
     216 
     217<?php if ( current_user_can('edit_posts') ) : ?> 
     218<div id="posttimestampdiv" class="postbox"> 
     219<h3><?php _e('Post Timestamp'); ?></h3> 
     220<div class="inside"><?php touch_time(($action == 'edit')); ?></div> 
     221</div> 
     222<?php endif; ?> 
     223 
     224<?php 
     225$authors = get_editable_user_ids( $current_user->id ); // TODO: ROLE SYSTEM 
     226if ( $post->post_author && !in_array($post->post_author, $authors) ) 
     227    $authors[] = $post->post_author; 
     228if ( $authors && count( $authors ) > 1 ) : 
     229?> 
     230<div id="authordiv" class="postbox"> 
     231<h3><?php _e('Post Author'); ?></h3> 
     232<div class="inside"> 
     233<?php wp_dropdown_users( array('include' => $authors, 'name' => 'post_author_override', 'selected' => empty($post_ID) ? $user_ID : $post->post_author) ); ?> 
     234</div> 
     235</div> 
     236<?php endif; ?> 
     237 
     238<?php do_action('dbx_post_sidebar'); ?> 
    264239 
    265240</div> 

  • trunk/wp-admin/includes/image.php

    r6454 r6544  
    318318} 
    319319 
     320function media_buttons() { // just a placeholder for now 
    320321?> 
     322<img src="./images/media-buttons.gif" alt="" /> 
     323<?php 
     324} 
     325add_action( 'media_buttons', 'media_buttons' ); 
     326 
     327?> 

  • trunk/wp-admin/includes/template.php

    r6427 r6544  
    506506        natcasesort($keys); 
    507507?> 
    508 <h3><?php _e( 'Add a new custom field:' ) ?></h3> 
     508<p><strong><?php _e( 'Add a new custom field:' ) ?></strong></p> 
    509509<table id="newmeta" cellspacing="3" cellpadding="3"> 
    510510    <tr> 

  • trunk/wp-admin/link-add.php

    r6213 r6544  
    1212    'notes', 'linkcheck[]')); 
    1313 
    14 wp_enqueue_script( array('xfn', 'dbx-admin-key?pagenow=link.php') ); 
    1514if ( current_user_can( 'manage_categories' ) ) 
    1615    wp_enqueue_script( 'ajaxcat' ); 

  • trunk/wp-admin/link.php

    r6255 r6544  
    8484 
    8585    case 'edit' : 
    86         wp_enqueue_script( array('xfn', 'dbx-admin-key?pagenow=link.php') ); 
    8786        if ( current_user_can( 'manage_categories' ) ) 
    8887            wp_enqueue_script( 'ajaxlinkcat' ); 

  • trunk/wp-admin/rtl.css

    r6146 r6544  
    11html, 
    2 .dbx-handle, 
    32#post_name, 
    43input[name=link_url], 
    …… 
    3130    } 
    3231p.submit, 
    33 .dbx-handle { 
    34     text-align: left; 
    35     } 
    3632html *, 
    3733select, 
    …… 
    8076    border-left: 2px solid #045290; 
    8177    } 
    82 .dbx-content input, .dbx-content select { 
    83     margin-right: 8px; 
    84     } 
     78 
    8579#newcat { 
    8680    width: 100px; 

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

    r6542 r6544  
    9898body, td { 
    9999    font: 13px "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif; 
    100 } 
    101  
    102 fieldset { 
    103     border: none; 
    104     padding: 3px; 
    105 } 
    106  
    107 fieldset label.selectit { 
    108     display: block; 
    109     font-size: 11px; 
    110     padding: 0 2px; 
    111 } 
    112  
    113 fieldset label.selectit:hover { 
    114     background: #e9e9e9; 
    115 } 
    116  
    117 fieldset legend { 
    118     padding: .1em .3em; 
    119100} 
    120101 
    …… 
    373354} 
    374355 
    375  
    376 #categorydiv input, #poststatusdiv input, #commentstatusdiv input, #pingstatusdiv input { 
    377     border: none; 
    378 } 
    379  
    380356#postdiv, #titlediv, #guiddiv { 
    381357    margin: 0 8px 0 0; 
    …… 
    396372    padding: 5px; 
    397373    line-height: 140%; 
    398 } 
    399  
    400 #titlediv input, #guiddiv input { 
    401     margin: 0; 
    402     width: 100%; 
    403374} 
    404375 
    …… 
    467438} 
    468439 
    469 #title { 
    470     font-size: 1.7em; 
    471     padding: 4px 3px; 
    472 } 
    473  
    474 #postexcerpt div, #attachmentlinks div { 
    475     margin-right: 8px; 
    476 } 
    477440 
    478441#attachmentlinks textarea { 
    …… 
    480443    height: 2.5em; 
    481444    margin-bottom: 6px; 
    482 } 
    483  
    484 * html #postexcerpt .dbx-toggle-open, * html #postexcerpt .dbx-toggle-open { 
    485     padding-right: 8px; 
    486445} 
    487446 
    …… 
    692651} 
    693652 
    694 #zeitgeist { 
    695     background: #eee; 
    696     border: 1px solid #c5c5c5; 
    697     float: right; 
    698     font-size: 90%; 
    699     margin-bottom: .5em; 
    700     margin-left: 1em; 
    701     margin-top: .5em; 
    702     padding: 1em; 
    703     width: 40%; 
    704 } 
    705  
    706 #zeitgeist h2, fieldset legend a { 
    707     background: none; 
    708 } 
    709  
    710 * html #zeitgeist h2 { 
    711     padding-top: 10px; 
    712 } 
    713  
    714 #zeitgeist h3 { 
    715     border-bottom: 1px solid #ccc; 
    716     font-size: 16px; 
    717     margin: 1em 0 0; 
    718 } 
    719  
    720 #zeitgeist h3 cite { 
    721     font-size: 12px; 
    722     font-style: normal; 
    723 } 
    724  
    725 #zeitgeist li, #zeitgeist p { 
    726     margin: .2em 0; 
    727 } 
    728  
    729 #zeitgeist ul { 
    730     margin: 0 0 .3em .6em; 
    731     padding: 0 0 0 .6em; 
    732 } 
    733  
    734653.active td { 
    735654    background: #BEB; 
    …… 
    766685} 
    767686 
    768 /* Box stuff */ 
    769 .dbx-clone { 
    770     position: absolute; 
    771     visibility: hidden; 
    772 } 
    773 .dbx-clone, .dbx-clone .dbx-handle-cursor { 
    774     cursor: move !important; 
    775 } 
    776 .dbx-dummy { 
    777     display: block; 
    778     width: 0; 
    779     height: 0; 
    780     overflow: hidden; 
    781 } 
    782 .dbx-group, .dbx-box, .dbx-handle { 
    783     position: relative; 
    784     display: block; 
    785 } 
    786  
    787 #grabit { 
    788     width: 188px; 
    789 } 
    790  
    791687* html #themeselect { 
    792688    padding: 0 3px; 
    793689    height: 22px; 
    794 } 
    795  
    796 /**************************************************************** 
    797 avoid padding, margins or borders on dbx-box, 
    798 to reduce visual discrepancies between it and the clone. 
    799 overall, dbx-box is best left as visually unstyled as possible 
    800 *****************************************************************/ 
    801 .dbx-box { 
    802     margin: 0; 
    803     padding: 0; 
    804     border: none; 
    805 } 
    806  
    807 /* Can change this */ 
    808 #moremeta fieldset, #advancedstuff fieldset { 
    809     margin-bottom: 1em; 
    810 } 
    811 #moremeta fieldset div { 
    812     margin: 2px 0 0 0; 
    813     padding: 7px; 
    814 } 
    815 #moremeta { 
    816     line-height: 130%; 
    817     margin-right: 15px; 
    818     position: absolute; 
    819     right: 5%; 
    820     width: 14.5em; 
    821 } 
    822 #moremeta select { 
    823     width: 96%; 
    824 } 
    825  
    826 #slugdiv input, #passworddiv input, #authordiv select, #thumbdiv input, #parentdiv input { 
    827     margin-top: .5em; 
    828     width: 90%; 
    829 } 
    830  
    831 #moremeta h3, #advancedstuff h3 { 
    832     padding: 3px; 
    833     font-weight: normal; 
    834     font-size: 13px; 
    835 } 
    836  
    837 #advancedstuff div { 
    838     margin-top: .5em; 
    839690} 
    840691 
    …… 
    889740} 
    890741 
    891 /* default box styles */ 
    892  
    893 /* toggle state of inner content area */ 
    894 .dbx-box-open .dbx-content { 
    895     display: block; 
    896 } 
    897 .dbx-box-closed .dbx-content { 
    898     display: none; 
    899 } 
    900  
    901 #moremeta .dbx-content { 
    902     background: url(images/box-butt.gif) no-repeat bottom right; 
    903     padding-bottom: 15px; 
    904     padding-right: 2px; 
    905 } 
    906  
    907 #moremeta fieldset.dbx-box-closed { 
    908     background: url(images/box-butt.gif) no-repeat bottom; 
    909     padding-bottom: 9px; 
    910 } 
    911  
    912 /* handles */ 
    913  
    914 .dbx-handle { 
    915     background: #2685af; 
    916     padding: 6px 1em 2px; 
    917     font-size: 12px; 
    918     margin: 0; 
    919     color: #E3EFF5; 
    920 } 
    921  
    922 #moremeta .dbx-handle { 
    923     padding: 6px 1em 2px; 
    924     font-size: 12px; 
    925     background: #2685af url(images/box-head.gif) no-repeat right; 
    926 } 
    927  
    928 #moremeta .dbx-box { 
    929     background: url(images/box-bg.gif) repeat-y right; 
    930 } 
    931  
    932 #advancedstuff h3.dbx-handle { 
    933     margin-left: 7px; 
    934     margin-bottom: -7px; 
    935     padding: 6px 1em 0 3px; 
    936     height: 19px; 
    937     font-size: 12px; 
    938     background: #2685af url(images/box-head-right.gif) no-repeat top right; 
    939 } 
    940  
    941 #advancedstuff div.dbx-h-andle-wrapper { 
    942     margin: 0 0 0 -7px; 
    943     background: #fff url(images/box-head-left.gif) no-repeat top left; 
    944 } 
    945  
    946 #advancedstuff div.dbx-content { 
    947     margin-left: 8px; 
    948     background: url(images/box-bg-right.gif) repeat-y right; 
    949     padding: 10px 10px 15px 0; 
    950 } 
    951  
    952 #postexcerpt div.dbx-content { 
    953     margin-right: 0; 
    954     padding-right: 17px; 
    955 } 
    956  
    957 #advancedstuff div.dbx-c-ontent-wrapper { 
    958     margin-left: -7px; 
    959     margin-right: 0; 
    960     background: url(images/box-bg-left.gif) repeat-y left; 
    961 } 
    962  
    963 #advancedstuff fieldset.dbx-box { 
    964     padding-bottom: 9px; 
    965     margin-left: 6px; 
    966     background: url(images/box-butt-right.gif) no-repeat bottom right; 
    967 } 
    968  
    969 #advancedstuff div.dbx-b-ox-wrapper { 
    970     background: url(images/box-butt-left.gif) no-repeat bottom left; 
    971 } 
    972  
    973 #advancedstuff .dbx-box-closed div.dbx-c-ontent-wrapper { 
    974     padding-bottom: 2px; 
    975     background: url(images/box-butt-left.gif) no-repeat bottom left; 
    976 } 
    977  
    978 #advancedstuff .dbx-box { 
    979     background: url(images/box-butt-right.gif) no-repeat bottom right; 
    980 } 
    981  
    982 /* handle cursors */ 
    983 .dbx-handle-cursor { 
    984     cursor: move; 
    985 } 
    986  
    987 /* toggle images */ 
    988 a.dbx-toggle, a.dbx-toggle:visited { 
    989     display: block; 
    990     overflow: hidden; 
    991     background-image: url( images/toggle.gif ); 
    992     position: absolute; 
    993     top: 0; 
    994     right: 0; 
    995     background-repeat: no-repeat; 
    996     border: 0; 
    997     margin: 0; 
    998     padding: 0; 
    999 } 
    1000  
    1001 #moremeta a.dbx-toggle, #moremeta a.dbx-toggle-open:visited { 
    1002     height: 25px; 
    1003     width: 27px; 
    1004     background-position: 0 0; 
    1005 } 
    1006  
    1007 #moremeta a.dbx-toggle-open, #moremeta a.dbx-toggle-open:visited { 
    1008     height: 25px; 
    1009     width: 27px; 
    1010     background-position: 0 -25px; 
    1011 } 
    1012  
    1013 #advancedstuff a.dbx-toggle, #advancedstuff a.dbx-toggle-open:visited { 
    1014     height: 22px; 
    1015     width: 22px; 
    1016     top: 3px; 
    1017     right: 5px; 
    1018     background-position: 0 -3px; 
    1019 } 
    1020  
    1021 #advancedstuff a.dbx-toggle-open, #advancedstuff a.dbx-toggle-open:visited { 
    1022     height: 22px; 
    1023     width: 22px; 
    1024     top: 3px; 
    1025     right: 5px; 
    1026     background-position: 0 -28px; 
    1027 } 
    1028  
    1029 #categorychecklist { 
    1030     margin-right: 6px; 
    1031 } 
    1032  
    1033 /* additional clone styles */ 
    1034 .dbx-clone { 
    1035     opacity: 0.8; 
    1036     -moz-opacity: 0.8; 
    1037     -khtml-opacity: 0.8; 
    1038     filter: alpha(opacity=80); 
    1039 } 
     742 
    1040743 
    1041744#newcat { 
    …… 
    1076779} 
    1077780 
    1078 #postdivrich #edButtons { 
    1079     padding-left: 3px; 
    1080 } 
    1081  
    1082 #postdivrich #content, #postdivrich #content:active { 
    1083     border: 1px solid #ccc; 
    1084 } 
    1085  
    1086 #edButtons input, #edButtons input:active { 
    1087     margin: 0 2px -1px; 
    1088 } 
    1089  
    1090 #edButtons input.edButtonFore, #edButtons input.edButtonFore:active { 
    1091     background: #f0f0ee; 
    1092     border-bottom: 1px solid #f0f0ee; 
    1093 } 
    1094  
    1095 #edButtons input.edButtonBack, #edButtons input.edButtonBack:active { 
    1096     background: #fff url( images/fade-butt.png ) repeat-x 0 15px; 
    1097     border-bottom: 1px solid #ccc; 
    1098 } 
    1099781 
    1100782.page-numbers { 
    …… 
    1120802    font-weight: bold; 
    1121803    margin: 0 6px; 
    1122 } 
    1123  
    1124 a.view-link { 
    1125     position: absolute; 
    1126     right: 5%; 
    1127     margin-right: 220px; 
    1128     text-decoration:underline; 
    1129804} 
    1130805 
    …… 
    14541129    color: black; 
    14551130} 
     1131 
     1132#poststuff h3 { 
     1133    background: #eaf3fa; 
     1134    font-size: 15px; 
     1135    font-weight: bold; 
     1136    padding: 10px 5px; 
     1137    margin: 0 0 10px; 
     1138} 
     1139 
     1140#poststuff fieldset { 
     1141    border: 1px solid #ccc;pa 
     1142    padding: 2px; 
     1143} 
     1144 
     1145#poststuff .postbox, #titlediv { 
     1146    margin-left: 20px; 
     1147    border: 1px solid #ebebeb; 
     1148    border-right: 1px solid #ccc; 
     1149    border-bottom: 1px solid #ccc; 
     1150    padding: 2px; 
     1151    margin-bottom: 10px; 
     1152} 
     1153 
     1154#poststuff .postarea { 
     1155    margin-left: 20px; 
     1156    margin-right: 8px; 
     1157} 
     1158 
     1159#poststuff .inside { 
     1160    margin: 0 12px 15px; 
     1161} 
     1162 
     1163#poststuff #title { 
     1164    font-size: 1.7em; 
     1165    padding: 4px 3px; 
     1166    width: 98%; 
     1167} 
     1168 
     1169#poststuff #editor-toolbar { 
     1170    position: relative; 
     1171    height: 30px; 
     1172    margin-top: -40px; 
     1173} 
     1174 
     1175#poststuff #edButtonPreview, #poststuff #edButtonHTML { 
     1176    display: block; 
     1177    height: 18px; 
     1178    padding: 5px; 
     1179    margin-right: 8px; 
     1180    float: right; 
     1181    cursor: pointer; 
     1182    color: #2583ad; 
     1183} 
     1184 
     1185#poststuff #editor-toolbar .active { 
     1186    background: #cee1ef; 
     1187    color: #333; 
     1188    font-weight: bold; 
     1189    -moz-border-radius: 2px; 
     1190} 
     1191 
     1192#poststuff #media-buttons { 
     1193    float: right; 
     1194    margin-right: 20px; 
     1195    margin-top: 5px; 
     1196} 
     1197 

  • trunk/wp-includes/general-template.php

    r6538 r6544  
    923923        #postdivrich table, #postdivrich #quicktags {border-top: none;} 
    924924        #quicktags {border-bottom: none; padding-bottom: 2px; margin-bottom: -1px;} 
    925         #edButtons {border-bottom: 1px solid #ccc;} 
    926925    </style> 
    927     <div id='edButtons' style='display:none;'> 
     926    <div id='editor-toolbar' style='display:none;'> 
    928927        <div class='zerosize'><input accesskey='e' type='button' onclick='switchEditors("<?php echo $id; ?>")' /></div> 
    929         <input id='edButtonPreview' class='edButtonFore' type='button' value='<?php _e('Visual'); ?>' /> 
    930         <input id='edButtonHTML' class='edButtonBack' type='button' value='<?php _e('Code'); ?>' onclick='switchEditors("<?php echo $id; ?>")' /> 
     928        <a id='edButtonHTML' class='' onclick='switchEditors("<?php echo $id; ?>")'><?php _e('HTML'); ?></a> 
     929        <a id='edButtonPreview' class='active'><?php _e('Visual'); ?></a> 
     930        <div id="media-buttons"> 
     931        <?php _e('Add media:'); ?> 
     932        <?php do_action( 'media_buttons'); ?> 
     933        </div> 
    931934    </div> 
    932935    <script type="text/javascript"> 
    933936    // <![CDATA[ 
    934937        if ( typeof tinyMCE != "undefined" && tinyMCE.configs.length > 0 ) 
    935             document.getElementById('edButtons').style.display = 'block'; 
     938            document.getElementById('editor-toolbar').style.display = 'block'; 
    936939    // ]]> 
    937940    </script> 

  • trunk/wp-includes/js/tinymce/plugins/wordpress/editor_plugin.js

    r5256 r6544  
    562562 
    563563function edToggle(A, B) { 
    564     A.className = 'edButtonFore'; 
    565     B.className = 'edButtonBack'; 
     564    A.className = 'active'; 
     565    B.className = ''; 
    566566 
    567567    B.onclick = A.onclick; 

  • trunk/wp-includes/js/tinymce/themes/advanced/css/editor_ui.css

    r5256 r6544  
    77.mceLabel {color: #000000;} 
    88.mceLabelDisabled {cursor: text; color: #999999;} 
    9 .mceEditor {background: #F0F0EE; border: 1px solid #cccccc; padding: 0; margin: 0;} 
     9.mceEditor {background: #F0F0EE; border: 1px solid #ddd; padding: 0; margin: 0;} 
    1010.mceEditorArea { font-family: 'MS Sans Serif', sans-serif, Verdana, Arial; background: #FFFFFF; padding: 0; margin: 0; } 
    11 .mceToolbarTop, .mceToolbarBottom {background: #F0F0EE; line-height: 1px; font-size: 1px;} 
     11.mceToolbarTop, .mceToolbarBottom {background: #cee1ef; line-height: 1px; font-size: 1px;} 
    1212.mceToolbarTop {border-bottom: 1px solid #cccccc; padding-bottom: 1px;} 
    1313.mceToolbarBottom {border-top: 1px solid #cccccc;} 
    …… 
    2727/* Button CSS rules */ 
    2828 
    29 a.mceButtonDisabled img, a.mceButtonNormal img, a.mceButtonSelected img {width: 20px; height: 20px; cursor: default; margin-top: 1px; margin-left: 1px;} 
     29a.mceButtonDisabled img, a.mceButtonNormal img, a.mceButtonSelected img {width: 20px; height: 20px; cursor: default; margin: 5px; background: #e9e8e8 url(../../../../../../../wp-admin/images/fade-butt.png); -moz-border-radius: 2px; border: 1px solid #ccc;} 
    3030a.mceButtonDisabled img {border: 0 !important;} 
    3131a.mceButtonNormal img, a.mceButtonSelected img {border: 1px solid #F0F0EE !important;} 

  • trunk/wp-includes/script-loader.php

    r6542 r6544  
    1212 
    1313    function default_scripts() { 
    14         $this->add( 'dbx', '/wp-includes/js/dbx.js', false, '2.05' ); 
    15  
    1614        $this->add( 'fat', '/wp-includes/js/fat.js', false, '1.0-RC1_3660' ); 
    1715 
    …… 
    10199                break; 
    102100            endswitch; 
    103             if ( $man ) { 
    104                 $this->add( 'dbx-admin-key', '/wp-admin/js/dbx-admin-key.js', array('dbx'), '20070417' ); 
    105                 $this->localize( 'dbx-admin-key', 'dbxL10n', array( 
    106                     'manager' => $man, 
    107                     'open' => __('open'), 
    108                     'close' => __('close'), 
    109                     'moveMouse' => __('click-down and drag to move this box'), 
    110                     'toggleMouse' => __('click to %toggle% this box'), 
    111                     'moveKey' => __('use the arrow keys to move this box'), 
    112                     'toggleKey' => __(', or press the enter key to %toggle% it'), 
    113                 ) ); 
    114             } 
    115101            $this->add( 'ajaxcat', '/wp-admin/js/cat.js', array( 'wp-lists' ), '20071101' ); 
    116102            $this->localize( 'ajaxcat', 'catL10n', array(