From b05ec0cd99e2b58ec8d5178a43a6ecfe8fe6874b Mon Sep 17 00:00:00 2001 From: azaozz Date: Wed, 19 Nov 2008 13:01:36 +0000 Subject: [PATCH] PressThis updates from Noel, see #7949 git-svn-id: http://svn.automattic.com/wordpress/trunk@9787 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/css/press-this-ie-rtl.css | 0 wp-admin/css/press-this-ie.css | 3 - wp-admin/css/press-this.css | 89 +++++++++++++++++++++++------- wp-admin/press-this.php | 57 ++++++++++--------- wp-includes/script-loader.php | 4 +- 5 files changed, 101 insertions(+), 52 deletions(-) delete mode 100644 wp-admin/css/press-this-ie-rtl.css delete mode 100644 wp-admin/css/press-this-ie.css diff --git a/wp-admin/css/press-this-ie-rtl.css b/wp-admin/css/press-this-ie-rtl.css deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/wp-admin/css/press-this-ie.css b/wp-admin/css/press-this-ie.css deleted file mode 100644 index bc410b1086..0000000000 --- a/wp-admin/css/press-this-ie.css +++ /dev/null @@ -1,3 +0,0 @@ -#posting { - position: static !important; -} \ No newline at end of file diff --git a/wp-admin/css/press-this.css b/wp-admin/css/press-this.css index d638330ed6..b500a3c0ca 100644 --- a/wp-admin/css/press-this.css +++ b/wp-admin/css/press-this.css @@ -12,7 +12,7 @@ img { /* Header */ #wphead { border-top: none; - padding-top: 8px; + padding-top: 4px; background: #444 !important; } @@ -22,6 +22,19 @@ img { -moz-border-radius-bottomright:0; -moz-border-radius-topleft:3px; -moz-border-radius-topright:3px; +-khtml-border-radius-bottomleft:0; +-khtml-border-radius-bottomright:0; +-khtml-border-radius-topleft:3px; +-khtml-border-radius-topright:3px; +-webkit-border-radius-bottomleft:0; +-webkit-border-radius-bottomright:0; +-webkit-border-radius-topleft:3px; +-webkit-border-radius-topright:3px; +border-radius-bottomleft:0; +border-radius-bottomright:0; +border-radius-topleft:3px; +border-radius-topright:3px; + border-style:solid; border-width:1px; cursor:pointer; @@ -47,13 +60,18 @@ margin-bottom: 3px; } input.text { - border: none; outline-color: -moz-use-text-color; outline-style: none; outline-width: medium; - padding: 0; width: 100%; - color: #333; + +} + +#message { + -moz-border-radius: 6px; + -khtml-border-radius: 6px; + -webkit-border-radius: 6px; + border-radius: 6px; } /* Editor/Main Column */ @@ -78,13 +96,16 @@ div.zerosize { } .posting { - margin-right: 228px; +margin-right: 228px; +position: relative; +left: 0; } #side-info-column { float: right; width: 218px; - position: relative; + position: absolute; + right: 0; margin-right: 10px; } @@ -114,11 +135,24 @@ margin:0 0 10px; padding:7px 9px; text-shadow:0 1px 0 #FFFFFF; } +h3.tb { +text-shadow:0 1px 0 #FFFFFF; +font-weight: bold; +font-size: 12px; +margin-left: 5px; +} +#TB_window { +border: 1px solid #333; +-moz-border-radius: 6px; + -khtml-border-radius: 6px; + -webkit-border-radius: 6px; + border-radius: 6px; +} .metabox-holder .postbox, .postbox, .stuffbox { - margin-bottom: 20px; + margin-bottom: 10px; border-width: 1px; border-style: solid; line-height: 1; @@ -130,11 +164,11 @@ text-shadow:0 1px 0 #FFFFFF; .titlediv { border-color:#DFDFDF; } -#title { --moz-border-radius-bottomleft:6px; --moz-border-radius-bottomright:6px; --moz-border-radius-topleft:6px; --moz-border-radius-topright:6px; +#title, .tbtitle { + -moz-border-radius: 6px; + -khtml-border-radius: 6px; + -webkit-border-radius: 6px; + border-radius: 6px; border-style:solid; border-width:1px; font-size:1.7em; @@ -142,7 +176,14 @@ outline-color:-moz-use-text-color; outline-style:none; outline-width:medium; padding:3px 4px; -width:98%; +border-color: #DFDFDF; +} +.tbtitle { +font-size: 12px; +padding: 3px; +} +#title { +width: 98%; } .postbox h2 { background-image:url(../images/postbox-bg.gif); @@ -152,14 +193,15 @@ background-color:#DFDFDF; } .editor-container { - -moz-border-radius-bottomleft:0; --moz-border-radius-bottomright:0; --moz-border-radius-topleft:6px; --moz-border-radius-topright:6px; + -moz-border-radius: 6px; + -khtml-border-radius: 6px; + -webkit-border-radius: 6px; + border-radius: 6px; border-collapse:separate; border-style:solid; border-width:1px; border-color:#DFDFDF; + } .postdivrich { @@ -201,6 +243,9 @@ border-color:#DFDFDF; margin-top: 10px; position: relative; } +#extra_fields .postbox { +margin-bottom: 5px; +} #extra_fields .titlewrap { padding: 0; @@ -214,16 +259,18 @@ border-color:#DFDFDF; #img_container a { display: block; - width: 71px; - height: 71px; float: left; overflow: hidden; vertical-align: center; } +#img_container img, #img_container a { + width: 68px; + height: 68px; +} #img_container img { - width: 71px; - height: 71px; + width: 68px; + height: 68px; border: none; background-color: #f4f4f4; cursor: pointer; diff --git a/wp-admin/press-this.php b/wp-admin/press-this.php index d94c9f4363..a9098c2372 100644 --- a/wp-admin/press-this.php +++ b/wp-admin/press-this.php @@ -145,9 +145,11 @@ switch ($_REQUEST['ajax']) { image_selector(); }); -

+

+
- + +

@@ -168,15 +170,19 @@ switch ($_REQUEST['ajax']) { image_selector(); }); -

-
- +

+
+
+ +
-

-
- +

+
+
+ +

|

@@ -248,21 +254,21 @@ switch ($_REQUEST['ajax']) { img_attr = 'id="img' + i + '"'; skip = false; if (img.width && img.height) { - if (img.width * img.height < 2500) - skip = true; - aspect = img.width / img.height; - scale = (aspect > 1) ? (71 / img.width) : (71 / img.height); - - w = img.width; - h = img.height; - - if (scale < 1) { - w = parseInt(img.width * scale); - h = parseInt(img.height * scale); + if (img.width >= 30 && img.height >= 30) { + aspect = img.width / img.height; + scale = (aspect > 1) ? (71 / img.width) : (71 / img.height); + + w = img.width; + h = img.height; + + if (scale < 1) { + w = parseInt(img.width * scale); + h = parseInt(img.height * scale); + } + img_attr += ' style="width: ' + w + 'px; height: ' + h + 'px;"'; + strtoappend += ''; } - img_attr += ' style="width: ' + w + 'px; height: ' + h + 'px;"'; } - if (!skip) strtoappend += ''; } function pick(img, desc) { @@ -321,7 +327,7 @@ die; do_action('admin_head'); if ( user_can_richedit() ) { - add_filter( 'teeny_mce_before_init', create_function( '$a', '$a["onpageload"] = ""; $a["mode"] = "textareas"; $a["editor_selector"] = "mceEditor"; return $a;' ) ); + add_filter( 'teeny_mce_before_init', create_function( '$a', '$a["height"] = "400"; $a["onpageload"] = ""; $a["mode"] = "textareas"; $a["editor_selector"] = "mceEditor"; return $a;' ) ); wp_tiny_mce( true ); } @@ -408,7 +414,8 @@ die; } jQuery(document).ready(function() { - top.resizeTo(720-screen.width+screen.availWidth,680-screen.height+screen.availHeight); + //resize screen + top.resizeTo(720-screen.width+screen.availWidth,660-screen.height+screen.availHeight); jQuery('#photo_button').click(function() { show('photo'); return false; }); jQuery('#video_button').click(function() { show('video'); return false; }); jQuery('#visual_mode_button').click(function() { @@ -535,8 +542,8 @@ die;
diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php index 461203997b..fbd5718f4e 100644 --- a/wp-includes/script-loader.php +++ b/wp-includes/script-loader.php @@ -298,7 +298,7 @@ function wp_default_styles( &$styles ) { $styles->default_version = get_bloginfo( 'version' ); $styles->text_direction = 'rtl' == get_bloginfo( 'text_direction' ) ? 'rtl' : 'ltr'; - $rtl_styles = array( 'global', 'colors', 'dashboard', 'ie', 'install', 'login', 'media', 'theme-editor', 'upload', 'widgets', 'press-this', 'press-this-ie', 'plugin-install', 'farbtastic' ); + $rtl_styles = array( 'global', 'colors', 'dashboard', 'ie', 'install', 'login', 'media', 'theme-editor', 'upload', 'widgets', 'press-this', 'plugin-install', 'farbtastic' ); $styles->add( 'wp-admin', '/wp-admin/wp-admin.css', array(), '20081119b' ); $styles->add_data( 'wp-admin', 'rtl', '/wp-admin/rtl.css' ); @@ -317,8 +317,6 @@ function wp_default_styles( &$styles ) { $styles->add( 'install', '/wp-admin/css/install.css', array(), '20080708' ); $styles->add( 'theme-editor', '/wp-admin/css/theme-editor.css' ); $styles->add( 'press-this', '/wp-admin/css/press-this.css', array(), '20081115' ); - $styles->add( 'press-this-ie', '/wp-admin/css/press-this-ie.css', array(), '20080915' ); - $styles->add_data( 'press-this-ie', 'conditional', 'gte IE 6' ); $styles->add( 'thickbox', '/wp-includes/js/thickbox/thickbox.css', array(), '20080613' ); $styles->add( 'login', '/wp-admin/css/login.css' ); $styles->add( 'plugin-install', '/wp-admin/css/plugin-install.css', array(), '20081114' );