-
+
post_status ) {
@@ -88,17 +90,17 @@ switch ( $post->post_status ) {
}
?>
-
-
+post_status || 'private' == $post->post_status ) { ?>
+
-
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+post_status ) { ?>
+
+
+
+
+
+
+
ID), true); ?> tabindex="4" />
+
+
+ID) ) { ?>
+
+
+
ID ) {
if ( 'future' == $post->post_status ) { // scheduled for publishing at a future date
- $stamp = __('Scheduled for:
%1$s at %2$s');
+ $stamp = __('Scheduled for: %1$s at %2$s');
} else if ( 'publish' == $post->post_status ) { // already published
- $stamp = __('Published on:
%1$s at %2$s');
+ $stamp = __('Published on: %1$s at %2$s');
} else if ( '0000-00-00 00:00:00' == $post->post_date ) { // draft, 1 or more saves, no date specified
$stamp = __('Publish immediately');
} else { // draft, 1 or more saves, date specified
- $stamp = __('Publish on:
%1$s at %2$s');
+ $stamp = __('Publish on: %1$s at %2$s');
}
$date = mysql2date(get_option('date_format'), $post->post_date);
$time = mysql2date(get_option('time_format'), $post->post_date);
@@ -132,33 +151,32 @@ if ( 0 != $post->ID ) {
$time = mysql2date(get_option('time_format'), current_time('mysql'));
}
?>
-
-
-
+
+
'. __('Already pinged:') . '
';
$already_pinged = explode("\n", trim($post->pinged));
@@ -287,7 +294,7 @@ function post_trackback_meta_box($post) {
-
()
+
()
pingbacks, no other action necessary.'); ?>
';
-
-$form_prevstatus = '';
-
-$saveasdraft = '';
-
?>
@@ -541,9 +542,6 @@ endif; ?>
@@ -52,11 +52,12 @@ function xfn_check($class, $value = '', $deprecated = '') {
link_id", 'delete-bookmark_' . $link->link_id) . "' onclick=\"if ( confirm('" . js_escape( sprintf( __("You are about to delete this link '%s'\n'Cancel' to stop, 'OK' to delete."), $link->link_name )) . "') ) { return true;}return false;\">" . __('Delete link') . "";
?>
+
-
+
post_status ) {
@@ -82,17 +84,17 @@ switch ( $post->post_status ) {
}
?>
+post_status || 'private' == $post->post_status ) { ?>
-
-
+
+
+
-
+
+
+
+
+
+
+
+
+post_status ) { ?>
+
+
+
+
+
+ID) ) { ?>
+
+
ID ) {
if ( 'future' == $post->post_status ) { // scheduled for publishing at a future date
- $stamp = __('Scheduled for:
%1$s at %2$s');
+ $stamp = __('Scheduled for: %1$s at %2$s');
} else if ( 'publish' == $post->post_status ) { // already published
- $stamp = __('Published on:
%1$s at %2$s');
+ $stamp = __('Published on: %1$s at %2$s');
} else if ( '0000-00-00 00:00:00' == $post->post_date ) { // draft, 1 or more saves, no date specified
$stamp = __('Publish immediately');
} else { // draft, 1 or more saves, date specified
- $stamp = __('Publish on:
%1$s at %2$s');
+ $stamp = __('Publish on: %1$s at %2$s');
}
$date = mysql2date(get_option('date_format'), $post->post_date);
$time = mysql2date(get_option('time_format'), $post->post_date);
@@ -121,56 +139,43 @@ if ( 0 != $post->ID ) {
$time = mysql2date(get_option('time_format'), current_time('mysql'));
}
?>
-
-
+
+
-
+post_status || 'private' == $post->post_status )
+ $savebtn = attribute_escape( __('Save') );
+else
+ $savebtn = attribute_escape( __('Save Draft') );
+?>
+
post_status ) { ?>
-
+
-ID) )
- echo "ID) . "' onclick=\"if ( confirm('" . js_escape(sprintf( ('draft' == $post->post_status) ? __("You are about to delete this draft '%s'\n 'Cancel' to stop, 'OK' to delete.") : __("You are about to delete this page '%s'\n 'Cancel' to stop, 'OK' to delete."), $post->post_title )) . "') ) { return true;}return false;\">" . __('Delete page') . "";
-?>
-
post_status, array('publish', 'future') ) || 0 == $post->ID ) {
-?>
+if ( !in_array( $post->post_status, array('publish', 'future') ) || 0 == $post->ID ) { ?>
-
-
-
+
+
+
" size="2" maxlength="2" />
-
+
+ ');
- $('.postbox h3, .postbox a.togbox').click( function() { $($(this).parent().get(0)).toggleClass('closed'); save_postboxes_state(page); } );
+ $('.postbox h3, .postbox a.togbox').click( function() {
+ $($(this).parent().get(0)).toggleClass('closed');
+ postboxes.save_state(page);
+ });
$('.hide-postbox-tog').click( function() {
var box = jQuery(this).val();
@@ -13,7 +16,7 @@
} else {
jQuery('#' + box).hide();
}
- save_postboxes_state(page);
+ postboxes.save_state(page);
} );
if ( $.browser.msie ) {
@@ -25,7 +28,7 @@
this.init(page);
},
-
+
expandSidebar : function( doIt ) {
if ( doIt || $.trim( $( '#side-info-column' ).text() ) ) {
$( '#post-body' ).addClass( 'has-sidebar' );
@@ -42,7 +45,6 @@
items: '> .postbox',
handle: '.hndle',
distance: 2,
- containment: '#wpbody-content',
stop: function() {
if ( 'side-sortables' == this.id ) { // doing this with jQuery doesn't work for some reason: make-it-tall gets duplicated
var makeItTall = document.getElementById( 'make-it-tall' );
@@ -69,20 +71,21 @@
postboxes.expandSidebar( true );
}
} );
+ },
+
+ save_state : function(page) {
+ var closed = $('.postbox').filter('.closed').map(function() { return this.id; }).get().join(',');
+ var hidden = $('.postbox').filter(':hidden').map(function() { return this.id; }).get().join(',');
+ $.post(postboxL10n.requestFile, {
+ action: 'closed-postboxes',
+ closed: closed,
+ hidden: hidden,
+ closedpostboxesnonce: jQuery('#closedpostboxesnonce').val(),
+ page: page
+ });
}
- }
+ };
+
+ $(document).ready(function(){postboxes.expandSidebar();});
+
}(jQuery));
-
-jQuery(document).ready(function(){postboxes.expandSidebar();});
-
-function save_postboxes_state(page) {
- var closed = jQuery('.postbox').filter('.closed').map(function() { return this.id; }).get().join(',');
- var hidden = jQuery('.postbox').filter(':hidden').map(function() { return this.id; }).get().join(',');
- jQuery.post(postboxL10n.requestFile, {
- action: 'closed-postboxes',
- closed: closed,
- hidden: hidden,
- closedpostboxesnonce: jQuery('#closedpostboxesnonce').val(),
- page: page
- });
-}
diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css
index a8b45a232b..58f6043306 100644
--- a/wp-admin/wp-admin.css
+++ b/wp-admin/wp-admin.css
@@ -237,16 +237,10 @@ table#availablethemes td.bottom {
}
.preview {
- border: 0 none;
padding: 7px;
}
-.submitbox .submit a.preview:hover {
- border: 0 none;
-}
-
#publish {
- display: block;
margin: 8px auto auto;
min-width: 150px;
}
@@ -1070,29 +1064,40 @@ table.form-table td .updated {
position: relative;
min-width: 195px;
}
-#normal-sortables .postbox .submitbox {
- clear: both;
- position: relative;
+
+#normal-sortables .inside-submitbox .insidebox {
+ float: left;
+ margin: 5px 12px 5px 0;
}
-#normal-sortables .postbox p {
- display: inline;
+
+#normal-sortables .submit #publish {
+ margin: 8px 0 0 12px;
}
-#normal-sortables .postbox .curtime {
- display: block;
+
+#normal-sortables .inside-submitbox {
+ float: left;
}
-#normal-sortables .postbox p strong {
- display: inline;
-}
-#normal-sortables .postbox #private-checkbox, #normal-sortables .postbox #sticky-checkbox {
- padding-left: 30px;
+
+#trackback_url {
+ width: 99%;
}
+
#normal-sortables .postbox .submit {
- position: absolute;
- top: -1em;
- right: 0;
- background: none;
- border: 0;
- padding: 0;
+ background: transparent none;
+ border: 0 none;
+ float: right;
+ padding: 0 12px;
+ margin: 0;
+}
+
+#side-sortables .submitbox .submit input,
+#side-sortables .submitbox .submit .preview,
+#side-sortables .submitbox .submit a.preview:hover {
+ border: 0 none;
+}
+
+#side-sortables .inside-submitbox .insidebox {
+ margin: 11px 0;
}
#mediadiv img {
@@ -1137,42 +1142,6 @@ table.form-table td .updated {
margin: 0;
}
-.submitbox {
-/* margin: 1em 0; */
-}
-
-.submitbox p {
-/* padding: 0;
- margin: 0; */
-}
-
-.submitbox .submit {
- text-align: left;
- padding: 12px 10px 10px;
- font-size: 11px;
-}
-
-.submitbox .submitdelete {
- border-bottom-width: 1px;
- border-bottom-style: solid;
- text-decoration: none;
- margin-left: 8px;
- padding-bottom: 1px;
-}
-
-.submitbox .submit a:hover {
- border-bottom-width: 1px;
- border-bottom-style: solid;
-}
-
-.submitbox .submit input {
- margin-bottom: 8px;
- margin-right: 3px;
- padding: 6px 4px;
- border: none;
-}
-
-
#tagchecklist {
margin-left: 10px;
font-size: 12px;
@@ -1296,6 +1265,14 @@ table.form-table td .updated {
font-size: 11px;
}
+#pending {
+ background: 0 none;
+ border: 0 none;
+ padding: 0;
+ font-size: 11px;
+ margin-top: -1px;
+}
+
#link_name, #link_url, #link_description {
font-size: 1.7em;
padding: 4px 3px;
@@ -1416,15 +1393,26 @@ table.form-table td .updated {
#side-info-column #side-sortables {
height: 100%;
- padding-top: 39px;
+}
+
+.submitbox .submit {
+ text-align: left;
+ padding: 12px 10px 10px;
+ font-size: 11px;
}
.submitbox .submitdelete {
border-bottom-width: 1px;
border-bottom-style: solid;
text-decoration: none;
- margin-left: 8px;
- padding-bottom: 1px;
+ padding: 1px 2px;
+}
+
+.submitbox .inside-submitbox #deletebutton {
+ padding: 0 0 2px 20px;
+ background-image: url(images/no.png);
+ background-position: left center;
+ background-repeat: no-repeat;
}
.submitbox .submit a:hover {
@@ -1434,10 +1422,14 @@ table.form-table td .updated {
.submitbox .submit input {
margin-bottom: 8px;
- margin-right: 3px;
+ margin-right: 4px;
padding: 6px;
}
+#post-status-select {
+ line-height: 2.5em;
+}
+
/* Categories */
#category-adder {
@@ -1842,10 +1834,16 @@ a.togbox {
#jj, #hh, #mn {
width: 1.5em;
+ padding: 1px;
}
#aa {
width: 2.7em;
+ padding: 1px;
+}
+
+#timestampdiv {
+ padding-top: 3px;
}
#inbox-filter .actions {