WordPress.org

Make WordPress Core

Changeset 8697


Ignore:
Timestamp:
08/21/08 02:25:14 (7 years ago)
Author:
azaozz
Message:

Some css cleanup and fixes after the merge, see #7552

Location:
trunk/wp-admin
Files:
10 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/admin-footer.php

    r8691 r8697  
    66 * @subpackage Administration 
    77 */ 
     8?> 
    89 
    9 if ( ! $fixed_bar ) { ?> 
    1010<br class="clear" /></div><!-- wpbody-content --> 
    11 <?php } ?> 
    12  
    1311</div><!-- wpbody --> 
    1412</div><!-- wpcontent --> 
  • trunk/wp-admin/admin-header.php

    r8691 r8697  
    2929        add_filter( 'admin_body_class', 'add_minwidth' ); 
    3030} 
    31  
    32 $fixed_bar_pages = array( 'post.php', 'post-new.php', 'page.php', 'page-new.php' ); 
    33 if ( ! isset($fixed_bar) ) $fixed_bar = in_array( $the_current_page, $fixed_bar_pages ) ? true : false; 
    3431 
    3532get_admin_page_title(); 
     
    143140?> 
    144141<div id="wpbody"> 
    145  
    146 <?php if ( ! $fixed_bar ) { ?> 
    147142<div id="wpbody-content"> 
    148 <?php } ?> 
  • trunk/wp-admin/comment.php

    r8691 r8697  
    3535 
    3636    wp_enqueue_script('comment'); 
    37     $fixed_bar = true; 
    38  
    3937    require_once('admin-header.php'); 
    4038 
  • trunk/wp-admin/edit-form-advanced.php

    r8691 r8697  
    5757 
    5858<form name="post" action="post.php" method="post" id="post"> 
    59 <div id="wpbody-content"> 
    60  
    61  
    6259<?php 
    6360 
     
    299296<input name="advanced_view" type="hidden" value="1" /> 
    300297<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> 
     298    <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> 
    302299</p> 
    303300<?php 
    304  
    305301 
    306302    if ( !$post_ID || $post_ID < 0 ) 
     
    318314    <tr> 
    319315        <th scope="col"><?php _e('Comments') ?></th> 
     316        <th scope="col"><?php _e('Author') ?></th> 
    320317        <th scope="col"><?php _e('Submitted') ?></th> 
    321318    </tr> 
     
    536533 
    537534</div> 
    538 <br class="clear" /> 
    539 </div> 
    540  
    541535</form> 
    542536 
  • trunk/wp-admin/edit-form-comment.php

    r8691 r8697  
    1717 
    1818<form name="post" action="comment.php" method="post" id="post"> 
    19 <div id="wpbody-content"> 
    20  
    2119<?php wp_nonce_field('update-comment_' . $comment->comment_ID) ?> 
    2220<div class="wrap"> 
     
    2624<a class="button" href="<?php echo get_comment_link(); ?>" target="_blank"><?php _e('View this Comment'); ?></a> 
    2725</div> 
    28  
     26<div id="poststuff"> 
    2927<input type="hidden" name="user_ID" value="<?php echo (int) $user_ID ?>" /> 
    3028<input type="hidden" name="action" value='<?php echo $form_action . $form_extra ?>' /> 
     
    118116</div> 
    119117</div> 
    120 </div> 
    121  
    122118</form> 
    123119 
  • trunk/wp-admin/edit-link-form.php

    r8691 r8697  
    258258add_meta_box('linkadvanceddiv', __('Advanced'), 'link_advanced_meta_box', 'link', 'normal', 'core'); 
    259259 
    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 ); ?> 
     260echo $form; 
     261echo $link_added; 
     262 
     263wp_nonce_field($nonce_action); 
     264wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); 
     265wp_nonce_field( 'meta-box-order', 'meta-box-order-nonce', false ); ?> 
    270266 
    271267<div class="wrap"> 
     
    362358 
    363359</div> 
    364  
    365 <br class="clear" /> 
    366 </div> 
    367  
    368360</form> 
  • trunk/wp-admin/edit-page-form.php

    r8691 r8697  
    4848 
    4949<form name="post" action="page.php" method="post" id="post"> 
    50 <div id="wpbody-content"> 
    51  
    5250<?php if ( $notice ) : ?> 
    5351<div id="notice" class="error"><p><?php echo $notice ?></p></div> 
     
    396394 
    397395</div> 
    398  
    399 <br class="clear" /> 
    400 </div> 
    401396</form> 
    402397 
  • trunk/wp-admin/link-add.php

    r8691 r8697  
    2727    '<div id="message" class="updated fade"><p>' . __('Link added.') . '</p></div>' : ''; 
    2828 
    29 $fixed_bar = true; 
    3029require('admin-header.php'); 
    3130?> 
  • trunk/wp-admin/link.php

    r8691 r8697  
    107107            wp_die(__('Link not found.')); 
    108108 
    109         $fixed_bar = true; 
    110109        include_once ('admin-header.php'); 
    111110        include ('edit-link-form.php'); 
  • trunk/wp-admin/wp-admin.css

    r8691 r8697  
    10921092} 
    10931093 
    1094 #submitdiv div.inside { 
     1094#submitdiv div.inside, 
     1095#pagesubmitdiv div.inside, 
     1096#linksubmitdiv div.inside, 
     1097 div.inside { 
    10951098    padding: 0; 
    10961099    margin: 0; 
     
    12501253} 
    12511254 
    1252 #poststuff .inside-submitbox { 
     1255#poststuff .inside-submitbox, 
     1256#side-info-column .inside-submitbox { 
    12531257    margin: 0 12px 12px; 
    12541258    font-size: 11px; 
     
    17931797    margin: 0; 
    17941798} 
    1795  
     1799/* 
    17961800p.meta-options { 
    17971801    border: 1px solid; 
    17981802    padding: 1em .5em; 
    17991803} 
    1800  
     1804*/ 
    18011805.ui-sortable .postbox h3 { 
    18021806    cursor:move; 
Note: See TracChangeset for help on using the changeset viewer.