diff --git a/wp-admin/css/wp-admin.css b/wp-admin/css/wp-admin.css index c22c5915ef..7ca3745f67 100644 --- a/wp-admin/css/wp-admin.css +++ b/wp-admin/css/wp-admin.css @@ -747,7 +747,8 @@ input[readonly] { background-color: #eee; } -:-moz-placeholder { +:-moz-placeholder, +.wp-core-ui :-moz-placeholder { color: #a9a9a9; } @@ -3080,11 +3081,78 @@ input#link_url { margin: 2px 0 2px -2px; } -#post-status-select, #post-format { +#post-status-select { line-height: 2.5em; margin-top: 3px; } +/* Post formats form */ +#poststuff .post-format-select { + margin-top: 0; + padding-bottom: 0; +} + +.post-formats-fields { + margin-bottom: 20px; +} + +.wp-format-standard .post-formats-fields, +.wp-format-aside .post-formats-fields, +.wp-format-chat .post-formats-fields, +.wp-format-status .post-formats-fields { + display: none; +} + +.post-formats-fields .field { + display: none; + margin-bottom: 10px; +} + +.post-formats-fields input, +.post-formats-fields textarea { + padding: 5px; + font-size: 1.2em; +} + +.wp-format-chat .field.wp-format-chat, +.wp-format-gallery .field.wp-format-gallery, +.wp-format-link .field.wp-format-link, +.wp-format-image .field.wp-format-image, +.wp-format-quote .field.wp-format-quote, +.wp-format-video .field.wp-format-video, +.wp-format-audio .field.wp-format-audio { + display: block; +} + +#wp-format-image-holder { + overflow: hidden; + width: 300px; + height: 200px; + border: 1px solid #dfdfdf; + background: #f5f5f5; +} + +#wp-format-image-holder:hover { + background-color: #eee; +} + +#wp-format-image-select { + display: block; + height: 200px; + text-align: center; +} + +#wp-format-image-select img { + max-width: 100%; + max-height: 100%; +} + +.empty #wp-format-image-select { + padding-top: 120px; + height: 80px; + background: url(../images/media-button-2x.png) no-repeat center; +} + /* Post Screen */ #post-body #normal-sortables { min-height: 50px; diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php index 1d56ad4492..52a1dc8cf0 100644 --- a/wp-admin/edit-form-advanced.php +++ b/wp-admin/edit-form-advanced.php @@ -112,9 +112,6 @@ if ( 'attachment' == $post_type ) { add_meta_box( 'submitdiv', __( 'Publish' ), 'post_submit_meta_box', null, 'side', 'core' ); } -if ( current_theme_supports( 'post-formats' ) && post_type_supports( $post_type, 'post-formats' ) ) - add_meta_box( 'formatdiv', _x( 'Format', 'post format' ), 'post_format_meta_box', null, 'side', 'core' ); - // all taxonomies foreach ( get_object_taxonomies( $post ) as $tax_name ) { $taxonomy = get_taxonomy($tax_name); @@ -129,6 +126,17 @@ foreach ( get_object_taxonomies( $post ) as $tax_name ) { add_meta_box($tax_name . 'div', $label, 'post_categories_meta_box', null, 'side', 'core', array( 'taxonomy' => $tax_name )); } +// post format +if ( post_type_supports( $post_type, 'post-formats' ) ) { + wp_enqueue_script( 'post-formats' ); + $post_format = get_post_format(); + $format_class = ''; + if ( ! $post_format ) + $post_format = 'standard'; + + $format_class = " class='wp-format-{$post_format}'"; +} + if ( post_type_supports($post_type, 'page-attributes') ) add_meta_box('pageparentdiv', 'page' == $post_type ? __('Page Attributes') : __('Attributes'), 'page_attributes_meta_box', null, 'side', 'core'); @@ -321,8 +329,28 @@ wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false );