diff --git a/wp-admin/inline-uploading.php b/wp-admin/inline-uploading.php
index 18cc7f19c4..a040336b82 100644
--- a/wp-admin/inline-uploading.php
+++ b/wp-admin/inline-uploading.php
@@ -29,7 +29,7 @@ switch($action) {
case 'delete':
if ( !current_user_can('edit_post', (int) $attachment) )
-die(__('You are not allowed to delete this attachment.').' ".__('Go back').'');
+ die(__('You are not allowed to delete this attachment.').' ".__('Go back').'');
wp_delete_attachment($attachment);
@@ -43,7 +43,7 @@ $overrides = array('action'=>'save');
$file = wp_handle_upload($_FILES['image'], $overrides);
if ( isset($file['error']) )
- die($file['error'] . ''.__('Back to Image Uploading').'');
+ die($file['error'] . '
'.__('Back to Image Uploading').'');
$url = $file['url'];
$type = $file['type'];
@@ -92,7 +92,7 @@ if ( preg_match('!^image/!', $attachment['post_mime_type']) ) {
add_post_meta($id, '_wp_attachment_metadata', array());
}
-header("Location: ".basename(__FILE__)."?post=$post&all=$all&action=view&last=true");
+header("Location: ".basename(__FILE__)."?post=$post&all=$all&action=view&start=0");
die();
case 'upload':
@@ -107,7 +107,7 @@ case 'view':
$num = 5;
$double = $num * 2;
-if ( $post && empty($all) ) {
+if ( $post && (empty($all) || $all == 'false') ) {
$and_post = "AND post_parent = '$post'";
$current_2 = ' class="current"';
} else {
@@ -201,7 +201,7 @@ var icon = new Array();
}
$attachment = array_merge($attachment, $meta);
$send_delete_cancel = "$__send_to_editor
-
+$__delete
$__close
";
$uwidth_sum += 128;
@@ -244,8 +244,8 @@ imgb[{$ID}] = '$__using_title";
+ $icon = get_attachment_icon($ID);
+ $toggle_icon = "$__using_title";
$script .= "aa[{$ID}] = '{$attachment['post_title']}';
ab[{$ID}] = '{$attachment['post_title']}';
title[{$ID}] = '{$attachment['post_title']}';
@@ -366,7 +366,7 @@ function toggleOtherIcon(n) {
if ( oi.innerHTML == usingtitle ) {
o.innerHTML = filename[n];
oi.innerHTML = usingfilename;
- } else if ( oi.innerHTML == usingfilename ) {
+ } else if ( oi.innerHTML == usingfilename && icon[n] != '' ) {
o.innerHTML = icon[n];
oi.innerHTML = usingicon;
} else {
@@ -376,7 +376,7 @@ function toggleOtherIcon(n) {
if ( oi.innerHTML == usingicon )
od.className = 'otherwrap usingicon';
else
- od.classname = 'otherwrap usingtext';
+ od.className = 'otherwrap usingtext';
}
var win = window.opener ? window.opener : window.dialogArguments;
@@ -440,7 +440,7 @@ form {
}
.otherwrap {
margin-right: 5px;
- overflow: hidden;
+/* overflow: hidden;*/
background-color: #f9fcfe;
float: left;
}
@@ -529,9 +529,12 @@ form {
margin-left: 40px;
}
#title, #descr {
- width: 100%;
+ width: 99%;
margin-top: 1px;
}
+th {
+ width: 4.5em;
+}
#descr {
height: 36px;
}
@@ -541,12 +544,16 @@ form {
}
.popup {
margin: 4px 4px;
- padding: 3px;
+ padding: 1px;
position: absolute;
width: 114px;
- height: 82px;
+/* height: 92px;*/
display: none;
- background-color: rgb(223, 232, 241);
+ background-color: rgb(240, 240, 238);
+ border-top: 2px solid #fff;
+ border-right: 2px solid #ddd;
+ border-bottom: 2px solid #ddd;
+ border-left: 2px solid #fff;
text-align: center;
}
.imagewrap .popup {
@@ -567,13 +574,32 @@ form {
background-color: #fff;
color: #000;
}
+#submit {
+ margin: 1px;
+ width: 99%;
+}
+#submit input, #submit input:focus {
+ background: url( images/fade-butt.png );
+ border: 3px double #999;
+ border-left-color: #ccc;
+ border-top-color: #ccc;
+ color: #333;
+ padding: 0.25em;
+}
+
+#submit input:active {
+ background: #f4f4f4;
+ border: 3px double #ccc;
+ border-left-color: #999;
+ border-top-color: #999;
+}