Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-10-01 08:37:55 +02:00
Code Issues Projects Releases Wiki Activity

Some changes and tweaks to how the inline image uploading works.

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@3126 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
matt 2005-11-17 03:19:19 +00:00
parent a370a5d002
commit 32daaee631
3 changed files with 133 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/edit-form-advanced.php
View File

@ -215,6 +215,8 @@ else
<?php <?php
$uploading_iframe_ID = (0 == $post_ID ? $temp_ID : $post_ID); $uploading_iframe_ID = (0 == $post_ID ? $temp_ID : $post_ID);
$uploading_iframe_src = "inline-uploading.php?action=view&amp;post=$uploading_iframe_ID"; $uploading_iframe_src = "inline-uploading.php?action=view&amp;post=$uploading_iframe_ID";
if ( !$attachments = $wpdb->get_results("SELECT ID FROM $wpdb->posts WHERE post_parent = '$uploading_iframe_ID'") )
$uploading_iframe_src = "inline-uploading.php?action=upload&amp;post=$uploading_iframe_ID";
$uploading_iframe_src = apply_filters('uploading_iframe_src', $uploading_iframe_src); $uploading_iframe_src = apply_filters('uploading_iframe_src', $uploading_iframe_src);
if ( false != $uploading_iframe_src ) if ( false != $uploading_iframe_src )
echo '<iframe id="uploading" border="0" src="' . $uploading_iframe_src . '">' . __('This feature requires iframe support.') . '</iframe>'; echo '<iframe id="uploading" border="0" src="' . $uploading_iframe_src . '">' . __('This feature requires iframe support.') . '</iframe>';

2
wp-admin/edit-page-form.php
View File

@ -150,6 +150,8 @@ edCanvas = document.getElementById('content');
<?php <?php
$uploading_iframe_ID = (0 == $post_ID ? $temp_ID : $post_ID); $uploading_iframe_ID = (0 == $post_ID ? $temp_ID : $post_ID);
$uploading_iframe_src = "inline-uploading.php?action=view&amp;post=$uploading_iframe_ID"; $uploading_iframe_src = "inline-uploading.php?action=view&amp;post=$uploading_iframe_ID";
if ( !$attachments = $wpdb->get_results("SELECT ID FROM $wpdb->posts WHERE post_parent = '$uploading_iframe_ID'") )
$uploading_iframe_src = "inline-uploading.php?action=upload&amp;post=$uploading_iframe_ID";
$uploading_iframe_src = apply_filters('uploading_iframe_src', $uploading_iframe_src); $uploading_iframe_src = apply_filters('uploading_iframe_src', $uploading_iframe_src);
if ( false != $uploading_iframe_src ) if ( false != $uploading_iframe_src )
echo '<iframe id="uploading" border="0" src="' . $uploading_iframe_src . '">' . __('This feature requires iframe support.') . '</iframe>'; echo '<iframe id="uploading" border="0" src="' . $uploading_iframe_src . '">' . __('This feature requires iframe support.') . '</iframe>';

239
wp-admin/inline-uploading.php
View File

@ -117,7 +117,7 @@ if ( $start < 0 )
$start = 0; $start = 0;
if ( '' == $sort ) if ( '' == $sort )
$sort = "ID"; $sort = "post_date_gmt DESC";
$images = $wpdb->get_results("SELECT ID, post_date, post_title, guid FROM $wpdb->posts WHERE post_status = 'attachment' AND left(post_mime_type, 5) = 'image' $and_post ORDER BY $sort LIMIT $start, $double", ARRAY_A); $images = $wpdb->get_results("SELECT ID, post_date, post_title, guid FROM $wpdb->posts WHERE post_status = 'attachment' AND left(post_mime_type, 5) = 'image' $and_post ORDER BY $sort LIMIT $start, $double", ARRAY_A);
@ -142,12 +142,13 @@ $images_style = '';
$images_script = ''; $images_script = '';
if ( count($images) > 0 ) { if ( count($images) > 0 ) {
$images = array_slice( $images, 0, $num ); $images = array_slice( $images, 0, $num );
$__delete = __('DELETE'); $__delete = __('Delete');
$__attachment_on = __('ATTACHMENT <strong>ON</strong>'); $__attachment_on = __('Link to Page');
$__thumbnail_on = __('THUMBNAIL <strong>ON</strong>'); $__attachment_off = __('Link to Image');
$__thumbnail_off = __('THUMBNAIL <strong>OFF</strong>'); $__thumbnail_on = __('Use Thumbnail');
$__no_thumbnail = __('<del>THUMBNAIL</del>'); $__thumbnail_off = __('Use Full Image');
$__close = __('CLOSE'); $__no_thumbnail = __('<del>No Thumbnail</del>');
$__close = __('Close Options');
$__confirmdelete = __('Delete this photo from the server?'); $__confirmdelete = __('Delete this photo from the server?');
$__nothumb = __('There is no thumbnail associated with this photo.'); $__nothumb = __('There is no thumbnail associated with this photo.');
$images_script .= "attachmenton = '$__attachment_on';\nattachmentoff = '$__attachment_off';\n"; $images_script .= "attachmenton = '$__attachment_on';\nattachmentoff = '$__attachment_off';\n";
@ -265,165 +266,172 @@ function toggleImage(n) {
</script> </script>
<style type="text/css"> <style type="text/css">
body { body {
font: 13px "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana; font: 13px "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana;
border: none; border: none;
margin: 0px; margin: 0px;
height: 150px; height: 150px;
background: rgb(223, 232, 241); background: #dfe8f1;
} }
form { form {
margin: 6px 2px 0px 6px; margin: 6px 2px 0px 6px;
} }
#wrap { #wrap {
clear: both; clear: both;
margin: 0px; margin: 0px;
padding: 0px; padding: 0px;
height: 133px; height: 133px;
width: 100%; width: 100%;
overflow: auto; overflow: auto;
} }
#images { #images {
clear: both; clear: both;
margin: 0px; margin: 0px;
padding: 5px 15px; padding: 5px 15px;
height: 96px; height: 96px;
white-space: nowrap; white-space: nowrap;
width: <?php echo $images_width; ?>px; width: <?php echo $images_width; ?>px;
} }
#images img { #images img {
background-color: rgb(209, 226, 239); background-color: rgb(209, 226, 239);
} }
<?php echo $images_style; ?> <?php echo $images_style; ?>
.imagewrap { .imagewrap {
margin-right: 5px; margin-right: 5px;
height: 96px; height: 96px;
overflow: hidden; overflow: hidden;
} }
.imagewrap * { .imagewrap * {
margin: 0px; margin: 0px;
padding: 0px; padding: 0px;
border: 0px; border: 0px;
} }
.imagewrap a, .imagewrap a img, .imagewrap a:hover img, .imagewrap a:visited img, .imagewrap a:active img { .imagewrap a, .imagewrap a img, .imagewrap a:hover img, .imagewrap a:visited img, .imagewrap a:active img {
text-decoration: none; text-decoration: none;
float: left; float: left;
/*display: block;*/ text-align: center;
text-align: center;
} }
#menu {
margin: 0px; #upload-menu {
list-style: none; background: #fff;
background: rgb(109, 166, 209); margin: 0;
padding: 4px 0px 0px 8px; padding: 0;
text-align: left; list-style: none;
border-bottom: 3px solid rgb(68, 138, 189); height: 2em;
border-bottom: 1px solid #448abd;
} }
#menu li {
display: inline; #upload-menu li {
margin: 0px; float: left;
margin: 0 0 0 1em;
} }
#menu a, #menu a:visited, #menu a:active {
padding: 1px 3px 3px; #upload-menu a {
text-decoration: none; display: block;
color: #234; padding: 5px;
background: transparent; text-decoration: none;
color: #000;
border-top: 3px solid #fff;
} }
#menu a:hover {
background: rgb(203, 214, 228); #upload-menu .current a {
color: #000; background: #dfe8f1;
border-right: 2px solid #448abd;
} }
#menu .current a, #menu .current a:hover, #menu .current a:visited, #menu .current a:active {
background: rgb(223, 232, 241); #upload-menu a:hover {
padding-bottom: 3px; background: #dfe8f1;
color: #000; color: #000;
border-right: 2px solid rgb(20, 86, 138);
} }
.tip { .tip {
color: rgb(68, 138, 189); color: rgb(68, 138, 189);
padding: 1px 3px; padding: 2px 1em;
} }
.inactive { .inactive {
color: #579; color: #fff;
padding: 1px 3px; padding: 1px 3px;
} }
.left { .left {
float: left; float: left;
} }
.right { .right {
float: right; float: right;
} }
.center { .center {
text-align: center; text-align: center;
} }
#menu li.spacer { #upload-menu li.spacer {
margin-left: 40px; margin-left: 40px;
}
label {
float: left;
width: 18%;
} }
#title, #descr { #title, #descr {
width: 80%; width: 80%;
margin-top: 2px; margin-top: 2px;
} }
#descr { #descr {
height: 35px; height: 35px;
v-align: top; v-align: top;
} }
#buttons { #buttons {
width: 98%; width: 98%;
margin-top: 2px; margin-top: 2px;
text-align: right; text-align: right;
} }
.popup { .popup {
margin: 4px 4px; margin: 4px 4px;
padding: 3px; padding: 3px;
position: absolute; position: absolute;
width: 114px; width: 114px;
height: 82px; height: 82px;
display: none; display: none;
background-color: rgb(223, 232, 241); background-color: rgb(223, 232, 241);
opacity: .90; opacity: .90;
filter:alpha(opacity=90); filter:alpha(opacity=90);
text-align: center; text-align: center;
} }
.popup a, .popup a:visited, .popup a:active { .popup a, .popup a:visited, .popup a:active {
background-color: transparent; background-color: transparent;
display: block; display: block;
width: 100%; width: 100%;
text-decoration: none; text-decoration: none;
color: #246; color: #246;
} }
.popup a:hover { .popup a:hover {
background-color: #fff; background-color: #fff;
color: #000; color: #000;
} }
</style> </style>
</head> </head>
<body onload="init()"> <body onload="init()">
<ul id="menu"> <ul id="upload-menu">
<li<?php echo $current_1; ?>><a href="<?php echo basename(__FILE__); ?>?action=upload&amp;post=<?php echo $post; ?>&amp;all=<?php echo $all; ?>"><?php _e('Upload File'); ?></a></li> <li<?php echo $current_1; ?>><a href="<?php echo basename(__FILE__); ?>?action=upload&amp;post=<?php echo $post; ?>&amp;all=<?php echo $all; ?>"><?php _e('Upload Image'); ?></a></li>
<li<?php echo $current_2; ?>><a href="<?php echo basename(__FILE__); ?>?action=view&amp;post=<?php echo $post; ?>"><?php _e('Browse Attached'); ?></a></li> <?php if ( $attachments = $wpdb->get_results("SELECT ID FROM $wpdb->posts WHERE post_parent = '$post'") ) { ?>
<li<?php echo $current_3; ?>><a href="<?php echo basename(__FILE__); ?>?action=view&amp;post=<?php echo $post; ?>&amp;all=true"><?php _e('Browse All'); ?></a></li> <li<?php echo $current_2; ?>><a href="<?php echo basename(__FILE__); ?>?action=view&amp;post=<?php echo $post; ?>"><?php _e('Attached Images'); ?></a></li>
<?php } ?>
<li<?php echo $current_3; ?>><a href="<?php echo basename(__FILE__); ?>?action=view&amp;post=<?php echo $post; ?>&amp;all=true"><?php _e('All Images'); ?></a></li>
<li> </li> <li> </li>
<?php if ( $action != 'upload' ) { ?>
<?php if ( false !== $back ) : ?> <?php if ( false !== $back ) : ?>
<li class="spacer"><a href="<?php echo basename(__FILE__); ?>?action=<?php echo $action; ?>&amp;post=<?php echo $post; ?>&amp;all=<?php echo $all; ?>&amp;start=0" title="<?php _e('First'); ?>">|&lt;</a></li> <li class="spacer"><a href="<?php echo basename(__FILE__); ?>?action=<?php echo $action; ?>&amp;post=<?php echo $post; ?>&amp;all=<?php echo $all; ?>&amp;start=0" title="<?php _e('First'); ?>">|&laquo;</a></li>
<li><a href="<?php echo basename(__FILE__); ?>?action=<?php echo $action; ?>&amp;post=<?php echo $post; ?>&amp;all=<?php echo $all; ?>&amp;start=<?php echo $back; ?>" title="<?php _e('Back'); ?>">&lt;&lt;</a></li> <li><a href="<?php echo basename(__FILE__); ?>?action=<?php echo $action; ?>&amp;post=<?php echo $post; ?>&amp;all=<?php echo $all; ?>&amp;start=<?php echo $back; ?>"">&laquo; <?php _e('Back'); ?></a></li>
<?php else : ?> <?php else : ?>
<li class="inactive spacer">|&lt;</li> <li class="inactive spacer">|&lt;</li>
<li class="inactive">&lt;&lt;</li> <li class="inactive">&lt;&lt;</li>
<?php endif; ?> <?php endif; ?>
<?php if ( false !== $next ) : ?> <?php if ( false !== $next ) : ?>
<li><a href="<?php echo basename(__FILE__); ?>?action=<?php echo $action; ?>&amp;post=<?php echo $post; ?>&amp;all=<?php echo $all; ?>&amp;start=<?php echo $next; ?>" title="<?php _e('Next'); ?>">&gt;&gt;</a></li> <li><a href="<?php echo basename(__FILE__); ?>?action=<?php echo $action; ?>&amp;post=<?php echo $post; ?>&amp;all=<?php echo $all; ?>&amp;start=<?php echo $next; ?>"><?php _e('Next'); ?> &raquo;</a></li>
<li><a href="<?php echo basename(__FILE__); ?>?action=<?php echo $action; ?>&amp;post=<?php echo $post; ?>&amp;all=<?php echo $all; ?>&amp;last=true" title="<?php _e('Last'); ?>">&gt;|</a></li> <li><a href="<?php echo basename(__FILE__); ?>?action=<?php echo $action; ?>&amp;post=<?php echo $post; ?>&amp;all=<?php echo $all; ?>&amp;last=true" title="<?php _e('Last'); ?>">&raquo;|</a></li>
<?php else : ?> <?php else : ?>
<li class="inactive">&gt;&gt;</li> <li class="inactive">&gt;&gt;</li>
<li class="inactive">&gt;|</li> <li class="inactive">&gt;|</li>
<?php endif; ?> <?php endif; ?>
<?php } // endif not upload?>
</ul> </ul>
<?php if ( $action == 'view' ) : ?> <?php if ( $action == 'view' ) : ?>
<span class="left tip"><?php _e('Drag and drop photos to post'); ?></span> <span class="left tip"><?php _e('You can drag and drop these photos into your post. Click on the thumbnail for more options.'); ?></span>
<span class="right tip"><?php _e('Click photos for more options'); ?></span> <span class="right tip"></span>
<div id="wrap"> <div id="wrap">
<div id="images"> <div id="images">
<?php echo $images_html; ?> <?php echo $images_html; ?>
@ -432,13 +440,24 @@ color: #000;
<?php elseif ( $action == 'upload' ) : ?> <?php elseif ( $action == 'upload' ) : ?>
<div class="tip"></div> <div class="tip"></div>
<form enctype="multipart/form-data" id="uploadForm" method="POST" action="<?php echo basename(__FILE__); ?>" onsubmit="return validateImageName()"> <form enctype="multipart/form-data" id="uploadForm" method="POST" action="<?php echo basename(__FILE__); ?>" onsubmit="return validateImageName()">
<label for="upload"><?php _e('Image:'); ?></label><input type="file" id="upload" name="image" onchange="validateImageName()" /> <table style="width: 100%">
<label for="title"><?php _e('Title:'); ?></label><input type="text" id="title" name="imgtitle" /> <tr>
<label for="descr"><?php _e('Description:'); ?></label><input type="textarea" name="descr" id="descr" value="" /> <th scope="row" style="width: 6em; text-align: right;"><label for="upload"><?php _e('Image:'); ?></label></th>
<td><input type="file" id="upload" name="image" onchange="validateImageName()" /></td>
</tr>
<tr>
<th scope="row" style="text-align: right;"><label for="title"><?php _e('Title:'); ?></label></th>
<td><input type="text" id="title" name="imgtitle" /></td>
</tr>
<tr>
<th scope="row" style="text-align: right;"><label for="descr"><?php _e('Description:'); ?></th>
<td><input type="textarea" name="descr" id="descr" value="" /></td>
</tr>
</table>
<p class="submit">
<input type="hidden" name="action" value="save" /> <input type="hidden" name="action" value="save" />
<input type="hidden" name="post" value="<?php echo $post; ?>" /> <input type="hidden" name="post" value="<?php echo $post; ?>" />
<input type="hidden" name="all" value="<?php echo $all; ?>" /> <input type="hidden" name="all" value="<?php echo $all; ?>" />
<div id="buttons">
<input type="submit" value="<?php _e('Upload'); ?>" /> <input type="submit" value="<?php _e('Upload'); ?>" />
<input type="button" value="<?php _e('Cancel'); ?>" onclick="cancelUpload()" /> <input type="button" value="<?php _e('Cancel'); ?>" onclick="cancelUpload()" />
</div> </div>