From 94dc5f67bd8f6b9c9fd810fa5ab91f6ca88627b3 Mon Sep 17 00:00:00 2001
From: azaozz <azaozz@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Sun, 28 Sep 2008 04:11:27 +0000
Subject: [PATCH] Move and adjust "Page Options" box

git-svn-id: http://svn.automattic.com/wordpress/trunk@9016 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/categories.php           | 31 +++++++------
 wp-admin/css/colors-classic.css   | 11 ++---
 wp-admin/css/colors-fresh.css     | 11 ++---
 wp-admin/edit-comments.php        | 30 ++++++-------
 wp-admin/edit-form-advanced.php   | 34 ++++++--------
 wp-admin/edit-link-categories.php | 33 +++++++-------
 wp-admin/edit-link-form.php       | 33 +++++++-------
 wp-admin/edit-page-form.php       | 35 ++++++++-------
 wp-admin/edit-pages.php           | 30 ++++++-------
 wp-admin/edit-tags.php            | 33 +++++++-------
 wp-admin/edit.php                 | 30 ++++++-------
 wp-admin/js/settings-box.js       | 15 ++-----
 wp-admin/link-manager.php         | 32 +++++++-------
 wp-admin/upload.php               | 19 ++++----
 wp-admin/users.php                | 33 +++++---------
 wp-admin/wp-admin.css             | 73 ++++++++++++-------------------
 16 files changed, 213 insertions(+), 270 deletions(-)

diff --git a/wp-admin/categories.php b/wp-admin/categories.php
index 2d30360ed..41861ef1f 100644
--- a/wp-admin/categories.php
+++ b/wp-admin/categories.php
@@ -117,7 +117,22 @@ $messages[2] = __('Category deleted.');
 $messages[3] = __('Category updated.');
 $messages[4] = __('Category not added.');
 $messages[5] = __('Category not updated.');
+?>
 
+<div id="edit-settings">
+<a href="#edit_settings" id="show-settings-link" class="hide-if-no-js show-settings"><?php _e('Page Options') ?></a>
+<div id="edit-settings-wrap" class="hidden">
+<a href="#edit_settings" id="hide-settings-link" class="show-settings"><?php _e('Hide Options') ?></a>
+<h5><?php _e('Show on screen') ?></h5>
+<form id="adv-settings" action="" method="get">
+<div class="metabox-prefs">
+<?php manage_columns_prefs('category') ?>
+<?php wp_nonce_field( 'hiddencolumns', 'hiddencolumnsnonce', false ); ?>
+<br class="clear" />
+</div></form>
+</div></div>
+
+<?php
 if ( isset($_GET['message']) && ( $msg = (int) $_GET['message'] ) ) : ?>
 <div id="message" class="updated fade"><p><?php echo $messages[$msg]; ?></p></div>
 <?php $_SERVER['REQUEST_URI'] = remove_query_arg(array('message'), $_SERVER['REQUEST_URI']);
@@ -125,24 +140,8 @@ endif; ?>
 
 <div class="wrap">
 
-<form id="adv-settings" action="" method="get">
-<div id="show-settings"><a href="#edit_settings" id="show-settings-link" class="hide-if-no-js"><?php _e('Advanced Options') ?></a>
-<a href="#edit_settings" id="hide-settings-link" class="hide-if-js hide-if-no-js"><?php _e('Hide Options') ?></a></div>
-
-<div id="edit-settings" class="hide-if-js hide-if-no-js">
-<div id="edit-settings-wrap">
-<h5><?php _e('Show on screen') ?></h5>
-<div class="metabox-prefs">
-<?php manage_columns_prefs('category') ?>
-<br class="clear" />
-</div></div>
-<?php wp_nonce_field( 'hiddencolumns', 'hiddencolumnsnonce', false ); ?>
-</div></form>
-
 	<h2><?php printf( current_user_can('manage_categories') ? __('Categories (<a href="%s">Add New</a>)') : __('Manage Tags'), '#addcat' ); ?></h2>
 
-<br class="clear" />
-
 <form id="posts-filter" action="" method="get">
 <div class="tablenav">
 
diff --git a/wp-admin/css/colors-classic.css b/wp-admin/css/colors-classic.css
index 67eae6a2f..07ead81c6 100644
--- a/wp-admin/css/colors-classic.css
+++ b/wp-admin/css/colors-classic.css
@@ -50,7 +50,7 @@ input.disabled, textarea.disabled {
 	background-color: #ccc;
 }
 
-#user_info a:hover, li.widget-list-control-item h4.widget-title a:hover,
+li.widget-list-control-item h4.widget-title a:hover,
 #dashmenu a:hover, #footer a, #upload-menu li a.upload-tab-link, 
 li.widget-list-control-item h4.widget-title a,
 #dragHelper li.widget-list-control-item h4.widget-title a,
@@ -239,7 +239,7 @@ div.dashboard-widget-submit input,
 #rightnow a:hover, a:hover, .subsubsub a:hover, .subsubsub a.current:hover,
 #login form .submit input:hover, div.dashboard-widget-submit input:hover,
 #edit-slug-buttons a.save:hover, #media-upload a.delete:hover,
-#media-upload a.del-link:hover, .ui-tabs-nav a:hover {
+#media-upload a.del-link:hover, .ui-tabs-nav a:hover, #user_info a:hover {
 	color: #d54e21;
 }
 
@@ -800,8 +800,7 @@ table.diff .diff-addedline ins {
 	color: #CFEBF6;
 }
 
-#edit-settings-wrap,
-#show-settings {
+#edit-settings-wrap {
 	background-color: #14568A;
 	border-color: #14568A;
 	color: #CFEBF6;
@@ -812,10 +811,6 @@ table.diff .diff-addedline ins {
 	color: #CFEBF6;
 }
 
-#show-settings.show-settings-opened {
-	border-bottom-color: #14568A;
-}
-
 #replydiv,
 .inline-editor .quick-edit-div {
 	border-color: #EBEBEB #CCC #CCC #EBEBEB;
diff --git a/wp-admin/css/colors-fresh.css b/wp-admin/css/colors-fresh.css
index 8ecf8d995..7c6f2dd9f 100644
--- a/wp-admin/css/colors-fresh.css
+++ b/wp-admin/css/colors-fresh.css
@@ -50,7 +50,7 @@ input.disabled, textarea.disabled {
 	background-color: #ccc;
 }
 
-#user_info a:hover, li.widget-list-control-item h4.widget-title a:hover,
+li.widget-list-control-item h4.widget-title a:hover,
 #dashmenu a:hover, #footer a, #upload-menu li a.upload-tab-link, 
 li.widget-list-control-item h4.widget-title a,
 #dragHelper li.widget-list-control-item h4.widget-title a,
@@ -239,7 +239,7 @@ div.dashboard-widget-submit input,
 #rightnow a:hover, a:hover, .subsubsub a:hover, .subsubsub a.current:hover,
 #login form .submit input:hover, div.dashboard-widget-submit input:hover,
 #edit-slug-buttons a.save:hover, #media-upload a.delete:hover,
-#media-upload a.del-link:hover, .ui-tabs-nav a:hover {
+#media-upload a.del-link:hover, .ui-tabs-nav a:hover, #user_info a:hover {
 	color: #d54e21;
 }
 
@@ -789,16 +789,11 @@ table.diff .diff-addedline ins {
 	border-top-color: #e4f2fd;
 }
 
-#edit-settings-wrap,
-#show-settings {
+#edit-settings-wrap {
 	background-color: #E4F2FD;
 	border-color: #c6d9e9;
 }
 
-#show-settings.show-settings-opened {
-	border-bottom-color: #E4F2FD;
-}
-
 #replydiv,
 .inline-editor .quick-edit-div {
 	border-color: #EBEBEB #CCC #CCC #EBEBEB;
diff --git a/wp-admin/edit-comments.php b/wp-admin/edit-comments.php
index e8fd17352..42fa11485 100644
--- a/wp-admin/edit-comments.php
+++ b/wp-admin/edit-comments.php
@@ -66,8 +66,22 @@ $mode = ( ! isset($_GET['mode']) || empty($_GET['mode']) ) ? 'detail' : attribut
 $comment_status = isset($_GET['comment_status']) ? attribute_escape($_GET['comment_status']) : '';
 
 $search_dirty = ( isset($_GET['s']) ) ? $_GET['s'] : '';
-$search = attribute_escape( $search_dirty );
+$search = attribute_escape( $search_dirty ); ?>
 
+<div id="edit-settings">
+<a href="#edit_settings" id="show-settings-link" class="hide-if-no-js show-settings"><?php _e('Page Options') ?></a>
+<div id="edit-settings-wrap" class="hidden">
+<a href="#edit_settings" id="hide-settings-link" class="show-settings"><?php _e('Hide Options') ?></a>
+<h5><?php _e('Show on screen') ?></h5>
+<form id="adv-settings" action="" method="get">
+<div class="metabox-prefs">
+<?php manage_columns_prefs('comment') ?>
+<?php wp_nonce_field( 'hiddencolumns', 'hiddencolumnsnonce', false ); ?>
+<br class="clear" />
+</div></form>
+</div></div>
+
+<?php
 if ( isset( $_GET['approved'] ) || isset( $_GET['deleted'] ) || isset( $_GET['spam'] ) ) {
 	$approved = isset( $_GET['approved'] ) ? (int) $_GET['approved'] : 0;
 	$deleted = isset( $_GET['deleted'] ) ? (int) $_GET['deleted'] : 0;
@@ -97,20 +111,6 @@ if ( isset( $_GET['approved'] ) || isset( $_GET['deleted'] ) || isset( $_GET['sp
 ?>
 <div class="wrap">
 
-<form id="adv-settings" action="" method="get">
-<div id="show-settings" class="hide-if-no-js"><a href="#edit_settings" id="show-settings-link"><?php _e('Advanced Options') ?></a>
-<a href="#edit_settings" id="hide-settings-link" class="hide-if-js"><?php _e('Hide Options') ?></a></div>
-
-<div id="edit-settings" class="hide-if-js hide-if-no-js">
-<div id="edit-settings-wrap">
-<h5><?php _e('Show on screen') ?></h5>
-<div class="metabox-prefs">
-<?php manage_columns_prefs('comment') ?>
-<br class="clear" />
-</div></div>
-<?php wp_nonce_field( 'hiddencolumns', 'hiddencolumnsnonce', false ); ?>
-</div></form>
-
 <form id="posts-filter" action="" method="get">
 <h2><?php _e('Manage Comments'); ?></h2>
 
diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php
index e16b0c68c..7bbf51de1 100644
--- a/wp-admin/edit-form-advanced.php
+++ b/wp-admin/edit-form-advanced.php
@@ -54,13 +54,7 @@ if ( 0 == $post_ID ) {
 	}
 }
 
-?>
-
-<form name="post" action="post.php" method="post" id="post">
-<?php
-
 // All meta boxes should be defined and added before the first do_meta_boxes() call (or potentially during the do_meta_boxes action).
-
 function post_submit_meta_box($post) {
 	global $action;
 
@@ -407,6 +401,18 @@ endif;
 
 ?>
 
+<div id="edit-settings">
+<a href="#edit_settings" id="show-settings-link" class="hide-if-no-js show-settings"><?php _e('Page Options') ?></a>
+<div id="edit-settings-wrap" class="hidden">
+<a href="#edit_settings" id="hide-settings-link" class="show-settings"><?php _e('Hide Options') ?></a>
+<h5><?php _e('Show on screen') ?></h5>
+<form id="adv-settings" action="" method="get">
+<div class="metabox-prefs">
+<?php meta_box_prefs('post') ?>
+<br class="clear" />
+</div></form>
+</div></div>
+
 <?php if ( $notice ) : ?>
 <div id="notice" class="error"><p><?php echo $notice ?></p></div>
 <?php endif; ?>
@@ -420,18 +426,6 @@ endif;
 
 <div class="wrap">
 
-<div id="show-settings"><a href="#edit_settings" id="show-settings-link" class="hide-if-no-js"><?php _e('Advanced Options') ?></a>
-<a href="#edit_settings" id="hide-settings-link" class="hide-if-js hide-if-no-js"><?php _e('Hide Options') ?></a></div>
-
-<div id="edit-settings" class="hide-if-js hide-if-no-js">
-<div id="edit-settings-wrap">
-<h5><?php _e('Show on screen') ?></h5>
-<div class="metabox-prefs">
-<?php meta_box_prefs('post') ?>
-<br class="clear" />
-</div></div>
-</div>
-
 <h2><?php
 	if ( !isset($post_ID) || 0 == $post_ID)
 		printf( __( '<a href="%s">Posts</a> / Write New Post' ), 'edit.php' );
@@ -439,6 +433,7 @@ endif;
 		printf( __( '<a href="%s">Posts</a> / Edit Post' ), 'edit.php' );
 ?></h2>
 
+<form name="post" action="post.php" method="post" id="post">
 <?php
 
 if ( 0 == $post_ID)
@@ -555,9 +550,8 @@ do_action('dbx_post_sidebar');
 </div>
 </div>
 </div><!-- /poststuff -->
-
-</div>
 </form>
+</div>
 
 <?php wp_comment_reply(); ?>
 
diff --git a/wp-admin/edit-link-categories.php b/wp-admin/edit-link-categories.php
index e479b6901..c3078fd61 100644
--- a/wp-admin/edit-link-categories.php
+++ b/wp-admin/edit-link-categories.php
@@ -55,33 +55,30 @@ $messages[2] = __('Category deleted.');
 $messages[3] = __('Category updated.');
 $messages[4] = __('Category not added.');
 $messages[5] = __('Category not updated.');
-$messages[6] = __('Categories deleted.');
+$messages[6] = __('Categories deleted.'); ?>
 
-if ( isset($_GET['message']) && ( $msg = (int) $_GET['message'] ) ) : ?>
+<div id="edit-settings">
+<a href="#edit_settings" id="show-settings-link" class="hide-if-no-js show-settings"><?php _e('Page Options') ?></a>
+<div id="edit-settings-wrap" class="hidden">
+<a href="#edit_settings" id="hide-settings-link" class="show-settings"><?php _e('Hide Options') ?></a>
+<h5><?php _e('Show on screen') ?></h5>
+<form id="adv-settings" action="" method="get">
+<div class="metabox-prefs">
+<?php manage_columns_prefs('link-category') ?>
+<?php wp_nonce_field( 'hiddencolumns', 'hiddencolumnsnonce', false ); ?>
+<br class="clear" />
+</div></form>
+</div></div>
+
+<?php if ( isset($_GET['message']) && ( $msg = (int) $_GET['message'] ) ) : ?>
 <div id="message" class="updated fade"><p><?php echo $messages[$msg]; ?></p></div>
 <?php $_SERVER['REQUEST_URI'] = remove_query_arg(array('message'), $_SERVER['REQUEST_URI']);
 endif; ?>
 
 <div class="wrap">
 
-<form id="adv-settings" action="" method="get">
-<div id="show-settings"><a href="#edit_settings" id="show-settings-link" class="hide-if-no-js"><?php _e('Advanced Options') ?></a>
-<a href="#edit_settings" id="hide-settings-link" class="hide-if-js hide-if-no-js"><?php _e('Hide Options') ?></a></div>
-
-<div id="edit-settings" class="hide-if-js hide-if-no-js">
-<div id="edit-settings-wrap">
-<h5><?php _e('Show on screen') ?></h5>
-<div class="metabox-prefs">
-<?php manage_columns_prefs('link-category') ?>
-<br class="clear" />
-</div></div>
-<?php wp_nonce_field( 'hiddencolumns', 'hiddencolumnsnonce', false ); ?>
-</div></form>
-
 	<h2><?php printf( current_user_can('manage_categories') ? __('Link Categories (<a href="%s">Add New</a>)') : __('Manage Tags'), '#addcat' ); ?></h2>
 
-<br class="clear" />
-
 <form id="posts-filter" action="" method="get">
 <div class="tablenav">
 
diff --git a/wp-admin/edit-link-form.php b/wp-admin/edit-link-form.php
index 444985a35..0efd58cfd 100644
--- a/wp-admin/edit-link-form.php
+++ b/wp-admin/edit-link-form.php
@@ -261,28 +261,22 @@ function link_advanced_meta_box($link) {
 </table>
 <?php
 }
-add_meta_box('linkadvanceddiv', __('Advanced'), 'link_advanced_meta_box', 'link', 'normal', 'core');
+add_meta_box('linkadvanceddiv', __('Advanced'), 'link_advanced_meta_box', 'link', 'normal', 'core'); ?>
 
-echo $form;
-echo $link_added;
-
-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">
-
-<div id="show-settings"><a href="#edit_settings" id="show-settings-link" class="hide-if-no-js"><?php _e('Advanced Options') ?></a>
-<a href="#edit_settings" id="hide-settings-link" class="hide-if-js hide-if-no-js"><?php _e('Hide Options') ?></a></div>
-
-<div id="edit-settings" class="hide-if-js hide-if-no-js">
-<div id="edit-settings-wrap">
+<div id="edit-settings">
+<a href="#edit_settings" id="show-settings-link" class="hide-if-no-js show-settings"><?php _e('Page Options') ?></a>
+<div id="edit-settings-wrap" class="hidden">
+<a href="#edit_settings" id="hide-settings-link" class="show-settings"><?php _e('Hide Options') ?></a>
 <h5><?php _e('Show on screen') ?></h5>
+<form id="adv-settings" action="" method="get">
 <div class="metabox-prefs">
 <?php meta_box_prefs('link') ?>
+<?php wp_nonce_field( 'hiddencolumns', 'hiddencolumnsnonce', false ); ?>
 <br class="clear" />
+</div></form>
 </div></div>
-</div>
+
+<div class="wrap">
 
 <h2><?php echo $heading; ?></h2>
 
@@ -312,6 +306,13 @@ wp_nonce_field( 'meta-box-order', 'meta-box-order-nonce', false ); ?>
 </ul>
 </div>
 -->
+<?php
+echo $form;
+echo $link_added;
+
+wp_nonce_field( $nonce_action );
+wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false );
+wp_nonce_field( 'meta-box-order', 'meta-box-order-nonce', false ); ?>
 
 <div id="poststuff">
 
diff --git a/wp-admin/edit-page-form.php b/wp-admin/edit-page-form.php
index e02c7e980..e6bd11746 100644
--- a/wp-admin/edit-page-form.php
+++ b/wp-admin/edit-page-form.php
@@ -46,14 +46,6 @@ $temp_ID = (int) $temp_ID;
 $user_ID = (int) $user_ID;
 ?>
 
-<form name="post" action="page.php" method="post" id="post">
-<?php if ( $notice ) : ?>
-<div id="notice" class="error"><p><?php echo $notice ?></p></div>
-<?php endif; ?>
-<?php if (isset($_GET['message'])) : ?>
-<div id="message" class="updated fade"><p><?php echo $messages[$_GET['message']]; ?></p></div>
-<?php endif; ?>
-
 <?php
 function page_submit_meta_box($post) {
 	global $action;
@@ -285,19 +277,20 @@ add_meta_box('revisionsdiv', __('Page Revisions'), 'page_revisions_meta_box', 'p
 endif;
 ?>
 
-<div class="wrap">
-
-<div id="show-settings"><a href="#edit_settings" id="show-settings-link" class="hide-if-no-js"><?php _e('Advanced Options') ?></a>
-<a href="#edit_settings" id="hide-settings-link" class="hide-if-js hide-if-no-js"><?php _e('Hide Options') ?></a></div>
-
-<div id="edit-settings" class="hide-if-js hide-if-no-js">
-<div id="edit-settings-wrap">
+<div id="edit-settings">
+<a href="#edit_settings" id="show-settings-link" class="hide-if-no-js show-settings"><?php _e('Page Options') ?></a>
+<div id="edit-settings-wrap" class="hidden">
+<a href="#edit_settings" id="hide-settings-link" class="show-settings"><?php _e('Hide Options') ?></a>
 <h5><?php _e('Show on screen') ?></h5>
+<form id="adv-settings" action="" method="get">
 <div class="metabox-prefs">
 <?php meta_box_prefs('page') ?>
+<?php wp_nonce_field( 'hiddencolumns', 'hiddencolumnsnonce', false ); ?>
 <br class="clear" />
+</div></form>
 </div></div>
-</div>
+
+<div class="wrap">
 
 <h2><?php
 	if ( !isset($post_ID) || 0 == $post_ID )
@@ -306,6 +299,14 @@ endif;
 		printf( __( '<a href="%s">Pages</a> / Edit Page' ), 'edit-pages.php' );
 ?></h2>
 
+<form name="post" action="page.php" method="post" id="post">
+<?php if ( $notice ) : ?>
+<div id="notice" class="error"><p><?php echo $notice ?></p></div>
+<?php endif; ?>
+<?php if (isset($_GET['message'])) : ?>
+<div id="message" class="updated fade"><p><?php echo $messages[$_GET['message']]; ?></p></div>
+<?php endif; ?>
+
 <?php
 wp_nonce_field($nonce_action);
 
@@ -431,8 +432,8 @@ do_meta_boxes('page', 'advanced', $post);
 </div>
 </div>
 
-</div>
 </form>
+</div>
 
 <script type="text/javascript">
 try{document.post.title.focus();}catch(e){}
diff --git a/wp-admin/edit-pages.php b/wp-admin/edit-pages.php
index 175f1267e..7cd92f82e 100644
--- a/wp-admin/edit-pages.php
+++ b/wp-admin/edit-pages.php
@@ -92,9 +92,22 @@ if ( is_singular() ) {
 	wp_enqueue_script( 'jquery-table-hotkeys' );
 }
 
-require_once('admin-header.php');
+require_once('admin-header.php'); ?>
 
-if ( isset($_GET['upd']) && (int) $_GET['upd'] ) { ?>
+<div id="edit-settings">
+<a href="#edit_settings" id="show-settings-link" class="hide-if-no-js show-settings"><?php _e('Page Options') ?></a>
+<div id="edit-settings-wrap" class="hidden">
+<a href="#edit_settings" id="hide-settings-link" class="show-settings"><?php _e('Hide Options') ?></a>
+<h5><?php _e('Show on screen') ?></h5>
+<form id="adv-settings" action="" method="get">
+<div class="metabox-prefs">
+<?php manage_columns_prefs('page') ?>
+<?php wp_nonce_field( 'hiddencolumns', 'hiddencolumnsnonce', false ); ?>
+<br class="clear" />
+</div></form>
+</div></div>
+
+<?php if ( isset($_GET['upd']) && (int) $_GET['upd'] ) { ?>
 <div id="message" class="updated fade"><p>
 <?php printf( __ngettext( '%d page updated.', '%d pages updated.', $_GET['upd'] ), number_format_i18n( $_GET['upd'] ) );
 unset($_GET['upd']);
@@ -107,19 +120,6 @@ unset($_GET['upd']);
 <?php } ?>
 
 <div class="wrap">
-<form id="adv-settings" action="" method="get">
-<div id="show-settings"><a href="#edit_settings" id="show-settings-link" class="hide-if-no-js"><?php _e('Advanced Options') ?></a>
-<a href="#edit_settings" id="hide-settings-link" class="hide-if-js hide-if-no-js"><?php _e('Hide Options') ?></a></div>
-
-<div id="edit-settings" class="hide-if-js hide-if-no-js">
-<div id="edit-settings-wrap">
-<h5><?php _e('Show on screen') ?></h5>
-<div class="metabox-prefs">
-<?php manage_columns_prefs('page') ?>
-<br class="clear" />
-</div></div>
-<?php wp_nonce_field( 'hiddencolumns', 'hiddencolumnsnonce', false ); ?>
-</div></form>
 
 <h2><?php
 // Use $_GET instead of is_ since they can override each other
diff --git a/wp-admin/edit-tags.php b/wp-admin/edit-tags.php
index d15f9c13f..480c10227 100644
--- a/wp-admin/edit-tags.php
+++ b/wp-admin/edit-tags.php
@@ -122,33 +122,30 @@ $messages[2] = __('Tag deleted.');
 $messages[3] = __('Tag updated.');
 $messages[4] = __('Tag not added.');
 $messages[5] = __('Tag not updated.');
-$messages[6] = __('Tags deleted.');
+$messages[6] = __('Tags deleted.'); ?>
 
-if ( isset($_GET['message']) && ( $msg = (int) $_GET['message'] ) ) : ?>
+<div id="edit-settings">
+<a href="#edit_settings" id="show-settings-link" class="hide-if-no-js show-settings"><?php _e('Page Options') ?></a>
+<div id="edit-settings-wrap" class="hidden">
+<a href="#edit_settings" id="hide-settings-link" class="show-settings"><?php _e('Hide Options') ?></a>
+<h5><?php _e('Show on screen') ?></h5>
+<form id="adv-settings" action="" method="get">
+<div class="metabox-prefs">
+<?php manage_columns_prefs('tag') ?>
+<?php wp_nonce_field( 'hiddencolumns', 'hiddencolumnsnonce', false ); ?>
+<br class="clear" />
+</div></form>
+</div></div>
+
+<?php if ( isset($_GET['message']) && ( $msg = (int) $_GET['message'] ) ) : ?>
 <div id="message" class="updated fade"><p><?php echo $messages[$msg]; ?></p></div>
 <?php $_SERVER['REQUEST_URI'] = remove_query_arg(array('message'), $_SERVER['REQUEST_URI']);
 endif; ?>
 
 <div class="wrap">
 
-<form id="adv-settings" action="" method="get">
-<div id="show-settings"><a href="#edit_settings" id="show-settings-link" class="hide-if-no-js"><?php _e('Advanced Options') ?></a>
-<a href="#edit_settings" id="hide-settings-link" class="hide-if-js hide-if-no-js"><?php _e('Hide Options') ?></a></div>
-
-<div id="edit-settings" class="hide-if-js hide-if-no-js">
-<div id="edit-settings-wrap">
-<h5><?php _e('Show on screen') ?></h5>
-<div class="metabox-prefs">
-<?php manage_columns_prefs('tag') ?>
-<br class="clear" />
-</div></div>
-<?php wp_nonce_field( 'hiddencolumns', 'hiddencolumnsnonce', false ); ?>
-</div></form>
-
 	<h2><?php printf( current_user_can('manage_categories') ? __('Tags (<a href="%s">Add New</a>)') : __('Manage Tags'), '#addtag' ); ?></h2>
 
-<br class="clear" />
-
 <form id="posts-filter" action="" method="get">
 <div class="tablenav">
 
diff --git a/wp-admin/edit.php b/wp-admin/edit.php
index 3795f250b..cd1cea3e9 100644
--- a/wp-admin/edit.php
+++ b/wp-admin/edit.php
@@ -89,8 +89,22 @@ if ( !isset( $_GET['paged'] ) )
 if ( empty($_GET['mode']) )
 	$mode = 'list';
 else
-	$mode = attribute_escape($_GET['mode']);
+	$mode = attribute_escape($_GET['mode']); ?>
 
+<div id="edit-settings">
+<a href="#edit_settings" id="show-settings-link" class="hide-if-no-js show-settings"><?php _e('Page Options') ?></a>
+<div id="edit-settings-wrap" class="hidden">
+<a href="#edit_settings" id="hide-settings-link" class="show-settings"><?php _e('Hide Options') ?></a>
+<h5><?php _e('Show on screen') ?></h5>
+<form id="adv-settings" action="" method="get">
+<div class="metabox-prefs">
+<?php manage_columns_prefs('post') ?>
+<?php wp_nonce_field( 'hiddencolumns', 'hiddencolumnsnonce', false ); ?>
+<br class="clear" />
+</div></form>
+</div></div>
+
+<?php
 if ( isset($_GET['posted']) && $_GET['posted'] ) : $_GET['posted'] = (int) $_GET['posted']; ?>
 <div id="message" class="updated fade"><p><strong><?php _e('Your post has been saved.'); ?></strong> <a href="<?php echo get_permalink( $_GET['posted'] ); ?>"><?php _e('View post'); ?></a> | <a href="<?php echo get_edit_post_link( $_GET['posted'] ); ?>"><?php _e('Edit post'); ?></a></p></div>
 <?php $_SERVER['REQUEST_URI'] = remove_query_arg(array('posted'), $_SERVER['REQUEST_URI']);
@@ -110,20 +124,6 @@ unset($_GET['upd']);
 
 <div class="wrap">
 
-<form id="adv-settings" action="" method="get">
-<div id="show-settings"><a href="#edit_settings" id="show-settings-link" class="hide-if-no-js"><?php _e('Advanced Options') ?></a>
-<a href="#edit_settings" id="hide-settings-link" class="hide-if-js hide-if-no-js"><?php _e('Hide Options') ?></a></div>
-
-<div id="edit-settings" class="hide-if-js hide-if-no-js">
-<div id="edit-settings-wrap">
-<h5><?php _e('Show on screen') ?></h5>
-<div class="metabox-prefs">
-<?php manage_columns_prefs('post') ?>
-<br class="clear" />
-</div></div>
-<?php wp_nonce_field( 'hiddencolumns', 'hiddencolumnsnonce', false ); ?>
-</div></form>
-
 <h2><?php
 if ( is_single() ) {
 	printf(__('Comments on %s'), apply_filters( "the_title", $post->post_title));
diff --git a/wp-admin/js/settings-box.js b/wp-admin/js/settings-box.js
index 04f8085d6..7b009cc04 100644
--- a/wp-admin/js/settings-box.js
+++ b/wp-admin/js/settings-box.js
@@ -1,21 +1,14 @@
 jQuery(document).ready( function($) {
-		$('#show-settings-link').click(function () {
-		$('#edit-settings').slideDown('normal', function(){
-			$('#show-settings-link').hide();
-			$('#hide-settings-link').show();
-			
-		});
-		$('#show-settings').addClass('show-settings-opened');
+	$('#show-settings-link').click(function () {
+		$(this).hide()
+		$('#edit-settings-wrap').slideDown('normal');
 		return false;
 	});
 	
 	$('#hide-settings-link').click(function () {
-		$('#edit-settings').slideUp('normal', function(){
-			$('#hide-settings-link').hide();
+		$('#edit-settings-wrap').slideUp('normal', function(){
 			$('#show-settings-link').show();
-			$('#show-settings').removeClass('show-settings-opened');
 		});
-		
 		return false;
 	});
 });
\ No newline at end of file
diff --git a/wp-admin/link-manager.php b/wp-admin/link-manager.php
index 65a9f73ee..2a8e5ec24 100644
--- a/wp-admin/link-manager.php
+++ b/wp-admin/link-manager.php
@@ -71,8 +71,22 @@ switch ($order_by) {
 	default :
 		$sqlorderby = 'name';
 		break;
-}
+} ?>
 
+<div id="edit-settings">
+<a href="#edit_settings" id="show-settings-link" class="hide-if-no-js show-settings"><?php _e('Page Options') ?></a>
+<div id="edit-settings-wrap" class="hidden">
+<a href="#edit_settings" id="hide-settings-link" class="show-settings"><?php _e('Hide Options') ?></a>
+<h5><?php _e('Show on screen') ?></h5>
+<form id="adv-settings" action="" method="get">
+<div class="metabox-prefs">
+<?php manage_columns_prefs('link') ?>
+<?php wp_nonce_field( 'hiddencolumns', 'hiddencolumnsnonce', false ); ?>
+<br class="clear" />
+</div></form>
+</div></div>
+
+<?php
 if ( isset($_GET['deleted']) ) {
 	echo '<div id="message" class="updated fade"><p>';
 	$deleted = (int) $_GET['deleted'];
@@ -84,24 +98,8 @@ if ( isset($_GET['deleted']) ) {
 
 <div class="wrap">
 
-<form id="adv-settings" action="" method="get">
-<div id="show-settings"><a href="#edit_settings" id="show-settings-link" class="hide-if-no-js"><?php _e('Advanced Options') ?></a>
-<a href="#edit_settings" id="hide-settings-link" class="hide-if-js hide-if-no-js"><?php _e('Hide Options') ?></a></div>
-
-<div id="edit-settings" class="hide-if-js hide-if-no-js">
-<div id="edit-settings-wrap">
-<h5><?php _e('Show on screen') ?></h5>
-<div class="metabox-prefs">
-<?php manage_columns_prefs('link') ?>
-<br class="clear" />
-</div></div>
-<?php wp_nonce_field( 'hiddencolumns', 'hiddencolumnsnonce', false ); ?>
-</div></form>
-
 <h2><?php printf( __('Links (<a href="%s">Add New</a>)' ), 'link-add.php' ); ?></h2>
 
-<br class="clear" />
-
 <form id="posts-filter" action="" method="get">
 <div class="tablenav">
 
diff --git a/wp-admin/upload.php b/wp-admin/upload.php
index 914c0c835..154b14d6b 100644
--- a/wp-admin/upload.php
+++ b/wp-admin/upload.php
@@ -137,21 +137,20 @@ if ( is_singular() ) {
 
 require_once('admin-header.php'); ?>
 
-<div class="wrap">
-
-<form id="adv-settings" action="" method="get">
-<div id="show-settings"><a href="#edit_settings" id="show-settings-link" class="hide-if-no-js"><?php _e('Advanced Options') ?></a>
-<a href="#edit_settings" id="hide-settings-link" class="hide-if-js hide-if-no-js"><?php _e('Hide Options') ?></a></div>
-
-<div id="edit-settings" class="hide-if-js hide-if-no-js">
-<div id="edit-settings-wrap">
+<div id="edit-settings">
+<a href="#edit_settings" id="show-settings-link" class="hide-if-no-js show-settings"><?php _e('Page Options') ?></a>
+<div id="edit-settings-wrap" class="hidden">
+<a href="#edit_settings" id="hide-settings-link" class="show-settings"><?php _e('Hide Options') ?></a>
 <h5><?php _e('Show on screen') ?></h5>
+<form id="adv-settings" action="" method="get">
 <div class="metabox-prefs">
 <?php manage_columns_prefs('media') ?>
-<br class="clear" />
-</div></div>
 <?php wp_nonce_field( 'hiddencolumns', 'hiddencolumnsnonce', false ); ?>
+<br class="clear" />
 </div></form>
+</div></div>
+
+<div class="wrap">
 
 <h2><?php
 if ( isset($_GET['detached']) ) {
diff --git a/wp-admin/users.php b/wp-admin/users.php
index 67986901a..f668e94d8 100644
--- a/wp-admin/users.php
+++ b/wp-admin/users.php
@@ -236,13 +236,18 @@ default:
 		}
 	endif; ?>
 
-<form class="search-form" action="" method="get">
-	<p id="user-search" class="search-box">
-	<label class="hidden" for="user-search-input"><?php _e( 'Search Users' ); ?></label>
-	<input type="text" id="user-search-input" class="search-input" name="usersearch" value="<?php echo attribute_escape($wp_user_search->search_term); ?>" />
-	<input type="submit" value="<?php _e( 'Search Users' ); ?>" class="button" />
-	</p>
-</form>
+<div id="edit-settings">
+<a href="#edit_settings" id="show-settings-link" class="hide-if-no-js show-settings"><?php _e('Page Options') ?></a>
+<div id="edit-settings-wrap" class="hidden">
+<a href="#edit_settings" id="hide-settings-link" class="show-settings"><?php _e('Hide Options') ?></a>
+<h5><?php _e('Show on screen') ?></h5>
+<form id="adv-settings" action="" method="get">
+<div class="metabox-prefs">
+<?php manage_columns_prefs('user') ?>
+<?php wp_nonce_field( 'hiddencolumns', 'hiddencolumnsnonce', false ); ?>
+<br class="clear" />
+</div></form>
+</div></div>
 
 <?php if ( isset($errors) && is_wp_error( $errors ) ) : ?>
 	<div class="error">
@@ -262,20 +267,6 @@ if ( ! empty($messages) ) {
 
 <div class="wrap">
 
-<form id="adv-settings" action="" method="get">
-<div id="show-settings"><a href="#edit_settings" id="show-settings-link" class="hide-if-no-js"><?php _e('Advanced Options') ?></a>
-<a href="#edit_settings" id="hide-settings-link" class="hide-if-js hide-if-no-js"><?php _e('Hide Options') ?></a></div>
-
-<div id="edit-settings" class="hide-if-js hide-if-no-js">
-<div id="edit-settings-wrap">
-<h5><?php _e('Show on screen') ?></h5>
-<div class="metabox-prefs">
-<?php manage_columns_prefs('user') ?>
-<br class="clear" />
-</div></div>
-<?php wp_nonce_field( 'hiddencolumns', 'hiddencolumnsnonce', false ); ?>
-</div></form>
-
 <form id="posts-filter" action="" method="get">
 	<?php if ( $wp_user_search->is_search() ) : ?>
 		<h2><?php printf( current_user_can('create_users') ? __('Users Matching "%2$s" (<a href="%1$s">Add New</a>)') : __('Add New'), '#add-new-user', wp_specialchars($wp_user_search->search_term) ); ?></h2>
diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css
index 24d567b80..669130f2e 100644
--- a/wp-admin/wp-admin.css
+++ b/wp-admin/wp-admin.css
@@ -2061,72 +2061,55 @@ a.togbox {
 }
 
 /* show/hide settings */
-#show-settings {
-	float: right;
-	margin: 0 0 -30px;
-	position: relative;
-	z-index: 1;
-	width: 218px;
-	height: 28px;
-	border-width: 1px;
-	border-style: solid;
-	-moz-border-radius: 4px;
-	-khtml-border-radius: 4px;
-	-webkit-border-radius: 4px;
-	border-radius: 4px;
-}
-
 #show-settings-link,
 #hide-settings-link {
-	background-position: 8px center;
-	background-repeat: no-repeat;
-	line-height: 28px;
-	padding: 0 0 0 26px;
+	display: block;
+	height: 18px;
+	font-size: 11px;
+	text-decoration: none;
+	z-index: 1;
 }
 
 #show-settings-link {
-	background-image: url(images/menu-closed.png);
+	position: absolute;
+	padding: 3px 8px 1px;
+	right: 15px;
+	top: 0;
 }
 
 #hide-settings-link {
-	background-image: url(images/menu-open.png);
+	float: right;
+	padding: 3px 8px;
+	position: relative;
 }
 
 #edit-settings {
-	padding: 29px 0 0;
-	margin: 0 0 20px;
+	position: relative;
+	top: -12px;
 }
 
 #edit-settings-wrap h5 {
-	padding: 10px 0 5px 20px;
+	padding: 10px 0 0 15px;
 	margin: 0;
 	font-size: 13px;
 }
 
 #edit-settings-wrap {
-	-moz-border-radius: 4px 0 4px 4px;
-	-khtml-border-radius: 4px;
-	-khtml-border-top-right-radius: 0;
-	-webkit-border-radius: 4px;
-	-webkit-border-top-right-radius: 0;
-	border-radius: 4px;
-	border-top-right-radius: 0;
-	border-width: 1px;
-	border-style: solid;
-}
-
-#show-settings.show-settings-opened {
-	-moz-border-radius: 4px 4px 0 0;
-	-webkit-border-bottom-left-radius: 0;
-	-webkit-border-bottom-right-radius: 0;
-	-khtml-border-bottom-left-radius: 0;
-	-khtml-border-bottom-right-radius: 0;
-	border-bottom-left-radius: 0;
-	border-bottom-right-radius: 0;
+	border-style: none solid solid;
+	border-top: 0 none;
+	border-width: 0 1px 1px;
+	margin: 0 15px;
+	-moz-border-radius: 0 0 4px 4px;
+	-webkit-border-bottom-left-radius: 4px;
+	-webkit-border-bottom-right-radius: 4px;
+	-khtml-border-bottom-left-radius: 4px;
+	-khtml-border-bottom-right-radius: 4px;
+	border-bottom-left-radius: 4px;
+	border-bottom-right-radius: 4px;
 }
 
 .metabox-prefs {
-	padding: 8px 15px 15px;
+	padding: 5px 10px 10px;
 }
 
 .metabox-prefs label {
@@ -2134,7 +2117,7 @@ a.togbox {
 	float: left;
 	padding: 5px 3px;
 	white-space: nowrap;
-	width: 15em;
+	width: 12em;
 }
 
 .metabox-prefs label input {