Changeset 8959

Timestamp:

09/22/2008 10:04:10 PM (17 years ago)

Author:

ryan

Message:

Press This updates from noel. see #7732

Location:

trunk

Files:

• wp-admin/css/press-this.css (modified) (3 diffs)
• wp-admin/includes/media.php (modified) (1 diff)
• wp-admin/press-this.php (modified) (5 diffs)
• wp-includes/script-loader.php (modified) (1 diff)

trunk/wp-admin/css/press-this.css

@@ -123 +123 @@
 
 #category-add input {
-    width: 94%;
+    width: 94%; 
+    font-family:Verdana,Arial,Helvetica,sans-serif;
+    font-size:13px;
+    margin:1px;
+    padding:3px;
+    
 }
 
 #category-add select {
-    width: 100%;
+    width: 70%;
+    -x-system-font:none;
+    border-style:solid;
+    border-width:1px;
+    font-family:"Lucida Grande","Lucida Sans Unicode",Tahoma,Verdana,sans-serif;
+    font-size:12px;
+    height:2em;
+    line-height:20px;
+    padding:2px;
+    margin: 1px;
+    vertical-align:top;
 }
 
@@ -144 +159 @@
 }
 
-#categorydiv ul.categorychecklist ul, #linkcategorydiv ul.categorychecklist ul {
+#categorydiv ul.categorychecklist ul {
     margin-left: 18px;
 }
 
 
-#categorydiv div.ui-tabs-panel, #linkcategorydiv div.ui-tabs-panel {
+#categorydiv div.ui-tabs-panel {
+height:150px;
+overflow:auto;
 padding:0.5em 0.9em;
 }
@@ -192 +209 @@
 #TB_ajaxContent #options{position:absolute;top:20px;right:25px;padding:5px;}
 #TB_ajaxContent h3{margin-bottom:.25em;}
-.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%;}
+.updated{margin:10px 0;padding:0;border-width:1px;border-style:solid; width:99%;}
 .updated p,.error p{margin:0.6em 0;padding:0 0.6em;}
 .updated a,.error a{text-decoration:underline;}

trunk/wp-admin/includes/media.php

@@ -343 +343 @@
     if (!empty($file) ) {
         $file_array['name'] = basename($file);
-        $file_array['tmp_name'] = download_url($file);
+        $tmp = download_url($file);
+        $file_array['tmp_name'] = $tmp;
         $desc = @$desc;
 
+        if ( is_wp_error($tmp) ) {
+            @unlink($file_array['tmp_name']);
+            $file_array['tmp_name'] = '';
+        }
+        
         $id = media_handle_sideload($file_array, $post_id, $desc);
         $src = $id;
-
+        
         if ( is_wp_error($id) ) {
             @unlink($file_array['tmp_name']);

trunk/wp-admin/press-this.php

@@ -249 +249 @@
                 img_attr += ' style="width: ' + w + 'px; height: ' + h + 'px;"';
             }
-            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>';
+            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>';
         }
 
@@ -258 +258 @@
                 jQuery('.photolist').append('<input name="photo_src[' + length + ']" value="' + img +'" type="hidden"/>');
                 jQuery('.photolist').append('<input name="photo_description[' + length + ']" value="' + desc +'" type="hidden"/>');
-                append_editor("\n\n" + '<p><img src="' + img +'" alt="' + desc + '" class="aligncenter"/></p>');
+                append_editor("\n\n" + '<p style="text-align: center;"><a href="<?php echo urlencode($url); ?>"><img src="' + img +'" alt="' + desc + '" /></a></p>');
             }
             tinyMCE.activeEditor.resizeToContent();
@@ -431 +431 @@
 
     jQuery(document).ready(function() {
+        top.resizeTo(700-screen.width+screen.availWidth,680-screen.height+screen.availHeight);
         jQuery('#photo_button').click(function() { show('photo'); return false; });
         jQuery('#video_button').click(function() { show('video'); return false; });
@@ -451 +452 @@
 </div>
 
-<?php
-if ( isset($posted) && intval($posted) ) {
-    $post_ID = intval($posted);
-?>
-<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>
-<?php
-}
-?>
 <form action="press-this.php?action=post" method="post">
     <?php wp_nonce_field('press-this') ?>
     <input type="hidden" name="post_type" id="post_type" value="text"/>
     
-    <div id="poststuff">
+    <div id="poststuff">    
     <div id="side-info-column">
         <div class="sleeve">
@@ -515 +508 @@
     
         <div class="posting">
+            <?php
+            if ( isset($posted) && intval($posted) ) {
+                $post_ID = intval($posted);
+            ?>
+            <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>
+            <?php
+            }
+            ?>
+            
             <h2 id="title"><label for="post_title"><?php _e('Title') ?></label></h2>
             <div class="titlewrap">

trunk/wp-includes/script-loader.php

@@ -319 +319 @@
     $styles->add( 'install', '/wp-admin/css/install.css', array(), '20080708' );
     $styles->add( 'theme-editor', '/wp-admin/css/theme-editor.css' );
-    $styles->add( 'press-this', '/wp-admin/css/press-this.css', array(), '20080915' );
+    $styles->add( 'press-this', '/wp-admin/css/press-this.css', array(), '20080922' );
     $styles->add( 'press-this-ie', '/wp-admin/css/press-this-ie.css', array(), '20080915' );
     $styles->add_data( 'press-this-ie', 'conditional', 'gte IE 6' );