WordPress.org

Make WordPress Core

Changeset 10009


Ignore:
Timestamp:
12/02/2008 10:29:54 AM (12 years ago)
Author:
azaozz
Message:

Remove insert image default options (handled by state saving), fix URL buttons in uploader for newly uploaded images, fix font priority in global.css

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/css/global.css

    r9990 r10009  
    167167body,
    168168td {
    169     font: 13px "Lucida Grande", "Bitstream Vera Sans", Verdana, Arial, sans-serif;
     169    font: 13px "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif;
    170170}
    171171
  • trunk/wp-admin/options-media.php

    r9954 r10009  
    2323<form action="options.php" method="post">
    2424<?php settings_fields('media'); ?>
    25 
    26 <p><?php _e('The setting below determines where images, documents, and other media files will be linked to when inserted into the body of a post.'); ?></p>
    27 
    28 <table class="form-table">
    29 <tr valign="top">
    30 <th scope="row"><?php _e('Default media links') ?></th>
    31 <td><fieldset><legend class="hidden"><?php _e('Default image links') ?></legend>
    32 <?php
    33     $link_types = array('none' => __('None'), 'post' => __('Post URL'), 'file' => __('File'));
    34 
    35     $default_link_type = get_option('image_default_link_type');
    36         if ( empty($default_link_type) )
    37             $default_link_type = 'file';
    38 
    39     foreach ($link_types as $type => $name) { ?>
    40         <input type="radio" name="image_default_link_type" id="image_default_link_type_<?php echo $type; ?>" value="<?php echo $type; ?>"<?php echo ($default_link_type == $type ? ' checked="checked"' : ''); ?> />
    41         <label for="image_default_link_type_<?php echo $type; ?>"><?php echo $name; ?></label>
    42     <?php
    43     }
    44 ?>
    45 </fieldset></td>
    46 </tr>
    47 </table>
    4825
    4926<h3><?php _e('Image sizes') ?></h3>
     
    8259</fieldset></td>
    8360</tr>
    84  
    85 <tr valign="top">
    86 <th scope="row"><?php _e('Default image size') ?></th>
    87 <td><fieldset><legend class="hidden"><?php _e('Default image size') ?></legend>
    88 <?php
    89     $size_names = array('' => __('Auto'), 'thumbnail' => __('Thumbnail'), 'medium' => __('Medium'), 'large' => __('Large'), 'full' => __('Full size'));
    90     foreach ($size_names as $size => $name) { ?>
    91         <input type="radio" name="image_default_size" id="image_default_size_<?php echo $size; ?>" value="<?php echo $size; ?>"<?php echo (get_option('image_default_size') == $size ? ' checked="checked"' : ''); ?> />             
    92         <label for="image_default_size_<?php echo $size; ?>"><?php echo $name; ?></label>
    93     <?php
    94     }
    95 ?>
    96 </fieldset></td>
    97 </tr>
    9861
    99 <tr valign="top">
    100 <th scope="row"><?php _e('Default image alignment') ?></th>
    101 <td><fieldset><legend class="hidden"><?php _e('Default image alignment') ?></legend>
    102 <?php
    103     $alignments = array('none' => 'None', 'left' => 'Left', 'center' => 'Center', 'right' => 'Right');
    104 
    105     $default_align = get_option('image_default_align');
    106     if ( empty($default_align) )
    107         $default_align = 'none';
    108 
    109     foreach ($alignments as $align => $name) { ?>
    110         <input type="radio" name="image_default_align" id="image_default_align_<?php echo $align; ?>" value="<?php echo $align; ?>"<?php echo ($default_align == $align ? ' checked="checked"' : ''); ?> />           
    111         <label for="image_default_align_<?php echo $align; ?>"><?php _e($name); ?></label>
    112     <?php
    113     }
    114 ?>
    115 </fieldset></td>
    116 </tr>
    11762<?php do_settings_fields('media', 'default'); ?>
    11863</table>
  • trunk/wp-includes/js/swfupload/handlers.js

    r9894 r10009  
    120120
    121121function updateMediaForm() {
     122    storeState();
    122123    // Just one file, no need for collapsible part
    123124    if ( jQuery('.type-form #media-items>*').length == 1 ) {
     
    250251
    251252// remember the last used image size, alignment and url
    252 jQuery(document).ready(function($){
     253var storeState;
     254(function($){
     255
     256storeState = function(){
    253257    var align = getUserSetting('align') || '', imgsize = getUserSetting('imgsize') || '';
    254258
     
    280284        $(this).val( $(this).siblings('button.'+b).attr('title') );
    281285    });
    282 });
     286}
     287})(jQuery);
  • trunk/wp-includes/script-loader.php

    r10001 r10009  
    110110    ) );
    111111    $scripts->add( 'swfupload-queue', '/wp-includes/js/swfupload/plugins/swfupload.queue.js', array('swfupload'), '2.2.0-20081031');
    112     $scripts->add( 'swfupload-handlers', '/wp-includes/js/swfupload/handlers.js', array('swfupload'), '2.2.0-20081112');
     112    $scripts->add( 'swfupload-handlers', '/wp-includes/js/swfupload/handlers.js', array('swfupload'), '2.2.0-20081201');
    113113    // these error messages came from the sample swfupload js, they might need changing.
    114114    $scripts->localize( 'swfupload-handlers', 'swfuploadL10n', array(
Note: See TracChangeset for help on using the changeset viewer.