WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Press This update from noel. see #7949 

git-svn-id: http://svn.automattic.com/wordpress/trunk@9673 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2008-11-14 01:20:20 +00:00
parent cffcfd149f
commit 1a52b3e086
3 changed files with 157 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

179
wp-admin/css/press-this.css
View File

@ -16,25 +16,31 @@ img {
background: #444 !important; background: #444 !important;
} }
.button,
#poststuff #edButtonPreview, #poststuff #edButtonPreview,
#poststuff #edButtonHTML { #poststuff #edButtonHTML {
font-family: "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif; -moz-border-radius-bottomleft:0;
padding: 3px 5px; -moz-border-radius-bottomright:0;
font-size: 12px; -moz-border-radius-topleft:3px;
line-height: 1.5em; -moz-border-radius-topright:3px;
border-width: 1px; border-style:solid;
border-style: solid; border-width:1px;
-moz-border-radius: 3px; cursor:pointer;
-khtml-border-radius: 3px; display:block;
-webkit-border-radius: 3px; height:18px;
border-radius: 3px; margin:0px 5px 0 0;
cursor: pointer; padding:0px 5px 0px;
margin-left: 5px; background-color:#E9E9E9;
text-decoration: none; border-bottom-color:#E9E9E9;
color:#333333;
font-size: 10px;
line-height: 18px;
} }
.howto { .howto {
margin-top: 2px;
margin-bottom: 3px;
font-size: 11px; font-size: 11px;
font-style: italic; font-style: italic;
display: block; display: block;
@ -47,7 +53,6 @@ input.text {
outline-width: medium; outline-width: medium;
padding: 0; padding: 0;
width: 100%; width: 100%;
border-style: solid;
color: #333; color: #333;
} }
@ -92,46 +97,74 @@ div.zerosize {
margin: 0 12px 12px; margin: 0 12px 12px;
} }
#post_title {
width: 99%;
}
.titlewrap {
border-style: solid;
border-width: 1px;
padding: 2px 3px;
border-color: #ccc;
}
.titlewrap input {
font-size: 1.2em;
}
#poststuff h2, #poststuff h3 { #poststuff h2, #poststuff h3 {
font-size: 14px; font-size: 14px;
font-weight: bold; font-weight: bold;
padding: 7px; padding: 7px;
margin: 0 0 10px; margin: 0 0 10px;
background-color: #eaf3fa;
background-image:url(../images/postbox-bg.gif);
background-position:left top;
background-repeat:repeat-x;
font-size:12px;
font-weight:bold;
line-height:1;
margin:0 0 10px;
padding:7px 9px;
text-shadow:0 1px 0 #FFFFFF;
} }
#poststuff .stuffbox { .metabox-holder .postbox,
border: 1px solid white; .postbox,
border-color: #EBEBEB #ccc #ccc #EBEBEB; .stuffbox {
padding: 2px; margin-bottom: 20px;
margin-bottom: 10px; border-width: 1px;
border-style: solid;
line-height: 1;
-moz-border-radius: 6px;
-khtml-border-radius: 6px;
-webkit-border-radius: 6px;
border-radius: 6px;
}
.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;
border-style:solid;
border-width:1px;
font-size:1.7em;
outline-color:-moz-use-text-color;
outline-style:none;
outline-width:medium;
padding:3px 4px;
width:98%;
}
.postbox h2 {
background-image:url(../images/postbox-bg.gif);
background-position:left top;
background-repeat:repeat-x;
background-color:#DFDFDF;
} }
.editor-container { .editor-container {
border-width: 1px; -moz-border-radius-bottomleft:0;
border-color: #ccc; -moz-border-radius-bottomright:0;
border-style: solid; -moz-border-radius-topleft:6px;
margin-bottom: 1em; -moz-border-radius-topright:6px;
margin-top: -10px; border-collapse:separate;
border-style:solid;
border-width:1px;
border-color:#DFDFDF;
} }
.postdivrich { .postdivrich {
position: relative; position: relative;
margin-top: 10px; padding-top: 25px;
} }
#actions { #actions {
@ -145,6 +178,7 @@ div.zerosize {
#actions li { #actions li {
float: left; float: left;
list-style: none; list-style: none;
margin-right: 10px;
} }
/* Photo Styles */ /* Photo Styles */
@ -213,20 +247,20 @@ div.zerosize {
/* Video */ /* Video */
#embed-code { #embed-code {
width: 100%; width: 100%;
border: 0;
height: 98px; height: 98px;
} }
/* Submit Column */ /* Submit Column */
#viewsite { #viewsite {
padding: 0; padding: 0;
margin: 0; margin: 0 0 20px 0;
font-size: 10px;
clear: both;
} }
#viewsite .button { #viewsite .button {
width: 196px; margin: 0 0 0px 0;
margin: 0 0 10px 0;
display: block; display: block;
} }
@ -269,7 +303,7 @@ div.zerosize {
} }
#categorydiv { #categorydiv {
padding: 0.5em 0.9em;
} }
/* Categories */ /* Categories */
@ -286,7 +320,6 @@ div.zerosize {
#categorydiv div.ui-tabs-panel { #categorydiv div.ui-tabs-panel {
height: 150px; height: 150px;
overflow: auto; overflow: auto;
padding: 0.5em 0.9em;
} }
ul.categorychecklist li { ul.categorychecklist li {
@ -306,9 +339,12 @@ ul.categorychecklist li {
clear: both; clear: both;
margin: 0; margin: 0;
} }
#tagadd {
margin-left: 3px;
}
#tagchecklist { #tagchecklist {
padding-left: 1em; margin-top: 3px;
margin-bottom: 1em; margin-bottom: 1em;
font-size: 12px; font-size: 12px;
overflow: auto; overflow: auto;
@ -343,27 +379,34 @@ ul.categorychecklist li {
} }
/* Submit */ /* Submit */
.submitbox {
margin-top: -10px;
}
.submitbox .submit { .submit input,
font-size: 11px; .button,
padding: 12px 10px 10px; .button-primary,
text-align: left; .button-secondary,
.button-highlighted,
#postcustomstuff .submit input {
font-family: "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif;
text-decoration: none;
font-size: 11px !important;
line-height: 16px;
padding: 2px 8px;
cursor: pointer;
border-width: 1px;
border-style: solid;
-moz-border-radius: 11px;
-khtml-border-radius: 11px;
-webkit-border-radius: 11px;
border-radius: 11px;
-moz-box-sizing: content-box;
-webkit-box-sizing: content-box;
-khtml-box-sizing: content-box;
box-sizing: content-box;
} }
.button-primary {
.submit { background:#21759B url(../images/button-grad.png) repeat-x scroll left top;
border-top: 1px solid #ccc; border-color:#21759B;
margin: 10px 0 0; color:#FFFFFF;
padding: 1.5em 0 0;
-moz-border-radius: 3px 3px 0 0;
-webkit-border-top-left-radius: 3px;
-webkit-border-top-right-radius: 3px;
-khtml-border-top-left-radius: 3px;
-khtml-border-top-right-radius: 3px;
border-top-left-radius: 3px;
border-top-right-radius: 3px;
} }
.ac_results { .ac_results {

59
wp-admin/press-this.php
View File

@ -56,7 +56,7 @@ function press_it() {
$quick['post_status'] = isset($_REQUEST['publish']) ? 'publish' : 'draft'; $quick['post_status'] = isset($_REQUEST['publish']) ? 'publish' : 'draft';
$quick['post_category'] = $_REQUEST['post_category']; $quick['post_category'] = $_REQUEST['post_category'];
$quick['tags_input'] = $_REQUEST['tags_input']; $quick['tags_input'] = $_REQUEST['tags_input'];
$quick['post_title'] = $_REQUEST['post_title']; $quick['post_title'] = $_REQUEST['title'];
$quick['post_content'] = ''; $quick['post_content'] = '';
// insert the post with nothing in it, to get an ID // insert the post with nothing in it, to get an ID
@ -124,11 +124,15 @@ switch ($_REQUEST['ajax']) {
jQuery('#extra_fields').html(''); jQuery('#extra_fields').html('');
}); });
</script> </script>
<div class="postbox">
<h2><label for="embed-code"><?php _e('Embed Code') ?></label></h2> <h2><label for="embed-code"><?php _e('Embed Code') ?></label></h2>
<div class="titlewrap" > <div class="inside">
<textarea name="embed-code" id="embed-code" rows="8" cols="40"><?php echo format_to_edit($selection, true); ?></textarea> <textarea name="embed-code" id="embed-code" rows="8" cols="40"><?php echo format_to_edit($selection, true); ?></textarea>
</div>
<p id="options"><a href="#" class="select button"><?php _e('Insert Video'); ?></a> <a href="#" class="close button"><?php _e('Cancel'); ?></a></p> <p id="options"><a href="#" class="select button"><?php _e('Insert Video'); ?></a> <a href="#" class="close button"><?php _e('Cancel'); ?></a></p>
</div>
</div>
<?php break; <?php break;
case 'photo_thickbox': ?> case 'photo_thickbox': ?>
@ -141,7 +145,7 @@ switch ($_REQUEST['ajax']) {
image_selector(); image_selector();
}); });
</script> </script>
<h3 id="title"><label for="post_title"><?php _e('Description') ?></label></h3> <h3 id="title"><label for="title"><?php _e('Description') ?></label></h3>
<div class="titlewrap"> <div class="titlewrap">
<input id="this_photo_description" name="photo_description" class="text" onkeypress="if(event.keyCode==13) image_selector();" value="<?php echo attribute_escape($title);?>"/> <input id="this_photo_description" name="photo_description" class="text" onkeypress="if(event.keyCode==13) image_selector();" value="<?php echo attribute_escape($title);?>"/>
</div> </div>
@ -150,6 +154,8 @@ switch ($_REQUEST['ajax']) {
<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> <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 button"><?php _e('Insert Image'); ?></a> <a href="#" class="cancel button"><?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 break; <?php break;
case 'photo_thickbox_url': ?> case 'photo_thickbox_url': ?>
@ -162,13 +168,13 @@ switch ($_REQUEST['ajax']) {
image_selector(); image_selector();
}); });
</script> </script>
<h3 id="title"><label for="post_title"><?php _e('URL') ?></label></h3> <h3 id="title"><label for="title"><?php _e('URL') ?></label></h3>
<div class="titlewrap"> <div class="titlewrap">
<input id="this_photo" name="this_photo" class="text" onkeypress="if(event.keyCode==13) image_selector();" /> <input id="this_photo" name="this_photo" class="text" onkeypress="if(event.keyCode==13) image_selector();" />
</div> </div>
<h3 id="title"><label for="post_title"><?php _e('Description') ?></label></h3> <h3 id="title"><label for="title"><?php _e('Description') ?></label></h3>
<div class="titlewrap"> <div class="titlewrap">
<input id="this_photo_description" name="photo_description" class="text" onkeypress="if(event.keyCode==13) image_selector();" value="<?php echo attribute_escape($title);?>"/> <input id="this_photo_description" name="photo_description" class="text" onkeypress="if(event.keyCode==13) image_selector();" value="<?php echo attribute_escape($title);?>"/>
</div> </div>
@ -281,7 +287,7 @@ switch ($_REQUEST['ajax']) {
} }
jQuery(document).ready(function() { jQuery(document).ready(function() {
jQuery('#extra_fields').html('<h2>Photo <small id="photo_directions">(<?php _e("click images to select") ?>)</small></h2><ul id="actions"><li><a href="#" id="photo_add_url" class="thickbox button"><?php _e("Add from URL") ?> +</a></li></ul><div class="titlewrap"><div id="img_container"></div></div><p id="options"><a href="#" class="close button"><?php _e('Cancel'); ?></a></p>'); jQuery('#extra_fields').html('<div class="postbox"><h2>Photo <small id="photo_directions">(<?php _e("click images to select") ?>)</small></h2><ul id="actions"><li><a href="#" id="photo_add_url" class="thickbox button"><?php _e("Add from URL") ?> +</a></li></ul><div class="inside"><div class="titlewrap"><div id="img_container"></div></div><p id="options"><a href="#" class="close button"><?php _e('Cancel'); ?></a></p></div>');
jQuery('.close').click(function() { jQuery('.close').click(function() {
jQuery('#extra_fields').hide(); jQuery('#extra_fields').hide();
jQuery('#extra_fields').html(''); jQuery('#extra_fields').html('');
@ -384,7 +390,7 @@ die;
case 'photo' : case 'photo' :
jQuery('#extra_fields').html(''); jQuery('#extra_fields').html('');
jQuery('#extra_fields').show(); jQuery('#extra_fields').show();
jQuery('#extra_fields').before('<p id="waiting"><img src="images/loading.gif" alt="" /><?php echo js_escape( __( 'Loading...' ) ); ?></p>'); jQuery('#extra_fields').before('<p id="waiting"><img src="images/loading.gif" alt="" /> <?php echo js_escape( __( 'Loading...' ) ); ?></p>');
jQuery.ajax({ jQuery.ajax({
type: "GET", type: "GET",
cache : false, cache : false,
@ -402,7 +408,7 @@ die;
} }
jQuery(document).ready(function() { jQuery(document).ready(function() {
top.resizeTo(700-screen.width+screen.availWidth,680-screen.height+screen.availHeight); top.resizeTo(720-screen.width+screen.availWidth,680-screen.height+screen.availHeight);
jQuery('#photo_button').click(function() { show('photo'); return false; }); jQuery('#photo_button').click(function() { show('photo'); return false; });
jQuery('#video_button').click(function() { show('video'); return false; }); jQuery('#video_button').click(function() { show('video'); return false; });
jQuery('#visual_mode_button').click(function() { jQuery('#visual_mode_button').click(function() {
@ -432,10 +438,13 @@ die;
<div id="side-info-column"> <div id="side-info-column">
<div class="sleeve"> <div class="sleeve">
<h1 id="viewsite"><a class="button" href="<?php echo get_option('home'); ?>/" target="_blank"><?php bloginfo('name'); ?> &rsaquo; <?php _e('Press This') ?></a></span></h1> <h1 id="viewsite"><a class="button" href="<?php echo get_option('home'); ?>/" target="_blank"><?php bloginfo('name'); ?> &rsaquo; <?php _e('Press This') ?></a></span></h1>
<?php wp_nonce_field('press-this') ?> <?php wp_nonce_field('press-this') ?>
<input type="hidden" name="post_type" id="post_type" value="text"/> <input type="hidden" name="post_type" id="post_type" value="text"/>
<!-- This div holds the photo metadata -->
<div class="photolist"></div> <div class="photolist"></div>
<div id="categorydiv" class="stuffbox"> <div id="categorydiv" class="stuffbox">
<h2><?php _e('Categories') ?></h2> <h2><?php _e('Categories') ?></h2>
<div class="inside"> <div class="inside">
@ -448,7 +457,7 @@ die;
</div> </div>
<div id="category-adder" class="wp-hidden-children"> <div id="category-adder" class="wp-hidden-children">
<h4><a id="category-add-toggle" href="#category-add" class="hide-if-no-js" tabindex="3"><?php _e( '+ Add New Category' ); ?></a></h4> <a id="category-add-toggle" href="#category-add" class="hide-if-no-js" tabindex="3"><?php _e( '+ Add New Category' ); ?></a>
<p id="category-add" class="wp-hidden-child"> <p id="category-add" class="wp-hidden-child">
<label class="hidden" for="newcat"><?php _e( 'Add New Category' ); ?></label><input type="text" name="newcat" id="newcat" class="form-required form-input-tip" value="<?php _e( 'New category name' ); ?>" tabindex="3" aria-required="true"/> <label class="hidden" for="newcat"><?php _e( 'Add New Category' ); ?></label><input type="text" name="newcat" id="newcat" class="form-required form-input-tip" value="<?php _e( 'New category name' ); ?>" tabindex="3" aria-required="true"/>
<label class="hidden" for="newcat_parent"><?php _e('Parent category'); ?>:</label><?php wp_dropdown_categories( array( 'hide_empty' => 0, 'name' => 'newcat_parent', 'orderby' => 'name', 'hierarchical' => 1, 'show_option_none' => __('Parent category'), 'tab_index' => 3 ) ); ?> <label class="hidden" for="newcat_parent"><?php _e('Parent category'); ?>:</label><?php wp_dropdown_categories( array( 'hide_empty' => 0, 'name' => 'newcat_parent', 'orderby' => 'name', 'hierarchical' => 1, 'show_option_none' => __('Parent category'), 'tab_index' => 3 ) ); ?>
@ -469,12 +478,12 @@ die;
<div id="tagchecklist"></div> <div id="tagchecklist"></div>
</div> </div>
</div> </div>
<div id="submitdiv" class="stuffbox"> <div id="submitdiv" class="postbox">
<h2><?php _e('Publish') ?></h2> <h2><?php _e('Publish') ?></h2>
<div class="submitbox"> <div class="inside">
<p class="submit"> <p>
<input class="button" type="submit" name="draft" value="<?php _e('Save Draft') ?>" id="save" /> <input class="button" type="submit" name="draft" value="<?php _e('Save Draft') ?>" id="save" />
<input class="button" type="submit" name="publish" value="<?php _e('Publish') ?>" id="publish" /> <input class="button-primary" type="submit" name="publish" value="<?php _e('Publish') ?>" id="publish" />
<img src="images/loading-publish.gif" alt="" id="saving" style="display:none;"/> <img src="images/loading-publish.gif" alt="" id="saving" style="display:none;"/>
</p> </p>
</div> </div>
@ -492,17 +501,25 @@ die;
} }
?> ?>
<h2 id="title"><label for="post_title"><?php _e('Title') ?></label></h2>
<div id="titlediv">
<div class="titlewrap"> <div class="titlewrap">
<input name="post_title" id="post_title" class="text" value="<?php echo attribute_escape($title);?>"/> <input name="title" id="title" class="text" value="<?php echo attribute_escape($title);?>"/>
</div>
</div> </div>
<div id="extra_fields" style="display: none"></div> <div id="extra_fields" style="display: none"></div>
<div class="postdivrich"> <div class="postdivrich">
<ul id="actions"> <ul id="actions">
<li id="photo_button"><a href="#" class="button"><?php _e( 'Add Photo' ); ?></a></li> <li id="photo_button">
<li id="video_button"><a href="#" class="button"><?php _e( 'Add Video' ); ?></a></li>
Add: <a title="<?php _e('Insert an Image'); ?>" href="#">
<img alt="<?php _e('Insert an Image'); ?>" src="images/media-button-image.gif"/></a>
</li>
<li id="video_button">
<a title="<?php _e('Embed a Video'); ?>" href="#"><img alt="<?php _e('Embed a Video'); ?>" src="images/media-button-video.gif"/></a>
</li>
<li id="switcher"> <li id="switcher">
<?php wp_print_scripts( 'quicktags' ); ?> <?php wp_print_scripts( 'quicktags' ); ?>
@ -512,12 +529,9 @@ die;
<div class="zerosize"><input accesskey="e" type="button" onclick="switchEditors.go('<?php echo $id; ?>')" /></div> <div class="zerosize"><input accesskey="e" type="button" onclick="switchEditors.go('<?php echo $id; ?>')" /></div>
</li> </li>
</ul> </ul>
<div id="quicktags"> <div id="quicktags"></div>
</div>
<h2 id="content_type"><label for="content"><?php _e('Post') ?></label></h2>
<div class="editor-container"> <div class="editor-container">
<textarea name="content" id="content" style="width:100%;" class="mceEditor" rows="15"> <textarea name="content" id="content" style="width:100%;" class="mceEditor" rows="15">
@ -525,6 +539,7 @@ die;
<?php if ($url) { echo '<p>'; if($selection) printf( __('via %s.'), "<a href='$url'>$title</a>" ); echo '</p>'; } ?> <?php if ($url) { echo '<p>'; if($selection) printf( __('via %s.'), "<a href='$url'>$title</a>" ); echo '</p>'; } ?>
</textarea> </textarea>
</div> </div>
</div> </div>
</div> </div>
</div> </div>

2
wp-includes/script-loader.php
View File

@ -317,7 +317,7 @@ function wp_default_styles( &$styles ) {
$styles->add( 'dashboard', '/wp-admin/css/dashboard.css', array(), '20081113' ); $styles->add( 'dashboard', '/wp-admin/css/dashboard.css', array(), '20081113' );
$styles->add( 'install', '/wp-admin/css/install.css', array(), '20080708' ); $styles->add( 'install', '/wp-admin/css/install.css', array(), '20080708' );
$styles->add( 'theme-editor', '/wp-admin/css/theme-editor.css' ); $styles->add( 'theme-editor', '/wp-admin/css/theme-editor.css' );
$styles->add( 'press-this', '/wp-admin/css/press-this.css', array(), '20080922' ); $styles->add( 'press-this', '/wp-admin/css/press-this.css', array(), '20081113' );
$styles->add( 'press-this-ie', '/wp-admin/css/press-this-ie.css', array(), '20080915' ); $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_data( 'press-this-ie', 'conditional', 'gte IE 6' );
$styles->add( 'thickbox', '/wp-includes/js/thickbox/thickbox.css', array(), '20080613' ); $styles->add( 'thickbox', '/wp-includes/js/thickbox/thickbox.css', array(), '20080613' );