From fe24ab0b60dd30fdaa2097cb91479bee5189f40e Mon Sep 17 00:00:00 2001
From: Andrew Ozz <azaozz@git.wordpress.org>
Date: Tue, 14 Oct 2008 06:07:49 +0000
Subject: [PATCH] Put post status inline with post name

git-svn-id: https://develop.svn.wordpress.org/trunk@9157 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-admin/includes/template.php | 11 +++--------
 wp-admin/wp-admin.css          |  1 -
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php
index 2ce259489a..3935ddfd73 100644
--- a/wp-admin/includes/template.php
+++ b/wp-admin/includes/template.php
@@ -1259,10 +1259,8 @@ function _post_row($a_post, $pending_comments, $mode) {
 		case 'title':
 			$attributes = 'class="post-title column-title"' . $style;
 		?>
-		<td <?php echo $attributes ?>><strong><?php if ( current_user_can( 'edit_post', $post->ID ) ) { ?><a class="row-title" href="<?php echo $edit_link; ?>" title="<?php echo attribute_escape(sprintf(__('Edit "%s"'), $title)); ?>"><?php echo $title ?></a><?php } else { echo $title; } ?></strong>
+		<td <?php echo $attributes ?>><strong><?php if ( current_user_can( 'edit_post', $post->ID ) ) { ?><a class="row-title" href="<?php echo $edit_link; ?>" title="<?php echo attribute_escape(sprintf(__('Edit "%s"'), $title)); ?>"><?php echo $title ?></a><?php } else { echo $title; }; _post_states($post); ?></strong>
 		<?php
-			_post_states($post);
-
 			if ( 'excerpt' == $mode )
 				the_excerpt();
 
@@ -1445,10 +1443,8 @@ foreach ($posts_columns as $column_name=>$column_display_name) {
 		$attributes = 'class="post-title page-title column-title"' . $style;
 		$edit_link = get_edit_post_link( $page->ID );
 		?>
-		<td <?php echo $attributes ?>><strong><?php if ( current_user_can( 'edit_post', $page->ID ) ) { ?><a class="row-title" href="<?php echo $edit_link; ?>" title="<?php echo attribute_escape(sprintf(__('Edit "%s"'), $title)); ?>"><?php echo $pad; echo $title ?></a><?php } else { echo $pad; echo $title; } ?></strong>
+		<td <?php echo $attributes ?>><strong><?php if ( current_user_can( 'edit_post', $page->ID ) ) { ?><a class="row-title" href="<?php echo $edit_link; ?>" title="<?php echo attribute_escape(sprintf(__('Edit "%s"'), $title)); ?>"><?php echo $pad; echo $title ?></a><?php } else { echo $pad; echo $title; }; _post_states($page); ?></strong>
 		<?php
-		_post_states($page);
-
 		$actions = array();
 		$actions['edit'] = '<a href="' . $edit_link . '">' . __('Edit') . '</a>';
 		$actions['inline'] = '<a href="#" class="editinline">' . __('Quick Edit') . '</a>';
@@ -3067,13 +3063,12 @@ function _post_states($post) {
 	if ( ! empty($post_states) ) {
 		$state_count = count($post_states);
 		$i = 0;
-		echo '<div id="post-states">';
+		echo ' - ';
 		foreach ( $post_states as $state ) {
 			++$i;
 			( $i == $state_count ) ? $sep = '' : $sep = ', ';
 			echo "<span class='post-state'>$state$sep</span>";
 		}
-		echo '</div>';
 	}
 }
 
diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css
index d1cd9fd111..327349e84d 100644
--- a/wp-admin/wp-admin.css
+++ b/wp-admin/wp-admin.css
@@ -771,7 +771,6 @@ ul#adminmenu li.write-new-button a {
 	margin: 0;
 	padding: 0;
 	list-style: none;
-	z-index: 1000;
 }
 
 #adminmenu li.wp-menu-open .wp-submenu {