Changeset 7988

Timestamp:

05/24/2008 05:03:51 PM (16 years ago)

Author:

ryan

Message:

Few css fixes for the media uploader, confirm delete of attachments from the library tab. Props azaozz. fixes #7033

Location:

trunk

Files:

• wp-admin/css/colors-classic.css (modified) (4 diffs)
• wp-admin/css/colors-fresh.css (modified) (3 diffs)
• wp-admin/css/media.css (modified) (4 diffs)
• wp-admin/includes/media.php (modified) (3 diffs)
• wp-includes/script-loader.php (modified) (1 diff)

trunk/wp-admin/css/colors-classic.css

@@ -205 +205 @@
 }
 
-.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;
 }
@@ -240 +240 @@
 }
 
-.submitbox .submitdelete:hover {
+.submitbox .submitdelete:hover,
+#media-upload a.delete:hover {
     color: #fff;
     background-color: #f00;
@@ -292 +293 @@
 }
 
-#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;
 }
@@ -551 +552 @@
 }
 
-#media-upload a.delete { 
-    color: #888; 
-}
-
-
 /* TinyMCE */
 .wp_themeSkin *,

trunk/wp-admin/css/colors-fresh.css

@@ -197 +197 @@
 }
 
-.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;
 }
@@ -227 +227 @@
 }
 
-.submitbox .submitdelete:hover {
+.submitbox .submitdelete:hover,
+#media-upload a.delete:hover {
     color: #fff;
     background-color: #f00;
@@ -279 +280 @@
 }
 
-#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;
 }

trunk/wp-admin/css/media.css

@@ -217 +217 @@
 
 #media-upload .media-item {
-    cursor:move;
     position: relative;
     border-bottom-width: 1px;
@@ -224 +223 @@
     width: 100%;
 }
+
+#media-upload .ui-sortable .media-item {
+    cursor: move;
+}
+
 .filename {
     line-height: 36px;
@@ -235 +239 @@
     width: 100%;
     clear: both;
+    cursor: default;
 }
 #media-upload .describe th.label {
@@ -262 +267 @@
     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;
+}

trunk/wp-admin/includes/media.php

@@ -127 +127 @@
 <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' );
 
 ?>
@@ -140 +140 @@
 </script>
 <?php
+do_action('admin_print_styles');
 do_action('admin_print_scripts');
-do_action('admin_print_styles');
 do_action('admin_head');
 if ( is_string($content_func) )
@@ -673 +673 @@
         $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();

trunk/wp-includes/script-loader.php

@@ -222 +222 @@
 
     $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' );