Changes in trunk/wp-admin/index.php [4399:3443]

File:

• trunk/wp-admin/index.php (modified) (11 diffs)

trunk/wp-admin/index.php

@@ -2 +2 @@
 require_once('admin.php'); 
 $title = __('Dashboard'); 
-$parent_file = 'index.php';
 require_once('admin-header.php');
-require_once (ABSPATH . WPINC . '/rss.php');
+require_once (ABSPATH . WPINC . '/rss-functions.php');
 
 $today = current_time('mysql', 1);
@@ -11 +10 @@
 <div class="wrap">
 
-<h2><?php _e('Welcome to WordPress'); ?></h2>
+<h2><?php _e('Dashboard'); ?></h2>
 
 <div id="zeitgeist">
@@ -21 +20 @@
 ?>
 <div id="incominglinks">
-<h3><?php _e('Incoming Links'); ?> <cite><a href="http://www.technorati.com/search/<?php echo trailingslashit(get_option('home')); ?>?partner=wordpress"><?php _e('More &raquo;'); ?></a></cite></h3>
+<h3><?php _e('Incoming Links'); ?> <cite><a href="http://www.technorati.com/search/<?php echo trailingslashit(get_option('home')); ?>?partner=wordpress"><?php _e('More'); ?> &raquo;</a></cite></h3>
 <ul>
 <?php
@@ -27 +26 @@
 foreach ($rss->items as $item ) {
 ?>
-    <li><a href="<?php echo wp_filter_kses($item['link']); ?>"><?php echo wptexturize(wp_specialchars($item['title'])); ?></a></li>
+    <li><a href="<?php echo wp_filter_kses($item['link']); ?>"><?php echo wp_specialchars($item['title']); ?></a></li>
 <?php } ?>
 </ul>
@@ -45 +44 @@
 <p><strong><a href="moderation.php"><?php echo sprintf(__('Comments in moderation (%s)'), number_format($numcomments) ); ?> &raquo;</a></strong></p>
 <?php endif; ?>
+</div>
 
 <ul>
@@ -57 +57 @@
 ?>
 </ul>
-</div>
+
 <?php endif; ?>
 
 <?php
-if ( $recentposts = $wpdb->get_results("SELECT ID, post_title FROM $wpdb->posts WHERE post_type = 'post' AND post_status = 'publish' AND post_date_gmt < '$today' ORDER BY post_date DESC LIMIT 5") ) :
+if ( $recentposts = $wpdb->get_results("SELECT ID, post_title FROM $wpdb->posts WHERE post_status = 'publish' AND post_date_gmt < '$today' ORDER BY post_date DESC LIMIT 5") ) :
 ?>
 <div>
@@ -80 +80 @@
 
 <?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") ) :
+if ( $scheduled = $wpdb->get_results("SELECT ID, post_title, post_date_gmt FROM $wpdb->posts WHERE post_status = 'publish' AND post_date_gmt > '$today' ORDER BY post_date ASC") ) :
 ?> 
 <div>
@@ -99 +99 @@
 <h3><?php _e('Blog Stats'); ?></h3>
 <?php
-$numposts = $wpdb->get_var("SELECT COUNT(*) FROM $wpdb->posts WHERE post_type = 'post' AND post_status = 'publish'");
+$numposts = $wpdb->get_var("SELECT COUNT(*) FROM $wpdb->posts WHERE post_status = 'publish'");
 if (0 < $numposts) $numposts = number_format($numposts); 
 
@@ -114 +114 @@
 </div>
 
+<h3><?php _e('Welcome to WordPress'); ?></h3>
+
 <p><?php _e('Use these links to get started:'); ?></p>
 
 <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 bookmark 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; ?>
+<li><a href="post.php"><?php _e('Write a post'); ?></a></li>
+<li><a href="profile.php"><?php _e('Update your profile or change your password'); ?></a></li>
+<li><a href="link-add.php"><?php _e('Add a link to your blogroll'); ?></a></li>
+<li><a href="themes.php"><?php _e('Change your site&#8217;s look or theme'); ?></a></li>
 </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>
+
+<p><?php _e("Below is the latest news from the official WordPress development blog, click on a title to read the full entry. If you need help with WordPress please see our <a href='http://codex.wordpress.org/'>great documentation</a> or if that doesn't help visit the <a href='http://wordpress.org/support/'>support forums</a>."); ?></p>
 <?php
 $rss = @fetch_rss('http://wordpress.org/development/feed/');
 if ( isset($rss->items) && 0 != count($rss->items) ) {
 ?>
-<div id="devnews">
 <h3><?php _e('WordPress Development Blog'); ?></h3>
 <?php
@@ -145 +141 @@
 }
 ?>
-</div>
+
 
 <?php
@@ -152 +148 @@
 ?>
 <div id="planetnews">
-<h3><?php _e('Other WordPress News'); ?></h3>
+<h3><?php _e('Other WordPress News'); ?> <a href="http://planet.wordpress.org/"><?php _e('more'); ?> &raquo;</a></h3>
 <ul>
 <?php
 $rss->items = array_slice($rss->items, 0, 20);
 foreach ($rss->items as $item ) {
-$title = wp_specialchars($item['title']);
-$author = preg_replace( '|(.+?):.+|s', '$1', $item['title'] );
-$post = preg_replace( '|.+?:(.+)|s', '$1', $item['title'] );
 ?>
-<li><a href='<?php echo wp_filter_kses($item['link']); ?>'><span class="post"><?php echo $post; ?></span><span class="hidden"> - </span><cite><?php echo $author; ?></cite></a></li>
+<li><a href='<?php echo wp_filter_kses($item['link']); ?>'><?php echo wp_specialchars($item['title']); ?></a></li>
 <?php
     }
 ?>
 </ul>
-<p class="readmore"><a href="http://planet.wordpress.org/"><?php _e('Read more'); ?> &raquo;</a></p>
 </div>
 <?php