Wordpress 3.1

[autoinstalls/wordpress.git] / wp-admin / index.php

diff --git a/wp-admin/index.php b/wp-admin/index.php
index 2447e2fe60dd5811e1150a90bf9f6d8b204da683..748141e0ecdeddf1a1040b82b5406b4e79de1174 100644 (file)
--- a/wp-admin/index.php
+++ b/wp-admin/index.php
@@ -1,145 +1,70 @@
 <?php
 <?php

-require_once('admin.php');
+/**
+ * Dashboard Administration Panel
+ *
+ * @package WordPress
+ * @subpackage Administration
+ */

 
 

-function index_js() {
-?>
-<script type="text/javascript">
-       jQuery(function() {
-               jQuery('#incominglinks').load('index-extra.php?jax=incominglinks');
-               jQuery('#devnews').load('index-extra.php?jax=devnews');
-               jQuery('#planetnews').load('index-extra.php?jax=planetnews');
-       });
-</script>
-<?php
-}
-add_action( 'admin_head', 'index_js' );
+/** Load WordPress Bootstrap */
+require_once('./admin.php');
+
+/** Load WordPress dashboard API */
+require_once(ABSPATH . 'wp-admin/includes/dashboard.php');

 
 

-wp_enqueue_script( 'jquery' );
+wp_dashboard_setup();
+
+wp_enqueue_script( 'dashboard' );
+wp_enqueue_script( 'plugin-install' );
+wp_enqueue_script( 'media-upload' );
+wp_admin_css( 'dashboard' );
+wp_admin_css( 'plugin-install' );
+add_thickbox();

 
 $title = __('Dashboard');
 $parent_file = 'index.php';
 
 $title = __('Dashboard');
 $parent_file = 'index.php';

-require_once('admin-header.php');
+
+if ( is_user_admin() )
+       add_screen_option('layout_columns', array('max' => 4, 'default' => 1) );
+else
+       add_screen_option('layout_columns', array('max' => 4, 'default' => 2) );
+
+add_contextual_help($current_screen,
+
+       '<p>' . __( 'Welcome to your WordPress Dashboard! You will find helpful tips in the Help tab of each screen to assist you as you get to know the application.' ) . '</p>' .
+       '<p>' . __( 'The Admin Bar at the top, new in 3.1, provides quick access to common tasks when you are viewing your site.' ) . '</p>' .
+       '<p>' . __( 'The left-hand navigation menu provides links to the administration screens in your WordPress application. You can expand or collapse navigation sections by clicking on the arrow that appears on the right side of each navigation item when you hover over it. You can also minimize the navigation menu to a narrow icon strip by clicking on the faint separator lines between the Dashboard and Posts sections, or between Comments and Appearance; when minimized, the submenu items will be displayed on hover.' ) . '</p>' .
+       '<p>' . __( 'You can configure your dashboard by choosing which boxes, or modules, to display in the work area, how many columns to display them in, and where each box should be placed. You can hide/show boxes and select the number of columns in the Screen Options tab. To rearrange the boxes, drag and drop by clicking on the title bar of the selected box and releasing when you see a gray dotted-line rectangle appear in the location you want to place the box. You can also expand or collapse each box by clicking once on the title bar of the box. In addition, some boxes are configurable, and will show a &#8220;Configure&#8221; link in the title bar when you hover over it.' ) . '</p>' .
+       '<p>' . __( 'The boxes on your Dashboard screen are:' ) . '</p>' .
+       '<p>' . __( '<strong>Right Now</strong> - Displays a summary of the content on your site and identifies which theme and version of WordPress you are using.' ) . '</p>' .
+       '<p>' . __( '<strong>Recent Comments</strong> - Shows the most recent comments on your posts (configurable, up to 30) and allows you to moderate them.' ) . '</p>' .
+       '<p>' . __( '<strong>Incoming Links</strong> - Shows links to your site found by Google Blog Search.' ) . '</p>' .
+       '<p>' . __( '<strong>QuickPress</strong> - Allows you to create a new post and either publish it or save it as a draft.' ) . '</p>' .
+       '<p>' . __( '<strong>Recent Drafts</strong> - Displays links to the 5 most recent draft posts you&#8217;ve started.' ) . '</p>' .
+       '<p>' . __( '<strong>WordPress Development Blog</strong> - Come here for the latest scoop.' ) . '</p>' .
+       '<p>' . __( '<strong>Other WordPress News</strong> - Shows the feed from <a href="http://planet.wordpress.org" target="_blank">WordPress Planet</a>. You can configure it to show a different feed of your choosing.' ) . '</p>' .
+       '<p>' . __( '<strong>Plugins</strong> - Features the most popular, newest, and recently updated plugins from the WordPress.org Plugin Directory.' ) . '</p>' .
+       '<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
+       '<p>' . __( '<a href="http://codex.wordpress.org/Dashboard_SubPanel" target="_blank">Documentation on Dashboard</a>' ) . '</p>' .
+       '<p>' . __( '<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>' ) . '</p>'
+);
+
+include (ABSPATH . 'wp-admin/admin-header.php');

 
 $today = current_time('mysql', 1);
 ?>
 
 <div class="wrap">
 
 $today = current_time('mysql', 1);
 ?>
 
 <div class="wrap">

+<?php screen_icon(); ?>
+<h2><?php echo esc_html( $title ); ?></h2>

 
 

-<h2><?php _e('Welcome to WordPress'); ?></h2>
-
-<div id="zeitgeist">
-<h2><?php _e('Latest Activity'); ?></h2>
-
-<div id="incominglinks"></div>
-
-<?php
-$comments = $wpdb->get_results("SELECT comment_author, comment_author_url, comment_ID, comment_post_ID FROM $wpdb->comments WHERE comment_approved = '1' ORDER BY comment_date_gmt DESC LIMIT 5");
-$numcomments = $wpdb->get_var("SELECT COUNT(*) FROM $wpdb->comments WHERE comment_approved = '0'");
-
-if ( $comments || $numcomments ) :
-?>
-<div>
-<h3><?php printf( __( 'Comments <a href="%s" title="More comments&#8230;">&raquo;</a>' ), 'edit-comments.php' ); ?></h3>
-
-<?php if ( $numcomments ) : ?>
-<p><strong><a href="moderation.php"><?php echo sprintf(__('Comments in moderation (%s) &raquo;'), number_format_i18n($numcomments) ); ?></a></strong></p>
-<?php endif; ?>
-
-<ul>
-<?php
-if ( $comments ) {
-foreach ($comments as $comment) {
-       echo '<li>' . sprintf(__('%1$s on %2$s'), get_comment_author_link(), '<a href="'. get_permalink($comment->comment_post_ID) . '#comment-' . $comment->comment_ID . '">' . get_the_title($comment->comment_post_ID) . '</a>');
-       edit_comment_link(__("Edit"), ' <small>(', ')</small>');
-       echo '</li>';
-}
-}
-?>
-</ul>
-</div>
-<?php endif; ?>
-
-<?php
-if ( $recentposts = $wpdb->get_results("SELECT ID, post_title FROM $wpdb->posts WHERE post_type = 'post' AND " . get_private_posts_cap_sql('post') . " AND post_date_gmt < '$today' ORDER BY post_date DESC LIMIT 5") ) :
-?>
-<div>
-<h3><?php printf( __( 'Posts <a href="%s" title="More posts&#8230;">&raquo;</a>' ), 'edit.php' ); ?></h3>
-<ul>
-<?php
-foreach ($recentposts as $post) {
-       if ($post->post_title == '')
-               $post->post_title = sprintf(__('Post #%s'), $post->ID);
-       echo "<li><a href='post.php?action=edit&amp;post=$post->ID'>";
-       the_title();
-       echo '</a></li>';
-}
-?>
-</ul>
-</div>
-<?php endif; ?>
-
-<?php
-if ( $scheduled = $wpdb->get_results("SELECT ID, post_title, post_date_gmt FROM $wpdb->posts WHERE post_type = 'post' AND post_status = 'future' ORDER BY post_date ASC") ) :
-?>
-<div>
-<h3><?php _e('Scheduled Entries:') ?></h3>
-<ul>
-<?php
-foreach ($scheduled as $post) {
-       if ($post->post_title == '')
-               $post->post_title = sprintf(__('Post #%s'), $post->ID);
-       echo "<li>" . sprintf(__('%1$s in %2$s'), "<a href='post.php?action=edit&amp;post=$post->ID' title='" . __('Edit this post') . "'>$post->post_title</a>", human_time_diff( current_time('timestamp', 1), strtotime($post->post_date_gmt. ' GMT') ))  . "</li>";
-}
-?>
-</ul>
-</div>
-<?php endif; ?>
+<div id="dashboard-widgets-wrap">

 
 

-<div>
-<h3><?php _e('Blog Stats'); ?></h3>
-<?php
-$numposts = (int) $wpdb->get_var("SELECT COUNT(*) FROM $wpdb->posts WHERE post_type = 'post' AND post_status = 'publish'");
-$numcomms = (int) $wpdb->get_var("SELECT COUNT(*) FROM $wpdb->comments WHERE comment_approved = '1'");
-$numcats  = wp_count_terms('category');
-$numtags = wp_count_terms('post_tag');
-
-$post_str = sprintf(__ngettext('%1$s <a href="%2$s" title="Posts">post</a>', '%1$s <a href="%2$s" title="Posts">posts</a>', $numposts), number_format_i18n($numposts), 'edit.php');
-$comm_str = sprintf(__ngettext('%1$s <a href="%2$s" title="Comments">comment</a>', '%1$s <a href="%2$s" title="Comments">comments</a>', $numcomms), number_format_i18n($numcomms), 'edit-comments.php');
-$cat_str  = sprintf(__ngettext('%1$s <a href="%2$s" title="Categories">category</a>', '%1$s <a href="%2$s" title="Categories">categories</a>', $numcats), number_format_i18n($numcats), 'categories.php');
-$tag_str  = sprintf(__ngettext('%1$s tag', '%1$s tags', $numtags), number_format_i18n($numtags));
-?>
-
-<p><?php printf(__('There are currently %1$s and %2$s, contained within %3$s and %4$s.'), $post_str, $comm_str, $cat_str, $tag_str); ?></p>
-</div>
-
-<?php do_action('activity_box_end'); ?>
-</div>
-
-<p><?php _e('Use these links to get started:'); ?></p>
+<?php wp_dashboard(); ?>

 
 

-<ul>
-<?php if ( current_user_can('edit_posts') ) : ?>
-       <li><a href="post-new.php"><?php _e('Write a post'); ?></a></li>
-<?php endif; ?>
-       <li><a href="profile.php"><?php _e('Update your profile or change your password'); ?></a></li>
-<?php if ( current_user_can('manage_links') ) : ?>
-       <li><a href="link-add.php"><?php _e('Add a link to your blogroll'); ?></a></li>
-<?php endif; ?>
-<?php if ( current_user_can('switch_themes') ) : ?>
-       <li><a href="themes.php"><?php _e('Change your site&#8217;s look or theme'); ?></a></li>
-<?php endif; ?>
-</ul>
-<p><?php _e("Need help with WordPress? Please see our <a href='http://codex.wordpress.org/'>documentation</a> or visit the <a href='http://wordpress.org/support/'>support forums</a>."); ?></p>
+<div class="clear"></div>
+</div><!-- dashboard-widgets-wrap -->

 
 

-<div id="devnews"></div>
+</div><!-- wrap -->

 
 

-<div id="planetnews"></div>
-
-<div style="clear: both">&nbsp;
-<br clear="all" />
-</div>
-</div>
-
-<?php
-require('./admin-footer.php');
-?>
+<?php require(ABSPATH . 'wp-admin/admin-footer.php'); ?>