WordPress.org

Make WordPress Core

Changeset 8959


Ignore:
Timestamp:
09/22/2008 10:04:10 PM (10 years ago)
Author:
ryan
Message:

Press This updates from noel. see #7732

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/css/press-this.css

    r8903 r8959  
    123123
    124124#category-add input {
    125     width: 94%;
     125    width: 94%;
     126    font-family:Verdana,Arial,Helvetica,sans-serif;
     127    font-size:13px;
     128    margin:1px;
     129    padding:3px;
     130   
    126131}
    127132
    128133#category-add select {
    129     width: 100%;
     134    width: 70%;
     135    -x-system-font:none;
     136    border-style:solid;
     137    border-width:1px;
     138    font-family:"Lucida Grande","Lucida Sans Unicode",Tahoma,Verdana,sans-serif;
     139    font-size:12px;
     140    height:2em;
     141    line-height:20px;
     142    padding:2px;
     143    margin: 1px;
     144    vertical-align:top;
    130145}
    131146
     
    144159}
    145160
    146 #categorydiv ul.categorychecklist ul, #linkcategorydiv ul.categorychecklist ul {
     161#categorydiv ul.categorychecklist ul {
    147162    margin-left: 18px;
    148163}
    149164
    150165
    151 #categorydiv div.ui-tabs-panel, #linkcategorydiv div.ui-tabs-panel {
     166#categorydiv div.ui-tabs-panel {
     167height:150px;
     168overflow:auto;
    152169padding:0.5em 0.9em;
    153170}
     
    192209#TB_ajaxContent #options{position:absolute;top:20px;right:25px;padding:5px;}
    193210#TB_ajaxContent h3{margin-bottom:.25em;}
    194 .updated{margin:0;margin-left:15px;margin-right:15px;padding:0;max-width:980px;border-width:1px;border-style:solid;max-width:950px;margin-top:1em;margin-bottom:1em;width:66%;}
     211.updated{margin:10px 0;padding:0;border-width:1px;border-style:solid; width:99%;}
    195212.updated p,.error p{margin:0.6em 0;padding:0 0.6em;}
    196213.updated a,.error a{text-decoration:underline;}
  • trunk/wp-admin/includes/media.php

    r8914 r8959  
    343343    if (!empty($file) ) {
    344344        $file_array['name'] = basename($file);
    345         $file_array['tmp_name'] = download_url($file);
     345        $tmp = download_url($file);
     346        $file_array['tmp_name'] = $tmp;
    346347        $desc = @$desc;
    347348
     349        if ( is_wp_error($tmp) ) {
     350            @unlink($file_array['tmp_name']);
     351            $file_array['tmp_name'] = '';
     352        }
     353       
    348354        $id = media_handle_sideload($file_array, $post_id, $desc);
    349355        $src = $id;
    350 
     356       
    351357        if ( is_wp_error($id) ) {
    352358            @unlink($file_array['tmp_name']);
  • trunk/wp-admin/press-this.php

    r8903 r8959  
    249249                img_attr += ' style="width: ' + w + 'px; height: ' + h + 'px;"';
    250250            }
    251             if (!skip) strtoappend += '<a href="?ajax=photo_thickbox&amp;i=' + img.src + '&amp;u=<?php echo $url; ?>&amp;height=400&amp;width=500" title="" class="thickbox"><img src="' + img.src + '" ' + img_attr + '/></a>';
     251            if (!skip) strtoappend += '<a href="?ajax=photo_thickbox&amp;i=' + encodeURI(img.src) + '&amp;u=<?php echo $url; ?>&amp;height=400&amp;width=500" title="" class="thickbox"><img src="' + img.src + '" ' + img_attr + '/></a>';
    252252        }
    253253
     
    258258                jQuery('.photolist').append('<input name="photo_src[' + length + ']" value="' + img +'" type="hidden"/>');
    259259                jQuery('.photolist').append('<input name="photo_description[' + length + ']" value="' + desc +'" type="hidden"/>');
    260                 append_editor("\n\n" + '<p><img src="' + img +'" alt="' + desc + '" class="aligncenter"/></p>');
     260                append_editor("\n\n" + '<p style="text-align: center;"><a href="<?php echo urlencode($url); ?>"><img src="' + img +'" alt="' + desc + '" /></a></p>');
    261261            }
    262262            tinyMCE.activeEditor.resizeToContent();
     
    431431
    432432    jQuery(document).ready(function() {
     433        top.resizeTo(700-screen.width+screen.availWidth,680-screen.height+screen.availHeight);
    433434        jQuery('#photo_button').click(function() { show('photo'); return false; });
    434435        jQuery('#video_button').click(function() { show('video'); return false; });
     
    451452</div>
    452453
    453 <?php
    454 if ( isset($posted) && intval($posted) ) {
    455     $post_ID = intval($posted);
    456 ?>
    457 <div id="message" class="updated fade"><p><strong><?php _e('Your post has been saved.'); ?></strong> <a onclick="window.opener.location.replace(this.href); window.close();" href="<?php echo get_permalink( $post_ID); ?>"><?php _e('View post'); ?></a> | <a href="<?php echo get_edit_post_link( $post_ID ); ?>" onclick="window.opener.location.replace(this.href); window.close();"><?php _e('Edit post'); ?></a> | <a href="#" onclick="window.close();"><?php _e('Close Window'); ?></a></p></div>
    458 <?php
    459 }
    460 ?>
    461454<form action="press-this.php?action=post" method="post">
    462455    <?php wp_nonce_field('press-this') ?>
    463456    <input type="hidden" name="post_type" id="post_type" value="text"/>
    464457   
    465     <div id="poststuff">
     458    <div id="poststuff">   
    466459    <div id="side-info-column">
    467460        <div class="sleeve">
     
    515508   
    516509        <div class="posting">
     510            <?php
     511            if ( isset($posted) && intval($posted) ) {
     512                $post_ID = intval($posted);
     513            ?>
     514            <div id="message" class="updated fade"><p><strong><?php _e('Your post has been saved.'); ?></strong> <a onclick="window.opener.location.replace(this.href); window.close();" href="<?php echo get_permalink( $post_ID); ?>"><?php _e('View post'); ?></a> | <a href="<?php echo get_edit_post_link( $post_ID ); ?>" onclick="window.opener.location.replace(this.href); window.close();"><?php _e('Edit post'); ?></a> | <a href="#" onclick="window.close();"><?php _e('Close Window'); ?></a></p></div>
     515            <?php
     516            }
     517            ?>
     518           
    517519            <h2 id="title"><label for="post_title"><?php _e('Title') ?></label></h2>
    518520            <div class="titlewrap">
  • trunk/wp-includes/script-loader.php

    r8943 r8959  
    319319    $styles->add( 'install', '/wp-admin/css/install.css', array(), '20080708' );
    320320    $styles->add( 'theme-editor', '/wp-admin/css/theme-editor.css' );
    321     $styles->add( 'press-this', '/wp-admin/css/press-this.css', array(), '20080915' );
     321    $styles->add( 'press-this', '/wp-admin/css/press-this.css', array(), '20080922' );
    322322    $styles->add( 'press-this-ie', '/wp-admin/css/press-this-ie.css', array(), '20080915' );
    323323    $styles->add_data( 'press-this-ie', 'conditional', 'gte IE 6' );
Note: See TracChangeset for help on using the changeset viewer.