Minor tweaks

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

wp-admin/admin-header.php

@@ -9,27 +9,6 @@ if (!isset($_GET["page"])) require_once('admin.php'); ?>
 <link rel="stylesheet" href="<?php echo get_settings('siteurl') ?>/wp-admin/wp-admin.css?version=<?php bloginfo('version'); ?>" type="text/css" />
 <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_settings('blog_charset'); ?>" />
 
-<?php if ( get_option('rich_editing') ) :?>
-<script type="text/javascript" src="tinymce/tiny_mce_src.js"></script>
-<script type="text/javascript">
-tinyMCE.init({
-	mode : "specific_textareas",
-	textarea_trigger : "title",
-	theme : "advanced",
-	theme_advanced_buttons1 : "bold,italic,strikethrough,separator,bullist,numlist,separator,justifyleft,justifycenter,justifyright,separator,link,unlink,image,emotions,separator,undo,redo,code",
-	theme_advanced_buttons2 : "",
-	theme_advanced_buttons3 : "",
-	theme_advanced_toolbar_location : "top",
-	theme_advanced_toolbar_align : "left",
-	theme_advanced_path_location : "bottom",
-	entity_encoding : "raw",
-	extended_valid_elements : "a[id|href|title|onclick],img[class|src|alt|title|width|height|align]",
-	plugins : "emotions"
-	<?php do_action('mce_options'); ?>
-});
-</script>
-<?php endif; ?>
-
 <script type="text/javascript">
 //<![CDATA[
 
@@ -93,13 +72,31 @@ function blurry() {
 }
 
 addLoadEvent(blurry);
-
 <?php endif; ?>
-
-
 //]]>
 </script>
 <script type="text/javascript" src="fat.js"></script>
+<?php if ( get_option('rich_editing') ) :?>
+<script type="text/javascript" src="tinymce/tiny_mce_src.js"></script>
+<script type="text/javascript">
+tinyMCE.init({
+	mode : "specific_textareas",
+	textarea_trigger : "title",
+	width : "100%",
+	theme : "advanced",
+	theme_advanced_buttons1 : "bold,italic,strikethrough,separator,bullist,numlist,separator,justifyleft,justifycenter,justifyright,separator,link,unlink,image,emotions,separator,undo,redo,code",
+	theme_advanced_buttons2 : "",
+	theme_advanced_buttons3 : "",
+	theme_advanced_toolbar_location : "top",
+	theme_advanced_toolbar_align : "left",
+	theme_advanced_path_location : "bottom",
+	entity_encoding : "raw",
+	extended_valid_elements : "a[id|href|title|onclick],img[class|src|alt|title|width|height|align]",
+	plugins : "emotions"
+	<?php do_action('mce_options'); ?>
+});
+</script>
+<?php endif; ?>
 <?php if ( isset( $editing ) ) : ?>
 <script type="text/javascript" src="dbx.js"></script>
 <script type="text/javascript" src="dbx-key.js"></script>

wp-admin/dbx-key.js

@@ -1,5 +1,4 @@
 
-
 //initialisation function
 addLoadEvent( function()
 {
@@ -10,8 +9,8 @@ addLoadEvent( function()
 	//create new docking boxes group
 	var meta = new dbxGroup(
 		'grabit', 		// container ID [/-_a-zA-Z0-9/]
-		'vertical', 		// orientation ['vertical'|'horizontal']
+		'vertical', 	// orientation ['vertical'|'horizontal']
-		'7', 			// drag threshold ['n' pixels]
+		'10', 			// drag threshold ['n' pixels]
 		'no',			// restrict drag movement to container axis ['yes'|'no']
 		'10', 			// animate re-ordering [frames per transition, or '0' for no effect]
 		'yes', 			// include open/close toggle buttons ['yes'|'no']
@@ -28,7 +27,7 @@ addLoadEvent( function()
 	var advanced = new dbxGroup(
 		'advancedstuff', 		// container ID [/-_a-zA-Z0-9/]
 		'vertical', 		// orientation ['vertical'|'horizontal']
-		'7', 			// drag threshold ['n' pixels]
+		'10', 			// drag threshold ['n' pixels]
 		'yes',			// restrict drag movement to container axis ['yes'|'no']
 		'10', 			// animate re-ordering [frames per transition, or '0' for no effect]
 		'yes', 			// include open/close toggle buttons ['yes'|'no']

wp-admin/edit-pages.php

@@ -7,6 +7,7 @@ require_once('admin-header.php');
 
 <div class="wrap">
 <h2><?php _e('Page Management'); ?></h2>
+<p><?php _e('Pages are like posts except they live outside of the normal blog chronology and can be hierarchical. You can use pages to organize and manage any amount of content.'); ?> <a href="page-new.php"><?php _e('Create a new page'); ?> &raquo;</a></p>
 
 <?php
 $posts = $wpdb->get_results("SELECT * FROM $wpdb->posts WHERE post_status = 'static'");
@@ -32,9 +33,9 @@ if ($posts) {
 <?php
 } // end if ($posts)
 ?> 
-<p><?php _e('Pages are like posts except they live outside of the normal blog chronology. You can use pages to organize and manage any amount of content.'); ?></p>
+
 <h3><a href="page-new.php"><?php _e('Create New Page'); ?> &raquo;</a></h3>
+
 </div>
 
-
 <?php include('admin-footer.php'); ?> 

wp-admin/options-personal-update.php

@@ -2,6 +2,8 @@
 
 require_once('admin.php');
 
+check_admin_referer();
+
 if ( isset( $_POST['action'] ) ) {
 	if ( !isset( $_POST['rich_editing'] ) )
 		$_POST['rich_editing'] = 'false';

wp-admin/options.php

@@ -29,6 +29,8 @@ switch($action) {
 case 'update':
 	$any_changed = 0;
 	
+	check_admin_referer();
+    
 	if (!$_POST['page_options']) {
 		foreach ($_POST as $key => $value) {
 			$option_names[] = "'$key'";

wp-admin/themes.php

@@ -26,7 +26,7 @@ require_once('admin-header.php');
 <?php if ( ! validate_current_theme() ) : ?>
 <div id="message1" class="updated fade"><p><?php _e('The active theme is broken.  Reverting to the default theme.'); ?></p></div>
 <?php elseif ( isset($activated) ) : ?>
-<div id="message2" class="updated fade"><p><?php _e('New theme activated'); ?></p></div>
+<div id="message2" class="updated fade"><p><?php printf(__('New theme activated. <a href="%s">View site &raquo;</a>'), get_bloginfo('home')); ?></p></div>
 <?php endif; ?>
 
 <?php