From 5bd33d81b1f9484d9693d9ef1e20837dc1de18be Mon Sep 17 00:00:00 2001
From: Mark Jaquith <markjaquith@git.wordpress.org>
Date: Thu, 30 Oct 2008 03:50:23 +0000
Subject: [PATCH] Publish postbox layout tweaks for Main Column Mode.

git-svn-id: https://develop.svn.wordpress.org/trunk@9409 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-admin/edit-form-advanced.php | 20 +++++++-------------
 wp-admin/wp-admin.css           | 24 ++++++++++++++++++++++--
 wp-includes/script-loader.php   |  2 +-
 3 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php
index c784ad9cdd..c2289ceefe 100644
--- a/wp-admin/edit-form-advanced.php
+++ b/wp-admin/edit-form-advanced.php
@@ -78,14 +78,17 @@ function post_submit_meta_box($post) {
 <input type="submit" name="save" value="<?php echo attribute_escape( __('Save') ); ?>" />
 </div>
 
+<div id="misc-pub-block-1">
 <?php if ( $can_publish && current_user_can( 'edit_others_posts' ) ) { ?>
 	<div class="misc-pub-section" id="sticky-checkbox"><input id="sticky" name="sticky" type="checkbox" value="sticky" <?php checked(is_sticky($post->ID), true); ?> tabindex="4" /> <label for="sticky" class="selectit"><?php _e('Stick to front page') ?></label></div>
 <?php } ?>
 
-<div class="misc-pub-section" id="visibility">
+<div class="misc-pub-section misc-pub-section-1-last" id="visibility">
 <?php _e('Visibility:'); ?> <b><?php _e('Public'); // TODO: dropdown ?></b>
 </div>
+</div>
 
+<div id="misc-pub-block-2">
 <?php
 $datef = _c( 'M j, Y \a\t G:i|Publish box date format');
 if ( 0 != $post->ID ) {
@@ -115,7 +118,7 @@ if ( 0 != $post->ID ) {
 </div>
 <?php endif; ?>
 
-<div class="misc-pub-section misc-pub-section-last"><label for="post_status"><?php _e('Status:') ?></label>
+<div class="misc-pub-section misc-pub-section-2-last"><label for="post_status"><?php _e('Status:') ?></label>
 <b><span id="post-status-display">
 <?php
 switch ( $post->post_status ) {
@@ -155,19 +158,10 @@ if ( $post->post_status == 'publish' ) : ?>
 <a href="#post_status" class="save-post-status hide-if-no-js button"><?php _e('OK'); ?></a>
 <a href="#post_status" class="cancel-post-status hide-if-no-js"><?php _e('Cancel'); ?></a>
 </div>
-</div>
-
-<?php } else { ?>
-</div>
-
-<?php if ( $can_publish && 'pending' != $post->post_status ) { ?>
-<!--
-<div  class="insidebox"><input name="pending" type="submit" class="button" id="pending" tabindex="6" accesskey="r" value="<?php _e('Submit for Review') ?>" /></div>
--->
-<?php } ?>
 
 <?php } ?>
-
+</div>
+</div>
 </div>
 
 <div id="minor-publishing-actions">
diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css
index e90b4a3f87..b4a2fc454d 100644
--- a/wp-admin/wp-admin.css
+++ b/wp-admin/wp-admin.css
@@ -226,12 +226,32 @@ table#availablethemes td.bottom {
 	border-bottom: 1px solid #ddd;
 }
 
-.misc-pub-section-last {
+#normal-sortables .misc-pub-section {
+	min-height: 18px;
+}
+
+#normal-sortables .misc-pub-section-1-last,
+.misc-pub-section-2-last {
 	border-bottom: 0;
 }
 
+#normal-sortables #misc-pub-block-1,
+#normal-sortables #misc-pub-block-2 {
+	float: left;
+	min-height: 70px;
+}
+
+#normal-sortables #misc-pub-block-1 {
+	border-right: 1px solid #ddd;
+}
+
+#normal-sortables #misc-pub-block-2 {
+	border-left: 1px solid #ddd;
+	margin-left: -1px;
+}
+
 #minor-publishing-actions {
-	padding: 4px 4px 4px 0;
+	padding: 6px 6px 6px 0;
 	float: right;
 	text-align: right;
 }
diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php
index c66cc043c8..2c2ed48179 100644
--- a/wp-includes/script-loader.php
+++ b/wp-includes/script-loader.php
@@ -316,7 +316,7 @@ function wp_default_styles( &$styles ) {
 
 	$rtl_styles = array( 'global', 'colors', 'dashboard', 'ie', 'install', 'login', 'media', 'theme-editor', 'upload', 'widgets', 'press-this', 'press-this-ie' );
 
-	$styles->add( 'wp-admin', '/wp-admin/wp-admin.css', array(), '20081029b' );
+	$styles->add( 'wp-admin', '/wp-admin/wp-admin.css', array(), '20081029c' );
 	$styles->add_data( 'wp-admin', 'rtl', '/wp-admin/rtl.css' );
 
 	$styles->add( 'ie', '/wp-admin/css/ie.css' );