Changeset 7988

Show
Ignore:
Timestamp:
05/24/08 17:03:51 (6 months ago)
Author:
ryan
Message:

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

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/wp-admin/css/colors-classic.css

    r7974 r7988  
    205205} 
    206206 
    207 .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
     207.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
    208208    color: #d54e21; 
    209209} 
     
    240240} 
    241241 
    242 .submitbox .submitdelete:hover { 
     242.submitbox .submitdelete:hover, 
     243#media-upload a.delete:hover { 
    243244    color: #fff; 
    244245    background-color: #f00; 
     
    292293} 
    293294 
    294 #poststuff #edButtonPreview, #poststuff #edButtonHTML, #the-comment-list p.comment-author strong a, a { 
     295#poststuff #edButtonPreview, #poststuff #edButtonHTML, #the-comment-list p.comment-author strong a, #media-upload a.del-link, #media-upload a.delete, a { 
    295296    color: #2e7ca0; 
    296297} 
     
    551552} 
    552553 
    553 #media-upload a.delete {  
    554     color: #888;  
    555 } 
    556  
    557  
    558554/* TinyMCE */ 
    559555.wp_themeSkin *, 
  • trunk/wp-admin/css/colors-fresh.css

    r7974 r7988  
    197197} 
    198198 
    199 .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
     199.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
    200200    color: #d54e21; 
    201201} 
     
    227227} 
    228228 
    229 .submitbox .submitdelete:hover { 
     229.submitbox .submitdelete:hover, 
     230#media-upload a.delete:hover { 
    230231    color: #fff; 
    231232    background-color: #f00; 
     
    279280} 
    280281 
    281 #adminmenu a, #submenu a, #poststuff #edButtonPreview, #poststuff #edButtonHTML, #the-comment-list p.comment-author strong a, a { 
     282#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 { 
    282283    color: #2583ad; 
    283284} 
  • trunk/wp-admin/css/media.css

    r7974 r7988  
    217217 
    218218#media-upload .media-item { 
    219     cursor:move; 
    220219    position: relative; 
    221220    border-bottom-width: 1px; 
     
    224223    width: 100%; 
    225224} 
     225 
     226#media-upload .ui-sortable .media-item { 
     227    cursor: move; 
     228} 
     229 
    226230.filename { 
    227231    line-height: 36px; 
     
    235239    width: 100%; 
    236240    clear: both; 
     241    cursor: default; 
    237242} 
    238243#media-upload .describe th.label { 
     
    262267    vertical-align:top; 
    263268} 
     269 
     270#media-upload a.delete, 
     271#media-upload a.del-link { 
     272    padding: 0 3px 1px; 
     273} 
     274 
     275#media-upload .del-attachment { 
     276    display: none; 
     277    margin: 5px 0; 
     278} 
  • trunk/wp-admin/includes/media.php

    r7979 r7988  
    127127<title><?php bloginfo('name') ?> &rsaquo; <?php _e('Uploads'); ?> &#8212; <?php _e('WordPress'); ?></title> 
    128128<?php 
    129 wp_admin_css( 'global' ); 
    130 wp_admin_css(); 
    131 wp_admin_css( 'colors' ); 
     129wp_enqueue_style( 'global' ); 
     130wp_enqueue_style( 'wp-admin' ); 
     131wp_enqueue_style( 'colors' ); 
    132132if ( 0 === strpos( $content_func, 'media' ) ) 
    133     wp_admin_css( 'media' ); 
     133    wp_enqueue_style( 'media' ); 
    134134 
    135135?> 
     
    140140</script> 
    141141<?php 
     142do_action('admin_print_styles'); 
    142143do_action('admin_print_scripts'); 
    143 do_action('admin_print_styles'); 
    144144do_action('admin_head'); 
    145145if ( is_string($content_func) ) 
     
    673673        $send = "<input type='submit' class='button' name='send[$attachment_id]' value='" . attribute_escape( __( 'Insert into Post' ) ) . "' />"; 
    674674    if ( $delete ) 
    675         $delete = "<a href='$delete_href' id='del[$attachment_id]' disabled='disabled' class='delete'>" . __('Delete') . "</button>"; 
     675        $delete = "<a href=\"#\" class=\"del-link\" onclick=\"document.getElementById('del_attachment_$attachment_id').style.display='block';return false;\">" . __('Delete') . "</a>"; 
    676676    if ( ( $send || $delete ) && !isset($form_fields['buttons']) ) 
    677         $form_fields['buttons'] = array('tr' => "\t\t<tr class='submit'><td></td><td class='savesend'>$send $delete</td></tr>\n"); 
     677        $form_fields['buttons'] = array('tr' => "\t\t<tr class='submit'><td></td><td class='savesend'>$send $delete 
     678        <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> 
     679        <a href=\"#\" class=\"del-link\" onclick=\"this.parentNode.style.display='none';return false;\">" . __('Cancel') . "</a></div></td></tr>\n"); 
    678680 
    679681    $hidden_fields = array(); 
  • trunk/wp-includes/script-loader.php

    r7981 r7988  
    222222 
    223223    $styles->add( 'global', '/wp-admin/css/global.css' ); 
    224     $styles->add( 'media', '/wp-admin/css/media.css' ); 
     224    $styles->add( 'media', '/wp-admin/css/media.css', array(), '20080523' ); 
    225225    $styles->add( 'widgets', '/wp-admin/css/widgets.css' ); 
    226226    $styles->add( 'dashboard', '/wp-admin/css/dashboard.css' );