From e386cb17c5610b184c10c05908e2855923ee7a30 Mon Sep 17 00:00:00 2001
From: Andrew Nacin <nacin@git.wordpress.org>
Date: Wed, 5 Oct 2011 21:07:04 +0000
Subject: [PATCH] UI touches for the single media button. see #17578.

git-svn-id: https://develop.svn.wordpress.org/trunk@18890 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-admin/css/wp-admin-rtl.dev.css      |  13 ++-------
 wp-admin/css/wp-admin.dev.css          |  38 ++++---------------------
 wp-admin/images/media-button.png       | Bin 0 -> 3117 bytes
 wp-admin/includes/media.php            |  17 ++++++-----
 wp-includes/css/editor-buttons.dev.css |   7 +++--
 5 files changed, 19 insertions(+), 56 deletions(-)
 create mode 100644 wp-admin/images/media-button.png

diff --git a/wp-admin/css/wp-admin-rtl.dev.css b/wp-admin/css/wp-admin-rtl.dev.css
index c57f39be41..23968433fc 100644
--- a/wp-admin/css/wp-admin-rtl.dev.css
+++ b/wp-admin/css/wp-admin-rtl.dev.css
@@ -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;
diff --git a/wp-admin/css/wp-admin.dev.css b/wp-admin/css/wp-admin.dev.css
index 6284428fa1..0c6607d223 100644
--- a/wp-admin/css/wp-admin.dev.css
+++ b/wp-admin/css/wp-admin.dev.css
@@ -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 {
diff --git a/wp-admin/images/media-button.png b/wp-admin/images/media-button.png
new file mode 100644
index 0000000000000000000000000000000000000000..82550734ae4ce806657867e8827ff7c27a6c08b8
GIT binary patch
literal 3117
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
Hu0mjffd%q3

literal 0
HcmV?d00001

diff --git a/wp-admin/includes/media.php b/wp-admin/includes/media.php
index 7b15606f6c..4c817ed3c2 100644
--- a/wp-admin/includes/media.php
+++ b/wp-admin/includes/media.php
@@ -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;">
diff --git a/wp-includes/css/editor-buttons.dev.css b/wp-includes/css/editor-buttons.dev.css
index e8d6bfd1d9..206526b093 100644
--- a/wp-includes/css/editor-buttons.dev.css
+++ b/wp-includes/css/editor-buttons.dev.css
@@ -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;
 }