diff options
Diffstat (limited to 'wp-admin')
| -rw-r--r-- | wp-admin/css/press-this.css | 6 | ||||
| -rw-r--r-- | wp-admin/gears-manifest.php | 7 | ||||
| -rw-r--r-- | wp-admin/includes/media.php | 1 | ||||
| -rw-r--r-- | wp-admin/includes/plugin.php | 10 | ||||
| -rw-r--r-- | wp-admin/includes/widgets.php | 2 | ||||
| -rw-r--r-- | wp-admin/js/editor.js | 1 | ||||
| -rw-r--r-- | wp-admin/js/gallery.js | 2 | ||||
| -rw-r--r-- | wp-admin/press-this.php | 8 |
8 files changed, 23 insertions, 14 deletions
diff --git a/wp-admin/css/press-this.css b/wp-admin/css/press-this.css index 71a4125..005e13f 100644 --- a/wp-admin/css/press-this.css +++ b/wp-admin/css/press-this.css @@ -428,7 +428,6 @@ padding-bottom: .25em; position: absolute; top: 20px; right: 25px; -background: white; padding: 5px; } #TB_ajaxContent h3 { @@ -505,3 +504,8 @@ margin-bottom: 8px; #footer p a:hover { text-decoration: underline; +} + +.centered { + text-align: center; +} diff --git a/wp-admin/gears-manifest.php b/wp-admin/gears-manifest.php index c8ea433..7daed22 100644 --- a/wp-admin/gears-manifest.php +++ b/wp-admin/gears-manifest.php @@ -64,7 +64,7 @@ header( 'Content-Type: application/x-javascript; charset=UTF-8' ); ?> { "betaManifestVersion" : 1, -"version" : "<?php echo $man_version; ?>_20080703", +"version" : "<?php echo $man_version; ?>_20080704", "entries" : [ <?php echo $defaults; ?> @@ -97,6 +97,8 @@ header( 'Content-Type: application/x-javascript; charset=UTF-8' ); { "url" : "images/toggle-arrow.gif" }, { "url" : "images/wordpress-logo.png" }, { "url" : "images/xit.gif" }, +{ "url" : "images/loading-publish.gif" }, +{ "url" : "images/loading.gif" }, { "url" : "../wp-includes/images/crystal/archive.png" }, { "url" : "../wp-includes/images/crystal/audio.png" }, @@ -127,6 +129,9 @@ header( 'Content-Type: application/x-javascript; charset=UTF-8' ); { "url" : "../wp-includes/js/tinymce/themes/advanced/js/source_editor.js?ver=311" }, { "url" : "../wp-includes/js/tinymce/themes/advanced/js/anchor.js?ver=311" }, { "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js?ver=311" }, +{ "url" : "../wp-includes/js/tinymce/tiny_mce.js?ver=311" }, +{ "url" : "../wp-includes/js/tinymce/themes/advanced/editor_template.js?ver=311" }, +{ "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/editor_plugin.js?ver=311" }, { "url" : "../wp-includes/js/tinymce/themes/advanced/source_editor.htm?ver=311" }, { "url" : "../wp-includes/js/tinymce/themes/advanced/anchor.htm?ver=311" }, diff --git a/wp-admin/includes/media.php b/wp-admin/includes/media.php index a79944a..89a3040 100644 --- a/wp-admin/includes/media.php +++ b/wp-admin/includes/media.php @@ -720,6 +720,7 @@ function get_media_item( $attachment_id, $args = null ) { } $display_title = ( !empty( $title ) ) ? $title : $filename; // $title shouldn't ever be empty, but just in case + $display_title = wp_html_excerpt($display_title, 100); $item = " $type diff --git a/wp-admin/includes/plugin.php b/wp-admin/includes/plugin.php index 72acd45..2822dac 100644 --- a/wp-admin/includes/plugin.php +++ b/wp-admin/includes/plugin.php @@ -470,18 +470,16 @@ function get_plugin_page_hookname( $plugin_page, $parent_page ) { $parent = get_admin_page_parent(); + $page_type = 'admin'; if ( empty ( $parent_page ) || 'admin.php' == $parent_page ) { if ( isset( $admin_page_hooks[$plugin_page] )) $page_type = 'toplevel'; else if ( isset( $admin_page_hooks[$parent] )) $page_type = $admin_page_hooks[$parent]; - } else - if ( isset( $admin_page_hooks[$parent_page] ) ) { - $page_type = $admin_page_hooks[$parent_page]; - } else { - $page_type = 'admin'; - } + } else if ( isset( $admin_page_hooks[$parent_page] ) ) { + $page_type = $admin_page_hooks[$parent_page]; + } $plugin_name = preg_replace( '!\.php!', '', $plugin_page ); diff --git a/wp-admin/includes/widgets.php b/wp-admin/includes/widgets.php index 79a4f1a..52d1d7b 100644 --- a/wp-admin/includes/widgets.php +++ b/wp-admin/includes/widgets.php @@ -64,7 +64,7 @@ function wp_list_widgets( $show = 'all', $_search = false ) { if ( 'all' == $show && $is_multi ) { // it's a multi-widget. We only need to show it in the list once. $already_shown[] = $widget['callback']; - $num = (int) array_pop( explode( '-', $widget['id'] ) ); + $num = (int) array_pop( $ids = explode( '-', $widget['id'] ) ); $id_base = $wp_registered_widget_controls[$widget['id']]['id_base']; // so that we always add a new one when clicking "add" while ( isset($wp_registered_widgets["$id_base-$num"]) ) diff --git a/wp-admin/js/editor.js b/wp-admin/js/editor.js index d2049e4..7f5875a 100644 --- a/wp-admin/js/editor.js +++ b/wp-admin/js/editor.js @@ -53,6 +53,7 @@ switchEditors = { content = content.replace(new RegExp('\\s*<div', 'mg'), '\n<div'); content = content.replace(new RegExp('</div>\\s*', 'mg'), '</div>\n'); content = content.replace(new RegExp('\\s*\\[wp_caption([^\\[]+)\\[/wp_caption\\]\\s*', 'gi'), '\n\n[wp_caption$1[/wp_caption]\n\n'); + content = content.replace(new RegExp('wp_caption\\]\\n\\n+\\[wp_caption', 'g'), 'wp_caption]\n\n[wp_caption'); var blocklist2 = 'blockquote|ul|ol|li|table|thead|tr|th|td|h[1-6]|pre'; content = content.replace(new RegExp('\\s*<(('+blocklist2+') ?[^>]*)\\s*>', 'mg'), '\n<$1>'); diff --git a/wp-admin/js/gallery.js b/wp-admin/js/gallery.js index aae0221..f29573b 100644 --- a/wp-admin/js/gallery.js +++ b/wp-admin/js/gallery.js @@ -10,7 +10,7 @@ jQuery(function($) { // When an update has occurred, adjust the order for each item var galleryReorder = function(e, sort) { - jQuery.each(sort['instance'].toArray(), function(i, id) { + jQuery.each(sort['element'].sortable('toArray'), function(i, id) { jQuery('#' + id + ' .menu_order input')[0].value = i; }); } diff --git a/wp-admin/press-this.php b/wp-admin/press-this.php index 56d5a27..5957803 100644 --- a/wp-admin/press-this.php +++ b/wp-admin/press-this.php @@ -136,10 +136,10 @@ if($_REQUEST['ajax'] == 'thickbox') { ?> <input id="this_photo_description" name="photo_description" class="text" onkeypress="if(event.keyCode==13) image_selector();" value="<?php echo attribute_escape($title);?>"/> </div> - <p><input type="hidden" name="this_photo" value="<?php echo attribute_escape($image); ?>" id="this_photo" /> - <a href="#" class="select"><img src="<?php echo clean_url($image); ?>" width="475" alt="<?php echo attribute_escape(__('Click to insert.')); ?>" title="<?php echo attribute_escape(__('Click to insert.')); ?>" /></a></p> + <p class="centered"><input type="hidden" name="this_photo" value="<?php echo attribute_escape($image); ?>" id="this_photo" /> + <a href="#" class="select"><img src="<?php echo clean_url($image); ?>" alt="<?php echo attribute_escape(__('Click to insert.')); ?>" title="<?php echo attribute_escape(__('Click to insert.')); ?>" /></a></p> - <p id="options"><a href="#" class="select"><?php _e('Insert Image'); ?></a> | <a href="#" class="cancel"><?php _e('Cancel'); ?></a></p> + <p id="options"><a href="#" class="select button"><?php _e('Insert Image'); ?></a> <a href="#" class="cancel button"><?php _e('Cancel'); ?></a></p> <?php die; } @@ -295,7 +295,7 @@ if($_REQUEST['ajax'] == 'photo') { ?> <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_option('blog_charset'); ?>" /> <title><?php _e('Press This') ?></title> - <script type="text/javascript" src="../wp-includes/js/tinymce/tiny_mce.js"></script> + <script type="text/javascript" src="../wp-includes/js/tinymce/tiny_mce.js?ver=311"></script> <?php add_thickbox(); wp_enqueue_style('press-this'); |