diff --git a/wp-admin/gears-manifest.php b/wp-admin/gears-manifest.php index 6fc01da8d2..cfb60fcdc9 100644 --- a/wp-admin/gears-manifest.php +++ b/wp-admin/gears-manifest.php @@ -87,7 +87,7 @@ header( 'Content-Type: application/x-javascript; charset=UTF-8' ); ?> { "betaManifestVersion" : 1, -"version" : "_20080606", +"version" : "_20080613", "entries" : [ @@ -177,6 +177,7 @@ header( 'Content-Type: application/x-javascript; charset=UTF-8' ); { "url" : "../wp-includes/js/tinymce/plugins/paste/css/pasteword.css?ver=3091" }, { "url" : "../wp-includes/js/tinymce/plugins/paste/css/blank.css?ver=3091" }, { "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css?ver=3091" }, +{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage-rtl.css?ver=3091" }, { "url" : "../wp-includes/js/tinymce/wordpress.css?ver=3091" }, { "url" : "../wp-includes/js/tinymce/themes/advanced/img/icons.gif" }, diff --git a/wp-includes/js/thickbox/thickbox.css b/wp-includes/js/thickbox/thickbox.css index cadee178d0..a7c4a4012a 100644 --- a/wp-includes/js/thickbox/thickbox.css +++ b/wp-includes/js/thickbox/thickbox.css @@ -116,12 +116,13 @@ margin-top: expression(0 - parseInt(this.offsetHeight / 2) + (TBWindowMargin = d #TB_load{ position: fixed; display:none; - height:13px; - width:208px; z-index:103; top: 50%; left: 50%; - margin: -6px 0 0 -104px; /* -height/2 0 0 -width/2 */ + background-color: #E8E8E8; + border: 4px solid #525252; + margin: -45px 0pt 0pt -125px; + padding: 40px 15px 15px; } * html #TB_load { /* ie6 hack */ diff --git a/wp-includes/js/tinymce/langs/wp-langs.php b/wp-includes/js/tinymce/langs/wp-langs.php index b1875e9a57..d62fd8646f 100644 --- a/wp-includes/js/tinymce/langs/wp-langs.php +++ b/wp-includes/js/tinymce/langs/wp-langs.php @@ -397,5 +397,31 @@ wp_help_desc:"' . mce_escape( __('Help') ) . ' (Alt+Shift+H)", wp_more_alt:"' . mce_escape( __('More...') ) . '", wp_page_alt:"' . mce_escape( __('Next page...') ) . '" }); + +tinyMCE.addI18n("' . $language . '.wpeditimage",{ +edit_img:"' . mce_escape( __('Edit Image') ) . '", +adv_settings:"' . mce_escape( __('Advanced Settings') ) . '", +none:"' . mce_escape( __('None') ) . '", +size:"' . mce_escape( __('Size') ) . '", +thumbnail:"' . mce_escape( __('Thumbnail') ) . '", +medium:"' . mce_escape( __('Medium') ) . '", +full_size:"' . mce_escape( __('Full Size') ) . '", +alt_help:"' . js_escape( __('Alternate text, e.g. "The Mona Lisa"') ) . '", +current_link:"' . mce_escape( __('Current Link') ) . '", +link_to_img:"' . mce_escape( __('Link to Image') ) . '", +link_help:"' . mce_escape( __('Enter a link URL or click above for presets.') ) . '", +adv_img_settings:"' . mce_escape( __('Advanced Image Settings') ) . '", +source:"' . mce_escape( __('Source') ) . '", +width:"' . mce_escape( __('Width') ) . '", +height:"' . mce_escape( __('Height') ) . '", +orig_size:"' . mce_escape( __('Original Size') ) . '", +css:"' . mce_escape( __('CSS Class') ) . '", +adv_link_settings:"' . mce_escape( __('Advanced Link Settings') ) . '", +link_rel:"' . mce_escape( __('Link Rel') ) . '", +height:"' . mce_escape( __('Height') ) . '", +orig_size:"' . mce_escape( __('Original Size') ) . '", +css:"' . mce_escape( __('CSS Class') ) . '", +caption:"' . mce_escape( __('Caption') ) . '" +}); '; ?> \ No newline at end of file diff --git a/wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css b/wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css index 48a5a9f567..2519bbb6d2 100644 --- a/wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css +++ b/wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css @@ -38,15 +38,17 @@ abbr.required { text-align: left; } +img.alignright, .alignright { float: right; } +img.alignleft, .alignleft { float: left; } -.aligncenter { +img.aligncenter { display: block; margin-left: auto; margin-right: auto; @@ -61,8 +63,9 @@ th.label { } .show-align { - padding: 8px; height: 200px; + width: 480px; + float: right; background-color: #f1f1f1; cursor: default; -moz-user-select: none; @@ -73,7 +76,7 @@ th.label { #media-upload #img-edit { border: 1px solid #c0c0c0; width: 623px; - margin: 20px auto auto; + margin: 15px auto; } #media-upload .media-upload-form table.describe { @@ -90,7 +93,7 @@ th.label { } #img_demo { - padding: 0 5px 4px; + padding: 0; } #saveeditimg { @@ -137,31 +140,38 @@ th.label { } #media-upload h3 { - clear:both; - padding:0pt 0pt 3px; - border-bottom-style:solid; - border-bottom-width:1px; - font-family:Georgia,"Times New Roman",Times,serif; - font-size:20px; - font-weight:normal; - line-height:normal; - margin:20px 0 15px -4px; - padding:0 0 3px 0; - border-bottom-color:#DADADA; - color:#5A5A5A; + clear: both; + padding: 0pt 0pt 3px; + border-bottom-style: solid; + border-bottom-width: 1px; + font-family: Georgia,"Times New Roman",Times,serif; + font-size: 20px; + font-weight: normal; + line-height: normal; + margin: 0 0 10px -4px; + padding: 15px 0 3px; + border-bottom-color: #DADADA; + color: #5A5A5A; } #img_dim #width, -#img_dim #height { - width:40px; +#img_dim #height, +#img_prop #border, +#img_prop #vspace, +#img_prop #hspace { + width: 36px; } #img_dim abbr { padding: 0 4px; } -#basic .align .field label { - margin: 0 10px 0 0; - padding: 0 0 0 25px; +#show_align_sp { + width: 115px; +} + +#img_dim input, +#img_prop input { + margin-right: 10px; } diff --git a/wp-includes/js/tinymce/plugins/wpeditimage/editimage.html b/wp-includes/js/tinymce/plugins/wpeditimage/editimage.html index 33ccc5f528..1d1188abec 100644 --- a/wp-includes/js/tinymce/plugins/wpeditimage/editimage.html +++ b/wp-includes/js/tinymce/plugins/wpeditimage/editimage.html @@ -1,5 +1,5 @@ - +