golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move and adjust "Page Options" box 

git-svn-id: http://svn.automattic.com/wordpress/trunk@9016 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
azaozz 2008-09-28 04:11:27 +00:00
parent a21c2c2890
commit 94dc5f67bd
16 changed files with 213 additions and 270 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
wp-admin/categories.php
View File

@ -117,7 +117,22 @@ $messages[2] = __('Category deleted.');
$messages[3] = __('Category updated.'); $messages[3] = __('Category updated.');
$messages[4] = __('Category not added.'); $messages[4] = __('Category not added.');
$messages[5] = __('Category not updated.'); $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'] ) ) : ?> if ( isset($_GET['message']) && ( $msg = (int) $_GET['message'] ) ) : ?>
<div id="message" class="updated fade"><p><?php echo $messages[$msg]; ?></p></div> <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']); <?php $_SERVER['REQUEST_URI'] = remove_query_arg(array('message'), $_SERVER['REQUEST_URI']);
@ -125,24 +140,8 @@ endif; ?>
<div class="wrap"> <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> <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"> <form id="posts-filter" action="" method="get">
<div class="tablenav"> <div class="tablenav">

11
wp-admin/css/colors-classic.css
View File

@ -50,7 +50,7 @@ input.disabled, textarea.disabled {
background-color: #ccc; 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, #dashmenu a:hover, #footer a, #upload-menu li a.upload-tab-link,
li.widget-list-control-item h4.widget-title a, li.widget-list-control-item h4.widget-title a,
#dragHelper 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, #rightnow a:hover, a:hover, .subsubsub a:hover, .subsubsub a.current:hover,
#login form .submit input:hover, div.dashboard-widget-submit input:hover, #login form .submit input:hover, div.dashboard-widget-submit input:hover,
#edit-slug-buttons a.save:hover, #media-upload a.delete: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; color: #d54e21;
} }
@ -800,8 +800,7 @@ table.diff .diff-addedline ins {
color: #CFEBF6; color: #CFEBF6;
} }
#edit-settings-wrap, #edit-settings-wrap {
#show-settings {
background-color: #14568A; background-color: #14568A;
border-color: #14568A; border-color: #14568A;
color: #CFEBF6; color: #CFEBF6;
@ -812,10 +811,6 @@ table.diff .diff-addedline ins {
color: #CFEBF6; color: #CFEBF6;
} }
#show-settings.show-settings-opened {
border-bottom-color: #14568A;
}
#replydiv, #replydiv,
.inline-editor .quick-edit-div { .inline-editor .quick-edit-div {
border-color: #EBEBEB #CCC #CCC #EBEBEB; border-color: #EBEBEB #CCC #CCC #EBEBEB;

11
wp-admin/css/colors-fresh.css
View File

@ -50,7 +50,7 @@ input.disabled, textarea.disabled {
background-color: #ccc; 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, #dashmenu a:hover, #footer a, #upload-menu li a.upload-tab-link,
li.widget-list-control-item h4.widget-title a, li.widget-list-control-item h4.widget-title a,
#dragHelper 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, #rightnow a:hover, a:hover, .subsubsub a:hover, .subsubsub a.current:hover,
#login form .submit input:hover, div.dashboard-widget-submit input:hover, #login form .submit input:hover, div.dashboard-widget-submit input:hover,
#edit-slug-buttons a.save:hover, #media-upload a.delete: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; color: #d54e21;
} }
@ -789,16 +789,11 @@ table.diff .diff-addedline ins {
border-top-color: #e4f2fd; border-top-color: #e4f2fd;
} }
#edit-settings-wrap, #edit-settings-wrap {
#show-settings {
background-color: #E4F2FD; background-color: #E4F2FD;
border-color: #c6d9e9; border-color: #c6d9e9;
} }
#show-settings.show-settings-opened {
border-bottom-color: #E4F2FD;
}
#replydiv, #replydiv,
.inline-editor .quick-edit-div { .inline-editor .quick-edit-div {
border-color: #EBEBEB #CCC #CCC #EBEBEB; border-color: #EBEBEB #CCC #CCC #EBEBEB;

30
wp-admin/edit-comments.php
View File

@ -66,8 +66,22 @@ $mode = ( ! isset($_GET['mode']) || empty($_GET['mode']) ) ? 'detail' : attribut
$comment_status = isset($_GET['comment_status']) ? attribute_escape($_GET['comment_status']) : ''; $comment_status = isset($_GET['comment_status']) ? attribute_escape($_GET['comment_status']) : '';
$search_dirty = ( isset($_GET['s']) ) ? $_GET['s'] : ''; $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'] ) ) { if ( isset( $_GET['approved'] ) || isset( $_GET['deleted'] ) || isset( $_GET['spam'] ) ) {
$approved = isset( $_GET['approved'] ) ? (int) $_GET['approved'] : 0; $approved = isset( $_GET['approved'] ) ? (int) $_GET['approved'] : 0;
$deleted = isset( $_GET['deleted'] ) ? (int) $_GET['deleted'] : 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"> <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"> <form id="posts-filter" action="" method="get">
<h2><?php _e('Manage Comments'); ?></h2> <h2><?php _e('Manage Comments'); ?></h2>

34
wp-admin/edit-form-advanced.php
View File

@ -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). // 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) { function post_submit_meta_box($post) {
global $action; 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 ) : ?> <?php if ( $notice ) : ?>
<div id="notice" class="error"><p><?php echo $notice ?></p></div> <div id="notice" class="error"><p><?php echo $notice ?></p></div>
<?php endif; ?> <?php endif; ?>
@ -420,18 +426,6 @@ endif;
<div class="wrap"> <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 <h2><?php
if ( !isset($post_ID) || 0 == $post_ID) if ( !isset($post_ID) || 0 == $post_ID)
printf( __( '<a href="%s">Posts</a> / Write New Post' ), 'edit.php' ); 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' ); printf( __( '<a href="%s">Posts</a> / Edit Post' ), 'edit.php' );
?></h2> ?></h2>
<form name="post" action="post.php" method="post" id="post">
<?php <?php
if ( 0 == $post_ID) if ( 0 == $post_ID)
@ -555,9 +550,8 @@ do_action('dbx_post_sidebar');
</div> </div>
</div> </div>
</div><!-- /poststuff --> </div><!-- /poststuff -->
</div>
</form> </form>
</div>
<?php wp_comment_reply(); ?> <?php wp_comment_reply(); ?>

33
wp-admin/edit-link-categories.php
View File

@ -55,33 +55,30 @@ $messages[2] = __('Category deleted.');
$messages[3] = __('Category updated.'); $messages[3] = __('Category updated.');
$messages[4] = __('Category not added.'); $messages[4] = __('Category not added.');
$messages[5] = __('Category not updated.'); $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> <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']); <?php $_SERVER['REQUEST_URI'] = remove_query_arg(array('message'), $_SERVER['REQUEST_URI']);
endif; ?> endif; ?>
<div class="wrap"> <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> <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"> <form id="posts-filter" action="" method="get">
<div class="tablenav"> <div class="tablenav">

33
wp-admin/edit-link-form.php
View File

@ -261,28 +261,22 @@ function link_advanced_meta_box($link) {
</table> </table>
<?php <?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; <div id="edit-settings">
echo $link_added; <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">
wp_nonce_field($nonce_action); <a href="#edit_settings" id="hide-settings-link" class="show-settings"><?php _e('Hide Options') ?></a>
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">
<h5><?php _e('Show on screen') ?></h5> <h5><?php _e('Show on screen') ?></h5>
<form id="adv-settings" action="" method="get">
<div class="metabox-prefs"> <div class="metabox-prefs">
<?php meta_box_prefs('link') ?> <?php meta_box_prefs('link') ?>
<?php wp_nonce_field( 'hiddencolumns', 'hiddencolumnsnonce', false ); ?>
<br class="clear" /> <br class="clear" />
</div></form>
</div></div> </div></div>
</div>
<div class="wrap">
<h2><?php echo $heading; ?></h2> <h2><?php echo $heading; ?></h2>
@ -312,6 +306,13 @@ wp_nonce_field( 'meta-box-order', 'meta-box-order-nonce', false ); ?>
</ul> </ul>
</div> </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"> <div id="poststuff">

35
wp-admin/edit-page-form.php
View File

@ -46,14 +46,6 @@ $temp_ID = (int) $temp_ID;
$user_ID = (int) $user_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 <?php
function page_submit_meta_box($post) { function page_submit_meta_box($post) {
global $action; global $action;
@ -285,19 +277,20 @@ add_meta_box('revisionsdiv', __('Page Revisions'), 'page_revisions_meta_box', 'p
endif; endif;
?> ?>
<div class="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="show-settings"><a href="#edit_settings" id="show-settings-link" class="hide-if-no-js"><?php _e('Advanced Options') ?></a> <div id="edit-settings-wrap" class="hidden">
<a href="#edit_settings" id="hide-settings-link" class="hide-if-js hide-if-no-js"><?php _e('Hide Options') ?></a></div> <a href="#edit_settings" id="hide-settings-link" class="show-settings"><?php _e('Hide Options') ?></a>
<div id="edit-settings" class="hide-if-js hide-if-no-js">
<div id="edit-settings-wrap">
<h5><?php _e('Show on screen') ?></h5> <h5><?php _e('Show on screen') ?></h5>
<form id="adv-settings" action="" method="get">
<div class="metabox-prefs"> <div class="metabox-prefs">
<?php meta_box_prefs('page') ?> <?php meta_box_prefs('page') ?>
<?php wp_nonce_field( 'hiddencolumns', 'hiddencolumnsnonce', false ); ?>
<br class="clear" /> <br class="clear" />
</div></form>
</div></div> </div></div>
</div>
<div class="wrap">
<h2><?php <h2><?php
if ( !isset($post_ID) || 0 == $post_ID ) if ( !isset($post_ID) || 0 == $post_ID )
@ -306,6 +299,14 @@ endif;
printf( __( '<a href="%s">Pages</a> / Edit Page' ), 'edit-pages.php' ); printf( __( '<a href="%s">Pages</a> / Edit Page' ), 'edit-pages.php' );
?></h2> ?></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 <?php
wp_nonce_field($nonce_action); wp_nonce_field($nonce_action);
@ -431,8 +432,8 @@ do_meta_boxes('page', 'advanced', $post);
</div> </div>
</div> </div>
</div>
</form> </form>
</div>
<script type="text/javascript"> <script type="text/javascript">
try{document.post.title.focus();}catch(e){} try{document.post.title.focus();}catch(e){}

30
wp-admin/edit-pages.php
View File

@ -92,9 +92,22 @@ if ( is_singular() ) {
wp_enqueue_script( 'jquery-table-hotkeys' ); 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> <div id="message" class="updated fade"><p>
<?php printf( __ngettext( '%d page updated.', '%d pages updated.', $_GET['upd'] ), number_format_i18n( $_GET['upd'] ) ); <?php printf( __ngettext( '%d page updated.', '%d pages updated.', $_GET['upd'] ), number_format_i18n( $_GET['upd'] ) );
unset($_GET['upd']); unset($_GET['upd']);
@ -107,19 +120,6 @@ unset($_GET['upd']);
<?php } ?> <?php } ?>
<div class="wrap"> <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 <h2><?php
// Use $_GET instead of is_ since they can override each other // Use $_GET instead of is_ since they can override each other

33
wp-admin/edit-tags.php
View File

@ -122,33 +122,30 @@ $messages[2] = __('Tag deleted.');
$messages[3] = __('Tag updated.'); $messages[3] = __('Tag updated.');
$messages[4] = __('Tag not added.'); $messages[4] = __('Tag not added.');
$messages[5] = __('Tag not updated.'); $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> <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']); <?php $_SERVER['REQUEST_URI'] = remove_query_arg(array('message'), $_SERVER['REQUEST_URI']);
endif; ?> endif; ?>
<div class="wrap"> <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> <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"> <form id="posts-filter" action="" method="get">
<div class="tablenav"> <div class="tablenav">

30
wp-admin/edit.php
View File

@ -89,8 +89,22 @@ if ( !isset( $_GET['paged'] ) )
if ( empty($_GET['mode']) ) if ( empty($_GET['mode']) )
$mode = 'list'; $mode = 'list';
else 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']; ?> 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> <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']); <?php $_SERVER['REQUEST_URI'] = remove_query_arg(array('posted'), $_SERVER['REQUEST_URI']);
@ -110,20 +124,6 @@ unset($_GET['upd']);
<div class="wrap"> <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 <h2><?php
if ( is_single() ) { if ( is_single() ) {
printf(__('Comments on %s'), apply_filters( "the_title", $post->post_title)); printf(__('Comments on %s'), apply_filters( "the_title", $post->post_title));

15
wp-admin/js/settings-box.js
View File

@ -1,21 +1,14 @@
jQuery(document).ready( function($) { jQuery(document).ready( function($) {
$('#show-settings-link').click(function () { $('#show-settings-link').click(function () {
$('#edit-settings').slideDown('normal', function(){ $(this).hide()
$('#show-settings-link').hide(); $('#edit-settings-wrap').slideDown('normal');
$('#hide-settings-link').show();
});
$('#show-settings').addClass('show-settings-opened');
return false; return false;
}); });
$('#hide-settings-link').click(function () { $('#hide-settings-link').click(function () {
$('#edit-settings').slideUp('normal', function(){ $('#edit-settings-wrap').slideUp('normal', function(){
$('#hide-settings-link').hide();
$('#show-settings-link').show(); $('#show-settings-link').show();
$('#show-settings').removeClass('show-settings-opened');
}); });
return false; return false;
}); });
}); });

32
wp-admin/link-manager.php
View File

@ -71,8 +71,22 @@ switch ($order_by) {
default : default :
$sqlorderby = 'name'; $sqlorderby = 'name';
break; 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']) ) { if ( isset($_GET['deleted']) ) {
echo '<div id="message" class="updated fade"><p>'; echo '<div id="message" class="updated fade"><p>';
$deleted = (int) $_GET['deleted']; $deleted = (int) $_GET['deleted'];
@ -84,24 +98,8 @@ if ( isset($_GET['deleted']) ) {
<div class="wrap"> <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> <h2><?php printf( __('Links (<a href="%s">Add New</a>)' ), 'link-add.php' ); ?></h2>
<br class="clear" />
<form id="posts-filter" action="" method="get"> <form id="posts-filter" action="" method="get">
<div class="tablenav"> <div class="tablenav">

19
wp-admin/upload.php
View File

@ -137,21 +137,20 @@ if ( is_singular() ) {
require_once('admin-header.php'); ?> require_once('admin-header.php'); ?>
<div class="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>
<form id="adv-settings" action="" method="get"> <div id="edit-settings-wrap" class="hidden">
<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="show-settings"><?php _e('Hide 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> <h5><?php _e('Show on screen') ?></h5>
<form id="adv-settings" action="" method="get">
<div class="metabox-prefs"> <div class="metabox-prefs">
<?php manage_columns_prefs('media') ?> <?php manage_columns_prefs('media') ?>
<br class="clear" />
</div></div>
<?php wp_nonce_field( 'hiddencolumns', 'hiddencolumnsnonce', false ); ?> <?php wp_nonce_field( 'hiddencolumns', 'hiddencolumnsnonce', false ); ?>
<br class="clear" />
</div></form> </div></form>
</div></div>
<div class="wrap">
<h2><?php <h2><?php
if ( isset($_GET['detached']) ) { if ( isset($_GET['detached']) ) {

33
wp-admin/users.php
View File

@ -236,13 +236,18 @@ default:
} }
endif; ?> endif; ?>
<form class="search-form" action="" method="get"> <div id="edit-settings">
<p id="user-search" class="search-box"> <a href="#edit_settings" id="show-settings-link" class="hide-if-no-js show-settings"><?php _e('Page Options') ?></a>
<label class="hidden" for="user-search-input"><?php _e( 'Search Users' ); ?></label> <div id="edit-settings-wrap" class="hidden">
<input type="text" id="user-search-input" class="search-input" name="usersearch" value="<?php echo attribute_escape($wp_user_search->search_term); ?>" /> <a href="#edit_settings" id="hide-settings-link" class="show-settings"><?php _e('Hide Options') ?></a>
<input type="submit" value="<?php _e( 'Search Users' ); ?>" class="button" /> <h5><?php _e('Show on screen') ?></h5>
</p> <form id="adv-settings" action="" method="get">
</form> <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 ) ) : ?> <?php if ( isset($errors) && is_wp_error( $errors ) ) : ?>
<div class="error"> <div class="error">
@ -262,20 +267,6 @@ if ( ! empty($messages) ) {
<div class="wrap"> <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"> <form id="posts-filter" action="" method="get">
<?php if ( $wp_user_search->is_search() ) : ?> <?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> <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>

73
wp-admin/wp-admin.css
View File

@ -2061,72 +2061,55 @@ a.togbox {
} }
/* show/hide settings */ /* 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, #show-settings-link,
#hide-settings-link { #hide-settings-link {
background-position: 8px center; display: block;
background-repeat: no-repeat; height: 18px;
line-height: 28px; font-size: 11px;
padding: 0 0 0 26px; text-decoration: none;
z-index: 1;
} }
#show-settings-link { #show-settings-link {
background-image: url(images/menu-closed.png); position: absolute;
padding: 3px 8px 1px;
right: 15px;
top: 0;
} }
#hide-settings-link { #hide-settings-link {
background-image: url(images/menu-open.png); float: right;
padding: 3px 8px;
position: relative;
} }
#edit-settings { #edit-settings {
padding: 29px 0 0; position: relative;
margin: 0 0 20px; top: -12px;
} }
#edit-settings-wrap h5 { #edit-settings-wrap h5 {
padding: 10px 0 5px 20px; padding: 10px 0 0 15px;
margin: 0; margin: 0;
font-size: 13px; font-size: 13px;
} }
#edit-settings-wrap { #edit-settings-wrap {
-moz-border-radius: 4px 0 4px 4px; border-style: none solid solid;
-khtml-border-radius: 4px; border-top: 0 none;
-khtml-border-top-right-radius: 0; border-width: 0 1px 1px;
-webkit-border-radius: 4px; margin: 0 15px;
-webkit-border-top-right-radius: 0; -moz-border-radius: 0 0 4px 4px;
border-radius: 4px; -webkit-border-bottom-left-radius: 4px;
border-top-right-radius: 0; -webkit-border-bottom-right-radius: 4px;
border-width: 1px; -khtml-border-bottom-left-radius: 4px;
border-style: solid; -khtml-border-bottom-right-radius: 4px;
} border-bottom-left-radius: 4px;
border-bottom-right-radius: 4px;
#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;
} }
.metabox-prefs { .metabox-prefs {
padding: 8px 15px 15px; padding: 5px 10px 10px;
} }
.metabox-prefs label { .metabox-prefs label {
@ -2134,7 +2117,7 @@ a.togbox {
float: left; float: left;
padding: 5px 3px; padding: 5px 3px;
white-space: nowrap; white-space: nowrap;
width: 15em; width: 12em;
} }
.metabox-prefs label input { .metabox-prefs label input {