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

git-svn-id: http://svn.automattic.com/wordpress/trunk@8697 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
azaozz 2008-08-21 02:25:14 +00:00
parent 01e3a5ec79
commit 39e0608b33
10 changed files with 17 additions and 48 deletions

View File

@ -5,11 +5,9 @@
* @package WordPress
* @subpackage Administration
*/
?>
if ( ! $fixed_bar ) { ?>
<br class="clear" /></div><!-- wpbody-content -->
<?php } ?>
</div><!-- wpbody -->
</div><!-- wpcontent -->
</div><!-- wpwrap -->

View File

@ -29,9 +29,6 @@ if ( in_array( $the_current_page, $min_width_pages ) ) {
add_filter( 'admin_body_class', 'add_minwidth' );
}
$fixed_bar_pages = array( 'post.php', 'post-new.php', 'page.php', 'page-new.php' );
if ( ! isset($fixed_bar) ) $fixed_bar = in_array( $the_current_page, $fixed_bar_pages ) ? true : false;
get_admin_page_title();
?>
@ -142,7 +139,4 @@ if ( $parent_file == 'options-general.php' ) {
}
?>
<div id="wpbody">
<?php if ( ! $fixed_bar ) { ?>
<div id="wpbody-content">
<?php } ?>

View File

@ -34,8 +34,6 @@ case 'editcomment' :
$title = __('Edit Comment');
wp_enqueue_script('comment');
$fixed_bar = true;
require_once('admin-header.php');
$comment_id = absint( $_GET['c'] );

View File

@ -56,9 +56,6 @@ if ( 0 == $post_ID ) {
?>
<form name="post" action="post.php" method="post" id="post">
<div id="wpbody-content">
<?php
// All meta boxes should be defined and added before the first do_meta_boxes() call (or potentially during the do_meta_boxes action).
@ -302,7 +299,6 @@ function post_comment_status_meta_box($post) {
</p>
<?php
if ( !$post_ID || $post_ID < 0 )
return;
@ -317,6 +313,7 @@ function post_comment_status_meta_box($post) {
<thead>
<tr>
<th scope="col"><?php _e('Comments') ?></th>
<th scope="col"><?php _e('Author') ?></th>
<th scope="col"><?php _e('Submitted') ?></th>
</tr>
</thead>
@ -535,9 +532,6 @@ do_action('dbx_post_sidebar');
</div><!-- /poststuff -->
</div>
<br class="clear" />
</div>
</form>
<?php if ((isset($post->post_title) && '' == $post->post_title) || (isset($_GET['message']) && 2 > $_GET['message'])) : ?>

View File

@ -16,8 +16,6 @@ $form_extra = "' />\n<input type='hidden' name='comment_ID' value='" . $comment-
?>
<form name="post" action="comment.php" method="post" id="post">
<div id="wpbody-content">
<?php wp_nonce_field('update-comment_' . $comment->comment_ID) ?>
<div class="wrap">
<h2><?php echo $toprow_title; ?></h2>
@ -25,7 +23,7 @@ $form_extra = "' />\n<input type='hidden' name='comment_ID' value='" . $comment-
<div id="previewview">
<a class="button" href="<?php echo get_comment_link(); ?>" target="_blank"><?php _e('View this Comment'); ?></a>
</div>
<div id="poststuff">
<input type="hidden" name="user_ID" value="<?php echo (int) $user_ID ?>" />
<input type="hidden" name="action" value='<?php echo $form_action . $form_extra ?>' />
<?php
@ -117,8 +115,6 @@ add_meta_box('submitdiv', __('Save'), 'comment_submit_meta_box', 'comment', 'sid
</div>
</div>
</div>
</div>
</form>
<script type="text/javascript">

View File

@ -257,16 +257,12 @@ function link_advanced_meta_box($link) {
}
add_meta_box('linkadvanceddiv', __('Advanced'), 'link_advanced_meta_box', 'link', 'normal', 'core');
?>
echo $form;
echo $link_added;
<?php echo $form ?>
<div id="wpbody-content">
<?php echo $link_added; ?>
<?php wp_nonce_field($nonce_action); ?>
<?php wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); ?>
<?php wp_nonce_field( 'meta-box-order', 'meta-box-order-nonce', false ); ?>
wp_nonce_field($nonce_action);
wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false );
wp_nonce_field( 'meta-box-order', 'meta-box-order-nonce', false ); ?>
<div class="wrap">
<h2><?php echo $heading; ?></h2>
@ -361,8 +357,4 @@ if ( $link_id ) : ?>
</div>
</div>
<br class="clear" />
</div>
</form>

View File

@ -47,8 +47,6 @@ $user_ID = (int) $user_ID;
?>
<form name="post" action="page.php" method="post" id="post">
<div id="wpbody-content">
<?php if ( $notice ) : ?>
<div id="notice" class="error"><p><?php echo $notice ?></p></div>
<?php endif; ?>
@ -394,9 +392,6 @@ do_meta_boxes('page', 'advanced', $post);
</div>
</div>
</div>
<br class="clear" />
</div>
</form>

View File

@ -26,7 +26,6 @@ wp_enqueue_script('xfn');
$link_added = ( isset($_GET['added']) && '' != $_POST['link_name'] ) ?
'<div id="message" class="updated fade"><p>' . __('Link added.') . '</p></div>' : '';
$fixed_bar = true;
require('admin-header.php');
?>

View File

@ -106,7 +106,6 @@ switch ($action) {
if (!$link = get_link_to_edit($link_id))
wp_die(__('Link not found.'));
$fixed_bar = true;
include_once ('admin-header.php');
include ('edit-link-form.php');
include ('admin-footer.php');

View File

@ -1091,7 +1091,10 @@ table.form-table td .updated {
border: none;
}
#submitdiv div.inside {
#submitdiv div.inside,
#pagesubmitdiv div.inside,
#linksubmitdiv div.inside,
div.inside {
padding: 0;
margin: 0;
}
@ -1249,7 +1252,8 @@ table.form-table td .updated {
border-style: solid;
}
#poststuff .inside-submitbox {
#poststuff .inside-submitbox,
#side-info-column .inside-submitbox {
margin: 0 12px 12px;
font-size: 11px;
}
@ -1792,12 +1796,12 @@ fieldset {
.settings-toggle h3 {
margin: 0;
}
/*
p.meta-options {
border: 1px solid;
padding: 1em .5em;
}
*/
.ui-sortable .postbox h3 {
cursor:move;
}