Changeset 9857

Timestamp:

11/24/2008 04:29:35 AM (16 years ago)

Author:

azaozz

Message:

PressThis css fixes from Noel, see #7949

Location:

trunk/wp-admin

Files:

• css/press-this.css (modified) (7 diffs)
• press-this.php (modified) (3 diffs)

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

@@ -35 +35 @@
     border-radius-topleft: 3px;
     border-radius-topright: 3px;
-
     border-style: solid;
     border-width: 1px;
@@ -49 +48 @@
     line-height: 18px;
     float: left;
+    float: left;
 }
 
@@ -66 +66 @@
     outline-width: medium;
     width: 100%;
-
 }
 
@@ -125 +124 @@
     padding: 7px;
     margin: 0 0 10px;
-    
     background-image: url(../images/postbox-bg.gif);
     background-position: left top;
     background-repeat: repeat-x;
-
     font-size: 12px;
     font-weight: bold;
@@ -222 +219 @@
     position: relative;
 }
+#extra_fields #actions {
+    clear: both;
+    position: absolute;
+    right: 4px;
+    top: 6px;
+    margin: 0;
+}
 
 #actions li {
@@ -227 +231 @@
     list-style: none;
     margin-right: 10px;
+}
+#extra_fields .button {
+    margin-right: 5px;
 }
 
@@ -332 +339 @@
 
 #category-add input {
-    width: 94%; 
+    width: 94%;
     font-family: Verdana, Arial, Helvetica, sans-serif;
     font-size: 13px;

trunk/wp-admin/press-this.php

@@ -236 +236 @@
         var last = null
         var img, img_tag, aspect, w, h, skip, i, strtoappend = "";
-        if(!my_src) {
             var my_src = eval(
                 jQuery.ajax({
@@ -247 +246 @@
                 }).responseText
             );
-        }
+            if(my_src.length == 0) {
+                var my_src = eval(
+                jQuery.ajax({
+                    type: "GET",
+                    url: "<?php echo clean_url($_SERVER['PHP_SELF']); ?>",
+                    cache : false,
+                    async : false,
+                    data: "ajax=photo_images&u=<?php echo urlencode($url); ?>",
+                    dataType : "script"
+                }).responseText
+                );
+                if(my_src.length == 0) {
+    
+                    strtoappend = '<?php _e('Unable to retrieve images or no images on page.'); ?>';
+                }
+            }
+        
 
         for (i = 0; i < my_src.length; i++) {
@@ -294 +309 @@
 
         jQuery(document).ready(function() {
-            jQuery('#extra_fields').html('<div class="postbox"><h2>Photo <small id="photo_directions">(<?php _e("click images to select") ?>)</small></h2><ul id="actions"><li><a href="#" id="photo_add_url" class="thickbox button"><?php _e("Add from URL") ?> +</a></li></ul><div class="inside"><div class="titlewrap"><div id="img_container"></div></div><p id="options"><a href="#" class="close button"><?php _e('Cancel'); ?></a></p></div>');
+            jQuery('#extra_fields').html('<div class="postbox"><h2>Photo <small id="photo_directions">(<?php _e("click images to select") ?>)</small></h2><ul id="actions"><li><a href="#" id="photo_add_url" class="thickbox button"><?php _e("Add from URL") ?> +</a></li></ul><div class="inside"><div class="titlewrap"><div id="img_container"></div></div><p id="options"><a href="#" class="close button"><?php _e('Cancel'); ?></a><a href="#" class="refresh button"><?php _e('Refresh'); ?></a></p></div>');
             jQuery('.close').click(function() {
                 jQuery('#extra_fields').hide();
                 jQuery('#extra_fields').html('');
             });
+            jQuery('.refresh').click(function() {
+                        show('photo');
+                    });
             jQuery('#img_container').html(strtoappend);
             jQuery('#photo_add_url').attr('href', '?ajax=photo_thickbox_url&height=200&width=500');
             tb_init('#extra_fields .thickbox');
+            
+            
         });
         <?php break;