Move posts filter above tablenav

git-svn-id: http://svn.automattic.com/wordpress/trunk@9018 1a063a9b-81f0-0310-95a4-ce76da25c4cd

wp-admin/css/colors-classic.css

@@ -61,7 +61,7 @@ li.widget-list-control-item h4.widget-title a,
 }
 
 li.widget-list-control-item, div.nav, .tablenav, #dashboard-widgets p.dashboard-widget-links,
-ul.view-switch li.current, .form-table tr, #poststuff h3, #replyhandle,
+.form-table tr, #poststuff h3, #replyhandle,
 .login form, h3.info-box-title, #post-status-info, #edit-settings-wrap,
 #wpbody-content .describe tr {
 	background-color: #cfebf7;
@@ -248,7 +248,7 @@ div.dashboard-widget-submit input,
 	background-color: #a6d2e5 !important;
 }
 
-.submitbox #autosave .error, ul.view-switch li.current a,
+.submitbox #autosave .error,
 #side-info-column #category-tabs .ui-tabs-selected a {
 	color: #333;
 }

wp-admin/css/colors-fresh.css

@@ -61,7 +61,7 @@ li.widget-list-control-item h4.widget-title a,
 }
 
 li.widget-list-control-item, div.nav, .tablenav, #dashboard-widgets p.dashboard-widget-links,
-ul.view-switch li.current, .form-table tr, #poststuff h3, #replyhandle,
+.form-table tr, #poststuff h3, #replyhandle,
 .login form, h3.info-box-title, #post-status-info, #edit-settings-wrap,
 #wpbody-content .describe tr {
 	background-color: #eaf3fa;
@@ -247,7 +247,6 @@ div.dashboard-widget-submit input,
 	border-color: #328ab2;
 }
 
-ul.view-switch li.current a,
 #side-info-column #category-tabs .ui-tabs-selected a {
 	color: #333;
 }

wp-admin/css/global.css

@@ -131,10 +131,11 @@ h6 {
 
 .subsubsub {
 	list-style: none;
-	margin: 14px 0 8px 0;
+	margin: 0 0 8px;
 	padding: 0;
 	white-space: nowrap;
 	font-size: 12px;
+	float: left;
 }
 
 .subsubsub a { line-height: 200%; padding: 3px; text-decoration: none; }

wp-admin/css/ie-rtl.css

@@ -51,7 +51,7 @@ form#widgets-filter {
 	display:none;
 }
 /* fix manage comment page */
-ul.view-switch li {
+.view-switch {
 	float:left;
 }
 form#posts-filter {

wp-admin/edit-comments.php

@@ -111,7 +111,6 @@ if ( isset( $_GET['approved'] ) || isset( $_GET['deleted'] ) || isset( $_GET['sp
 ?>
 <div class="wrap">
 
-<form id="posts-filter" action="" method="get">
 <h2><?php _e('Manage Comments'); ?></h2>
 
 <ul class="subsubsub">
@@ -141,17 +140,6 @@ unset($status_links);
 ?>
 </ul>
 
-<input type="hidden" name="mode" value="<?php echo $mode; ?>" />
-<input type="hidden" name="comment_status" value="<?php echo $comment_status; ?>" />
-</form>
-
-<!-- crazyhorse
-<ul class="view-switch">
-	<li <?php if ( 'detail' == $mode ) echo "class='current'" ?>><a href="<?php echo clean_url(add_query_arg('mode', 'detail', $_SERVER['REQUEST_URI'])) ?>"><?php _e('Detail View') ?></a></li>
-	<li <?php if ( 'list' == $mode ) echo "class='current'" ?>><a href="<?php echo clean_url(add_query_arg('mode', 'list', $_SERVER['REQUEST_URI'])) ?>"><?php _e('List View') ?></a></li>
-</ul>
--->
-
 <?php
 
 $comments_per_page = apply_filters('comments_per_page', 20, $comment_status);
@@ -178,6 +166,8 @@ $page_links = paginate_links( array(
 ?>
 
 <form id="comments-form" action="" method="post">
+<input type="hidden" name="mode" value="<?php echo $mode; ?>" />
+<input type="hidden" name="comment_status" value="<?php echo $comment_status; ?>" />
 
 <div class="tablenav">
 

wp-admin/edit-pages.php

@@ -132,7 +132,6 @@ if ( isset($_GET['author']) && $_GET['author'] ) {
 printf( _c( '%1$s%2$s%3$s (<a href="%4$s">Add New</a>)|You can reorder these: 1: Pages, 2: by {s}, 3: matching {s}' ), $post_status_label, $h2_author, $h2_search, 'page-new.php' );
 ?></h2>
 
-<form id="posts-filter" action="" method="get">
 <ul class="subsubsub">
 <?php
 
@@ -190,6 +189,8 @@ if ( $page_links )
 	echo "<div class='tablenav-pages'>$page_links</div>";
 ?>
 
+<form id="posts-filter" action="" method="get">
+
 <div class="alignleft">
 <select name="action">
 <option value="-1" selected><?php _e('Actions'); ?></option>

wp-admin/edit.php

@@ -155,7 +155,6 @@ if ( is_single() ) {
 }
 ?></h2>
 
-<form id="posts-filter" action="" method="get">
 <ul class="subsubsub">
 <?php
 if ( empty($locked_post_status) ) :
@@ -183,38 +182,8 @@ endif;
 ?>
 </ul>
 
-<?php if ( isset($_GET['post_status'] ) ) : ?>
+<div class="filter">
-<input type="hidden" name="post_status" value="<?php echo attribute_escape($_GET['post_status']) ?>" />
+<form id="list-filter" action="" method="get">
-<?php endif; ?>
-<input type="hidden" name="mode" value="<?php echo $mode; ?>" />
-
-<ul class="view-switch">
-	<li <?php if ( 'list' == $mode ) echo "class='current'" ?>><a href="<?php echo clean_url(add_query_arg('mode', 'list', $_SERVER['REQUEST_URI'])) ?>"><?php _e('List View') ?></a></li>
-	<li <?php if ( 'excerpt' == $mode ) echo "class='current'" ?>><a href="<?php echo clean_url(add_query_arg('mode', 'excerpt', $_SERVER['REQUEST_URI'])) ?>"><?php _e('Excerpt View') ?></a></li>
-</ul>
-
-<div class="tablenav">
-
-<?php
-$page_links = paginate_links( array(
-	'base' => add_query_arg( 'paged', '%#%' ),
-	'format' => '',
-	'total' => $wp_query->max_num_pages,
-	'current' => $_GET['paged']
-));
-
-if ( $page_links )
-	echo "<div class='tablenav-pages'>$page_links</div>";
-?>
-
-<div class="alignleft">
-<select name="action">
-<option value="-1" selected="selected"><?php _e('Actions'); ?></option>
-<option value="edit"><?php _e('Edit'); ?></option>
-<option value="delete"><?php _e('Delete'); ?></option>
-</select>
-<input type="submit" value="<?php _e('Apply'); ?>" name="doaction" id="doaction" class="button-secondary action" />
-<?php wp_nonce_field('bulk-posts'); ?>
 <?php
 if ( !is_singular() ) {
 $arc_query = "SELECT DISTINCT YEAR(post_date) AS yyear, MONTH(post_date) AS mmonth FROM $wpdb->posts WHERE post_type = 'post' ORDER BY post_date DESC";
@@ -256,6 +225,42 @@ do_action('restrict_manage_posts');
 <input type="submit" id="post-query-submit" value="<?php _e('Filter'); ?>" class="button-secondary" />
 
 <?php } ?>
+</form>
+</div>
+
+<div class="view-switch">
+	<a href="<?php echo clean_url(add_query_arg('mode', 'list', $_SERVER['REQUEST_URI'])) ?>"><img <?php if ( 'list' == $mode ) echo 'class="current"'; ?> src="images/list.gif" title="<?php _e('List View') ?>" alt="<?php _e('List View') ?>" /></a>
+	<a href="<?php echo clean_url(add_query_arg('mode', 'excerpt', $_SERVER['REQUEST_URI'])) ?>"><img <?php if ( 'excerpt' == $mode ) echo 'class="current"'; ?> src="images/exc.gif" title="<?php _e('Excerpt View') ?>" alt="<?php _e('Excerpt View') ?>" /></a>
+</div>
+
+<form id="posts-filter" action="" method="get">
+
+<?php if ( isset($_GET['post_status'] ) ) : ?>
+<input type="hidden" name="post_status" value="<?php echo attribute_escape($_GET['post_status']) ?>" />
+<?php endif; ?>
+<input type="hidden" name="mode" value="<?php echo $mode; ?>" />
+
+<div class="tablenav">
+<?php
+$page_links = paginate_links( array(
+	'base' => add_query_arg( 'paged', '%#%' ),
+	'format' => '',
+	'total' => $wp_query->max_num_pages,
+	'current' => $_GET['paged']
+));
+
+if ( $page_links )
+	echo "<div class='tablenav-pages'>$page_links</div>";
+?>
+
+<div class="alignleft">
+<select name="action">
+<option value="-1" selected="selected"><?php _e('Actions'); ?></option>
+<option value="edit"><?php _e('Edit'); ?></option>
+<option value="delete"><?php _e('Delete'); ?></option>
+</select>
+<input type="submit" value="<?php _e('Apply'); ?>" name="doaction" id="doaction" class="button-secondary action" />
+<?php wp_nonce_field('bulk-posts'); ?>
 </div>
 
 <br class="clear" />

wp-admin/link-manager.php

@@ -100,15 +100,7 @@ if ( isset($_GET['deleted']) ) {
 
 <h2><?php printf( __('Links (<a href="%s">Add New</a>)' ), 'link-add.php' ); ?></h2>
 
-<form id="posts-filter" action="" method="get">
+<form id="list-filter" action="" method="get">
-<div class="tablenav">
-
-<div class="alignleft">
-<select name="action">
-<option value="" selected><?php _e('Actions'); ?></option>
-<option value="delete"><?php _e('Delete'); ?></option>
-</select>
-<input type="submit" value="<?php _e('Apply'); ?>" name="doaction" id="doaction" class="button-secondary action" />
 <?php
 $categories = get_terms('link_category', "hide_empty=1");
 $select_cat = "<select name=\"cat_id\">\n";
@@ -129,7 +121,17 @@ echo $select_order;
 
 ?>
 <input type="submit" id="post-query-submit" value="<?php _e('Filter'); ?>" class="button-secondary" />
+</form>
 
+<form id="posts-filter" action="" method="get">
+<div class="tablenav">
+
+<div class="alignleft">
+<select name="action">
+<option value="" selected><?php _e('Actions'); ?></option>
+<option value="delete"><?php _e('Delete'); ?></option>
+</select>
+<input type="submit" value="<?php _e('Apply'); ?>" name="doaction" id="doaction" class="button-secondary action" />
 </div>
 
 <br class="clear" />

wp-admin/rtl.css

@@ -310,13 +310,10 @@ p#tag-search, p.search-box {
 #posts-filter fieldset legend {
 	padding: 0 1px .2em 0;
 }
-ul.view-switch {
+.view-switch {
 	float: left;
-	margin: -23px 0 -2px 5px;
-}
-ul.view-switch li {
-	float: right;
 }
+
 #the-comment-list td.comment p.comment-author {
 	margin-right: 0 ;
 }

wp-admin/wp-admin.css

@@ -223,7 +223,7 @@ table#availablethemes td.bottom {
 
 .submit input, .button, .button-secondary, .button-highlighted {
 	font-family: "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif;
-	padding: 3px 5px;
+	padding: 2px 4px;
 	font-size: 12px;
 	line-height: 1.5em;
 	border-width: 1px;
@@ -1540,10 +1540,6 @@ form#tags-filter {
 	position: relative;
 }
 
-form#posts-filter {
-	position: relative;
-}
-
 p#big-add-button {
 	position: absolute;
 	right: 0;
@@ -1616,37 +1612,27 @@ td.post-title p {
 }
 
 body.minwidth {
-	min-width: 808px;
+	min-width: 785px;
 }
 
-ul.view-switch {
+.view-switch {
 	float: right;
-	list-style: none;
+	margin: 3px 5px;
-	margin: -23px 5px -2px 0;
 	position: relative;
 }
 
-ul.view-switch li {
+.view-switch img {
-	float: left;
 	margin: 0;
-	font-size: 11px;
+	border: 1px solid #fff;
-	padding: 4px 6px;
-	font-weight: bold;
 }
 
-ul.view-switch a {
+.view-switch img.current {
-	text-decoration: none;
+	border: 1px solid #999;
 }
 
-ul.view-switch li.current {
+.filter {
-	border: none;
+	float: left;
-	-moz-border-radius: 3px 3px 0 0;
+	margin: 0 30px;
-	-webkit-border-top-left-radius: 3px;
-	-webkit-border-top-right-radius: 3px;
-	-khtml-border-top-left-radius: 3px;
-	-khtml-border-top-right-radius: 3px;
-	border-top-left-radius: 3px;
-	border-top-right-radius: 3px;
 }
 
 #the-comment-list td.comment p.comment-author {