From b70d3b2028f8462e44356900331cae754ff410f2 Mon Sep 17 00:00:00 2001
From: ryan <ryan@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Sat, 24 May 2008 17:03:51 +0000
Subject: [PATCH] Few css fixes for the media uploader, confirm delete of
 attachments from the library tab. Props azaozz. fixes #7033

git-svn-id: http://svn.automattic.com/wordpress/trunk@7988 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/css/colors-classic.css | 12 ++++--------
 wp-admin/css/colors-fresh.css   |  7 ++++---
 wp-admin/css/media.css          | 17 ++++++++++++++++-
 wp-admin/includes/media.php     | 16 +++++++++-------
 wp-includes/script-loader.php   |  2 +-
 5 files changed, 34 insertions(+), 20 deletions(-)

diff --git a/wp-admin/css/colors-classic.css b/wp-admin/css/colors-classic.css
index 7032f2b57a..7541ab3828 100644
--- a/wp-admin/css/colors-classic.css
+++ b/wp-admin/css/colors-classic.css
@@ -204,7 +204,7 @@ ul#widget-list li.widget-list-item h4.widget-title {
 	border-color: #535353;
 }
 
-.submit input:hover, .button:hover, .button-secondary:hover, #wphead #viewsite a:hover, #submenu a.current, #submenu a:hover, .submitbox #previewview a:hover, #the-comment-list .comment a:hover, #rightnow a:hover, a:hover, .subsubsub a:hover, .subsubsub a.current:hover, #login form .submit input:hover, div.dashboard-widget-submit input:hover, #edit-slug-buttons a.save:hover {
+.submit input:hover, .button:hover, .button-secondary:hover, #wphead #viewsite a:hover, #submenu a.current, #submenu a:hover, .submitbox #previewview a:hover, #the-comment-list .comment a:hover, #rightnow a:hover, a:hover, .subsubsub a:hover, .subsubsub a.current:hover, #login form .submit input:hover, div.dashboard-widget-submit input:hover, #edit-slug-buttons a.save:hover, #media-upload a.del-link:hover {
 	color: #d54e21;
 }
 
@@ -239,7 +239,8 @@ ul#widget-list li.widget-list-item h4.widget-title {
 	border-bottom-color: #999;
 }
 
-.submitbox .submitdelete:hover {
+.submitbox .submitdelete:hover,
+#media-upload a.delete:hover {
 	color: #fff;
 	background-color: #f00;
 	border-bottom-color: #f00;
@@ -291,7 +292,7 @@ ul#widget-list li.widget-list-item h4.widget-title {
 	color: #5a5a5a;
 }
 
-#poststuff #edButtonPreview, #poststuff #edButtonHTML, #the-comment-list p.comment-author strong a, a {
+#poststuff #edButtonPreview, #poststuff #edButtonHTML, #the-comment-list p.comment-author strong a, #media-upload a.del-link, #media-upload a.delete, a {
 	color: #2e7ca0;
 }
 
@@ -550,11 +551,6 @@ div#media-upload-error, .file-error, abbr.required, .widget-control-remove:hover
 	color: #f00;
 }
 
-#media-upload a.delete { 
-	color: #888; 
-}
-
-
 /* TinyMCE */
 .wp_themeSkin *,
 .wp_themeSkin a:hover, 
diff --git a/wp-admin/css/colors-fresh.css b/wp-admin/css/colors-fresh.css
index 1da5a53da0..ef835ab39e 100644
--- a/wp-admin/css/colors-fresh.css
+++ b/wp-admin/css/colors-fresh.css
@@ -196,7 +196,7 @@ ul#widget-list li.widget-list-item h4.widget-title {
 	border-color: #535353;
 }
 
-.submit input:hover, .button:hover, .button-secondary:hover, #wphead #viewsite a:hover, #adminmenu a:hover, #sidemenu a:hover, #submenu a.current, #submenu a:hover, .submitbox #previewview a:hover, #the-comment-list .comment a:hover, #rightnow a:hover, a:hover, .subsubsub a:hover, .subsubsub a.current:hover, #login form .submit input:hover, div.dashboard-widget-submit input:hover, #edit-slug-buttons a.save:hover, #media-upload a.delete:hover {
+.submit input:hover, .button:hover, .button-secondary:hover, #wphead #viewsite a:hover, #adminmenu a:hover, #sidemenu a:hover, #submenu a.current, #submenu a:hover, .submitbox #previewview a:hover, #the-comment-list .comment a:hover, #rightnow a:hover, a:hover, .subsubsub a:hover, .subsubsub a.current:hover, #login form .submit input:hover, div.dashboard-widget-submit input:hover, #edit-slug-buttons a.save:hover, #media-upload a.delete:hover, #media-upload a.del-link:hover {
 	color: #d54e21;
 }
 
@@ -226,7 +226,8 @@ ul#widget-list li.widget-list-item h4.widget-title {
 	border-bottom-color: #999;
 }
 
-.submitbox .submitdelete:hover {
+.submitbox .submitdelete:hover,
+#media-upload a.delete:hover {
 	color: #fff;
 	background-color: #f00;
 	border-bottom-color: #f00;
@@ -278,7 +279,7 @@ ul#widget-list li.widget-list-item h4.widget-title {
 	color: #666;
 }
 
-#adminmenu a, #submenu a, #poststuff #edButtonPreview, #poststuff #edButtonHTML, #the-comment-list p.comment-author strong a, a {
+#adminmenu a, #submenu a, #poststuff #edButtonPreview, #poststuff #edButtonHTML, #the-comment-list p.comment-author strong a, #media-upload a.del-link, #media-upload a.delete, a {
 	color: #2583ad;
 }
 
diff --git a/wp-admin/css/media.css b/wp-admin/css/media.css
index eabc477582..225fa8495f 100644
--- a/wp-admin/css/media.css
+++ b/wp-admin/css/media.css
@@ -216,13 +216,17 @@ abbr.required {
 }
 
 #media-upload .media-item {
-	cursor:move;
 	position: relative;
 	border-bottom-width: 1px;
 	border-bottom-style: solid;
 	min-height: 36px;
 	width: 100%;
 }
+
+#media-upload .ui-sortable .media-item {
+	cursor: move;
+}
+
 .filename {
 	line-height: 36px;
 	margin-left: 10px;
@@ -234,6 +238,7 @@ abbr.required {
 	padding: 5px;
 	width: 100%;
 	clear: both;
+	cursor: default;
 }
 #media-upload .describe th.label {
 	padding-top: .5em;
@@ -261,3 +266,13 @@ abbr.required {
 	padding:2px;
 	vertical-align:top;
 }
+
+#media-upload a.delete,
+#media-upload a.del-link {
+	padding: 0 3px 1px;
+}
+
+#media-upload .del-attachment {
+	display: none;
+	margin: 5px 0;
+}
diff --git a/wp-admin/includes/media.php b/wp-admin/includes/media.php
index 5faab77df4..47d442d882 100644
--- a/wp-admin/includes/media.php
+++ b/wp-admin/includes/media.php
@@ -126,11 +126,11 @@ function wp_iframe($content_func /* ... */) {
 <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_option('blog_charset'); ?>" />
 <title><?php bloginfo('name') ?> &rsaquo; <?php _e('Uploads'); ?> &#8212; <?php _e('WordPress'); ?></title>
 <?php
-wp_admin_css( 'global' );
-wp_admin_css();
-wp_admin_css( 'colors' );
+wp_enqueue_style( 'global' );
+wp_enqueue_style( 'wp-admin' );
+wp_enqueue_style( 'colors' );
 if ( 0 === strpos( $content_func, 'media' ) )
-	wp_admin_css( 'media' );
+	wp_enqueue_style( 'media' );
 
 ?>
 <script type="text/javascript">
@@ -139,8 +139,8 @@ function addLoadEvent(func) {if ( typeof wpOnload!='function'){wpOnload=func;}el
 //]]>
 </script>
 <?php
-do_action('admin_print_scripts');
 do_action('admin_print_styles');
+do_action('admin_print_scripts');
 do_action('admin_head');
 if ( is_string($content_func) )
 	do_action( "admin_head_{$content_func}" );
@@ -672,9 +672,11 @@ function get_media_item( $attachment_id, $args = null ) {
 	if ( $send )
 		$send = "<input type='submit' class='button' name='send[$attachment_id]' value='" . attribute_escape( __( 'Insert into Post' ) ) . "' />";
 	if ( $delete )
-		$delete = "<a href='$delete_href' id='del[$attachment_id]' disabled='disabled' class='delete'>" . __('Delete') . "</button>";
+		$delete = "<a href=\"#\" class=\"del-link\" onclick=\"document.getElementById('del_attachment_$attachment_id').style.display='block';return false;\">" . __('Delete') . "</a>";
 	if ( ( $send || $delete ) && !isset($form_fields['buttons']) )
-		$form_fields['buttons'] = array('tr' => "\t\t<tr class='submit'><td></td><td class='savesend'>$send $delete</td></tr>\n");
+		$form_fields['buttons'] = array('tr' => "\t\t<tr class='submit'><td></td><td class='savesend'>$send $delete
+		<div id=\"del_attachment_$attachment_id\" class=\"del-attachment\" style=\"display:none;\">" . sprintf(__("You are about to delete <strong>%s</strong>."), $filename) . " <a href=\"$delete_href\" id=\"del[$attachment_id]\" class=\"delete\">" . __('Continue') . "</a>
+		<a href=\"#\" class=\"del-link\" onclick=\"this.parentNode.style.display='none';return false;\">" . __('Cancel') . "</a></div></td></tr>\n");
 
 	$hidden_fields = array();
 
diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php
index 5ca62d8183..f506c10d6e 100644
--- a/wp-includes/script-loader.php
+++ b/wp-includes/script-loader.php
@@ -221,7 +221,7 @@ function wp_default_styles( &$styles ) {
 	$styles->add_data( 'colors-fresh', 'rtl', true );
 
 	$styles->add( 'global', '/wp-admin/css/global.css' );
-	$styles->add( 'media', '/wp-admin/css/media.css' );
+	$styles->add( 'media', '/wp-admin/css/media.css', array(), '20080523' );
 	$styles->add( 'widgets', '/wp-admin/css/widgets.css' );
 	$styles->add( 'dashboard', '/wp-admin/css/dashboard.css' );
 	$styles->add( 'install', '/wp-admin/css/install.css' );