WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

UI touches for the single media button. see #17578. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@18890 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2011-10-05 21:07:04 +00:00
parent f9ebf31d4a
commit 593bce9f3e
5 changed files with 19 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
wp-admin/css/wp-admin-rtl.dev.css
View File

@ -696,12 +696,6 @@ th.sorted a span {
float: right;
}
.postarea #add-media-button {
float: left;
right: auto;
left: 10px;
}
#edButtonPreview,
#edButtonHTML {
margin: 5px 0 0 5px;
@ -713,10 +707,6 @@ th.sorted a span {
margin-left: 15px;
}
.wp-media-buttons a {
padding: 0 10px 5px 0;
}
.submitbox .submit {
text-align: right;
}
@ -1566,8 +1556,9 @@ ol.ol-decimal {
}
#dashboard_quick_press #media-buttons {
margin: 0 5em .5em 0;
padding: 0 10px 0 0;
padding: 0;
}
#dashboard-widgets #dashboard_quick_press form p.submit {
margin-left: 0;
margin-right: 4.6em;

38
wp-admin/css/wp-admin.dev.css
View File

@ -2819,27 +2819,6 @@ input#link_url {
float: left;
}
.postarea #add-media-button {
float: right;
margin: 7px 0pt 0pt;
position: relative;
right: 10px;
}
.wp-media-buttons {
cursor: default;
padding: 8px 8px 0;
}
.wp-media-buttons a {
cursor: pointer;
padding: 0 0 5px 10px;
}
.wp-media-buttons img {
vertical-align: middle;
}
#submitpost #ajax-loading,
#submitpost .ajax-loading {
vertical-align: middle;
@ -5291,20 +5270,13 @@ div.postbox div.inside {
margin: 0 0 1em 5em;
}
#media-buttons {
#dashboard_quick_press #media-buttons {
margin: 0 0 .5em 5em;
padding: 0 0 0 10px;
line-height: 17px;
padding: 0;
}
#dashboard_quick_press #media-buttons a {
color: #777;
cursor: default;
}
#media-buttons a {
margin: 0 3px;
}
#media-buttons a img {
vertical-align: middle;
}
#dashboard-widgets #dashboard_quick_press form p.submit {

BIN
wp-admin/images/media-button.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

17
wp-admin/includes/media.php
View File

@ -374,25 +374,25 @@ document.body.className = c;
* @since 2.5.0
*/
function media_buttons($editor_id = 'content') {
$out = _media_button(__('Add Media'), 'images/media-button-video.gif?ver=20100531', 'media', $editor_id);
$context = apply_filters('media_buttons_context', __('Upload/Insert %s'));
printf($context, $out);
$img = '<img src="' . esc_url( admin_url( 'images/media-button.png?ver=20111005' ) ) . '" width="15" height="15" />';
echo '<a href="' . esc_url( get_upload_iframe_src() ) . '" class="thickbox add_media" id="$editor_id-add_media" title="' . esc_attr__( 'Add Media' ) . '" onclick="return false;">' . sprintf( $context, $img ) . '</a>';
}
add_action( 'media_buttons', 'media_buttons' );
function _media_button($title, $icon, $type, $id) {
return "<a href='" . esc_url( get_upload_iframe_src($type) ) . "' id='{$id}-add_{$type}' class='thickbox add_$type' title='$title'><img src='" . esc_url( admin_url( $icon ) ) . "' alt='$title' onclick='return false;' /></a>";
return "<a href='" . esc_url( get_upload_iframe_src($type) ) . "' id='{$id}-add_{$type}' class='thickbox add_$type' title='" . esc_attr( $title ) . "'><img src='" . esc_url( admin_url( $icon ) ) . "' alt='$title' onclick='return false;' /></a>";
}
function get_upload_iframe_src($type) {
function get_upload_iframe_src( $type = null ) {
global $post_ID;
$uploading_iframe_ID = (int) $post_ID;
$upload_iframe_src = add_query_arg( 'post_id', $uploading_iframe_ID, admin_url('media-upload.php') );
if ( 'media' != $type )
if ( $type && 'media' != $type )
$upload_iframe_src = add_query_arg('type', $type, $upload_iframe_src);
$upload_iframe_src = apply_filters($type . '_upload_iframe_src', $upload_iframe_src);
@ -1456,7 +1456,7 @@ function media_upload_type_url_form($type = null, $errors = null, $id = null) {
<input type="hidden" name="post_id" id="post_id" value="<?php echo (int) $post_id; ?>" />
<?php wp_nonce_field('media-form'); ?>
<h3 class="media-title"><?php _e('Add media file from URL'); ?></h3>
<h3 class="media-title"><?php _e('Insert media from another website'); ?></h3>
<script type="text/javascript">
//<![CDATA[
@ -1890,8 +1890,7 @@ function type_url_form_image( $default_view = 'image' ) {
}
return '
<h4 class="media-sub-title">' . __('Insert media from another web site') . '</h4>
<p class="media-types"><label><input type="radio" name="media_type" value="image" id="image-only"' . checked( 'image-only', $view, false ) . ' /> ' . __( 'Images' ) . '</label> &nbsp; &nbsp; <label><input type="radio" name="media_type" value="generic" id="not-image"' . checked( 'not-image', $view, false ) . ' /> ' . __( 'Audio, Video, or Files' ) . '</label></p>
<p class="media-types"><label><input type="radio" name="media_type" value="image" id="image-only"' . checked( 'image-only', $view, false ) . ' /> ' . __( 'Image' ) . '</label> &nbsp; &nbsp; <label><input type="radio" name="media_type" value="generic" id="not-image"' . checked( 'not-image', $view, false ) . ' /> ' . __( 'Audio, Video, or Other File' ) . '</label></p>
<table class="describe ' . $table_class . '"><tbody>
<tr>
<th valign="top" scope="row" class="label" style="width:130px;">

7
wp-includes/css/editor-buttons.dev.css
View File

@ -1050,16 +1050,17 @@
}
.wp-media-buttons {
cursor: default;
padding: 8px 8px 0;
padding: .5em .5em 0;
}
.wp-media-buttons a {
cursor: pointer;
padding: 0 0 5px 10px;
text-decoration: none;
color: #333;
}
.wp-media-buttons img {
padding: 0 4px;
vertical-align: middle;
}