Skip to content
Browse files

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
  • Loading branch information...
1 parent 01e3a5e commit 39e0608b335cb2c17d90dd5d50a3af0891fb8969 azaozz committed
View
4 wp-admin/admin-footer.php
@@ -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
6 wp-admin/admin-header.php
@@ -29,9 +29,6 @@ function add_minwidth($c) {
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 @@ function add_minwidth($c) {
}
?>
<div id="wpbody">
-
-<?php if ( ! $fixed_bar ) { ?>
<div id="wpbody-content">
-<?php } ?>
View
2 wp-admin/comment.php
@@ -34,8 +34,6 @@ function comment_footer_die( $msg ) { //
$title = __('Edit Comment');
wp_enqueue_script('comment');
- $fixed_bar = true;
-
require_once('admin-header.php');
$comment_id = absint( $_GET['c'] );
View
10 wp-admin/edit-form-advanced.php
@@ -56,9 +56,6 @@
?>
<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).
@@ -298,11 +295,10 @@ function post_comment_status_meta_box($post) {
?>
<input name="advanced_view" type="hidden" value="1" />
<p class="meta-options">
- <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>
+ <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>
</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 @@ function post_revisions_meta_box($post) {
</div><!-- /poststuff -->
</div>
-<br class="clear" />
-</div>
-
</form>
<?php if ((isset($post->post_title) && '' == $post->post_title) || (isset($_GET['message']) && 2 > $_GET['message'])) : ?>
View
6 wp-admin/edit-form-comment.php
@@ -16,8 +16,6 @@
?>
<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 @@
<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 @@ function comment_submit_meta_box($comment) {
</div>
</div>
</div>
-</div>
-
</form>
<script type="text/javascript">
View
18 wp-admin/edit-link-form.php
@@ -257,16 +257,12 @@ function link_advanced_meta_box($link) {
}
add_meta_box('linkadvanceddiv', __('Advanced'), 'link_advanced_meta_box', 'link', 'normal', 'core');
-?>
-
-<?php echo $form ?>
-<div id="wpbody-content">
-
-<?php echo $link_added; ?>
+echo $form;
+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 @@ function link_advanced_meta_box($link) {
</div>
</div>
-
-<br class="clear" />
-</div>
-
</form>
View
5 wp-admin/edit-page-form.php
@@ -47,8 +47,6 @@
?>
<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; ?>
@@ -395,9 +393,6 @@ function page_revisions_meta_box($post) {
</div>
</div>
-
-<br class="clear" />
-</div>
</form>
<script type="text/javascript">
View
1 wp-admin/link-add.php
@@ -26,7 +26,6 @@
$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
1 wp-admin/link.php
@@ -106,7 +106,6 @@
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
12 wp-admin/wp-admin.css
@@ -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;
}

0 comments on commit 39e0608

Please sign in to comment.
Something went wrong with that request. Please try again.