Press This: Obey color scheme. Props azaozz. see #6998

git-svn-id: http://svn.automattic.com/wordpress/trunk@7993 1a063a9b-81f0-0310-95a4-ce76da25c4cd

wp-admin/css/colors-classic.css

@@ -208,7 +208,7 @@ ul#widget-list li.widget-list-item h4.widget-title {
 	color: #d54e21;
 }
 
-#adminmenu a:hover, #sidemenu a:hover {
+#adminmenu a:hover, #sidemenu a:hover, .ui-tabs-nav a:hover {
 	color: #97c4d8;
 }
 
@@ -296,7 +296,7 @@ ul#widget-list li.widget-list-item h4.widget-title {
 	color: #2e7ca0;
 }
 
-#adminmenu a {
+#adminmenu a, .ui-tabs-nav a {
 	color: #cfebf6;
 }
 
@@ -304,7 +304,7 @@ ul#widget-list li.widget-list-item h4.widget-title {
 	color: #2782af
 }
 /* Because we don't want visited on these links */
-#adminmenu a.current, #sidemenu a.current {
+#adminmenu a.current, #sidemenu a.current, .ui-tabs-selected a, .ui-tabs-selected a:hover {
 	background-color: #fff;
 	border-color: #07273e;
 	border-bottom-color: #fff;

wp-admin/css/colors-fresh.css

@@ -196,7 +196,7 @@ ul#widget-list li.widget-list-item h4.widget-title {
 	border-color: #535353;
 }
 
-.submit input:hover, .button:hover, .button-secondary:hover, #wphead #viewsite a:hover, #adminmenu a:hover, #sidemenu a:hover, #submenu a.current, #submenu a:hover, .submitbox #previewview a:hover, #the-comment-list .comment a:hover, #rightnow a:hover, a:hover, .subsubsub a:hover, .subsubsub a.current:hover, #login form .submit input:hover, div.dashboard-widget-submit input:hover, #edit-slug-buttons a.save:hover, #media-upload a.delete:hover, #media-upload a.del-link:hover {
+.submit input:hover, .button:hover, .button-secondary:hover, #wphead #viewsite a:hover, #adminmenu a:hover, #sidemenu a:hover, #submenu a.current, #submenu a:hover, .submitbox #previewview a:hover, #the-comment-list .comment a:hover, #rightnow a:hover, a:hover, .subsubsub a:hover, .subsubsub a.current:hover, #login form .submit input:hover, div.dashboard-widget-submit input:hover, #edit-slug-buttons a.save:hover, #media-upload a.delete:hover, #media-upload a.del-link:hover, .ui-tabs-nav a:hover {
 	color: #d54e21;
 }
 
@@ -279,12 +279,12 @@ ul#widget-list li.widget-list-item h4.widget-title {
 	color: #666;
 }
 
-#adminmenu a, #submenu a, #poststuff #edButtonPreview, #poststuff #edButtonHTML, #the-comment-list p.comment-author strong a, #media-upload a.del-link, #media-upload a.delete, a {
+#adminmenu a, #submenu a, #poststuff #edButtonPreview, #poststuff #edButtonHTML, #the-comment-list p.comment-author strong a, #media-upload a.del-link, #media-upload a.delete, .ui-tabs-nav a, a {
 	color: #2583ad;
 }
 
 /* Because we don't want visited on these links */
-#adminmenu a.current, #sidemenu a.current {
+#adminmenu a.current, #sidemenu a.current, .ui-tabs-selected a, .ui-tabs-selected a:hover {
 	background-color: #fff;
 	border-color: #c6d9e9;
 	border-bottom-color: #fff;

wp-admin/css/press-this.css

@@ -77,8 +77,6 @@ div.ui-tabs-panel {
 	-webkit-border-top-right-radius: 4px;
 	border-style: solid;
 	border-width: 1px;
-	border-color: #C6D9E9 rgb(198, 217, 233) rgb(255, 255, 255);
-	color: #D54E21;
 }
 
 .ui-tabs-nav .ui-tabs-selected a {
@@ -99,7 +97,7 @@ div.ui-tabs-panel {
 
 .ui-tabs-loading em {
 	padding: 0 0 0 20px;
-	background: url(./images/loading.gif) no-repeat 0 50%;
+	background: url(../images/loading.gif) no-repeat 0 50%;
 }
 
 /* Additional IE specific bug fixes... */
@@ -357,4 +355,8 @@ div#categories h2 {
 	-khtml-border-top-right-radius: 3px;
 	-webkit-border-top-right-radius: 3px;
 	border-top-right-radius: 3px;
-}
+}
+
+.hidden {
+	display: none;
+}

wp-admin/press-this.php

@@ -86,7 +86,7 @@ function category_div() {
 		</div>
 		<p class="submit">         
 		<input type="submit" value="<?php _e('Publish') ?>" onclick="document.getElementById('photo_saving').style.display = '';"/>
-		<img src="/images/bookmarklet_loader.gif" alt="" id="photo_saving" style="width:16px; height:16px; vertical-align:-4px; display:none;"/>
+		<img src="images/loading.gif" alt="" id="photo_saving" style="width:16px; height:16px; vertical-align:-4px; display:none;"/>
 		</p>
 	</div>	
 <?php
@@ -155,7 +155,7 @@ function press_this_js_init() { ?>
 				accessibility_focus : false,
 				tab_focus : ":next",
 				plugins : "safari,inlinepopups",
-				entity_encoding : "raw"
+				entities : "38,amp,60,lt,62,gt"
 			});
     <?php } ?>
 
@@ -199,12 +199,12 @@ if ( empty($_GET['tab']) ) {
 <?php
 	wp_enqueue_script('jquery-ui-tabs');
 	add_thickbox();
-	wp_admin_css('press-this');
+	wp_enqueue_style('press-this');
-	wp_admin_css( 'colors' );
+	wp_enqueue_style( 'colors' );
 	wp_enqueue_script('post');
 
-	do_action('admin_print_scripts'); 
+	do_action('admin_print_styles');
-	do_action('admin_print_styles'); 
+	do_action('admin_print_scripts');
 	do_action('admin_head');
 ?>
 	<script type="text/javascript">
@@ -331,8 +331,10 @@ if ( empty($_GET['tab']) ) {
 					
 					<h2><?php _e('Caption') ?></h2>
 					<div class="editor-container">
-						<textarea name="content" id="photo_post_two" style="" class="mceEditor"><?php echo $selection;?>
+						<textarea name="content" id="photo_post_two" style="" class="mceEditor">
-						&lt;a href="<?php echo attribute_escape($url);?>"&gt;<?php echo $title;?>&lt;/a&gt; </textarea>
+						<?php echo $selection; ?>
+						&lt;p&gt;&lt;a href="<?php echo attribute_escape($url);?>"&gt;<?php echo $title;?>&lt;/a&gt; &lt;/p&gt;
+						</textarea>
 					</div>
 
 					<?php tag_div(); ?>
@@ -360,9 +362,11 @@ exit;
 					
 				  	<h2><?php _e('Post') ?></h2>
 					<div class="editor-container">
-						<textarea name="content" id="regular_post_two" style="height:170px;width:100%;" class="mceEditor"><?php echo $selection;?><a href="<?php echo $url;?>"><?php echo $title;?></a></textarea>
+						<textarea name="content" id="regular_post_two" style="height:170px;width:100%;" class="mceEditor">
+						<?php echo $selection; ?>
+						&lt;p&gt;&lt;a href="<?php echo $url;?>"&gt;<?php echo $title;?>&lt;/a&gt; &lt;/p&gt;
+						</textarea>
 					</div>        
-
 					<?php tag_div(); ?>
        
 				</div>
@@ -388,12 +392,16 @@ exit;
 					
 					<h2><?php _e('Quote') ?></h2>
 					<div class="editor-container">
-						<textarea name="content" id="quote_post_one" style="height:130px;width:100%;" class="mceEditor"><?php echo $selection;?></textarea>
+						<textarea name="content" id="quote_post_one" style="height:130px;width:100%;" class="mceEditor">
+						<?php echo $selection; ?>
+						</textarea>
 					</div>
 
-					<h2><?php _e('Source <span class="optional">(optional)</span>') ?></h2>
+					<h2><?php _e('Source'); ?> <span class="optional"><?php _e('(optional)'); ?></span></h2>
 					<div class="editor-container">
-						<textarea name="content2" id="quote_post_two" style="height:130px;width:100%;" class="mceEditor"><cite>&lt;a href="<?php echo $url;?>"&gt;<?php echo $title;?>&lt;/a&gt;</cite></textarea>
+						<textarea name="content2" id="quote_post_two" style="height:130px;width:100%;" class="mceEditor">
+						&lt;p&gt;&lt;cite&gt;&lt;a href="<?php echo $url;?>"&gt;<?php echo $title;?>&lt;/a&gt;&lt;/cite&gt; &lt;/p&gt;
+						</textarea>
 					</div>
 
 					<?php tag_div(); ?>
@@ -433,7 +441,10 @@ exit;
 					<h2><?php _e('Caption <span class="optional">(optional)</span>') ?></h2>
 
 					<div class="editor-container">
-						<textarea name="content2" id="video_post_two" style="height:130px;width:100%;" class="mceEditor"><?php echo $selection; ?> &lt;a href="<?php echo $url; ?>"&gt;<?php echo $title;?>&lt;/a&gt;</textarea>
+						<textarea name="content2" id="video_post_two" style="height:130px;width:100%;" class="mceEditor">
+						<?php echo $selection; ?>
+						&lt;p&gt;&lt;a href="<?php echo $url; ?>"&gt;<?php echo $title; ?>&lt;/a&gt; &lt;/p&gt;
+						</textarea>
 					</div>
 
 					<?php tag_div(); ?>