Changeset 18890

Timestamp:

10/05/2011 09:07:04 PM (13 years ago)

Author:

nacin

Message:

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

Location:

trunk

Files:

• wp-admin/css/wp-admin-rtl.dev.css (modified) (3 diffs)
• wp-admin/css/wp-admin.dev.css (modified) (2 diffs)
• wp-admin/images/media-button.png (added)
• wp-admin/includes/media.php (modified) (4 diffs)
• wp-includes/css/editor-buttons.dev.css (modified) (1 diff)

trunk/wp-admin/css/wp-admin-rtl.dev.css

@@ -697 +697 @@
 }
 
-.postarea #add-media-button {
-    float: left;
-    right: auto;
-    left: 10px;
-}
-
 #edButtonPreview,
 #edButtonHTML {
@@ -712 +706 @@
     margin-right: 0;
     margin-left: 15px;
-}
-
-.wp-media-buttons a {
-    padding: 0 10px 5px 0;
 }
 
@@ -1567 +1557 @@
 #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;

trunk/wp-admin/css/wp-admin.dev.css

@@ -2820 +2820 @@
 }
 
-.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 {
@@ -5292 +5271 @@
 }
 
-#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;
 }
 

trunk/wp-admin/includes/media.php

@@ -375 +375 @@
  */
 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>";
-}
-
-function get_upload_iframe_src($type) {
+    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 = null ) {
     global $post_ID;
 
@@ -393 +393 @@
     $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);
 
@@ -1457 +1457 @@
 <?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">
@@ -1891 +1891 @@
 
     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>

trunk/wp-includes/css/editor-buttons.dev.css

@@ -1051 +1051 @@
 
 .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;
 }