vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-08-11 20:30:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Pinking shears

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@19054 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Ryan Boren
2011-10-24 19:13:23 +00:00
parent 5fecc93721
commit fd10e500e4
26 changed files with 59 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wp-admin/css/ie-rtl.dev.css
+1 -1
View File
@@ -126,7 +126,7 @@ form#widgets-filter { /* fix widget page */
position: static;
}
/* nav menus
/* nav menus
.menu-max-depth-0 #menu-management { width: 460px; }
.menu-max-depth-1 #menu-management { width: 490px; }
.menu-max-depth-2 #menu-management { width: 520px; }
wp-admin/edit-form-advanced.php
+4 -4
View File
@@ -212,23 +212,23 @@ if ( 'post' == $post_type ) {
} elseif ( 'page' == $post_type ) {
$about_pages = '<p>' . __('Pages are similar to Posts in that they have a title, body text, and associated metadata, but they are different in that they are not part of the chronological blog stream, kind of like permanent posts. Pages are not categorized or tagged, but can have a hierarchy. You can nest Pages under other Pages by making one the &#8220;Parent&#8221; of the other, creating a group of Pages.') . '</p>' .
'<p>' . __('Creating a Page is very similar to creating a Post, and the screens can be customized in the same way using drag and drop, the Screen Options tab, and expanding/collapsing boxes as you choose. This screen also has the new in 3.2 distraction-free writing space, available in both the Visual and HTML modes via the Fullscreen buttons. The Page editor mostly works the same as the Post editor, but there are some Page-specific features in the Page Attributes box:') . '</p>';
$current_screen->add_help_tab( array(
'id' => 'about-pages',
'title' => __('About Pages'),
'content' => $about_pages,
) );
$page_attributes = '<p>' . __('<strong>Parent</strong> - You can arrange your pages in hierarchies. For example, you could have an &#8220;About&#8221; page that has &#8220;Life Story&#8221; and &#8220;My Dog&#8221; pages under it. There are no limits to how many levels you can nest pages.') . '</p>' .
'<p>' . __('<strong>Template</strong> - Some themes have custom templates you can use for certain pages that might have additional features or custom layouts. If so, you&#8217;ll see them in this dropdown menu.') . '</p>' .
'<p>' . __('<strong>Order</strong> - Pages are usually ordered alphabetically, but you can choose your own order by entering a number (1 for first, etc.) in this field.') . '</p>';
$current_screen->add_help_tab( array(
'id' => 'page-attributes',
'title' => __('Page Attributes'),
'content' => $page_attributes,
) );
$current_screen->add_help_sidebar(
'<p><strong>' . __('For more information:') . '</strong></p>' .
'<p>' . __('<a href="http://codex.wordpress.org/Pages_Add_New_Screen" target="_blank">Documentation on Adding New Pages</a>') . '</p>' .
wp-admin/edit-tags.php
+2 -2
View File
@@ -143,8 +143,8 @@ case 'editedtag':
if ( !current_user_can( $tax->cap->edit_terms ) )
wp_die( __( 'Cheatin&#8217; uh?' ) );
$tag = get_term( $tag_ID, $taxonomy );
$tag = get_term( $tag_ID, $taxonomy );
if ( ! $tag )
wp_die( __( 'You attempted to edit an item that doesn&#8217;t exist. Perhaps it was deleted?' ) );
wp-admin/includes/class-wp-posts-list-table.php
+2 -2
View File
@@ -864,7 +864,7 @@ class WP_Posts_List_Table extends WP_List_Table {
<?php
endif; // hierarchical
if ( !$bulk ) : ?>
<label>
@@ -996,7 +996,7 @@ class WP_Posts_List_Table extends WP_List_Table {
</div>
<?php if ( post_type_supports( $screen->post_type, 'post-formats' ) && current_theme_supports( 'post-formats' ) ) :
<?php if ( post_type_supports( $screen->post_type, 'post-formats' ) && current_theme_supports( 'post-formats' ) ) :
$post_formats = get_theme_support( 'post-formats' );
if ( isset( $post_formats[0] ) && is_array( $post_formats[0] ) ) :
$all_post_formats = get_post_format_strings(); ?>
wp-admin/includes/class-wp-upgrader.php
+1 -1
View File
@@ -1539,7 +1539,7 @@ class File_Upload_Upgrader {
$this->id = (int) $_GET[$urlholder];
$attachment = get_post( $this->id );
if ( empty($attachment) )
wp_die(__('Please select a file'));
wp_die(__('Please select a file'));
$this->filename = $attachment->post_title;
$this->package = get_attached_file( $attachment->ID );
wp-admin/includes/deprecated.php
+1 -1
View File
@@ -710,7 +710,7 @@ function wp_dashboard_quick_press_output() {
*/
function wp_tiny_mce() {
_deprecated_function( __FUNCTION__, '3.3', 'wp_editor()' );
wp_editor('', 'content');
}
wp-admin/includes/file.php
+1 -1
View File
@@ -347,7 +347,7 @@ function wp_handle_upload( &$file, $overrides = false, $time = null ) {
$new_file = $uploads['path'] . "/$filename";
copy( $tmp_file, $new_file );
unlink($tmp_file);
// Set correct file permissions
$stat = stat( dirname( $new_file ));
$perms = $stat['mode'] & 0000666;
wp-admin/includes/media.php
+2 -2
View File
@@ -1363,7 +1363,7 @@ wpUploaderInit = <?php echo json_encode($plupload_init); ?>;
<?php do_action('post-html-upload-ui'); ?>
</div>
<p><?php printf( __( 'Maximum upload file size: %d%s.' ), esc_html($upload_size_unit), esc_html($sizes[$u]) ); ?>
<p><?php printf( __( 'Maximum upload file size: %d%s.' ), esc_html($upload_size_unit), esc_html($sizes[$u]) ); ?>
<?php _e('After a file has been uploaded, you can add titles and descriptions.'); ?></p>
<?php
@@ -2004,7 +2004,7 @@ function media_upload_max_image_resize() {
printf( __( 'Scale images to match the large size selected in %1$simage options%2$s (%3$d &times; %4$d).' ), $a, $end, (int) get_option( 'large_size_w', '1024' ), (int) get_option( 'large_size_h', '1024' ) );
?>
</label></p>
<?php
<?php
}
add_action( 'post-upload-ui', 'media_upload_max_image_resize' );
wp-admin/includes/post.php
+1 -1
View File
@@ -598,7 +598,7 @@ function wp_write_post() {
* Calls wp_write_post() and handles the errors.
*
* @since 2.0.0
* @uses wp_write_post()
* @uses is_wp_error()
* @uses wp_die()
wp-admin/includes/screen.php
+11 -11
View File
@@ -333,7 +333,7 @@ final class WP_Screen {
* @access private
*/
private $_help_tabs = array();
/**
* The help sidebar data associated with screen, if any.
*
@@ -395,10 +395,10 @@ final class WP_Screen {
* @return WP_Screen Screen object.
*/
public function get( $hook_name = '' ) {
if ( is_a( $hook_name, 'WP_Screen' ) )
return $hook_name;
$action = $post_type = $taxonomy = '';
if ( $hook_name ) {
@@ -425,12 +425,12 @@ final class WP_Screen {
$action = 'add';
$id = str_replace( array( '-new', '-add' ), '', $id );
}
if ( 'index' == $id )
$id = 'dashboard';
$base = $id;
// If this is the current screen, see if we can be more accurate for post types and taxonomies.
if ( ! $hook_name ) {
switch ( $base ) {
@@ -466,7 +466,7 @@ final class WP_Screen {
break;
}
}
switch ( $base ) {
case 'post' :
if ( ! $post_type )
@@ -484,7 +484,7 @@ final class WP_Screen {
$id = 'edit-' . $taxonomy;
break;
}
if ( is_network_admin() ) {
$id .= '-network';
$base .= '-network';
@@ -492,7 +492,7 @@ final class WP_Screen {
$id .= '-user';
$base .= '-user';
}
if ( isset( self::$_registry[ $id ] ) )
return self::$_registry[ $id ];
@@ -509,7 +509,7 @@ final class WP_Screen {
return $screen;
}
/**
* Makes the screen object the current screen.
*
@@ -543,7 +543,7 @@ final class WP_Screen {
* @param string $help Help text.
*/
static function add_old_compat_help( $screen, $help ) {
self::$_old_compat_help[ $screen->id ] = $help;
self::$_old_compat_help[ $screen->id ] = $help;
}
/**
wp-admin/js/common.dev.js
+1 -1
View File
@@ -142,7 +142,7 @@ screenMeta = {
height;
columns.height('auto');
height = Math.max.apply( null, $.map( columns, function( el ) { return $(el).height(); }) );
columns.height( height );
wp-admin/js/editor.dev.js
+6 -6
View File
@@ -1,10 +1,10 @@
var switchEditors = {
go: function(a) {
var t = this, aid = a.id, l = aid.length, id = aid.substr(0, l - 5), mode = aid.substr(l - 4),
ed = tinyMCE.get(id), wrap_id = 'wp-'+id+'-wrap', dom = tinymce.DOM, txtarea_el = dom.get(id);
if ( 'tmce' == mode ) {
if ( ed && ! ed.isHidden() )
return false;
@@ -14,7 +14,7 @@ var switchEditors = {
if ( tinyMCEPreInit.mceInit[id] && tinyMCEPreInit.mceInit[id].wpautop )
txtarea_el.value = t.wpautop( txtarea_el.value );
if ( ed ) {
ed.show();
} else {
@@ -25,12 +25,12 @@ var switchEditors = {
dom.removeClass(wrap_id, 'html-active');
dom.addClass(wrap_id, 'tmce-active');
setUserSetting('editor', 'tinymce');
} else if ( 'html' == mode ) {
if ( ed && ed.isHidden() )
return false;
if ( ed ) {
txtarea_el.style.height = ed.getContentAreaContainer().offsetHeight + 20 + 'px';
ed.hide();
@@ -42,7 +42,7 @@ var switchEditors = {
}
return false;
},
_wp_Nop : function(content) {
var blocklist1, blocklist2;
wp-admin/network.php
+1 -1
View File
@@ -523,7 +523,7 @@ if ( $_POST ) {
// create network tables
install_network();
$hostname = get_clean_basedomain();
$subdomain_install = allow_subdomain_install() ? !empty( $_POST['subdomain_install'] ) : false;
$subdomain_install = allow_subdomain_install() ? !empty( $_POST['subdomain_install'] ) : false;
if ( ! network_domain_check() ) {
$result = populate_network( 1, get_clean_basedomain(), sanitize_email( $_POST['email'] ), stripslashes( $_POST['sitename'] ), $base, $subdomain_install );
if ( is_wp_error( $result ) ) {
wp-admin/press-this.php
+4 -4
View File
@@ -578,10 +578,10 @@ var photostorage = false;
if ( $url ) {
$content .= '<p>';
if ( $selection )
$content .= __('via ');
$content .= sprintf( "<a href='%s'>%s</a>.</p>", esc_url( $url ), esc_html( $title ) );
}
@@ -602,7 +602,7 @@ var photostorage = false;
}
wp_editor( $content, 'content', $editor_settings );
?>
</div>
</div>
@@ -619,7 +619,7 @@ var photostorage = false;
<td><input type="button" class="button" onclick="image_selector()" value="<?php esc_attr_e('Insert Image'); ?>" /></td>
</tr></table>
</div>
<?php
<?php
do_action('admin_footer');
do_action('admin_print_footer_scripts');
?>
wp-admin/update-core.php
+4 -4
View File
@@ -12,7 +12,7 @@ require_once('./admin.php');
wp_enqueue_style( 'plugin-install' );
wp_enqueue_script( 'plugin-install' );
add_thickbox();
if ( is_multisite() && ! is_network_admin() ) {
wp_redirect( network_admin_url( 'update-core.php' ) );
exit();
@@ -250,11 +250,11 @@ function list_plugin_updates() {
} else {
$upgrade_notice = '';
}
$details_url = self_admin_url('plugin-install.php?tab=plugin-information&plugin=' . $plugin_data->update->slug . '&TB_iframe=true&width=640&height=662');
$details_text = sprintf(__('View version %1$s details'), $plugin_data->update->new_version);
$details_text = sprintf(__('View version %1$s details'), $plugin_data->update->new_version);
$details = sprintf('<a href="%1$s" class="thickbox" title="%2$s">%3$s</a>.', esc_url($details_url), esc_attr($plugin_data->Name), $details_text);
echo "
<tr class='active'>
<th scope='row' class='check-column'><input type='checkbox' name='checked[]' value='" . esc_attr($plugin_file) . "' /></th>